Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/Config/EventConditionConfig.json   resolved by origin/master(远端) version
#	Assets/Res/Config/EventConfig.json   resolved by origin/master(远端) version
#	Assets/Res/Config/LanguageChineseConfig.json   resolved by origin/master(远端) version
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	Excel2Json/Excel/Maps.xlsx   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -20,7 +20,25 @@ MonoBehaviour:
     m_RotationOrder: 4
   InExpo:
     serializedVersion: 2
-    m_Curve: []
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4

Assets/Res/Config/DivineSenseConfig.json

@@ -11,8 +11,8 @@
         0.0,
         1.0
       ],
-      "exp": 300,
-      "MaxNum": 1
+      "exp": 1000,
+      "MaxNum": 2
     },
     {
       "ID": 2,
@@ -25,8 +25,8 @@
         0.0,
         2.0
       ],
-      "exp": 600,
-      "MaxNum": 2
+      "exp": 3000,
+      "MaxNum": 3
     },
     {
       "ID": 3,
@@ -39,8 +39,8 @@
         0.0,
         3.0
       ],
-      "exp": 900,
-      "MaxNum": 3
+      "exp": 6000,
+      "MaxNum": 4
     },
     {
       "ID": 4,
@@ -53,8 +53,8 @@
         0.0,
         4.0
       ],
-      "exp": 1200,
-      "MaxNum": 4
+      "exp": 10000,
+      "MaxNum": 5
     },
     {
       "ID": 5,
@@ -67,8 +67,8 @@
         0.0,
         5.0
       ],
-      "exp": 1500,
-      "MaxNum": 5
+      "exp": 15000,
+      "MaxNum": 6
     },
     {
       "ID": 6,
@@ -81,7 +81,7 @@
         0.0,
         6.0
       ],
-      "exp": 1500,
+      "exp": 21000,
       "MaxNum": 6
     },
     {
@@ -95,7 +95,7 @@
         0.0,
         7.0
       ],
-      "exp": 1500,
+      "exp": 27000,
       "MaxNum": 6
     },
     {
@@ -109,7 +109,7 @@
         0.0,
         8.0
       ],
-      "exp": 1500,
+      "exp": 33000,
       "MaxNum": 6
     },
     {
@@ -123,7 +123,7 @@
         0.0,
         9.0
       ],
-      "exp": 1500,
+      "exp": 39000,
       "MaxNum": 6
     },
     {
@@ -136,7 +136,7 @@
         14.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 45000,
       "MaxNum": 6
     },
     {
@@ -149,7 +149,7 @@
         15.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 51000,
       "MaxNum": 6
     },
     {
@@ -162,7 +162,7 @@
         16.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 57000,
       "MaxNum": 6
     },
     {
@@ -175,7 +175,7 @@
         17.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 63000,
       "MaxNum": 6
     },
     {
@@ -188,7 +188,7 @@
         18.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 69000,
       "MaxNum": 6
     },
     {
@@ -201,7 +201,7 @@
         19.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 75000,
       "MaxNum": 6
     },
     {
@@ -214,7 +214,7 @@
         20.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 81000,
       "MaxNum": 6
     },
     {
@@ -227,7 +227,7 @@
         21.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 87000,
       "MaxNum": 6
     },
     {
@@ -240,7 +240,7 @@
         22.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 93000,
       "MaxNum": 6
     },
     {
@@ -253,7 +253,7 @@
         23.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 99000,
       "MaxNum": 6
     },
     {
@@ -266,7 +266,7 @@
         24.0,
         0.0
       ],
-      "exp": 1500,
+      "exp": 105000,
       "MaxNum": 6
     }
   ]

Assets/Res/Config/EventConditionConfig.json

@@ -772,13 +772,13 @@
       "ID": 47,
       "message": 9046,
       "Operation": 0,
-      "ConditionType": 5,
+      "ConditionType": 10,
       "ConditionPara": [
         30023
       ],
       "finishCount": 5,
       "RelatedEvents": [
-        30023
+        9141
       ],
       "SkiptoIds": [
         1,
@@ -791,13 +791,13 @@
       "ID": 48,
       "message": 9047,
       "Operation": 0,
-      "ConditionType": 5,
+      "ConditionType": 10,
       "ConditionPara": [
         30024
       ],
       "finishCount": 5,
       "RelatedEvents": [
-        30024
+        9143
       ],
       "SkiptoIds": [
         1,

Assets/Res/Config/EventNPC.json

@@ -224,74 +224,176 @@
     },
     {
       "ID": 126,
-      "name": 0,
-      "icon": "",
+      "name": 2102,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 127,
-      "name": 0,
-      "icon": "",
+      "name": 2103,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 128,
-      "name": 0,
-      "icon": "",
+      "name": 2104,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 129,
-      "name": 0,
-      "icon": "",
+      "name": 2105,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 130,
-      "name": 0,
-      "icon": "",
+      "name": 2106,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 131,
-      "name": 0,
-      "icon": "",
+      "name": 2107,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 132,
-      "name": 0,
-      "icon": "",
+      "name": 2108,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 133,
-      "name": 0,
-      "icon": "",
+      "name": 2109,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 134,
-      "name": 0,
-      "icon": "",
+      "name": 2110,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 135,
-      "name": 0,
-      "icon": "",
+      "name": 2111,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 136,
-      "name": 0,
-      "icon": "",
+      "name": 2112,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
       "ID": 137,
-      "name": 0,
-      "icon": "",
+      "name": 2113,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 138,
+      "name": 2114,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 139,
+      "name": 2115,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 140,
+      "name": 2116,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 141,
+      "name": 2117,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 142,
+      "name": 2118,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 143,
+      "name": 2119,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 144,
+      "name": 2120,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 145,
+      "name": 2121,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 146,
+      "name": 2122,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 147,
+      "name": 2123,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 148,
+      "name": 2124,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 149,
+      "name": 2125,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 150,
+      "name": 2126,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 151,
+      "name": 2127,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 152,
+      "name": 2128,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 153,
+      "name": 2129,
+      "icon": "bg_lh_huizi",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 154,
+      "name": 2130,
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {

Assets/Res/Config/GroupConfig.json

@@ -757,10 +757,10 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        200
+        5
       ],
       "GroupMonster": [
-        9005
+        9002
       ]
     },
     {
@@ -843,6 +843,300 @@
       "GroupMonster": [
         9001
       ]
+    },
+    {
+      "ID": 4010,
+      "GroupMonsterLevel": [
+        170
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4011,
+      "GroupMonsterLevel": [
+        180
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4012,
+      "GroupMonsterLevel": [
+        190
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4013,
+      "GroupMonsterLevel": [
+        200
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4014,
+      "GroupMonsterLevel": [
+        210
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4015,
+      "GroupMonsterLevel": [
+        220
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4016,
+      "GroupMonsterLevel": [
+        230
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4017,
+      "GroupMonsterLevel": [
+        240
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4018,
+      "GroupMonsterLevel": [
+        250
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4019,
+      "GroupMonsterLevel": [
+        260
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4020,
+      "GroupMonsterLevel": [
+        270
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4021,
+      "GroupMonsterLevel": [
+        280
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4022,
+      "GroupMonsterLevel": [
+        290
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4023,
+      "GroupMonsterLevel": [
+        300
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4024,
+      "GroupMonsterLevel": [
+        300
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 4025,
+      "GroupMonsterLevel": [
+        300
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 5001,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        60
+      ],
+      "attQiangDu": [
+        60
+      ],
+      "duipingQiangDu": [
+        60
+      ]
+    },
+    {
+      "ID": 5002,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        70
+      ],
+      "duipingQiangDu": [
+        70
+      ]
+    },
+    {
+      "ID": 5003,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        80
+      ],
+      "attQiangDu": [
+        80
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5004,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        90
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        90
+      ]
+    },
+    {
+      "ID": 5005,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        100
+      ],
+      "attQiangDu": [
+        1000
+      ],
+      "duipingQiangDu": [
+        100
+      ]
+    },
+    {
+      "ID": 5006,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        60
+      ],
+      "attQiangDu": [
+        60
+      ],
+      "duipingQiangDu": [
+        60
+      ]
+    },
+    {
+      "ID": 5007,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        70
+      ],
+      "duipingQiangDu": [
+        70
+      ]
+    },
+    {
+      "ID": 5008,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        80
+      ],
+      "attQiangDu": [
+        80
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5009,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        90
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        90
+      ]
+    },
+    {
+      "ID": 5010,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        100
+      ],
+      "attQiangDu": [
+        1000
+      ],
+      "duipingQiangDu": [
+        100
+      ]
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -543,7 +543,7 @@
     {
       "ID": 10001,
       "Group": [
-        10001
+        100001
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -639,6 +639,266 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4010,
+      "Group": [
+        4010
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4011,
+      "Group": [
+        4011
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4012,
+      "Group": [
+        4012
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4013,
+      "Group": [
+        4013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4014,
+      "Group": [
+        4014
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4015,
+      "Group": [
+        4015
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4016,
+      "Group": [
+        4016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4017,
+      "Group": [
+        4017
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4018,
+      "Group": [
+        4018
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4019,
+      "Group": [
+        4019
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4020,
+      "Group": [
+        4020
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4021,
+      "Group": [
+        4021
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4022,
+      "Group": [
+        4022
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4023,
+      "Group": [
+        4023
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4024,
+      "Group": [
+        4024
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 4025,
+      "Group": [
+        4025
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5001,
+      "Group": [
+        5001
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5002,
+      "Group": [
+        5002
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5003,
+      "Group": [
+        5003
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5004,
+      "Group": [
+        5004
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5005,
+      "Group": [
+        5005
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5006,
+      "Group": [
+        5006
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5007,
+      "Group": [
+        5007
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5008,
+      "Group": [
+        5008
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5009,
+      "Group": [
+        5009
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5010,
+      "Group": [
+        5010
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

Assets/Res/Config/PlayerGuideConfig.json

@@ -22,9 +22,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.0,
       "Handle": 1,
@@ -61,9 +58,6 @@
       "SpeakerStyle": 3,
       "SpeakerImage": 3,
       "desc": 10132,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -100,9 +94,6 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10133,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -139,11 +130,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10134,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -178,11 +166,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10135,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -217,11 +202,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10136,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -256,11 +238,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10137,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -295,11 +274,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10138,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -334,11 +310,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10139,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -373,11 +346,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -412,11 +382,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10140,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -451,11 +418,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": -1,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -490,11 +454,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10141,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -529,11 +490,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10142,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -568,11 +526,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10143,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -607,11 +562,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10144,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -646,11 +598,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10145,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -685,11 +634,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10146,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -724,11 +670,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10147,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -763,11 +706,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10148,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -802,11 +742,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10149,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -841,9 +778,6 @@
       "SpeakerStyle": 4,
       "SpeakerImage": 3,
       "desc": 10150,
-      "ExtraShow": [
-        "0"
-      ],
       "Highlighting": 1,
       "blackAlpha": 0.0,
       "Handle": 1,

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -317,6 +317,7 @@ GameObject:
   - component: {fileID: 3845805147842114099}
   - component: {fileID: 3274072020448486571}
   - component: {fileID: 3326347593227472543}
+  - component: {fileID: 8873959656822706880}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -386,6 +387,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6D1E\u5E9C"
+--- !u!114 &8873959656822706880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 701047435480110982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10167
 --- !u!1 &1058212698097100470
 GameObject:
   m_ObjectHideFlags: 0
@@ -620,6 +634,7 @@ GameObject:
   - component: {fileID: 4454644270139638089}
   - component: {fileID: 6468258095934692119}
   - component: {fileID: 7376607911237243140}
+  - component: {fileID: 7114587401958330929}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -689,6 +704,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5546\u5E97"
+--- !u!114 &7114587401958330929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1223964728012805292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10168
 --- !u!1 &1274245267068317966
 GameObject:
   m_ObjectHideFlags: 0
@@ -835,6 +863,7 @@ GameObject:
   - component: {fileID: 8052324487370643166}
   - component: {fileID: 5311815257834640554}
   - component: {fileID: 6972843921874825402}
+  - component: {fileID: 6994518953004696016}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -904,6 +933,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5"
+--- !u!114 &6994518953004696016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324857811795273833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10166
 --- !u!1 &1693697974241859946
 GameObject:
   m_ObjectHideFlags: 0
@@ -1462,6 +1504,7 @@ GameObject:
   - component: {fileID: 9118942833055612608}
   - component: {fileID: 2151591527671032415}
   - component: {fileID: 1491700778139819005}
+  - component: {fileID: 5005952006266296929}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1546,6 +1589,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.12941177, g: 0.4666667, b: 0.52156866, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &5005952006266296929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2477149122243983751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10164
 --- !u!1 &2634108884773401188
 GameObject:
   m_ObjectHideFlags: 0
@@ -3799,6 +3855,7 @@ GameObject:
   - component: {fileID: 834936776012228567}
   - component: {fileID: 997768621759475326}
   - component: {fileID: 5328025960864367153}
+  - component: {fileID: 7965609398211261346}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3868,6 +3925,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u89D2"
+--- !u!114 &7965609398211261346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6989890744348440139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10165
 --- !u!1 &8685831570883163436
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -457,6 +457,7 @@ GameObject:
   - component: {fileID: 6752924059724541901}
   - component: {fileID: 2312756988428737885}
   - component: {fileID: 6912678622546442018}
+  - component: {fileID: 8981157537908112092}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -541,6 +542,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8981157537908112092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2545179559456748712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10181
 --- !u!1 &2832511953393709571
 GameObject:
   m_ObjectHideFlags: 0
@@ -795,6 +809,7 @@ GameObject:
   - component: {fileID: 7369070498500758347}
   - component: {fileID: 8313633874709827031}
   - component: {fileID: 7002168581208769732}
+  - component: {fileID: 5341232851300417637}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -864,6 +879,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "100\u6B21\u63A2\u5B9D\u5FC5\u5B9A\u83B7\u5F97\u9C9C\u54C1\u5B9D\u7269"
+--- !u!114 &5341232851300417637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2972985852202581853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10182
 --- !u!1 &3194501373201481477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1066,6 +1094,7 @@ GameObject:
   - component: {fileID: 6146448491995913950}
   - component: {fileID: 1165528826405602289}
   - component: {fileID: 7533858798716897096}
+  - component: {fileID: 3218150167887862838}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1150,6 +1179,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3218150167887862838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4898064796458299979}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10184
 --- !u!1 &4923044900321880700
 GameObject:
   m_ObjectHideFlags: 0
@@ -1347,6 +1389,7 @@ GameObject:
   - component: {fileID: 70910345278346324}
   - component: {fileID: 495549792939547536}
   - component: {fileID: 2300996724624505353}
+  - component: {fileID: 8341268561275804903}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -1431,6 +1474,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8341268561275804903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5523729796495235583}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10180
 --- !u!1 &5798365189845951622
 GameObject:
   m_ObjectHideFlags: 0
@@ -2166,6 +2222,7 @@ GameObject:
   - component: {fileID: 497667885178128358}
   - component: {fileID: 5008264443368327798}
   - component: {fileID: 4526228201366745338}
+  - component: {fileID: 904110818260172587}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2250,6 +2307,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &904110818260172587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7127849299946910399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10183
 --- !u!1 &7228162602162805773
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -515,6 +515,7 @@ GameObject:
   - component: {fileID: 7796969034276455814}
   - component: {fileID: 1685256847371958153}
   - component: {fileID: 3579563483478307139}
+  - component: {fileID: 8823835133171120684}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -599,6 +600,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.86666673, g: 0.5058824, b: 0.14117648, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8823835133171120684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 694216056308444776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10192
 --- !u!1 &909511257581152396
 GameObject:
   m_ObjectHideFlags: 0
@@ -917,6 +931,7 @@ GameObject:
   - component: {fileID: 3376946172870237539}
   - component: {fileID: 120338278017709567}
   - component: {fileID: 9127811789630958149}
+  - component: {fileID: 1545215545510873660}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -986,6 +1001,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "200\u62BD\u6311\u6218\u5DF2\u5B8C\u6210"
+--- !u!114 &1545215545510873660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1793374024918004430}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10259
 --- !u!1 &1932630478545625976
 GameObject:
   m_ObjectHideFlags: 0
@@ -1807,6 +1835,7 @@ GameObject:
   - component: {fileID: 4894137871019489262}
   - component: {fileID: 5751402451290122237}
   - component: {fileID: 4415097656486370284}
+  - component: {fileID: 8509887296616184999}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1876,6 +1905,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &8509887296616184999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4892589196280848047}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262
 --- !u!1 &5280978390038405183
 GameObject:
   m_ObjectHideFlags: 0
@@ -2674,6 +2716,7 @@ GameObject:
   - component: {fileID: 6103133270796787680}
   - component: {fileID: 9174172303824925929}
   - component: {fileID: 4377398059297220351}
+  - component: {fileID: 1102008301683451296}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (2)
@@ -2743,6 +2786,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9886\u53D62-4\u500D\u7FFB\u500D\u5956\u52B1"
+--- !u!114 &1102008301683451296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8531779723099794274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10193
 --- !u!1 &8770593840222513098
 GameObject:
   m_ObjectHideFlags: 0
@@ -2843,6 +2899,7 @@ GameObject:
   - component: {fileID: 1453335509118501595}
   - component: {fileID: 5439913488260530315}
   - component: {fileID: 3027166848902125876}
+  - component: {fileID: 1624114806214101848}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -2912,6 +2969,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "100\u6B21\u63A2\u5B9D\u5FC5\u5B9A\u83B7\u5F97\u9C9C\u54C1\u5B9D\u7269"
+--- !u!114 &1624114806214101848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8815570151867001862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10182
 --- !u!1 &8961401051079870463
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -246,6 +246,7 @@ GameObject:
   - component: {fileID: 3834812936624691349}
   - component: {fileID: 593285393034570064}
   - component: {fileID: 7209608839195132910}
+  - component: {fileID: 3186297236251683901}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (3)
@@ -315,6 +316,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5B8C\u6210\u6B21\u6570"
+--- !u!114 &3186297236251683901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673520390365364380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10188
 --- !u!1 &1811260603699865972
 GameObject:
   m_ObjectHideFlags: 0
@@ -696,6 +710,7 @@ GameObject:
   - component: {fileID: 3758813775204660129}
   - component: {fileID: 4803806791851739352}
   - component: {fileID: 3374620118655784798}
+  - component: {fileID: 3822665200114326682}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (2)
@@ -765,6 +780,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u5956\u52B1"
+--- !u!114 &3822665200114326682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726946618110334721}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10187
 --- !u!1 &2751109958425029971
 GameObject:
   m_ObjectHideFlags: 0
@@ -1053,6 +1081,7 @@ GameObject:
   - component: {fileID: 7237139809221645204}
   - component: {fileID: 8259251194257241138}
   - component: {fileID: 3998889105098686268}
+  - component: {fileID: 2262867269727710824}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1122,6 +1151,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u603B\u79EF\u5206\u5956\u52B1"
+--- !u!114 &2262867269727710824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4550440237619649473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10190
 --- !u!1 &4607014433633812362
 GameObject:
   m_ObjectHideFlags: 0
@@ -1413,6 +1455,7 @@ GameObject:
   - component: {fileID: 3050252600027618270}
   - component: {fileID: 6195597745949149028}
   - component: {fileID: 990153844699681966}
+  - component: {fileID: 5220332990210850460}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (4)
@@ -1482,6 +1525,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u6C47\u603B"
+--- !u!114 &5220332990210850460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5721303365524040708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10189
 --- !u!1 &5789812120163190839
 GameObject:
   m_ObjectHideFlags: 0
@@ -1660,6 +1716,7 @@ GameObject:
   - component: {fileID: 5424655315515069699}
   - component: {fileID: 8805799467788941862}
   - component: {fileID: 8240048422361482980}
+  - component: {fileID: 1865176108619071008}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1729,6 +1786,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!114 &1865176108619071008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5954846971050357279}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10186
 --- !u!1 &6025665801865041190
 GameObject:
   m_ObjectHideFlags: 0
@@ -1740,6 +1810,7 @@ GameObject:
   - component: {fileID: 486793005699165421}
   - component: {fileID: 9176188176770809839}
   - component: {fileID: 8188005894248303015}
+  - component: {fileID: 7357609503517022463}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1809,6 +1880,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!114 &7357609503517022463
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6025665801865041190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10186
 --- !u!1 &6027121454098449183
 GameObject:
   m_ObjectHideFlags: 0
@@ -2250,6 +2334,7 @@ GameObject:
   - component: {fileID: 5039672387026751436}
   - component: {fileID: 7966530394382647399}
   - component: {fileID: 5462732324185025076}
+  - component: {fileID: 4959511961338959571}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2334,6 +2419,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6313726, g: 0.3254902, b: 0.06666667, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &4959511961338959571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7506350864910962600}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10185
 --- !u!1 &7617855394433935135
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -1939,6 +1939,7 @@ GameObject:
   - component: {fileID: 3925115245566125737}
   - component: {fileID: 1904143301479141578}
   - component: {fileID: 1075934160111142449}
+  - component: {fileID: 764988950268057874}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: nextButton
@@ -2061,6 +2062,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &764988950268057874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6329833342161083256}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6411070171000765822
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -449,6 +449,7 @@ GameObject:
   - component: {fileID: 1526515506040239878}
   - component: {fileID: 9181876341202037186}
   - component: {fileID: 1659429409413804256}
+  - component: {fileID: 5277193031132899660}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -533,6 +534,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.38823533, g: 0.45098042, b: 0.3529412, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &5277193031132899660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1245667844451503244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10154
 --- !u!1 &1737360981415971026
 GameObject:
   m_ObjectHideFlags: 0
@@ -1057,6 +1071,7 @@ GameObject:
   - component: {fileID: 9037408276187403176}
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
+  - component: {fileID: 7009910568533120546}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1126,6 +1141,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4ED9\u9014\u4E8B\u4EF6"
+--- !u!114 &7009910568533120546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10151
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0
@@ -1226,6 +1254,7 @@ GameObject:
   - component: {fileID: 8060720440738292912}
   - component: {fileID: 4500106972101745355}
   - component: {fileID: 6327424440615269228}
+  - component: {fileID: 5345833806277290276}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Tips
@@ -1295,6 +1324,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6682\u65E0\u9053\u53CB\u4E8B\u4EF6"
+--- !u!114 &5345833806277290276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310031400641785489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10155
 --- !u!1 &4367645368508741333
 GameObject:
   m_ObjectHideFlags: 0
@@ -2217,6 +2259,7 @@ GameObject:
   - component: {fileID: 3138869795302671254}
   - component: {fileID: 8062631463110613129}
   - component: {fileID: 5677648083755106341}
+  - component: {fileID: 1293472729870226935}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -2286,6 +2329,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4ED9\u9014\u65E5\u5FD7"
+--- !u!114 &1293472729870226935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7546300630243016523}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10152
 --- !u!1 &7587375694572286685
 GameObject:
   m_ObjectHideFlags: 0
@@ -2397,6 +2453,7 @@ GameObject:
   - component: {fileID: 4976295221266540732}
   - component: {fileID: 5349980305419514505}
   - component: {fileID: 7303487924201986757}
+  - component: {fileID: 965679024968818397}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ShenShi
@@ -2594,6 +2651,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &965679024968818397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10153
 --- !u!1 &7754186531390172540
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -2886,6 +2886,7 @@ GameObject:
   - component: {fileID: 5450735266542739631}
   - component: {fileID: 6371802646384107119}
   - component: {fileID: 603735249505551289}
+  - component: {fileID: 3153705677345930592}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3015,6 +3016,19 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &3153705677345930592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4662147658589944582}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10252
 --- !u!1 &4708204802070258293
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab

@@ -345,6 +345,7 @@ GameObject:
   - component: {fileID: 2708046515207152597}
   - component: {fileID: 1851182301441702079}
   - component: {fileID: 4734895600006074142}
+  - component: {fileID: 3894974997294283614}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -414,6 +415,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u7B26\u9009\u62E9"
+--- !u!114 &3894974997294283614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1866119032993322482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10254
 --- !u!1 &2661625032725589361
 GameObject:
   m_ObjectHideFlags: 0
@@ -1017,8 +1031,29 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4902878083619623246}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!1 &291729150310018555 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 6273587929810223113}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4902878083619623246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291729150310018555}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10256
 --- !u!114 &1778556041660004066 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
@@ -1149,7 +1184,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7899468096981879552}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
 --- !u!114 &1342822691304209320 stripped
 MonoBehaviour:
@@ -1173,6 +1211,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &3552570020725593143 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7084566262572104133}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7899468096981879552
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552570020725593143}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10255
 --- !u!224 &7857197774275572282 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}

Assets/Res/UI/DivineSence/DivineSenceItemWidget.prefab

@@ -435,6 +435,7 @@ GameObject:
   - component: {fileID: 4442685365038033268}
   - component: {fileID: 6109028314290466192}
   - component: {fileID: 6822509983602381932}
+  - component: {fileID: 4660116328016628093}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -519,6 +520,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.5764706, g: 0.21176472, b: 0.20784315, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &4660116328016628093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8931825399018571475}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10257
 --- !u!1001 &2288303650482207532
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab

@@ -437,6 +437,7 @@ GameObject:
   - component: {fileID: 1953295275531088506}
   - component: {fileID: 6823089077047512013}
   - component: {fileID: 8570854921528429784}
+  - component: {fileID: 2384221320201441023}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -506,6 +507,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u51E1\u7F18"
+--- !u!114 &2384221320201441023
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1357882188952523013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10245
 --- !u!1 &1534618107640290712
 GameObject:
   m_ObjectHideFlags: 0
@@ -677,6 +691,7 @@ GameObject:
   - component: {fileID: 6490261525193129931}
   - component: {fileID: 6112732395038842149}
   - component: {fileID: 9065674820633882200}
+  - component: {fileID: 4271942760454626302}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -746,6 +761,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7075\u7F18"
+--- !u!114 &4271942760454626302
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1703113548507252815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10248
 --- !u!1 &1895069949315936185
 GameObject:
   m_ObjectHideFlags: 0
@@ -963,6 +991,7 @@ GameObject:
   - component: {fileID: 8567904690125214996}
   - component: {fileID: 1918684433069406871}
   - component: {fileID: 8929737306050891042}
+  - component: {fileID: 8447115123207622703}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -1032,6 +1061,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7384\u7F18"
+--- !u!114 &8447115123207622703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2120699421538322482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10249
 --- !u!1 &2360723107977484743
 GameObject:
   m_ObjectHideFlags: 0
@@ -1372,6 +1414,7 @@ GameObject:
   - component: {fileID: 8437062692557471587}
   - component: {fileID: 5509379017443693015}
   - component: {fileID: 4017975598700128642}
+  - component: {fileID: 2956392820949068890}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1441,6 +1484,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u7B49\u7EA7"
+--- !u!114 &2956392820949068890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3567353608385730091}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10241
 --- !u!1 &3857225550868910347
 GameObject:
   m_ObjectHideFlags: 0
@@ -1452,6 +1508,7 @@ GameObject:
   - component: {fileID: 5841087033254732091}
   - component: {fileID: 2213101297011153779}
   - component: {fileID: 6395369110927611976}
+  - component: {fileID: 1964761767403918018}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1521,6 +1578,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1.13
   m_Text: "\u795E\u8BC6\u89C4\u5219\u4ECB\u7ECD:\r\n\u795E\u8BC6\u63A2\u7D22\u53EF\u83B7\u5F97\u5404\u79CD\u4E8B\u4EF6\uFF0C\u4E8B\u4EF6\u6709\u4E0D\u540C\u7684\u54C1\u8D28\uFF0C\u54C1\u8D28\u8D8A\u9AD8\u5956\u52B1\u8D8A\u4E30\u5BCC\u3002\u4E00\u6B21\u795E\u8BC6\u63A2\u7D22\u6D88\u8017100\u70B9\u795E\u8BC6\u503C\u3002\n\u8FD8\u53EF\u4EE5\u901A\u8FC7\u8F85\u52A9\u795E\u7B26\uFF0C\u63D0\u9AD8\u4E8B\u4EF6\u54C1\u8D28\u6216\u63A2\u7D22\u7279\u5B9A\u4E8B\u4EF6\u3002"
+--- !u!114 &1964761767403918018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3857225550868910347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10242
 --- !u!1 &4079336015890028538
 GameObject:
   m_ObjectHideFlags: 0
@@ -1532,6 +1602,7 @@ GameObject:
   - component: {fileID: 1720309446663711232}
   - component: {fileID: 3406395008300554457}
   - component: {fileID: 714834916712075324}
+  - component: {fileID: 1074665847757349129}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -1601,6 +1672,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5947\u7F18"
+--- !u!114 &1074665847757349129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4079336015890028538}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10247
 --- !u!1 &4173284969590541697
 GameObject:
   m_ObjectHideFlags: 0
@@ -2010,6 +2094,7 @@ GameObject:
   - component: {fileID: 8972922283024183016}
   - component: {fileID: 1865015847960453317}
   - component: {fileID: 3548068244182032158}
+  - component: {fileID: 268102595690917675}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -2079,6 +2164,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5723\u7F18"
+--- !u!114 &268102595690917675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4912977973384151251}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10250
 --- !u!1 &5211702035266187922
 GameObject:
   m_ObjectHideFlags: 0
@@ -2969,6 +3067,7 @@ GameObject:
   - component: {fileID: 1467045573459450599}
   - component: {fileID: 5454917617072517021}
   - component: {fileID: 2690234165981548269}
+  - component: {fileID: 5975292112327363555}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3038,6 +3137,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5F02\u7F18"
+--- !u!114 &5975292112327363555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7693868869523510241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10246
 --- !u!1 &8208926563230717497
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -745,6 +745,7 @@ GameObject:
   - component: {fileID: 2618842243334602427}
   - component: {fileID: 6140569329782375919}
   - component: {fileID: 8062343385206969078}
+  - component: {fileID: 2524634468106264735}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -814,6 +815,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u25C6"
+--- !u!114 &2524634468106264735
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5014351108332961964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10258
 --- !u!1 &6433875597589258302
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -2191,6 +2191,7 @@ GameObject:
   - component: {fileID: 1132527634272378842}
   - component: {fileID: 6867107770330957799}
   - component: {fileID: 521768857768353200}
+  - component: {fileID: 2772177743011391143}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2260,6 +2261,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8FFD\u8E2A\u4E2D"
+--- !u!114 &2772177743011391143
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10159
 --- !u!1 &8193172811373753691
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -414,6 +414,7 @@ GameObject:
   - component: {fileID: 2175574356500699342}
   - component: {fileID: 3162022149235310311}
   - component: {fileID: 6213336244467756100}
+  - component: {fileID: 692530347648927001}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -498,6 +499,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &692530347648927001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10223
 --- !u!1 &3427245093439295002
 GameObject:
   m_ObjectHideFlags: 0
@@ -510,6 +524,7 @@ GameObject:
   - component: {fileID: 8188347619997027446}
   - component: {fileID: 4210667942956718264}
   - component: {fileID: 5712423932741483040}
+  - component: {fileID: 7551574326622614794}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -594,6 +609,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7551574326622614794
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10224
 --- !u!1 &6015582386914595975
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -160,14 +160,16 @@ GameObject:
   - component: {fileID: 3106622106931745522}
   - component: {fileID: 3703191467005982840}
   - component: {fileID: 1942332183402266682}
+  - component: {fileID: 7624787522536036482}
+  - component: {fileID: 7250883919371346337}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: TipsRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3106622106931745522
 RectTransform:
   m_ObjectHideFlags: 0
@@ -186,7 +188,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.04831, y: -946.8596}
-  m_SizeDelta: {x: 539.2465, y: 63.071}
+  m_SizeDelta: {x: 563, y: 63.071}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703191467005982840
 CanvasRenderer:
@@ -239,6 +241,46 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7624787522536036482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &7250883919371346337
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &850832341217663533
 GameObject:
   m_ObjectHideFlags: 0
@@ -2298,9 +2340,10 @@ GameObject:
   - component: {fileID: 8034867944299354957}
   - component: {fileID: 989892582208681239}
   - component: {fileID: 8330416603729543246}
+  - component: {fileID: 1871237412076693942}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Tips
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2323,7 +2366,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -137.7, y: -234.2}
+  m_AnchoredPosition: {x: 37, y: -234.2}
   m_SizeDelta: {x: 35.2913, y: 35.291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &989892582208681239
@@ -2377,6 +2420,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &1871237412076693942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5606048332584031267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8330416603729543246}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5639472365745752167
 GameObject:
   m_ObjectHideFlags: 0
@@ -2633,7 +2720,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2510253786452685598
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2651,7 +2738,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -0.000015258789}
-  m_SizeDelta: {x: 35.2913, y: 35.291}
+  m_SizeDelta: {x: 15.358, y: 25.0577}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3079895378528370827
 CanvasRenderer:
@@ -2674,7 +2761,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.20000002, g: 0.3647059, b: 0.4431373, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2691,14 +2778,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_shenshi_fuhao_wenhao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
   packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+    packName: shenshi
+    packgJsonPath: /Art/UIAssets/TextrueJson\shenshi.txt
+    packgSpritePath: Assets/Res/UIAtlas/shenshi.spriteatlasv2
+    lasetJsonGUID: 390613cb2a0c25f30d6ab3483d292479
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -3203,7 +3290,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3039944541514686334
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3220,7 +3307,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 366.83, y: -1021.1}
+  m_AnchoredPosition: {x: 215, y: -1021.1}
   m_SizeDelta: {x: 172.0734, y: 44.236}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8287794321715321591
@@ -3365,6 +3452,7 @@ GameObject:
   - component: {fileID: 1772753141541214691}
   - component: {fileID: 9156104007059516416}
   - component: {fileID: 1994731080098573646}
+  - component: {fileID: 6885229464675915263}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Speed
@@ -3387,11 +3475,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3106622106931745522}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -32}
+  m_SizeDelta: {x: 533, y: 64}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9156104007059516416
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3434,7 +3522,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: " \u4FEE\u70BC\u901F\u5EA6: 100/\u79D2       \u4E0B\u6B21\u7A81\u7834:
-    3\u5929+"
+    3\u5929+111"
+--- !u!114 &6885229464675915263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7204648226655871677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7368366197341708070
 GameObject:
   m_ObjectHideFlags: 0
@@ -3447,6 +3549,7 @@ GameObject:
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8911828159305465162}
   - component: {fileID: 1321197118262069093}
+  - component: {fileID: 8766603438186958323}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3531,6 +3634,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.1137255, g: 0.23137257, b: 0.20000002, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &8766603438186958323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7368366197341708070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10267
 --- !u!1 &7809232107031970724
 GameObject:
   m_ObjectHideFlags: 0
@@ -4231,4 +4347,34 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: Btn_Tips
+    gameObject: {fileID: 1871237412076693942}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: TipsRoot
+    gameObject: {fileID: 761335188077721832}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -1027,6 +1027,7 @@ GameObject:
   - component: {fileID: 5059099144490991677}
   - component: {fileID: 4658788957982810149}
   - component: {fileID: 6265222927004857925}
+  - component: {fileID: 5168416859472596651}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1096,6 +1097,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6CD5\u5B9D"
+--- !u!114 &5168416859472596651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683972799645630233}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10196
 --- !u!1 &2818405479463266363
 GameObject:
   m_ObjectHideFlags: 0
@@ -1473,6 +1487,7 @@ GameObject:
   - component: {fileID: 4230674668679273989}
   - component: {fileID: 8170707317414517154}
   - component: {fileID: 6598622436281157220}
+  - component: {fileID: 7891978421642869382}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1542,6 +1557,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C5E\u6027\uFF1A"
+--- !u!114 &7891978421642869382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008248057540541071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10194
 --- !u!1 &5182747711655341285
 GameObject:
   m_ObjectHideFlags: 0
@@ -1644,6 +1672,7 @@ GameObject:
   - component: {fileID: 4346796970422155979}
   - component: {fileID: 5625902866573920376}
   - component: {fileID: 2729956649548390542}
+  - component: {fileID: 8613698400489029809}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1713,6 +1742,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E03\u9053\u5FC3\u5883"
+--- !u!114 &8613698400489029809
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7407177216227092324}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10195
 --- !u!1 &8454043528910518791
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -107,6 +107,7 @@ GameObject:
   - component: {fileID: 5462186991158084938}
   - component: {fileID: 4120117667128276633}
   - component: {fileID: 8801748433091037963}
+  - component: {fileID: 4148332433799508222}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -176,6 +177,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7279\u6B8A\u6548\u679C"
+--- !u!114 &4148332433799508222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741793683712924752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10200
 --- !u!1 &1048431458388444575
 GameObject:
   m_ObjectHideFlags: 0
@@ -986,6 +1000,7 @@ GameObject:
   - component: {fileID: 3901820814049949018}
   - component: {fileID: 9077695253424898362}
   - component: {fileID: 3360249867863613287}
+  - component: {fileID: 7379733412482311614}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1070,6 +1085,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6862745, g: 0.6117647, b: 0.57254905, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7379733412482311614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471604515071345865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10204
 --- !u!1 &2539860516855989072
 GameObject:
   m_ObjectHideFlags: 0
@@ -1542,6 +1570,7 @@ GameObject:
   - component: {fileID: 62797131548316216}
   - component: {fileID: 8973767117532586104}
   - component: {fileID: 2257854166180824715}
+  - component: {fileID: 943853463764434505}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1626,6 +1655,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.21176472, g: 0.38823533, b: 0.3372549, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &943853463764434505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3149521884711883608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10201
 --- !u!1 &3186814507385341761
 GameObject:
   m_ObjectHideFlags: 0
@@ -1726,6 +1768,7 @@ GameObject:
   - component: {fileID: 1618446015633265560}
   - component: {fileID: 4658420417724510445}
   - component: {fileID: 9054897281558856292}
+  - component: {fileID: 3399225419570025943}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1795,6 +1838,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u57FA\u7840\u5C5E\u6027"
+--- !u!114 &3399225419570025943
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10198
 --- !u!1 &3314419697092224364
 GameObject:
   m_ObjectHideFlags: 0
@@ -3963,6 +4019,7 @@ GameObject:
   - component: {fileID: 8345998270810602064}
   - component: {fileID: 1742658536006775814}
   - component: {fileID: 9170284339109765767}
+  - component: {fileID: 69354767690102635}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -4032,6 +4089,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6CD5\u5B9D\u6548\u679C"
+--- !u!114 &69354767690102635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6819205046936886586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10199
 --- !u!1 &6855930046191711767
 GameObject:
   m_ObjectHideFlags: 0
@@ -4044,6 +4114,7 @@ GameObject:
   - component: {fileID: 6674707642684229937}
   - component: {fileID: 6169273498034197456}
   - component: {fileID: 2715828969720676018}
+  - component: {fileID: 790167163540477963}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4128,6 +4199,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.20784315, g: 0.3921569, b: 0.49411768, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &790167163540477963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855930046191711767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10202
 --- !u!1 &6891933565934835835
 GameObject:
   m_ObjectHideFlags: 0
@@ -4187,6 +4271,7 @@ GameObject:
   - component: {fileID: 8737435201132713237}
   - component: {fileID: 5668261920968099654}
   - component: {fileID: 6822675929848103333}
+  - component: {fileID: 9053633812066392234}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4271,6 +4356,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.5294118, g: 0.38823533, b: 0.29411766, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &9053633812066392234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7007869723404515456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10202
 --- !u!1 &7897947665373750767
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -2135,6 +2135,7 @@ GameObject:
   - component: {fileID: 4230346137702958171}
   - component: {fileID: 8911786067647200514}
   - component: {fileID: 9041634365181078547}
+  - component: {fileID: 592344222064337924}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2219,6 +2220,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.19215688, g: 0.43137258, b: 0.40000004, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &592344222064337924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4045698680392365287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10169
 --- !u!1 &4613292265912729625
 GameObject:
   m_ObjectHideFlags: 0
@@ -3863,6 +3877,7 @@ GameObject:
   - component: {fileID: 6494192655659048786}
   - component: {fileID: 6374094321362993211}
   - component: {fileID: 6294271820291261417}
+  - component: {fileID: 713215085916987482}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3947,6 +3962,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.19215688, g: 0.43137258, b: 0.40000004, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &713215085916987482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8748422954866088636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10170
 --- !u!1 &8816327462997807595
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -458,6 +458,7 @@ GameObject:
   - component: {fileID: 6236550534434111574}
   - component: {fileID: 1526018650847726743}
   - component: {fileID: 4839312907111622284}
+  - component: {fileID: 8704922108070187347}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -542,6 +543,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.8470589, g: 0.7254902, b: 0.4431373, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &8704922108070187347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2941944296177608750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10179
 --- !u!1 &3130597206452923713
 GameObject:
   m_ObjectHideFlags: 0
@@ -1038,6 +1052,7 @@ GameObject:
   - component: {fileID: 7795755333039391946}
   - component: {fileID: 5357729916732336808}
   - component: {fileID: 8585342351763295681}
+  - component: {fileID: 5517336535545917837}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1107,6 +1122,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6302\u673A\u89C4\u5219"
+--- !u!114 &5517336535545917837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6890044827097431758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10176
 --- !u!1 &6974122640565028989
 GameObject:
   m_ObjectHideFlags: 0
@@ -1207,6 +1235,7 @@ GameObject:
   - component: {fileID: 736018531242558669}
   - component: {fileID: 2736692243949800816}
   - component: {fileID: 775907732381339675}
+  - component: {fileID: 5741420070498122393}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1276,6 +1305,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53EF\u80FD\u83B7\u5F97"
+--- !u!114 &5741420070498122393
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651753569586649839}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10178
 --- !u!1 &8207949862918204580
 GameObject:
   m_ObjectHideFlags: 0
@@ -1496,6 +1538,7 @@ GameObject:
   - component: {fileID: 5811889443116312175}
   - component: {fileID: 2597693103234350293}
   - component: {fileID: 4631578995114678957}
+  - component: {fileID: 6669999713262919682}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1565,3 +1608,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &6669999713262919682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9211404844896670783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262

Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

@@ -100,6 +100,7 @@ GameObject:
   - component: {fileID: 5035167302667195021}
   - component: {fileID: 3996857531579991943}
   - component: {fileID: 7675581068234204215}
+  - component: {fileID: 7727667835602078107}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -169,6 +170,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6389\u843D\u8BE6\u60C5"
+--- !u!114 &7727667835602078107
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 363035462212344119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10174
 --- !u!1 &1596459594373263505
 GameObject:
   m_ObjectHideFlags: 0
@@ -271,6 +285,7 @@ GameObject:
   - component: {fileID: 3448986095428033778}
   - component: {fileID: 700079147170673296}
   - component: {fileID: 3803316130909754873}
+  - component: {fileID: 7830982427227946356}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -340,6 +355,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6302\u673A\u6536\u76CA"
+--- !u!114 &7830982427227946356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2049999833027880694}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10171
 --- !u!1 &2532249118558326853
 GameObject:
   m_ObjectHideFlags: 0
@@ -665,6 +693,7 @@ GameObject:
   - component: {fileID: 5321997241014361333}
   - component: {fileID: 7356625214712943944}
   - component: {fileID: 5271963949917915171}
+  - component: {fileID: 2240617675617681373}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -734,6 +763,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u83B7\u5F97\u9053\u5177"
+--- !u!114 &2240617675617681373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3016613418067968727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10173
 --- !u!1 &3604333629156684956
 GameObject:
   m_ObjectHideFlags: 0
@@ -880,6 +922,7 @@ GameObject:
   - component: {fileID: 1390114855689535063}
   - component: {fileID: 7485414286195926253}
   - component: {fileID: 264577896367833749}
+  - component: {fileID: 8218447288406010425}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -949,6 +992,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &8218447288406010425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4339270302534241287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262
 --- !u!1 &4827274471633624863
 GameObject:
   m_ObjectHideFlags: 0
@@ -1726,6 +1782,7 @@ GameObject:
   - component: {fileID: 1540786413512136814}
   - component: {fileID: 6251230890227274927}
   - component: {fileID: 55703236791615156}
+  - component: {fileID: 7124722172771162832}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1810,6 +1867,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.8470589, g: 0.7254902, b: 0.4431373, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &7124722172771162832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7727814668973207574}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10175
 --- !u!1 &8886446535026244096
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 2197576514537598055}
   - component: {fileID: 8624296202358403133}
   - component: {fileID: 4551161929545566271}
+  - component: {fileID: 613406281800350740}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -425,6 +426,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &613406281800350740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 384269343322849443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &545300615795425504
 GameObject:
   m_ObjectHideFlags: 0
@@ -436,6 +450,7 @@ GameObject:
   - component: {fileID: 8724379656954861553}
   - component: {fileID: 1084455871667264799}
   - component: {fileID: 9037374286165453700}
+  - component: {fileID: 2818768290241486985}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -505,6 +520,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &2818768290241486985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 545300615795425504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &821592631266946925
 GameObject:
   m_ObjectHideFlags: 0
@@ -1711,6 +1739,7 @@ GameObject:
   - component: {fileID: 8712308375318904764}
   - component: {fileID: 5963447625720637767}
   - component: {fileID: 3303909127726201600}
+  - component: {fileID: 8858433976529887197}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1780,6 +1809,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "90\u8FDE\u4FDD\u5E95\u51FA\u91D1\u8272\u6321\u4F4D\u5B9D\u5377"
+--- !u!114 &8858433976529887197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2556280747425114603}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10237
 --- !u!1 &2720669039826339307
 GameObject:
   m_ObjectHideFlags: 0
@@ -1791,6 +1833,7 @@ GameObject:
   - component: {fileID: 8969851006313811870}
   - component: {fileID: 3662656345577876215}
   - component: {fileID: 1508713389770196219}
+  - component: {fileID: 8788035973780030852}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1860,6 +1903,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "10\u8FDE\u4FDD\u5E95\u51FA\u7D2B\u8272\u6321\u4F4D\u5B9D\u5377"
+--- !u!114 &8788035973780030852
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10236
 --- !u!1 &3314336736973313898
 GameObject:
   m_ObjectHideFlags: 0
@@ -1872,6 +1928,7 @@ GameObject:
   - component: {fileID: 8793441359962076526}
   - component: {fileID: 3868606778493837749}
   - component: {fileID: 2842507757105308458}
+  - component: {fileID: 8212398364123823311}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -1956,6 +2013,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8212398364123823311
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10234
 --- !u!1 &3474275561877960227
 GameObject:
   m_ObjectHideFlags: 0
@@ -2153,6 +2223,7 @@ GameObject:
   - component: {fileID: 7556215900362502466}
   - component: {fileID: 4006986155286800134}
   - component: {fileID: 2704682498779368053}
+  - component: {fileID: 2090496180395684559}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -2222,6 +2293,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u62BD\u4EE3\u91D1\u5377"
+--- !u!114 &2090496180395684559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4207721097829976971}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10232
 --- !u!1 &4243376540668156147
 GameObject:
   m_ObjectHideFlags: 0
@@ -2329,6 +2413,7 @@ GameObject:
   - component: {fileID: 1050067315303430227}
   - component: {fileID: 8972264517317569572}
   - component: {fileID: 266783762442540142}
+  - component: {fileID: 7390983343711225798}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -2398,6 +2483,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &7390983343711225798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4558952006796478470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &4846709721966904208
 GameObject:
   m_ObjectHideFlags: 0
@@ -2857,6 +2955,7 @@ GameObject:
   - component: {fileID: 528673476842239041}
   - component: {fileID: 93835371485559685}
   - component: {fileID: 1748273484820765212}
+  - component: {fileID: 4410034090924764247}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -2941,6 +3040,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &4410034090924764247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10233
 --- !u!1 &5446121015897482731
 GameObject:
   m_ObjectHideFlags: 0
@@ -3620,6 +3732,7 @@ GameObject:
   - component: {fileID: 5522755505824043809}
   - component: {fileID: 8197789312143983254}
   - component: {fileID: 9205004485099477634}
+  - component: {fileID: 6559838807607604449}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3689,6 +3802,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &6559838807607604449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662389305889523523}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &7866375378532981335
 GameObject:
   m_ObjectHideFlags: 0
@@ -3985,6 +4111,7 @@ GameObject:
   - component: {fileID: 8975067585024914700}
   - component: {fileID: 6906539779169998035}
   - component: {fileID: 2798024686861002083}
+  - component: {fileID: 4267517252340139725}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -4054,6 +4181,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &4267517252340139725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8426370114494986623}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &8467925213815132010
 GameObject:
   m_ObjectHideFlags: 0
@@ -4583,6 +4723,7 @@ GameObject:
   - component: {fileID: 299358148823740969}
   - component: {fileID: 1269666230456169891}
   - component: {fileID: 1296186262974792229}
+  - component: {fileID: 5367612048591242570}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -4652,3 +4793,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &5367612048591242570
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9183658485641831872}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238

Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab

@@ -939,6 +939,7 @@ GameObject:
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
   - component: {fileID: 2456884504023472445}
+  - component: {fileID: 1985489301449211950}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_ShuangBei
@@ -1077,6 +1078,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &1985489301449211950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4418083923053840122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10192
 --- !u!1 &4588207117918255426
 GameObject:
   m_ObjectHideFlags: 0
@@ -1757,6 +1771,7 @@ GameObject:
   - component: {fileID: 6103133270796787680}
   - component: {fileID: 9174172303824925929}
   - component: {fileID: 4377398059297220351}
+  - component: {fileID: 6831221917211705353}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (2)
@@ -1826,6 +1841,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9886\u53D62-4\u500D\u7FFB\u500D\u5956\u52B1"
+--- !u!114 &6831221917211705353
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8531779723099794274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10193
 --- !u!1 &9069997952576734485
 GameObject:
   m_ObjectHideFlags: 0
@@ -1838,6 +1866,7 @@ GameObject:
   - component: {fileID: 3168964478753531872}
   - component: {fileID: 3768501890861781930}
   - component: {fileID: 2654173926048081410}
+  - component: {fileID: 6816519898809452594}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -1922,6 +1951,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &6816519898809452594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9069997952576734485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10270
 --- !u!1 &9098043191021390043
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -323,6 +323,7 @@ GameObject:
   - component: {fileID: 5433355474203580553}
   - component: {fileID: 5168015494678081087}
   - component: {fileID: 1207217417030577173}
+  - component: {fileID: 1883681821019418846}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -392,6 +393,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u5883\u754C"
+--- !u!114 &1883681821019418846
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760249640184550313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10217
 --- !u!1 &975683146836102746
 GameObject:
   m_ObjectHideFlags: 0
@@ -1443,6 +1457,7 @@ GameObject:
   - component: {fileID: 3549792637730888341}
   - component: {fileID: 4186974081922981718}
   - component: {fileID: 6812991800126589188}
+  - component: {fileID: 4706971563289100342}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -1512,6 +1527,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u6548\u679C"
+--- !u!114 &4706971563289100342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4826391284103991921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10218
 --- !u!1 &4882534291422396107
 GameObject:
   m_ObjectHideFlags: 0
@@ -2679,7 +2707,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5812057225866309631
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -771,6 +771,7 @@ GameObject:
   - component: {fileID: 4927574875558780897}
   - component: {fileID: 2133244237143657967}
   - component: {fileID: 1780334426314849626}
+  - component: {fileID: 510276586662715379}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GongFaCount
@@ -840,6 +841,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E00\u952E\u88C5\u914D"
+--- !u!114 &510276586662715379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675307928623745481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10211
 --- !u!1 &760159596962817389
 GameObject:
   m_ObjectHideFlags: 0
@@ -851,6 +865,7 @@ GameObject:
   - component: {fileID: 4735643001707298055}
   - component: {fileID: 6645589002682933467}
   - component: {fileID: 8539869173354091990}
+  - component: {fileID: 1065497139874792312}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -920,6 +935,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u76D8"
+--- !u!114 &1065497139874792312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760159596962817389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10206
 --- !u!1 &857437492319237345
 GameObject:
   m_ObjectHideFlags: 0
@@ -2274,6 +2302,7 @@ GameObject:
   - component: {fileID: 87607927935484462}
   - component: {fileID: 6314345131758368494}
   - component: {fileID: 9175187348211492529}
+  - component: {fileID: 8190567843051848756}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2343,6 +2372,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4FE1\u606F"
+--- !u!114 &8190567843051848756
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135059945273132741}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10216
 --- !u!1 &2199692367964551178
 GameObject:
   m_ObjectHideFlags: 0
@@ -3520,6 +3562,7 @@ GameObject:
   - component: {fileID: 4514347021073670849}
   - component: {fileID: 3642748124106631649}
   - component: {fileID: 4782197136162955827}
+  - component: {fileID: 2812138280631574750}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Setting
@@ -3656,6 +3699,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &2812138280631574750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3581938487787395720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10207
 --- !u!1 &3891518416558775222
 GameObject:
   m_ObjectHideFlags: 0
@@ -3668,6 +3724,7 @@ GameObject:
   - component: {fileID: 8438237142757567239}
   - component: {fileID: 1461499720874115526}
   - component: {fileID: 7136091248352913582}
+  - component: {fileID: 7241239895409799409}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3752,6 +3809,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7241239895409799409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891518416558775222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10214
 --- !u!1 &3898641425973088963
 GameObject:
   m_ObjectHideFlags: 0
@@ -4984,6 +5054,7 @@ GameObject:
   - component: {fileID: 4727156979047918535}
   - component: {fileID: 2704694145830204549}
   - component: {fileID: 5048207027985940991}
+  - component: {fileID: 3891197051174853768}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5068,6 +5139,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3891197051174853768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5885840101328355703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10212
 --- !u!1 &6270492250459322942
 GameObject:
   m_ObjectHideFlags: 0
@@ -6373,6 +6457,7 @@ GameObject:
   - component: {fileID: 489359079058652538}
   - component: {fileID: 8197373045940010032}
   - component: {fileID: 566360598316617976}
+  - component: {fileID: 3268066186942309884}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -6457,6 +6542,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3268066186942309884
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8374476484755925391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10213
 --- !u!1 &8428897132685908306
 GameObject:
   m_ObjectHideFlags: 0
@@ -6468,6 +6566,7 @@ GameObject:
   - component: {fileID: 5985873034990668332}
   - component: {fileID: 3339769281478272295}
   - component: {fileID: 3866877181325385980}
+  - component: {fileID: 5304470405785004291}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Tips
@@ -6537,6 +6636,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63D0\u793A\uFF1A\u70B9\u51FB\u529F\u6CD5\u8FDB\u884C\u88C5\u914D"
+--- !u!114 &5304470405785004291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8428897132685908306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10215
 --- !u!1 &8729277598116330670
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -109,8 +109,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 378, y: 83.3183}
+  m_AnchoredPosition: {x: 0, y: 3.4199}
+  m_SizeDelta: {x: 542.1544, y: 76.4785}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -319,7 +319,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.020126343, y: -0.05529785}
+  m_AnchoredPosition: {x: 0.020111084, y: -0.05529785}
   m_SizeDelta: {x: -8.092957, y: -6.725498}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8441070473825213442
@@ -447,8 +447,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1, y: 0}
-  m_SizeDelta: {x: 342.3, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 510, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1634987077912709362
 CanvasRenderer:
@@ -480,7 +480,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 18
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -580,6 +580,7 @@ GameObject:
   - component: {fileID: 7495592736081618043}
   - component: {fileID: 5728318949835301204}
   - component: {fileID: 5712998391856636078}
+  - component: {fileID: 2596033370412433455}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main (1)
@@ -695,6 +696,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &2596033370412433455
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1808984493116565295}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10161
 --- !u!1 &1881408301506554395
 GameObject:
   m_ObjectHideFlags: 0
@@ -1705,6 +1719,7 @@ GameObject:
   - component: {fileID: 7012158455063748255}
   - component: {fileID: 4290280934127662415}
   - component: {fileID: 1967428217266383594}
+  - component: {fileID: 5722501915926636096}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main (1)
@@ -1820,6 +1835,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &5722501915926636096
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5884159851099503130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10160
 --- !u!1 &6002680713102466570
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -175,7 +175,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///事件结局后提供的选项 1.EventLinkId 2.胜利id;失败id 3.EventConfigId
+		///结局后提供选项 1.EventLinkId 2.胜利id;失败id 3.EventConfigId
 		/// </summary>
 #if !COMBAT_SERVER
 		public int[] ResultOptions;

Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs

@@ -55,7 +55,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///手指类型 1. 手指&光圈 2. 手指 3. 光圈 4. 长按 -1：不要特效的光圈
+		///手指类型 1. 手指&光圈 2. 手指 3. 光圈 -1：不要特效的光圈
 		/// </summary>
 #if !COMBAT_SERVER
 		public int FingerType;
@@ -134,16 +134,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///额外演示 0/不填 无 1,par  图文 2,par  动画
-		/// </summary>
-#if !COMBAT_SERVER
-		public string[] ExtraShow;
-#else
-		public string[] ExtraShow{ set; get; }
-#endif
-		
-
 		/// <summary>
 		///高亮动效框 0/不填：无 1：默认动效框
 		/// </summary>

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1131,8 +1131,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
             eventList.isCompleted = true;
         }
 
-        RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
-        await rewardsPanel.UIClosed();
+        if (itemInfos != null && itemInfos.Count > 0)
+        {
+            RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
+            await rewardsPanel.UIClosed();
+        }
+
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
         {

Assets/Scripts/GameUI/GameApplction.cs

@@ -171,10 +171,10 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            if (!PlayerGuideManager.Instance.GuideIsCanDo(5))
+            MainPanel mainPanel = await MainPanel.OpenPanel();
+            if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                MainPanel mainPanel = await MainPanel.OpenPanel();
-                // mainPanel.GObjectPoolInterface.SetActive(false);
+                mainPanel.GObjectPoolInterface.SetActive(false);
             }
         }
 
@@ -187,26 +187,32 @@ public class GameApplction : IGameStart
 
     public async void XinShouCombat()
     {
-        if (PlayerGuideManager.Instance.GuideIsCanDo(5))
+        if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
+            AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
+            await EventSystemManager.Instance.TriggerEvent(eventList2);
             CTask cTask = CTask.Create();
-            CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
+            await CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
                 delegate(bool isWin)
                 {
                     LogTool.Log("战斗完成" + isWin);
                     cTask.SetResult();
                 });
-            
+
             await cTask;
 
             AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(10000);
+            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            mainPanel.GObjectPoolInterface.SetActive(true);
             await EventSystemManager.Instance.TriggerEvent(eventList1);
-            AccountFileInfo.Instance.playerData.isTiggerPlot = true;
+          
 
             AccountFileInfo.Instance.SavePlayerData();
 
-            MainPanel mainPanel = await MainPanel.OpenPanel();
-    
+           
+            AccountFileInfo.Instance.playerData.isTiggerPlot = true;
+            // PlayerGuideManager.Instance.NextGuide();
+            mainPanel.GetFocus();
         }
     }
 }

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -86,9 +86,9 @@ namespace Fort23.Mono
             StartRoot.gameObject.SetActive(SummonData.isSummonSocre);
             if (SummonData.isSummonSocre)
             {
-                Text_JingDu.text =
-                    $"当前进度：{SummonData.drawHistory.Count * 10}/{_openBoxConfig.ProgressRewardChoukaCount}";
-                Text_Score.text = $"目前得分：{SummonData.score}";
+                Text_JingDu.text = LanguageManager.Instance.Text(10260, SummonData.drawHistory.Count * 10,
+                    _openBoxConfig.ProgressRewardChoukaCount);
+                Text_Score.text = LanguageManager.Instance.Text(10261, SummonData.score);
 
                 OpenBoxScoreRule openBoxScoreRule = CheckAchievements(SummonData);
                 if (openBoxScoreRule.ID != 0)
@@ -227,7 +227,7 @@ namespace Fort23.Mono
                 // await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }
-            
+
             AudioManager.Instance.PlayAudio("ui_chouqugongfa.wav");
         }
     }

Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using GameLogic.Bag;
 using UnityEngine.UI;
@@ -38,7 +39,7 @@ namespace Fort23.Mono
         {
             this.lingquCallBack = lingquCallBack;
             _openBoxProgressReward = openBoxProgressReward;
-            Text_Name.text = $"累计达到 {openBoxProgressReward.TotalScore}";
+            Text_Name.text = $"{LanguageManager.Instance.Text(10191)} {openBoxProgressReward.TotalScore}";
             for (var i = 0; i < openBoxProgressReward.PrizeID.Length; i++)
             {
                 WidgetItem widgetItem =

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -41,10 +41,10 @@ namespace Fort23.Mono
                     CombatDrive.Instance.CombatController.CombatTypeBasic as LevelBattleCombatType;
                 if (levelBattleCombatType.levelbattleConfig.ID == 10001)
                 {
-                    if (PlayerGuideManager.Instance.GuideIsCanDo(5))
-                    {
-                        PlayerGuideManager.Instance.SetGuid(5);
-                    }
+                    // if (PlayerGuideManager.Instance.GuideIsCanDo(5))
+                    // {
+                    //     PlayerGuideManager.Instance.SetGuid(5);
+                    // }
                 }
             }
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -519,6 +519,10 @@ namespace Fort23.Mono
                 return 1;
             }
 
+            return type1.skillConfig.SkillType != type2.skillConfig.SkillType
+                ? type1.skillConfig.SkillType.CompareTo(type2.skillConfig.SkillType)
+                : type1.skillConfig.ID.CompareTo(type2.skillConfig.ID);
+
             return 0;
         }
 
@@ -929,9 +933,8 @@ namespace Fort23.Mono
                 allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
             }
 
-            Text_Cd.text = "功法盘运行周期：" +
-                           ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
-                               PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd) + "s";
+            Text_Cd.text =  LanguageManager.Instance.Text(10208, ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
+                PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd));
         }
 
         public List<int> GetNumbers(int start, float offset)
@@ -1000,10 +1003,10 @@ namespace Fort23.Mono
             }
 
 
-            Text_GongFaCount.text =
-                $"功法数量:{GetMainGongFaCount()}/{PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum}";
-            Text_FuZhuGongFaCount.text =
-                $"辅助功法:{GetPassiveGongFaCount()}/{PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum}";
+            Text_GongFaCount.text = LanguageManager.Instance.Text(10210, GetMainGongFaCount(),
+                PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum);
+                Text_FuZhuGongFaCount.text = LanguageManager.Instance.Text(10209, GetPassiveGongFaCount(),
+                    PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum);
         }
 
         private async void OnClick(ItemWidgetBasic obj)

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -201,10 +201,11 @@ namespace Fort23.Mono
         {
             if (isOver)
                 return;
+            icon.gameObject.SetActive(false);
             if (eventConditionConfig.NPCID != 100 &&  eventConditionConfig.NPCID != 0)
             {
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-                icon.gameObject.SetActive(false);
+             
                 icon.onSpriteAlter = () =>
                 {
                     icon.SetNativeSize();

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -149,7 +150,8 @@ namespace Fort23.Mono
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
                            PlayerManager.Instance.gameConstantConfig.DetectEventCount;
 
-            Text_ShenShiCount.text = $"神识({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
+            Text_ShenShiCount.text =   LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
+          
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -58,7 +59,6 @@ namespace Fort23.Mono
 
                 callback?.Invoke(useCount, useItems);
                 UIManager.Instance.HideUIUIPanel(this);
-            
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });
@@ -66,15 +66,19 @@ namespace Fort23.Mono
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
 
 
-            Btn_Event.onClick.AddListener(() => { DivineSenceEventPreviewPanel.OpenPanel(); });
+            Btn_Event.onClick.AddListener(async () =>
+            {
+                await DivineSenceEventPreviewPanel.OpenPanel();
+                UIManager.Instance.HideUIUIPanel(this,isBreadcrumbBarPanel:false);
+            });
         }
 
         private void Slider_Count_OnValueChanged(float value)
         {
             useCount = (int)value;
-            Text_Count.text = $"神识探索：{value}次";
+            Text_Count.text = LanguageManager.Instance.Text(10253, value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
-            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value }/{maxCount})";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value}/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
                 senceInfoBtnWidget.UpdateItermCount(useCount);
@@ -87,23 +91,30 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             _divineSenceInfoBtnWidgets.Clear();
-            divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
+            divineSenseConfig =
+                ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
             HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
 
-            Text_Level.text = $"神识等级:{AccountFileInfo.Instance.playerData.divineSenseLevel}级";
+            Text_Level.text =
+                LanguageManager.Instance.Text(10251, AccountFileInfo.Instance.playerData.divineSenseLevel);
             Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/{divineSenseConfig.exp}";
             Slider_Exp.maxValue = divineSenseConfig.exp;
             Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;
 
-            int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount);
+            int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint /
+                              PlayerManager.Instance.gameConstantConfig.DetectEventCount);
             maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
-            maxCount = maxCount > 10 ? 10 : maxCount;
-            count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
+            maxCount = maxCount > divineSenseConfig.MaxNum ? divineSenseConfig.MaxNum : maxCount;
+            count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount
+                ? maxCount - EventSystemManager.Instance.GetShenShiCount()
+                : count;
 
 
             if (count == 1)
@@ -130,11 +141,15 @@ namespace Fort23.Mono
                 Text_qs[i].text = $"{probabilities[i] * 100:F2}%";
             }
 
-            DivineSenceInfoBtnWidget divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam0, null);
+            DivineSenceInfoBtnWidget divineSenceInfoBtnWidget =
+                await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
+                    DivineSenceInfoBtnWidgetGam0, null);
             divineSenceInfoBtnWidget.CustomInit(-1, 1);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
-            divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam1, null);
+            divineSenceInfoBtnWidget =
+                await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
+                    DivineSenceInfoBtnWidgetGam1, null);
             divineSenceInfoBtnWidget.CustomInit(-1, 2);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
@@ -155,7 +170,8 @@ namespace Fort23.Mono
             List<int> selectType = new List<int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 && senceInfoBtnWidget.ItemInfo != null)
+                if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 &&
+                    senceInfoBtnWidget.ItemInfo != null)
                 {
                     selectType.Add(senceInfoBtnWidget.ItemInfo.config.associateID);
                 }
@@ -179,15 +195,18 @@ namespace Fort23.Mono
             Map<int, int> probabilitiesMap = new Map<int, int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
+                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null &&
+                    senceInfoBtnWidget.ItemInfo.config.associateID == 6)
                 {
                     if (!probabilitiesMap.ContainsKey(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]))
                     {
-                        probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0], senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
+                        probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0],
+                            senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
                     }
                     else
                     {
-                        probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] += senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
+                        probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] +=
+                            senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
                     }
                 }
 
@@ -211,7 +230,8 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(Action<int, List<ItemInfo>> callback)
         {
-            DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
+            DivineSenceInfoPanel divineSenceInfoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
             divineSenceInfoPanel.CustomInit(callback);
         }
     }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceLevelPreviewPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -40,7 +41,7 @@ namespace Fort23.Mono
                 CurrentBls[i].text = $"{probabilities[i] * 100:F2}%";
             }
 
-            Text_CurrentLevel.text = $"当前等级预览：{AccountFileInfo.Instance.playerData.divineSenseLevel}";
+            Text_CurrentLevel.text = LanguageManager.Instance.Text(10243,AccountFileInfo.Instance.playerData.divineSenseLevel);
 
             if (divineSenseConfig.ID >= divineSenseConfigs.Length)
             {
@@ -59,7 +60,7 @@ namespace Fort23.Mono
                     NextBls[i].text = $"{probabilities1[i] * 100:F2}%";
                 }
 
-                Text_NextLevel.text = $"下级预览：{AccountFileInfo.Instance.playerData.divineSenseLevel + 1}";
+                Text_NextLevel.text = LanguageManager.Instance.Text(10244,AccountFileInfo.Instance.playerData.divineSenseLevel + 1);
             }
 
             return base.AsyncInit(uiData);

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -108,7 +108,7 @@ namespace Fort23.Mono
             }
 
 
-            Text_Go.text = "前往";
+            Text_Go.text = LanguageManager.Instance.Text(10156);
             if (eventLinkData == null || eventLinkData.eventConditions == null ||
                 eventLinkData.eventConditions.Count == 0)
             {
@@ -143,7 +143,7 @@ namespace Fort23.Mono
 
                     if (evenkConfig.ResultType == 0 || evenkConfig.ResultType == 3)
                     {
-                        Text_Go.text = "完成";
+                        Text_Go.text = LanguageManager.Instance.Text(10156);
                     }
                 }
                 else
@@ -157,7 +157,7 @@ namespace Fort23.Mono
 
             if (eventList.isCompleted)
             {
-                Text_Go.text = "已完成";
+                Text_Go.text = LanguageManager.Instance.Text(10240);
                 Btn_Go.image.color = new Color32(200, 199, 199, 255);
             }
             else

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -175,10 +175,10 @@ namespace Fort23.Mono
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;
-            Text_Level1.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
-            Text_Level.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
+            Text_Level1.text = LanguageManager.Instance.Text(10222, _skillInfo.SkillPowerupConfig.ID.ToString());
+            Text_Level.text = LanguageManager.Instance.Text(10222, _skillInfo.SkillPowerupConfig.ID.ToString());
 
-            Text_SkillCd.text = $"加功法盘速度：{skillConfig.addcd}秒";
+            Text_SkillCd.text = LanguageManager.Instance.Text(10208, skillConfig.addcd);
 
             // skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
@@ -323,8 +323,8 @@ namespace Fort23.Mono
 
 
                     Text_NextLevel.transform.parent.gameObject.SetActive(true);
-                    Text_NextLevel.text =
-                        $"{_skillInfo.SkillPowerupConfig.ID}级  →  {nextSkillInfo.SkillPowerupConfig.ID}级";
+                    Text_NextLevel.text = LanguageManager.Instance.Text(10221, _skillInfo.SkillPowerupConfig.ID,
+                        nextSkillInfo.SkillPowerupConfig.ID);
 
                     LayoutRebuilder.ForceRebuildLayoutImmediate(Text_NextLevel.GetComponent<RectTransform>());
                     LayoutRebuilder.ForceRebuildLayoutImmediate(Text_NextLevel.transform.parent
@@ -347,7 +347,7 @@ namespace Fort23.Mono
                     else
                     {
                         Btn_UpGrade.gameObject.transform.RecoverColor();
-                        Text_UpGrade.text = "升级";
+                        Text_UpGrade.text = LanguageManager.Instance.Text(10220);
                         UpGradeItemRoot.SetActive(true);
                         for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
                         {
@@ -370,8 +370,10 @@ namespace Fort23.Mono
                 else
                 {
                     Text_NextLevel.transform.parent.gameObject.SetActive(true);
-                    Text_NextLevel.text = $"{_skillInfo.skillConfig.level}级  →  Max级";
-                    Text_UpGrade.text = "已满级";
+
+                    Text_NextLevel.text = LanguageManager.Instance.Text(10221, _skillInfo.skillConfig.level,
+                        "Max");
+                    Text_UpGrade.text = LanguageManager.Instance.Text(10264);
                     Btn_UpStar.gameObject.SetActive(false);
                     UpGradeItemRoot.SetActive(false);
                 }
@@ -389,7 +391,7 @@ namespace Fort23.Mono
                 if (_skillInfo.skillConfig.level < 6)
                 {
                     Btn_UpStar.gameObject.transform.RecoverColor();
-                    Text_UpStar.text = "领悟";
+                    Text_UpStar.text = LanguageManager.Instance.Text(10219);
                     Btn_UpGrade.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(true);
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
@@ -411,7 +413,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_UpStar.text = "已满星";
+                    Text_UpStar.text = LanguageManager.Instance.Text(10265);
                     Btn_UpGrade.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(false);
                 }
@@ -427,8 +429,8 @@ namespace Fort23.Mono
                 Btn_UpStar.gameObject.SetActive(true);
                 UpStarItemRoot.SetActive(false);
                 UpGradeItemRoot.SetActive(false);
-                Text_UpStar.text = "领悟";
-                Text_UpGrade.text = "升级";
+                Text_UpStar.text = LanguageManager.Instance.Text(10219);
+                Text_UpGrade.text = LanguageManager.Instance.Text(10220);
                 Btn_UpGrade.gameObject.transform.RecoverColor();
                 foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
                 {

Assets/Scripts/GameUI/UI/GuidePanel/GuidePanel.cs

@@ -13,6 +13,7 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            isAddStack = false;
         }
 
 
@@ -54,9 +55,8 @@ namespace Fort23.Mono
 
             Btn_MessageBG.onClick.AddListener(() => { PlayerGuideManager.Instance.dialogBox.OnClickScreen(); });
         }
-        
-        
-        
+
+
         [CustomMethod(customMethodType: CustomMethodType.Update)]
         public void Update()
         {
@@ -65,16 +65,13 @@ namespace Fort23.Mono
             //     return;
             // }
 
-            Vector3 worldPos = CombatDrive.Instance.CombatController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 worldPos = CombatDrive.Instance.CombatController.playerHeroEntity.combatHeroGameObject.hpTransform
+                .position;
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             dotPoint.transform.position = p2;
-
-          
-            
         }
-        
-        
+
 
         public void SetTarget(GameObject gameObject)
         {

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs

@@ -139,8 +139,8 @@ namespace Fort23.Mono.Phases
 
             pgm.SetfxTransVisiable(true);
             // pgm.SetMaskTarget(gameObject);
-            size = new Vector2(718, 938);
-            localPos = new Vector2(0, -96);
+            size = new Vector2(718, 858);
+            localPos = new Vector2(0, -135);
             pgm.SetShowFramePosAndSize(localPos, size, 0, null);
 
             await pgm.ConfigLogic(204, delegate() { pgm.NextGuide(); });

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs

@@ -129,8 +129,8 @@ namespace Fort23.Mono.Phases
 
             pgm.SetfxTransVisiable(true);
             // pgm.SetMaskTarget(gameObject);
-            size = new Vector2(718, 938);
-            localPos = new Vector2(0, -96);
+            size = new Vector2(718, 858);
+            localPos = new Vector2(0, -135);
             pgm.SetShowFramePosAndSize(localPos, size, 0, null);
 
             await pgm.ConfigLogic(303, delegate() { pgm.NextGuide(); });

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs

@@ -27,7 +27,7 @@ namespace Fort23.Mono.Phases
         {
             base.Active();
             actionList.Add(OnStep501);
-
+            // actionList.Add(OnStep502);
             actionList.Add(OnStepEnd);
         }
 
@@ -80,12 +80,26 @@ namespace Fort23.Mono.Phases
             pgm.StepInit();
             pgm.SetBlackAlpha(0.05f);
             pgm.SetOnClickMask(true);
+            // CombatPanel combatPanel = UIManager.Instance.GetComponent<CombatPanel>();
+            // combatPanel.CameraSelect.value = 0.2f;
             await TimerComponent.Instance.WaitAsync(1000);
             pgm.SetOnClickMask(false);
+
             CombatDrive.Instance.CombatController.isUpdate = false;
             await pgm.ConfigLogic(501, delegate() { pgm.NextGuide(); });
         }
 
+        /// <summary>
+        /// 点击功法
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep502(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            CombatDrive.Instance.CombatController.isUpdate = true;
+            await pgm.ConfigLogic(502, delegate() { });
+        }
+
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();

Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -170,6 +170,11 @@ namespace Fort23.Mono
             //     return false;
             // }
 
+            // if (GuideIsCanDo(5))
+            // {
+            //     return false;
+            // }
+
             if (curstep > 1 && guideLogic == null)
             {
                 return false;
@@ -649,6 +654,22 @@ namespace Fort23.Mono
             }
         }
 
+
+        public void SetfxTransImageVisiable(bool b, int type = 0)
+        {
+            switch (type)
+            {
+                case 0:
+                    fxTrans01.gameObject.GetComponent<MyImage>().enabled = b;
+
+                    break;
+                case 1:
+                    fxTrans02.gameObject.GetComponent<MyImage>().enabled = b;
+
+                    break;
+            }
+        }
+
         public void SetBlackBaseVisiable(bool b)
         {
             blackBaseObj.gameObject.SetActive(b);
@@ -685,20 +706,16 @@ namespace Fort23.Mono
                         guideConfig.AwardItemNum[i]));
                 }
             }
-            HideDialogBox(false);
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     HideDialogBox(false);
-            // }
-            // else
-            // {
-            //     HideDialogBox();
-            // }
-            // if (IsUseServerData)
-            // {
-            //     PlayerManager.Instance.PlayerGuideDataComponent.UpdateData(configID);
-            //     await HttpSendManager.Instance.SendSaveGuideDataRequest(configID, SaveGuideDataCallBack); //记录服务器
-            // }
+
+            if (guideConfig.desc == -1)
+            {
+                HideDialogBox();
+            }
+            else
+            {
+                HideDialogBox(false);
+            }
+
 
             if (guideConfig.IsSkip == 1)
             {
@@ -709,13 +726,12 @@ namespace Fort23.Mono
 
             if (guideConfig.Highlighting == 0)
             {
-                SetfxTransVisiable(false);
+                SetfxTransImageVisiable(false);
             }
 
 
             int[] fPos = guideConfig.fingerPos;
             int[] dPos = guideConfig.dialogPos;
-            //int[] nPos = guideConfig.NpcPos;
 
 
             isReadFingerPos = true;
@@ -725,22 +741,13 @@ namespace Fort23.Mono
             SetFingerPos(fPos);
 
             SetDialogPos(dPos);
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     SetDilogBGSize(new Vector2(guideConfig.TextSize[0], guideConfig.TextSize[1]));
-            // }
-
-
-            // SetNpcPos(nPos);
-
 
             SetBlackBaseVisiable(true);
 
             SetBlackAlpha(guideConfig.blackAlpha);
             ShowDialogBox(action, str);
             await dialogBox.SetDiTex(guideConfig, guideConfig.SpeakerImage);
-            // int[] scale = new[] { 750, 750 };
-            //  SetNpcSize(scale);
+            UIManager.Instance.SetEventSystemEnable(true);
         }
 
         /// <summary>
@@ -1201,18 +1208,10 @@ namespace Fort23.Mono
         /// </summary>
         public void StepInit()
         {
+            UIManager.Instance.SetEventSystemEnable(false);
             _customVectorTween?.Kill();
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();
-
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     HideDialogBox(false);
-            // }
-            // else
-            // {
-            //     HideDialogBox();
-            // }
             HideDialogBox();
             SetfxTransVisiable(false);
             SetMaskTarget(null);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -57,6 +57,8 @@ namespace Fort23.Mono
 
             Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
 
+            Btn_Tips.onClick.AddListener(() => { TipsRoot.gameObject.SetActive(!TipsRoot.gameObject.activeSelf); });
+
 
             Btn_Dujie.onClick.AddListener(async () =>
             {
@@ -124,6 +126,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
+                    HeroBreakthroughPanel.OpenPanel();
                     // TipMessagePanel.OpenTipMessagePanel("")
                 }
             });
@@ -173,11 +176,13 @@ namespace Fort23.Mono
             // HeroAttributeWidgets.Add(heroAttributeWidget);
             Text_Jingjie1.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]);
-            Text_Jingjie.text =
+            string jingjie =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) + "(" +
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 + "/10)";
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
+    
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -201,25 +206,29 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";
+                Text_Speed.text = LanguageManager.Instance.Text(10230,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
+           
             }
             else
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 可以突破";
+  
+                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
 
             Text_exp.text =
                 $"{PlayerManager.Instance.myHero.exp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
-            // if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
-            // {
-            //     Text_TuPo.text = "突破";
-            // }
-            // else
-            // {
-            //     Text_TuPo.text = "渡劫";
-            // }
+            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+            {
+                Text_TuPo.text = LanguageManager.Instance.Text(10228);
+            }
+            else
+            {
+                Text_TuPo.text = LanguageManager.Instance.Text(10229);
+            }
         }
 
         [CustomMethod(CustomMethodType.Update)]
@@ -239,11 +248,15 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";
+                Text_Speed.text = LanguageManager.Instance.Text(10230,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
+           
             }
             else
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 可以突破";
+  
+                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
         }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

@@ -195,6 +195,28 @@ namespace Fort23.Mono
 	      return _JingJieIcons;
 	     }
 	   }
+	  private Button _Btn_Tips;
+	  public Button Btn_Tips
+	   {
+	   get{
+	      if (_Btn_Tips == null)
+	       {
+	         _Btn_Tips  = GetUIUnit<Button>("Btn_Tips"); 
+	       }
+	      return _Btn_Tips;
+	     }
+	   }
+	  private GameObject _TipsRoot;
+	  public GameObject TipsRoot
+	   {
+	   get{
+	      if (_TipsRoot == null)
+	       {
+	         _TipsRoot  = GetUIUnit<GameObject>("TipsRoot"); 
+	       }
+	      return _TipsRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -412,7 +412,7 @@ namespace Fort23.Mono
             {
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
                                       faBaoInfo.FabaoPowerupConfig.ID;
-                Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
+                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}：{faBaoInfo.qiangDu}";
                 Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
                     faBaoInfo.effectValue);
 
@@ -436,11 +436,11 @@ namespace Fort23.Mono
                     //tupo
                     if (_nextFaBaoInfo.FabaoPowerupConfig.SkillLevel != selectedFaBaoInfo.FabaoPowerupConfig.SkillLevel)
                     {
-                        Text_UpGrade.text = "突破";
+                        Text_UpGrade.text = LanguageManager.Instance.Text(10205);
                     }
                     else
                     {
-                        Text_UpGrade.text = "升级";
+                        Text_UpGrade.text =  LanguageManager.Instance.Text(10203);
                     }
 
                     Text_UpGrade.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -47,16 +47,20 @@ namespace Fort23.Mono
         {
             await AppBarPanel.OpenPanel(this);
             TitlePanel.ClosePanel();
-            if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+            if (AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                await PlayerGuideManager.Instance.SetGuid(1);
-            }
+                if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+                {
+                    await PlayerGuideManager.Instance.SetGuid(1);
+                }
 
-            if (PlayerGuideManager.Instance.GuideIsCanDo(4))
-            {
-                await PlayerGuideManager.Instance.SetGuid(4);
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4))
+                {
+                    await PlayerGuideManager.Instance.SetGuid(4);
+                }
             }
 
+
             base.GetFocus();
         }
 
@@ -126,6 +130,11 @@ namespace Fort23.Mono
 
             Btn_Event.onClick.AddListener(() =>
             {
+                if (PlayerGuideManager.Instance.curPhase == 1)
+                {
+                    return;
+                }
+
                 EventSystemManager.Instance.isOpenUi = true;
                 DivineSenceEventPreviewPanel.OpenPanel();
             });

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -34,13 +35,16 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            Text_Desc.text = $"挂机上限时间：{UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime)}";
+            Text_Desc.text = LanguageManager.Instance.Text(10177,
+                UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
 
             List<QiankundaiConfig> qiankundaiConfigs = new List<QiankundaiConfig>();
             foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
             {
-                QiankundaiConfig qiankundaiConfig = ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
-                if (PlayerManager.Instance.myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] && PlayerManager.Instance.myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+                QiankundaiConfig qiankundaiConfig =
+                    ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
+                    PlayerManager.Instance.myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
                 {
                     qiankundaiConfigs.Add(qiankundaiConfig);
                 }
@@ -58,10 +62,12 @@ namespace Fort23.Mono
                 {
                     if (qiankundaiConfig.DropCount[i] < 0)
                     {
-                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                            qiankundaiConfig.DropCount[i]);
                         foreach (var info in itemInfo)
                         {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            WidgetItem widgetItem =
+                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                             widgetItem.InitWidget(new ItemInfo(info.itemID, 0));
                             items.Add(widgetItem);
                         }
@@ -71,7 +77,8 @@ namespace Fort23.Mono
                         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.ChoukaID[i]);
                         foreach (var i1 in dropConfig.showItemId)
                         {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            WidgetItem widgetItem =
+                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                             widgetItem.InitWidget(new ItemInfo(i1, 0));
                             items.Add(widgetItem);
                         }
@@ -84,7 +91,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top,isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top, isShowBG: true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using GameLogic.Bag;
@@ -47,7 +48,8 @@ namespace Fort23.Mono
                     {
                         for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
                         {
-                            List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                            List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                                qiankundaiConfig.DropCount[i]);
                             foreach (var info in itemInfo)
                             {
                                 PlayerManager.Instance.BagController.AddItem(info);
@@ -64,7 +66,8 @@ namespace Fort23.Mono
 
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer = 0;
                 AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Clear();
-                AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime = TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime =
+                    TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
                 AccountFileInfo.Instance.SavePlayerData();
 
                 RewardsPanel.OpenPanel(itemInfos);
@@ -88,7 +91,11 @@ namespace Fort23.Mono
             }
 
             items.Clear();
-            Text_Desc.text = $"挂机时间:{UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer)}/{UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime)}";
+   
+            Text_Desc.text =
+                LanguageManager.Instance.Text(10172,
+                    UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
+                    UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
@@ -99,7 +106,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top,isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top, isShowBG: true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                 {
                     if (Icon_Ads.gameObject.activeSelf)
                     {
-                        tenCion.text = "免费";
+                        tenCion.text = LanguageManager.Instance.Text(10235);
                         Icon_Ads.gameObject.SetActive(false);
                     }
                 }
@@ -161,7 +162,7 @@ namespace Fort23.Mono
                 {
                     if (!Icon_Ads.gameObject.activeSelf)
                     {
-                        tenCion.text = "今日免费次数已经用完";
+                        tenCion.text = LanguageManager.Instance.Text(10268);
                         Icon_Ads.gameObject.SetActive(true);
                     }
                 }
@@ -185,7 +186,7 @@ namespace Fort23.Mono
                 {
                     if (oneBiaoJi)
                     {
-                        onCion.text = "免费";
+                        onCion.text = LanguageManager.Instance.Text(10235);
                         oneBiaoJi = false;
                         oneButton.image.GetComponent<MyImage>().IsGray = false;
                     }
@@ -194,7 +195,7 @@ namespace Fort23.Mono
                 {
                     if (!oneBiaoJi)
                     {
-                        onCion.text = "今日免费次数已经用完";
+                        onCion.text = LanguageManager.Instance.Text(10268);
                         oneBiaoJi = true;
                         oneButton.image.GetComponent<MyImage>().IsGray = false;
                     }
@@ -210,12 +211,12 @@ namespace Fort23.Mono
             if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
-                tenCion.text = "免费";
+                tenCion.text =  LanguageManager.Instance.Text(10235);
             }
             //今日次数已用完
             else if (summonData.tenFreeCount >= openBoxConfig.oneConsumeFreePara_1[1])
             {
-                onCion.text = "进入免费次数已经用完";
+                onCion.text = LanguageManager.Instance.Text(10268);
             }
             else
             {
@@ -224,13 +225,13 @@ namespace Fort23.Mono
             if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
-                onCion.text = "免费";
+                onCion.text =  LanguageManager.Instance.Text(10235);
                 oneButton.image.GetComponent<MyImage>().IsGray = false;
                 oneBiaoJi = true;
             }
             else if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
             {
-                onCion.text = "进入免费次数已经用完";
+                onCion.text = LanguageManager.Instance.Text(10268);
                 oneButton.image.GetComponent<MyImage>().IsGray = true;
                 oneBiaoJi = false;
             }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -233,7 +233,7 @@ namespace Fort23.Mono
                     xianTuDatas.Add(xianTuData2);
                 }
 
-                xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName) + " (" + count + "/" + allCount + ")";
+                xianTuData.name = LanguageManager.Instance.Text(10225, LanguageManager.Instance.Text(bigMapConfig.mapName),count,allCount) ;
             }
         }
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs

@@ -37,7 +37,7 @@ namespace Fort23.Mono
                 _bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(id);
                 if (_bigMapConfig.ID == 0)
                 {
-                    Text_Name.text = "全部";
+                    Text_Name.text = LanguageManager.Instance.Text(10163);
                 }
                 else
                 {
@@ -50,7 +50,7 @@ namespace Fort23.Mono
 
                 if (_placesConfig.ID == 0)
                 {
-                    Text_Name.text = "全部";
+                    Text_Name.text = LanguageManager.Instance.Text(10163);
                 }
                 else
                 {

ProjectSettings/AndroidResolverDependencies.xml

@@ -0,0 +1,23 @@
+<dependencies>
+  <packages>
+    <package>com.android.support:appcompat-v7:28.0.0</package>
+  </packages>
+  <files />
+  <settings>
+    <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
+    <setting name="bundleId" value="com.taptap.xy.yousanjie" />
+    <setting name="explodeAars" value="True" />
+    <setting name="gradleBuildEnabled" value="True" />
+    <setting name="gradlePropertiesTemplateEnabled" value="False" />
+    <setting name="gradleTemplateEnabled" value="False" />
+    <setting name="installAndroidPackages" value="True" />
+    <setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
+    <setting name="packageDir" value="Assets/Plugins/Android" />
+    <setting name="patchAndroidManifest" value="True" />
+    <setting name="patchMainTemplateGradle" value="True" />
+    <setting name="projectExportEnabled" value="False" />
+    <setting name="useFullCustomMavenRepoPathWhenExport" value="True" />
+    <setting name="useFullCustomMavenRepoPathWhenNotExport" value="False" />
+    <setting name="useJetifier" value="True" />
+  </settings>
+</dependencies>

layout-zouge.wlt

@@ -0,0 +1,1093 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 405
+    y: 51
+    width: 1544
+    height: 1333
+  m_ShowMode: 4
+  m_Title: Project
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_Maximized: 0
+--- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 431
+    width: 828
+    height: 852
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 10}
+  m_Panes:
+  - {fileID: 11}
+  - {fileID: 10}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 8}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 716
+    y: 0
+    width: 828
+    height: 1283
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 448
+  draggingID: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1544
+    height: 1333
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_UseTopView: 1
+  m_TopViewHeight: 30
+  m_UseBottomView: 1
+  m_BottomViewHeight: 20
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1544
+    height: 30
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_LastLoadedLayoutName: zouge
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 30
+    width: 1544
+    height: 1283
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
+  vertical: 0
+  controlID: 447
+  draggingID: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 1313
+    width: 1544
+    height: 20
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+--- !u!114 &8
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ProjectBrowser
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 828
+    height: 431
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 12}
+  - {fileID: 13}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &9
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 716
+    height: 1283
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
+  m_Panes:
+  - {fileID: 15}
+  - {fileID: 14}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &10
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1121
+    y: 512
+    width: 827
+    height: 831
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 981
+    y: 934
+    width: 664
+    height: 409
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 64f8feff3c09ffff
+      m_RenameOverlay:
+        m_UserAcceptedRename: 0
+        m_Name: 
+        m_OriginalName: 
+        m_EditFieldRect:
+          serializedVersion: 2
+          x: 0
+          y: 0
+          width: 0
+          height: 0
+        m_UserData: 0
+        m_IsWaitingForDelay: 0
+        m_IsRenaming: 0
+        m_OriginalEventType: 11
+        m_IsRenamingFilename: 0
+        m_ClientGUIView: {fileID: 0}
+      m_SearchString: 
+    m_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
+--- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 981
+    y: 81
+    width: 664
+    height: 832
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: -160
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: -1
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}
+--- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_TitleContent:
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 1121
+    y: 81
+    width: 827
+    height: 410
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SearchFilter:
+    m_NameFilter: gameruntime
+    m_ClassNames: []
+    m_AssetLabels: []
+    m_AssetBundleNames: []
+    m_ReferencingInstanceIDs: 
+    m_SceneHandles: 
+    m_ShowAllHits: 0
+    m_SkipHidden: 0
+    m_SearchArea: 1
+    m_Folders: []
+    m_Globs: []
+    m_OriginalText: gameruntime
+    m_ImportLogFlags: 0
+    m_FilterByTypeIntersection: 0
+  m_ViewMode: 1
+  m_StartGridSize: 16
+  m_LastFolders:
+  - Assets/Scenes
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\UGit\XiuXianGame
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 16}
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 00000000befd000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 8}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_AssetTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 00000000befd000000ca9a3bffffff7f
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_ListAreaState:
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: 
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: GameRuntimeConfig
+      m_OriginalName: GameRuntimeConfig
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 45392
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 0
+      m_IsRenamingFilename: 1
+      m_ClientGUIView: {fileID: 8}
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+    m_NewAssetIndexInList: -1
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
+  m_SkipHiddenPackages: 0
+  m_DirectoriesAreaWidth: 256
+--- !u!114 &14
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 405
+    y: 81
+    width: 715
+    height: 1262
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 715
+      height: 1241
+    m_Scale: {x: 0.76416254, y: 0.76416254}
+    m_Translation: {x: 357.5, y: 620.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -467.8324
+      y: -812
+      width: 935.6648
+      height: 1624
+    m_MinimalGUI: 1
+  m_defaultScale: 0.76416254
+  m_LastWindowPixelSize: {x: 715, y: 1262}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1917
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData:
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -174, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 3
+      id: Tool Settings
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -141, y: 149}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-grid-and-snap-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-scene-view-toolbar
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-search-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-transform-toolbar
+      index: 0
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 197}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-component-tools
+      index: 1
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 67.5, y: 86}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Orientation
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Light Settings
+      index: 2
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Camera
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Constraints
+      index: 3
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Collisions
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Navmesh Display
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Agent Display
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Obstacle Display
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Occlusion Culling
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Physics Debugger
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Scene Visibility
+      index: 7
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Particles
+      index: 8
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Palette Helper
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Open Tile Palette
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Focus
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: AINavigationOverlay
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Path
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: APV Overlay
+      index: 10
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/TrailRenderer
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Hot Reload
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    m_OverlaysVisible: 1
+  m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
+  m_Gizmos: 1
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
+  m_SceneLighting: 1
+  m_2DMode: 1
+  m_isRotationLocked: 0
+  m_PlayAudio: 0
+  m_AudioPlay: 0
+  m_Position:
+    m_Target: {x: -35.224968, y: -9494.296, z: -2.4642797}
+    speed: 2
+    m_Value: {x: 36.74371, y: -9450.752, z: -1.2592325}
+  m_RenderMode: 0
+  m_CameraMode:
+    drawMode: 0
+    name: Shaded
+    section: Shading Mode
+  m_ValidateTrueMetals: 0
+  m_DoValidateTrueMetals: 0
+  m_SceneViewState:
+    m_AlwaysRefresh: 0
+    showFog: 1
+    showSkybox: 1
+    showFlares: 1
+    showImageEffects: 1
+    showParticleSystems: 1
+    showVisualEffectGraphs: 1
+    m_FxEnabled: 1
+  m_Grid:
+    xGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 0, y: 0}
+    yGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    zGrid:
+      m_Fade:
+        m_Target: 1
+        speed: 2
+        m_Value: 1
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    m_ShowGrid: 1
+    m_GridAxis: 1
+    m_gridOpacity: 0.5
+  m_Rotation:
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    speed: 2
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
+  m_Size:
+    m_Target: 249.34792
+    speed: 2
+    m_Value: 128.84317
+  m_Ortho:
+    m_Target: 1
+    speed: 2
+    m_Value: 1
+  m_CameraSettings:
+    m_Speed: 1
+    m_SpeedNormalized: 0.5
+    m_SpeedMin: 0.01
+    m_SpeedMax: 2
+    m_EasingEnabled: 1
+    m_EasingDuration: 0.4
+    m_AccelerationEnabled: 1
+    m_FieldOfViewHorizontalOrVertical: 60
+    m_NearClip: 0.03
+    m_FarClip: 10000
+    m_DynamicClip: 1
+    m_OcclusionCulling: 0
+    m_EnableGDRP: 1
+    m_BackfaceCulling: 0
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewOrtho: 0
+  m_ReplacementShader: {fileID: 0}
+  m_ReplacementString: 
+  m_SceneVisActive: 1
+  m_LastLockedObject: {fileID: 0}
+  m_ViewIsLockedToObject: 0