Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.5207902
+    - _Alpha: 0.10351008
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.2276597
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.2213437
+    - _Alpha: 0.25107044
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.18670607
+    - _MainTexOffsetU: 0.15252745
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventConfig.json

@@ -23,7 +23,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -54,7 +54,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -85,7 +85,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -116,7 +116,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -147,7 +147,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -178,7 +178,7 @@
         -5000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -209,7 +209,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -240,7 +240,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -271,7 +271,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -302,7 +302,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -333,7 +333,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -364,7 +364,7 @@
         -7500,
         -7500
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -395,7 +395,7 @@
         -7500,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -426,7 +426,7 @@
         -7500,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -457,7 +457,7 @@
         -7500,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -488,7 +488,7 @@
         -7500,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -519,7 +519,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -550,7 +550,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -581,7 +581,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -612,7 +612,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -643,7 +643,7 @@
         -15000,
         -15000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -674,7 +674,7 @@
         -15000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -705,7 +705,7 @@
         -15000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -736,7 +736,7 @@
         -15000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -767,7 +767,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -798,7 +798,7 @@
         -15000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -829,7 +829,7 @@
         -15000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -860,7 +860,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -891,7 +891,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -922,7 +922,7 @@
         -30000,
         -30000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -953,7 +953,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -984,7 +984,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1015,7 +1015,7 @@
         -30000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1046,7 +1046,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1077,7 +1077,7 @@
         -30000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1108,7 +1108,7 @@
         -30000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1139,7 +1139,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1170,7 +1170,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1201,7 +1201,7 @@
         -50000,
         -50000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1232,7 +1232,7 @@
         -50000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1263,7 +1263,7 @@
         -50000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1294,7 +1294,7 @@
         -50000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1325,7 +1325,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1356,7 +1356,7 @@
         -50000,
         3
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1387,7 +1387,7 @@
         -50000,
         3
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -2312,7 +2312,7 @@
       "LanID": [
         5180
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 10004,
       "step": 2,
       "optionType": 0,
@@ -3356,7 +3356,7 @@
       "step": 6,
       "optionType": 2,
       "optionPara1": [
-        1003
+        1015
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/GroupConfig.json

@@ -418,7 +418,7 @@
         1
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
@@ -427,7 +427,7 @@
         1
       ],
       "GroupMonster": [
-        1006
+        5007
       ]
     },
     {
@@ -436,7 +436,7 @@
         5
       ],
       "GroupMonster": [
-        1007
+        5001
       ]
     },
     {
@@ -445,7 +445,7 @@
         5
       ],
       "GroupMonster": [
-        1008
+        5001
       ]
     },
     {
@@ -454,7 +454,7 @@
         5
       ],
       "GroupMonster": [
-        1001
+        5003
       ]
     },
     {
@@ -463,7 +463,7 @@
         11
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
@@ -472,7 +472,7 @@
         11
       ],
       "GroupMonster": [
-        1006
+        5005
       ]
     },
     {
@@ -481,7 +481,7 @@
         11
       ],
       "GroupMonster": [
-        1007
+        5001
       ]
     },
     {
@@ -490,7 +490,7 @@
         21
       ],
       "GroupMonster": [
-        1008
+        5002
       ]
     },
     {
@@ -499,7 +499,7 @@
         21
       ],
       "GroupMonster": [
-        1001
+        5004
       ]
     },
     {
@@ -508,7 +508,7 @@
         31
       ],
       "GroupMonster": [
-        1005
+        5006
       ]
     },
     {
@@ -517,7 +517,7 @@
         31
       ],
       "GroupMonster": [
-        1006
+        5001
       ]
     },
     {
@@ -526,7 +526,7 @@
         31
       ],
       "GroupMonster": [
-        1007
+        5003
       ]
     },
     {
@@ -535,7 +535,7 @@
         31
       ],
       "GroupMonster": [
-        1008
+        5002
       ]
     },
     {
@@ -544,7 +544,7 @@
         41
       ],
       "GroupMonster": [
-        1001
+        5001
       ]
     },
     {
@@ -553,7 +553,7 @@
         41
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
@@ -562,7 +562,7 @@
         41
       ],
       "GroupMonster": [
-        1006
+        5003
       ]
     },
     {
@@ -571,7 +571,7 @@
         41
       ],
       "GroupMonster": [
-        1007
+        5004
       ]
     },
     {
@@ -580,7 +580,7 @@
         41
       ],
       "GroupMonster": [
-        1008
+        5005
       ]
     },
     {
@@ -589,7 +589,7 @@
         61
       ],
       "GroupMonster": [
-        1001
+        5001
       ]
     },
     {
@@ -598,7 +598,7 @@
         61
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
@@ -607,7 +607,7 @@
         61
       ],
       "GroupMonster": [
-        1006
+        5003
       ]
     },
     {
@@ -616,7 +616,7 @@
         81
       ],
       "GroupMonster": [
-        1007
+        5006
       ]
     },
     {
@@ -625,7 +625,7 @@
         111
       ],
       "GroupMonster": [
-        1008
+        5007
       ]
     },
     {
@@ -634,7 +634,7 @@
         131
       ],
       "GroupMonster": [
-        1001
+        5007
       ]
     },
     {
@@ -643,10 +643,10 @@
         1005
       ],
       "hpQiangDu": [
-        80
+        70
       ],
       "attQiangDu": [
-        80
+        90
       ],
       "duipingQiangDu": [
         80
@@ -658,13 +658,13 @@
         1006
       ],
       "hpQiangDu": [
-        90
+        85
       ],
       "attQiangDu": [
-        90
+        101
       ],
       "duipingQiangDu": [
-        90
+        93
       ]
     },
     {
@@ -676,10 +676,10 @@
         100
       ],
       "attQiangDu": [
-        100
+        112
       ],
       "duipingQiangDu": [
-        100
+        106
       ]
     },
     {
@@ -688,13 +688,13 @@
         1008
       ],
       "hpQiangDu": [
-        110
+        115
       ],
       "attQiangDu": [
-        110
+        123
       ],
       "duipingQiangDu": [
-        110
+        119
       ]
     },
     {
@@ -703,13 +703,13 @@
         1001
       ],
       "hpQiangDu": [
-        120
+        130
       ],
       "attQiangDu": [
-        120
+        134
       ],
       "duipingQiangDu": [
-        120
+        132
       ]
     },
     {
@@ -718,10 +718,10 @@
         1005
       ],
       "hpQiangDu": [
-        80
+        70
       ],
       "attQiangDu": [
-        80
+        90
       ],
       "duipingQiangDu": [
         80
@@ -733,13 +733,13 @@
         1006
       ],
       "hpQiangDu": [
-        90
+        85
       ],
       "attQiangDu": [
-        90
+        101
       ],
       "duipingQiangDu": [
-        90
+        93
       ]
     },
     {
@@ -751,10 +751,10 @@
         100
       ],
       "attQiangDu": [
-        100
+        112
       ],
       "duipingQiangDu": [
-        100
+        106
       ]
     },
     {
@@ -763,13 +763,13 @@
         1008
       ],
       "hpQiangDu": [
-        110
+        115
       ],
       "attQiangDu": [
-        110
+        123
       ],
       "duipingQiangDu": [
-        110
+        119
       ]
     },
     {
@@ -778,13 +778,13 @@
         1001
       ],
       "hpQiangDu": [
-        120
+        130
       ],
       "attQiangDu": [
-        120
+        134
       ],
       "duipingQiangDu": [
-        120
+        132
       ]
     },
     {

Assets/Res/Config/ItemConfig.json

@@ -842,7 +842,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        4000
+        0
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -874,7 +874,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        7000
+        1000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -906,7 +906,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        11000
+        1000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -938,7 +938,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        19000
+        2000
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/LanguageChineseConfig.json

@@ -12338,7 +12338,7 @@
     },
     {
       "ID": 3085,
-      "txt": "主感悟-1"
+      "txt": "逍遥自在"
     },
     {
       "ID": 3086,
@@ -12366,27 +12366,27 @@
     },
     {
       "ID": 3092,
-      "txt": "感悟-111"
+      "txt": "锋利之刃"
     },
     {
       "ID": 3093,
-      "txt": "感悟-112"
+      "txt": "无我之境"
     },
     {
       "ID": 3094,
-      "txt": "感悟-113"
+      "txt": "奇痒之毒"
     },
     {
       "ID": 3095,
-      "txt": "感悟-114"
+      "txt": "五行之力"
     },
     {
       "ID": 3096,
-      "txt": "火焰专精"
+      "txt": "灼烧之痛"
     },
     {
       "ID": 3097,
-      "txt": "毒专精"
+      "txt": "迅捷之毒"
     },
     {
       "ID": 3098,
@@ -38446,7 +38446,7 @@
     },
     {
       "ID": 10352,
-      "txt": "白嫖氪金"
+      "txt": "仙缘宝券"
     },
     {
       "ID": 10353,
@@ -38458,7 +38458,7 @@
     },
     {
       "ID": 10355,
-      "txt": "白嫖代金券"
+      "txt": "参悟天道"
     },
     {
       "ID": 10356,
@@ -38474,7 +38474,7 @@
     },
     {
       "ID": 10359,
-      "txt": "白嫖氪金-新手礼包"
+      "txt": "仙缘宝券-新手礼包"
     },
     {
       "ID": 10360,
@@ -38710,15 +38710,15 @@
     },
     {
       "ID": 10418,
-      "txt": "听说这里可以免费获得代金券？这些是可以白嫖吗？"
+      "txt": " 听说这里可以免费获得仙缘宝券？这些是可以免费参悟的吗？"
     },
     {
       "ID": 10419,
-      "txt": "点击这里，免费获得代金券！"
+      "txt": "点击这里，免费获得仙缘宝券！"
     },
     {
       "ID": 10420,
-      "txt": "代金券可以兑换稀有资源，我们先去兑换一些妖丹。"
+      "txt": "仙缘宝券可以兑换稀有资源，我们先去兑换一些妖丹。"
     },
     {
       "ID": 10421,
@@ -38835,6 +38835,14 @@
     {
       "ID": 10449,
       "txt": "同时使用的法宝，会开始比拼！"
+    },
+    {
+      "ID": 10450,
+      "txt": "天道藏玄机，观悟得机缘"
+    },
+    {
+      "ID": 10451,
+      "txt": "修为"
     }
   ]
 }

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -293,6 +293,7 @@ GameObject:
   - component: {fileID: 6318358308651211038}
   - component: {fileID: 2609827546376049157}
   - component: {fileID: 3475133236629777593}
+  - component: {fileID: 526914427563340992}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_cxtz
@@ -300,7 +301,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6766092608426705305
 RectTransform:
   m_ObjectHideFlags: 0
@@ -384,6 +385,50 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!114 &526914427563340992
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1862396927629131563}
+  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: 2609827546376049157}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2696130358514886593
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,7 +447,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9138207573109554942
 RectTransform:
   m_ObjectHideFlags: 0
@@ -582,7 +627,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 25}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4603564870567916663
 MonoBehaviour:
@@ -1639,6 +1684,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_cxtz
+    gameObject: {fileID: 526914427563340992}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7117668935224744481
 GameObject:
@@ -1984,7 +2034,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -170.6539, y: -152.58527}
+  m_AnchoredPosition: {x: 0, y: -152.58527}
   m_SizeDelta: {x: 222.7944, y: 61.739}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &33079179799988925

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 108, y: 96.45}
+  m_SizeDelta: {x: 0, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2700,7 +2700,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 77
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -2379,7 +2379,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10232
+  id: 10450
 --- !u!1 &4243376540668156147
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 115.51595, y: -23.732}
-  m_SizeDelta: {x: 57, y: 46.2139}
+  m_SizeDelta: {x: 0, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -327,7 +327,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3509861318896561903
 RectTransform:
   m_ObjectHideFlags: 0
@@ -341,11 +341,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2894239996624351365}
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 292, y: -661.39}
+  m_AnchoredPosition: {x: 225, y: -312}
   m_SizeDelta: {x: 184.1, y: 51.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1203846129011065506
@@ -2104,7 +2104,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 214, y: 211}
+  m_AnchoredPosition: {x: 214, y: 284}
   m_SizeDelta: {x: 142.5, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3966226649241584167
@@ -3174,7 +3174,6 @@ RectTransform:
   - {fileID: 50435170631078031}
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
-  - {fileID: 3509861318896561903}
   - {fileID: 4244019806394961563}
   - {fileID: 38430995020534155}
   - {fileID: 3727605509090450065}
@@ -5966,6 +5965,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4487645842108660236}
+  - {fileID: 3509861318896561903}
   - {fileID: 626305634221636739}
   - {fileID: 4539129630901987991}
   - {fileID: 4735643001707298055}

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -255,15 +255,15 @@ public class DialogueManager : Singleton<DialogueManager>
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
                 for (var i = 0; i < dialogueConfig.PrizeIDs.Length; i++)
                 {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dialogueConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
+                    // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dialogueConfig.PrizeIDs[i]);
+                    // if (dropConfig.dropType == 3)
+                    // {
+                    //     ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], dialogueConfig.PrizeNums[i]);
+                    //     itemInfos.Add(itemInfo);
+                    // }
+                    // else
                     {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], dialogueConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(dialogueConfig.PrizeIDs[i]);
+                        List<ItemInfo> items = DropManager.Instance.Drop(dialogueConfig.PrizeIDs[i],dialogueConfig.PrizeNums[i]);
                         itemInfos.AddRange(items);
                     }
                 }

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -39,6 +39,11 @@ namespace Fort23.Mono
                 callBack?.Invoke();
                 callBack = null;
             });
+            
+            Btn_cxtz.onClick.AddListener(() =>
+            {
+                
+            });
         }
 
         public async void CustomInit(bool isWin, System.Action callBack)
@@ -51,9 +56,6 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
-                // f
-                // Text_Desc.gameObject.SetActive(false);
-                // Text_Settlement.text = "胜利";
             }
             else
             {
@@ -61,15 +63,6 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
-
-                // SkipToWidget skipToWidget =
-                //     await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null,
-                //         SkipToContent);
-                // skipToWidget.CustonInit(1);
-                // skipToWidgets.Add(skipToWidget);
-                // skipToWidget.OnClick = OnClick;
-                // Text_Desc.gameObject.SetActive(true);
-                // Text_Settlement.text = "失败";
             }
         }
 

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanelData.cs

@@ -107,6 +107,17 @@ namespace Fort23.Mono
 	      return _Btn_Close2;
 	     }
 	   }
+	  private Button _Btn_cxtz;
+	  public Button Btn_cxtz
+	   {
+	   get{
+	      if (_Btn_cxtz == null)
+	       {
+	         _Btn_cxtz  = GetUIUnit<Button>("Btn_cxtz"); 
+	       }
+	      return _Btn_cxtz;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontPanel.cs

@@ -78,17 +78,17 @@ namespace Fort23.Mono
                     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
                 }
 
-                if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.powerUpConfig.ID)
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
-                    csc.ChangeState(0);
+                    csc.ChangeState(2);
                 }
-                else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.powerUpConfig.ID)
+                else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
                     csc.ChangeState(1);
                 }
                 else
                 {
-                    csc.ChangeState(2);
+                    csc.ChangeState(0);
                 }
 
                 ComBatFrontWidget bossInfoHeadWidget =

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontWidget.cs

@@ -35,6 +35,23 @@ namespace Fort23.Mono
             _combatHero = combatHeroInfo;
 
             Text_Name.text = LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
+            
+            
+            // //玩家等级
+            // if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
+            // {
+            //     MonsterPowerUpConfig heroPowerUpConfig =
+            //         ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+            //
+            //     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            // }
+            // else
+            // {
+            //     MonsterPowerUpConfig heroPowerUpConfig =
+            //         ConfigComponent.Instance.Get<MonsterPowerUpConfig>(groupConfig.GroupMonsterLevel[i]);
+            //
+            //     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+            // }
 
             Text_Jingjie.text =
                 LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +

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

@@ -400,8 +400,8 @@ namespace Fort23.Mono
         private void UpdateSaixuanBtnState()
         {
             Btn_Jin.transform.IsGray((type2 != 1 && type2 != 0) || type1 == 2);
-            Btn_Mu.transform.IsGray((type2 != 2 && type2 != 0) || type1 == 2);
-            Btn_Shui.transform.IsGray((type2 != 4 && type2 != 0) || type1 == 2);
+            Btn_Mu.transform.IsGray((type2 != 4 && type2 != 0) || type1 == 2);
+            Btn_Shui.transform.IsGray((type2 != 2 && type2 != 0) || type1 == 2);
             Btn_Huo.transform.IsGray((type2 != 8 && type2 != 0) || type1 == 2);
             Btn_Tu.transform.IsGray((type2 != 16 && type2 != 0) || type1 == 2);
         }
@@ -579,8 +579,9 @@ namespace Fort23.Mono
         List<List<int>> indexList = new List<List<int>>()
         {
             new List<int>() { 9, 8, 7 }, //金
-            new List<int>() { 7, 6, 5 }, //木
-            new List<int>() { 1, 0, 9 }, //水
+            new List<int>() { 1, 0, 9 }, //木
+            new List<int>() { 7, 6, 5 }, //水
+          
             new List<int>() { 5, 4, 3 }, //火
             new List<int>() { 7, 6, 5 }, //土
             new List<int>() { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, //辅助

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

@@ -139,15 +139,15 @@ namespace Fort23.Mono
                     csc.ChangeState(1);
                     break;
             }
-
-            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
-            {
-                redDotComType01.CustomInit(2, skillConfigId);
-            }
-            else
-            {
-                redDotComType01.CustomInit(2, null);
-            }
+            redDotComType01.CustomInit(2, skillConfigId);
+            // if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
+            // {
+            //     redDotComType01.CustomInit(2, skillConfigId);
+            // }
+            // else
+            // {
+            //     redDotComType01.CustomInit(2, null);
+            // }
 
          
         }

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

@@ -323,53 +323,53 @@ namespace Fort23.Mono
                     }
 
 
-                    if (eventConditionConfig.optionType == 3)
-                    {
-                        Btn_Bag.gameObject.SetActive(true);
-                        List<ItemInfo> itemInfos = new List<ItemInfo>();
-                        for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
-                        {
-                            DropConfig dropConfig =
-                                ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
-                            if (dropConfig.dropType == 3)
-                            {
-                                ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0],
-                                    eventConditionConfig.PrizeNums[i]);
-                                itemInfos.Add(itemInfo);
-                            }
-                            else
-                            {
-                                List<ItemInfo> items = DropManager.Instance.DropItem(eventConditionConfig.PrizeIDs[i]);
-                                itemInfos.AddRange(items);
-                            }
-                        }
-
-                        ShowItemMoveToTargetPanel showItemMoveToTargetUiPane =
-                            UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
-                        Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
-                                         Btn_Bag.transform.position;
-                        Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
-                                           StartPos.transform.position;
-                        int maxCount = 1;
-
-                        foreach (var itemInfo in itemInfos)
-                        {
-                            int addValue = (int)itemInfo.count.Value / maxCount;
-                            int finishVale = (int)itemInfo.count.Value % maxCount;
-                            // ItemInfo i = itemInfo;
-                            showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon,
-                                CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
-                                {
-                                    int currAddValue = addValue;
-                                    if (imageMove.GroupIndex == maxCount - 1)
-                                    {
-                                        currAddValue += finishVale;
-                                    }
-                                });
-                        }
-
-                        await TimerComponent.Instance.WaitAsync(2000);
-                    }
+                    // if (eventConditionConfig.optionType == 3)
+                    // {
+                    //     Btn_Bag.gameObject.SetActive(true);
+                    //     List<ItemInfo> itemInfos = new List<ItemInfo>();
+                    //     for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
+                    //     {
+                    //         DropConfig dropConfig =
+                    //             ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
+                    //         if (dropConfig.dropType == 3)
+                    //         {
+                    //             ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0],
+                    //                 eventConditionConfig.PrizeNums[i]);
+                    //             itemInfos.Add(itemInfo);
+                    //         }
+                    //         else
+                    //         {
+                    //             List<ItemInfo> items = DropManager.Instance.DropItem(eventConditionConfig.PrizeIDs[i]);
+                    //             itemInfos.AddRange(items);
+                    //         }
+                    //     }
+                    //
+                    //     ShowItemMoveToTargetPanel showItemMoveToTargetUiPane =
+                    //         UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
+                    //     Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                    //                      Btn_Bag.transform.position;
+                    //     Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                    //                        StartPos.transform.position;
+                    //     int maxCount = 1;
+                    //
+                    //     foreach (var itemInfo in itemInfos)
+                    //     {
+                    //         int addValue = (int)itemInfo.count.Value / maxCount;
+                    //         int finishVale = (int)itemInfo.count.Value % maxCount;
+                    //         // ItemInfo i = itemInfo;
+                    //         showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon,
+                    //             CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
+                    //             {
+                    //                 int currAddValue = addValue;
+                    //                 if (imageMove.GroupIndex == maxCount - 1)
+                    //                 {
+                    //                     currAddValue += finishVale;
+                    //                 }
+                    //             });
+                    //     }
+                    //
+                    //     await TimerComponent.Instance.WaitAsync(2000);
+                    // }
 
 
                     // 无选项，关闭面板，返回 null
@@ -400,7 +400,7 @@ namespace Fort23.Mono
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
-                    if (eventConditionConfig.step == 1 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
+                    if (eventConditionConfig.DialogueType == 2 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
                     {
                         _sb.Append(PlayerManager.Instance.PlayerName + ":");
                     }

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

@@ -9,6 +9,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "ItemWidgetType1")]
     public partial class ItemWidgetType1 : UIComponent
     {
+        private Color32 color;
+
         private void Init()
         {
         }
@@ -46,7 +48,16 @@ namespace Fort23.Mono
             }
 
 
-            Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+            if (count > PlayerManager.Instance.BagController.GetItemCount(id))
+            {
+                Text_Count.text =
+                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count}";
+            }
+            else
+            {
+                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+            }
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -118,7 +118,7 @@ namespace Fort23.Mono
                 SentimentEffectConfig sentimentEffectConfig =
                     ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
-                if (PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
+                if (!PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
                         sentimentEffectConfig.upConstCount))
                 {
                     ItemSourcePanel.OpenPanel(sentimentEffectConfig.upConstItemId);

UserSettings/Layouts/default-2022.dwlt

@@ -15,11 +15,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: -2553
-    y: 483
+    y: 489
     width: 2560
-    height: 829
+    height: 823
   m_ShowMode: 0
-  m_Title: 
+  m_Title: ' Hot Reload'
   m_RootView: {fileID: 6}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
@@ -62,8 +62,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -1208
-    y: 99
+    x: 289
+    y: 86
     width: 1208
     height: 1293
   m_ShowMode: 0
@@ -91,7 +91,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Inspector
   m_RootView: {fileID: 11}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -114,7 +114,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 829
+    height: 823
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 19}
@@ -141,11 +141,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 829
+    height: 823
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 192
+  controlID: 43
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -166,8 +166,8 @@ MonoBehaviour:
     y: 0
     width: 1189
     height: 662
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -196,7 +196,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 43
+  controlID: 92
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -217,8 +217,8 @@ MonoBehaviour:
     y: 0
     width: 1208
     height: 1293
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -346,7 +346,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 184
+  controlID: 140
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -374,7 +374,7 @@ MonoBehaviour:
   - {fileID: 21}
   - {fileID: 23}
   m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -474,9 +474,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: -2553
-    y: 483
+    y: 489
     width: 2560
-    height: 808
+    height: 802
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -929,9 +929,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.03153256, y: 0.5676818, z: 0.009998513}
+    m_Target: {x: 2.8204772, y: -0.5277249, z: 3436.3313}
     speed: 2
-    m_Value: {x: 0.03153256, y: 0.5676818, z: 0.009998513}
+    m_Value: {x: 2.8204772, y: -0.5277249, z: 3436.3313}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -981,9 +981,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.1422668
+    m_Target: 9.966226
     speed: 2
-    m_Value: 3.1422668
+    m_Value: 9.966226
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1030,8 +1030,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1208
-    y: 99
+    x: 289
+    y: 86
     width: 1208
     height: 1272
   m_SerializedDataModeController:
@@ -1234,21 +1234,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: bac4feffc0c4feff845bffff8a5bffffd85cffffe65cffffeaf1fffff0f1ffff78faffff
+      m_ExpandedIDs: 3a5bf2ff405bf2ff92e3f2ff2e7ef4ff347ef4ffbc2df6ffc22df6ff9824f9ff9e24f9ffb64cf9ffbc4cf9fff44cf9fffa4cf9ffe057f9ffee57f9fff257f9ff9258f9ff8259f9ffe459f9ff1c9bf9ff229bf9ff6c9cf9ff7e9cf9ffceedfcffd4edfcff463bfeff4c3bfeffc4a7feffcaa7feffc4f6feffcaf6feff78fafffff4ffffff84c50000bec50000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: FocusFrame01
+        m_OriginalName: FocusFrame01
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -439052
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 16}
       m_SearchString: 
@@ -1293,7 +1293,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1303,24 +1303,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/GuidePanel
+    - Assets/Res/UI/DivineSence
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/GuidePanel
+  - Assets/Res/UI/DivineSence
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 406}
-    m_SelectedIDs: 80cb0000
-    m_LastClickedID: 52096
-    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000c8cb0000d0cb0000180401001a04010000ca9a3b
+    scrollPos: {x: 0, y: 438}
+    m_SelectedIDs: 88430100
+    m_LastClickedID: 82824
+    m_ExpandedIDs: 0000000080cb000082cb000084cb000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb0000d0cb0000d4cb0000dccb0000f0cb0000f2cb000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1348,7 +1348,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000
+    m_ExpandedIDs: 0000000080cb000082cb000084cb000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: