소스 검색

1.添加游戏结算页面

王鹏鹏 2 년 전
부모
커밋
2995b84ceb

+ 3 - 1
.idea/misc.xml

@@ -494,17 +494,19 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_level_two.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_pause.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_placeholder.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_play.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_progressbar_selector.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_record.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_score.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_settlement.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_title.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_type.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_scientific_principle.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4055258467023173" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.4" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_play_game.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/dialog_count_down.xml" value="0.4" />

+ 1 - 0
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -90,6 +90,7 @@ class GameIntroductionActivity :
         super.onNewIntent(intent)
         isEnterGame = true
         binding.playTxCloudView.onResume()
+        binding.btnStartGame.text = "继续游戏"
     }
 
     override fun onResume() {

+ 15 - 7
game/src/main/res/drawable/bg_game_back.xml

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
-    <corners android:radius="@dimen/divider_29px" />
-    <stroke
-        android:width="@dimen/divider_1px"
-        android:color="@color/color_FF979797" />
-    <solid android:color="@android:color/white" />
-</shape>
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/divider_43px" />
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_FFFF9E58"
+                android:startColor="@color/color_FFC63910"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

+ 2 - 2
game/src/main/res/drawable/bg_game_settlement.xml

@@ -7,8 +7,8 @@
         <shape android:shape="rectangle">
             <gradient
                 android:angle="90"
-                android:endColor="@color/color_FFFFC400"
-                android:startColor="@color/color_FFFFDA81"
+                android:endColor="@color/color_FC426CFB"
+                android:startColor="@color/color_FF35BEFC"
                 android:type="linear"
                 android:useLevel="true" />
         </shape>

+ 37 - 7
game/src/main/res/layout/activity_game_settlement.xml

@@ -18,14 +18,14 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/backLayout"
-            android:layout_width="@dimen/divider_148px"
-            android:layout_height="@dimen/divider_58px"
+            android:layout_width="@dimen/divider_169px"
+            android:layout_height="@dimen/divider_65px"
             android:layout_marginStart="@dimen/divider_32px"
             android:layout_marginTop="@dimen/divider_32px"
             android:background="@drawable/bg_game_back"
             android:gravity="center"
             android:text="@string/game_back"
-            android:textColor="@color/color_FF4A75FF"
+            android:textColor="@android:color/white"
             android:textSize="@dimen/divider_28px"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -33,11 +33,41 @@
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/loadingImage"
-            android:layout_width="@dimen/divider_360px"
-            android:layout_height="@dimen/divider_416px"
+            android:layout_width="@dimen/divider_149px"
+            android:layout_height="@dimen/divider_244px"
+            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_marginBottom="@dimen/divider_9px"
+            android:scaleType="centerInside"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="@dimen/divider_136px"
+            android:layout_marginEnd="@dimen/divider_101px"
+            android:layout_marginBottom="@dimen/divider_60px"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toEndOf="@+id/loadingImage">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@mipmap/icon_game_result_bg" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/divider_58px"
+                android:layout_marginTop="@dimen/divider_21px"
+                android:layout_marginEnd="@dimen/divider_58px"
+                android:gravity="start"
+                android:text="@string/keep_going_try_to_surpass_yourself"
+                android:textColor="@color/color_FF6F3218"
+                android:textSize="@dimen/divider_24px"
+                android:textStyle="bold" />
+
+        </FrameLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/gamelayout"

BIN
game/src/main/res/mipmap-xxhdpi/icon_game_result_bg.png


+ 6 - 0
game/src/main/res/values/colors.xml

@@ -35,4 +35,10 @@
     <color name="color_FFFFF6CF" tools:ignore="ResourceName">#FFFFF6CF</color>
     <color name="color_FFFFC00D" tools:ignore="ResourceName">#FFFFC00D</color>
     <color name="color_FFA94A09" tools:ignore="ResourceName">#FFA94A09</color>
+    <color name="color_FF6F3218" tools:ignore="ResourceName">#FF6F3218</color>
+    <color name="color_FC426CFB" tools:ignore="ResourceName">#FC426CFB</color>
+    <color name="color_FF35BEFC" tools:ignore="ResourceName">#FF35BEFC</color>
+    <color name="color_FFFFE9A0" tools:ignore="ResourceName">#FFFFE9A0</color>
+    <color name="color_FFC63910" tools:ignore="ResourceName">#FFC63910</color>
+    <color name="color_FFFF9E58" tools:ignore="ResourceName">#FFFF9E58</color>
 </resources>

+ 3 - 0
game/src/main/res/values/dimens.xml

@@ -79,6 +79,7 @@
     <dimen name="divider_248px" tools:ignore="ResourceName">248px</dimen>
     <dimen name="divider_246px" tools:ignore="ResourceName">246px</dimen>
     <dimen name="divider_245px" tools:ignore="ResourceName">245px</dimen>
+    <dimen name="divider_244px" tools:ignore="ResourceName">244px</dimen>
     <dimen name="divider_243px" tools:ignore="ResourceName">243px</dimen>
     <dimen name="divider_240px" tools:ignore="ResourceName">240px</dimen>
     <dimen name="divider_238px" tools:ignore="ResourceName">238px</dimen>
@@ -116,12 +117,14 @@
     <dimen name="divider_153px" tools:ignore="ResourceName">153px</dimen>
     <dimen name="divider_152px" tools:ignore="ResourceName">152px</dimen>
     <dimen name="divider_151px" tools:ignore="ResourceName">151px</dimen>
+    <dimen name="divider_149px" tools:ignore="ResourceName">149px</dimen>
     <dimen name="divider_148px" tools:ignore="ResourceName">148px</dimen>
     <dimen name="divider_142px" tools:ignore="ResourceName">142px</dimen>
     <dimen name="divider_141px" tools:ignore="ResourceName">141px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_139px" tools:ignore="ResourceName">139px</dimen>
     <dimen name="divider_138px" tools:ignore="ResourceName">138px</dimen>
+    <dimen name="divider_136px" tools:ignore="ResourceName">136px</dimen>
     <dimen name="divider_135px" tools:ignore="ResourceName">135px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
     <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>

+ 1 - 0
game/src/main/res/values/strings.xml

@@ -12,4 +12,5 @@
     <string name="game_introduction" tools:ignore="ResourceName">游戏简介</string>
     <string name="score" tools:ignore="ResourceName">得分</string>
     <string name="zero" tools:ignore="ResourceName">0</string>
+    <string name="keep_going_try_to_surpass_yourself" tools:ignore="ResourceName">继续加油,努力超越自己!\n坚持训练下去,你的注意力分配能力会得到很大的提升</string>
 </resources>