Merge remote-tracking branch 'origin/master'

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.387241
+    - _Alpha: 0.99773496
     - _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
+    - _Alpha: 0.9954623
     - _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.20088696
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.21108508
+    - _MainTexOffsetU: 0.64
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/DropGroupConfig.json

@@ -123,7 +123,7 @@
       "ID": 18,
       "dropRate": 740,
       "dropItemID": [
-        11
+        12
       ]
     },
     {

Assets/Res/Config/EventConditionConfig.json

@@ -149,7 +149,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1005
+        1006
       ],
       "finishCount": 1,
       "RelatedEvents": [
@@ -165,7 +165,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1006
+        1007
       ],
       "finishCount": 1,
       "RelatedEvents": [
@@ -194,7 +194,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1007
+        1008
       ],
       "finishCount": 1,
       "RelatedEvents": [

Assets/Res/Config/EventLinkConfig.json

@@ -8197,7 +8197,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1004
+        1005
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8217,7 +8217,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1005
+        1006
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8237,7 +8237,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1006
+        1007
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -8257,7 +8257,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        1007
+        1008
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/EventNPC.json

@@ -18,7 +18,7 @@
       "ID": 3,
       "name": 1954,
       "isNpc": true,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yunzhi",
       "DaoyouID": 2
     },
     {
@@ -124,7 +124,7 @@
       "name": 3006,
       "isNpc": true,
       "icon": "bg_lh_xuyou",
-      "DaoyouID": 0
+      "DaoyouID": 5
     },
     {
       "ID": 107,
@@ -229,14 +229,14 @@
       "name": 2097,
       "isNpc": true,
       "icon": "bg_lh_yunzhi",
-      "DaoyouID": 0
+      "DaoyouID": 2
     },
     {
       "ID": 122,
       "name": 2098,
       "isNpc": true,
       "icon": "bg_lh_fengyao",
-      "DaoyouID": 0
+      "DaoyouID": 3
     },
     {
       "ID": 123,
@@ -299,7 +299,7 @@
       "name": 2107,
       "isNpc": true,
       "icon": "bg_lh_xiner",
-      "DaoyouID": 0
+      "DaoyouID": 7
     },
     {
       "ID": 132,
@@ -320,7 +320,7 @@
       "name": 2110,
       "isNpc": true,
       "icon": "bg_lh_liuqingyan1",
-      "DaoyouID": 0
+      "DaoyouID": 8
     },
     {
       "ID": 135,
@@ -362,7 +362,7 @@
       "name": 2116,
       "isNpc": true,
       "icon": "bg_lh_chuyunmiao",
-      "DaoyouID": 0
+      "DaoyouID": 9
     },
     {
       "ID": 141,
@@ -376,7 +376,7 @@
       "name": 2118,
       "isNpc": true,
       "icon": "bg_lh_linfeng",
-      "DaoyouID": 0
+      "DaoyouID": 10
     },
     {
       "ID": 143,
@@ -474,7 +474,7 @@
       "name": 2132,
       "isNpc": true,
       "icon": "bg_lh_liuqingyan2",
-      "DaoyouID": 0
+      "DaoyouID": 8
     },
     {
       "ID": 157,

Assets/Res/Config/GroupConfig.json

@@ -262,7 +262,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -271,7 +271,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         7001
@@ -280,7 +280,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -289,7 +289,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         7007
@@ -298,7 +298,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         5003
@@ -307,7 +307,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         5003
@@ -316,7 +316,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         5003
@@ -325,7 +325,7 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         7001
@@ -391,16 +391,16 @@
         126
       ],
       "GroupMonster": [
-        9001
+        7004
       ]
     },
     {
       "ID": 3016,
       "GroupMonsterLevel": [
-        0
+        46
       ],
       "GroupMonster": [
-        9001
+        5007
       ]
     },
     {
@@ -415,7 +415,7 @@
     {
       "ID": 4001,
       "GroupMonsterLevel": [
-        11
+        8
       ],
       "GroupMonster": [
         5002
@@ -424,7 +424,7 @@
     {
       "ID": 4002,
       "GroupMonsterLevel": [
-        36
+        23
       ],
       "GroupMonster": [
         5007
@@ -433,7 +433,7 @@
     {
       "ID": 4003,
       "GroupMonsterLevel": [
-        21
+        20
       ],
       "GroupMonster": [
         5001
@@ -442,7 +442,7 @@
     {
       "ID": 4004,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5001
@@ -451,7 +451,7 @@
     {
       "ID": 4005,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5003
@@ -460,7 +460,7 @@
     {
       "ID": 4006,
       "GroupMonsterLevel": [
-        16
+        30
       ],
       "GroupMonster": [
         5002
@@ -469,7 +469,7 @@
     {
       "ID": 4007,
       "GroupMonsterLevel": [
-        36
+        35
       ],
       "GroupMonster": [
         5005
@@ -478,7 +478,7 @@
     {
       "ID": 4008,
       "GroupMonsterLevel": [
-        56
+        40
       ],
       "GroupMonster": [
         5001
@@ -487,7 +487,7 @@
     {
       "ID": 4009,
       "GroupMonsterLevel": [
-        31
+        26
       ],
       "GroupMonster": [
         5002
@@ -496,7 +496,7 @@
     {
       "ID": 4010,
       "GroupMonsterLevel": [
-        41
+        31
       ],
       "GroupMonster": [
         5004

Assets/Res/Config/HeroPowerUpConfig.json

@@ -309,7 +309,7 @@
       "defK": 238,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 2,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -625,7 +625,7 @@
       "defK": 302,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 2,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -949,7 +949,7 @@
       "defK": 404,
       "ShenshiMax": 1000,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 1,
       "MaxFabaoNum": 1,
@@ -1271,7 +1271,7 @@
       "defK": 618,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 1,
@@ -1593,7 +1593,7 @@
       "defK": 807,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.1,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 3,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 2,
@@ -1917,7 +1917,7 @@
       "defK": 1106,
       "ShenshiMax": 1100,
       "AutoXiuwei": 0.11,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 2,
       "MaxFabaoNum": 2,
@@ -2241,7 +2241,7 @@
       "defK": 1771,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.13,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 3,
       "MaxFabaoNum": 2,
@@ -2565,7 +2565,7 @@
       "defK": 2421,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.15,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 3,
       "MaxFabaoNum": 3,
@@ -2891,7 +2891,7 @@
       "defK": 3453,
       "ShenshiMax": 1200,
       "AutoXiuwei": 0.17,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 3,
@@ -3215,7 +3215,7 @@
       "defK": 5405,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.19,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -3539,7 +3539,7 @@
       "defK": 7104,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.22,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -3865,7 +3865,7 @@
       "defK": 9308,
       "ShenshiMax": 1300,
       "AutoXiuwei": 0.23,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4191,7 +4191,7 @@
       "defK": 14142,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.24,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4517,7 +4517,7 @@
       "defK": 18135,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.25,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -4845,7 +4845,7 @@
       "defK": 23232,
       "ShenshiMax": 1400,
       "AutoXiuwei": 0.27,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5171,7 +5171,7 @@
       "defK": 35139,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.28,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5497,7 +5497,7 @@
       "defK": 44929,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.29,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -5825,7 +5825,7 @@
       "defK": 57399,
       "ShenshiMax": 1500,
       "AutoXiuwei": 0.31,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6151,7 +6151,7 @@
       "defK": 87697,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.32,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6477,7 +6477,7 @@
       "defK": 113286,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.34,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -6805,7 +6805,7 @@
       "defK": 146116,
       "ShenshiMax": 1600,
       "AutoXiuwei": 0.35,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7131,7 +7131,7 @@
       "defK": 222410,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.38,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7457,7 +7457,7 @@
       "defK": 286077,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.4,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -7785,7 +7785,7 @@
       "defK": 367517,
       "ShenshiMax": 1700,
       "AutoXiuwei": 0.42,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8111,7 +8111,7 @@
       "defK": 544777,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.44,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8437,7 +8437,7 @@
       "defK": 682365,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.46,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -8765,7 +8765,7 @@
       "defK": 854632,
       "ShenshiMax": 1800,
       "AutoXiuwei": 0.48,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9093,7 +9093,7 @@
       "defK": 1264899,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.51,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9421,7 +9421,7 @@
       "defK": 1583972,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.53,
-      "FailureExpReduce": 20,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,
@@ -9750,7 +9750,7 @@
       "defK": 2021685,
       "ShenshiMax": 1900,
       "AutoXiuwei": 0.56,
-      "FailureExpReduce": 50,
+      "FailureExpReduce": 15,
       "MaxActiveGongfaNum": 4,
       "MaxPassiveGongfaNum": 4,
       "MaxFabaoNum": 4,

Assets/Res/Config/ItemConfig.json

@@ -2334,7 +2334,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        900
+        800
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2366,7 +2366,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        1600
+        1200
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2398,7 +2398,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        2500
+        1700
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2754,27 +2754,27 @@
     },
     {
       "ID": 1120080,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120081,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120082,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120083,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120084,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果"
     },
     {
       "ID": 1120085,
-      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
+      "txt": "后方功法催动时释放{0}道剑气，对敌人造成{1}%攻击力的伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
     },
     {
       "ID": 1120090,
@@ -4710,7 +4710,7 @@
     },
     {
       "ID": 1220085,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "额外对敌人施加流血"
     },
     {
       "ID": 1220091,
@@ -4730,7 +4730,7 @@
     },
     {
       "ID": 1220095,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220101,
@@ -4750,7 +4750,7 @@
     },
     {
       "ID": 1220105,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "贫血时提升恢复量"
     },
     {
       "ID": 1220111,
@@ -4770,7 +4770,7 @@
     },
     {
       "ID": 1220115,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220121,
@@ -4790,7 +4790,7 @@
     },
     {
       "ID": 1220125,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220131,
@@ -4810,7 +4810,7 @@
     },
     {
       "ID": 1220135,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220141,
@@ -4830,7 +4830,7 @@
     },
     {
       "ID": 1220145,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220151,
@@ -4850,7 +4850,7 @@
     },
     {
       "ID": 1220155,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220161,
@@ -4870,7 +4870,7 @@
     },
     {
       "ID": 1220165,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1220171,
@@ -4890,7 +4890,7 @@
     },
     {
       "ID": 1220175,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物生命永久+3%"
     },
     {
       "ID": 1220181,
@@ -4910,7 +4910,7 @@
     },
     {
       "ID": 1220185,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物攻击永久+3%"
     },
     {
       "ID": 1220191,
@@ -4930,7 +4930,7 @@
     },
     {
       "ID": 1220195,
-      "txt": "前槽位也生效，剑气增强"
+      "txt": "人物防御永久+3%"
     },
     {
       "ID": 1231011,

Assets/Res/Config/LevelbattleConfig.json

@@ -40,6 +40,26 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 100005,
+      "Group": [
+        100005
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 100006,
+      "Group": [
+        100006
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 1002,
       "Group": [

Assets/Res/Config/OpenBoxConfig.json

@@ -34,7 +34,7 @@
       ],
       "reward1": 999005,
       "reward2": 999006,
-      "reward2para1": 100,
+      "reward2para1": 99,
       "ProgressRewardChoukaCount": -1,
       "betPara1": [
         2.0,
@@ -81,7 +81,7 @@
       ],
       "reward1": 999009,
       "reward2": 999010,
-      "reward2para1": 100,
+      "reward2para1": 99,
       "ProgressRewardChoukaCount": 200,
       "betPara1": [
         2.0,

Assets/Res/Config/SkillConfig.json

@@ -6170,9 +6170,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220095,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0,
         -1.0
@@ -6557,9 +6560,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220115
+      "PromoteLan": 1220115,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20120,
@@ -6740,9 +6746,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220125,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -6926,9 +6935,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220135,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7147,9 +7159,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220145,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0
@@ -7369,9 +7384,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220155,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         0.0,
         -1.0,
@@ -7587,9 +7605,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220165,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7791,9 +7812,12 @@
         101
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220175,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]
@@ -7998,9 +8022,12 @@
         102
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
-      "PromoteLan": 1220185
+      "PromoteLan": 1220185,
+      "PromoteLanPara": [
+        3.0
+      ]
     },
     {
       "ID": 20190,
@@ -8199,9 +8226,12 @@
         103
       ],
       "addPropertyValue": [
-        12.0
+        15.0
       ],
       "PromoteLan": 1220195,
+      "PromoteLanPara": [
+        3.0
+      ],
       "PromoteLanPara_1": [
         1.0
       ]

Assets/Res/Config/TowerInfoConfig.json

@@ -16,7 +16,7 @@
       ],
       "rewardCount": [
         1,
-        5200
+        13000
       ],
       "unlockValue": 0
     },
@@ -36,7 +36,7 @@
       ],
       "rewardCount": [
         1,
-        5200
+        13000
       ],
       "unlockValue": 0
     },
@@ -56,7 +56,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -76,7 +76,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -96,7 +96,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -116,7 +116,7 @@
       ],
       "rewardCount": [
         1,
-        5600
+        14000
       ],
       "unlockValue": 0
     },
@@ -136,7 +136,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -156,7 +156,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -176,7 +176,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -196,7 +196,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        15000
       ],
       "unlockValue": 0
     },
@@ -216,7 +216,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -236,7 +236,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -256,7 +256,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -276,7 +276,7 @@
       ],
       "rewardCount": [
         1,
-        6400
+        16000
       ],
       "unlockValue": 0
     },
@@ -296,7 +296,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -316,7 +316,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -336,7 +336,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -356,7 +356,7 @@
       ],
       "rewardCount": [
         1,
-        6800
+        17000
       ],
       "unlockValue": 0
     },
@@ -376,7 +376,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -396,7 +396,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -416,7 +416,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -436,7 +436,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        18000
       ],
       "unlockValue": 0
     },
@@ -456,7 +456,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -476,7 +476,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -496,7 +496,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -516,7 +516,7 @@
       ],
       "rewardCount": [
         1,
-        7600
+        19000
       ],
       "unlockValue": 0
     },
@@ -536,7 +536,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -556,7 +556,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -576,7 +576,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -596,7 +596,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        20000
       ],
       "unlockValue": 0
     },
@@ -616,7 +616,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -636,7 +636,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -656,7 +656,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -676,7 +676,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        21000
       ],
       "unlockValue": 0
     },
@@ -696,7 +696,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -716,7 +716,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -736,7 +736,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -756,7 +756,7 @@
       ],
       "rewardCount": [
         1,
-        8800
+        22000
       ],
       "unlockValue": 0
     },
@@ -776,7 +776,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -796,7 +796,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -816,7 +816,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -836,7 +836,7 @@
       ],
       "rewardCount": [
         1,
-        9200
+        23000
       ],
       "unlockValue": 0
     },
@@ -856,7 +856,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -876,7 +876,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -896,7 +896,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        24000
       ],
       "unlockValue": 0
     },
@@ -916,7 +916,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -936,7 +936,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -956,7 +956,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        25000
       ],
       "unlockValue": 0
     },
@@ -976,7 +976,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -996,7 +996,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -1016,7 +1016,7 @@
       ],
       "rewardCount": [
         1,
-        10400
+        26000
       ],
       "unlockValue": 0
     },
@@ -1036,7 +1036,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1056,7 +1056,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1076,7 +1076,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        27000
       ],
       "unlockValue": 0
     },
@@ -1096,7 +1096,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1116,7 +1116,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1136,7 +1136,7 @@
       ],
       "rewardCount": [
         1,
-        11200
+        28000
       ],
       "unlockValue": 0
     },
@@ -1156,7 +1156,7 @@
       ],
       "rewardCount": [
         1,
-        11600
+        29000
       ],
       "unlockValue": 0
     },
@@ -1176,7 +1176,7 @@
       ],
       "rewardCount": [
         1,
-        11600
+        29000
       ],
       "unlockValue": 0
     },
@@ -1196,7 +1196,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1216,7 +1216,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1236,7 +1236,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1256,7 +1256,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1276,7 +1276,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1296,7 +1296,7 @@
       ],
       "rewardCount": [
         1,
-        12400
+        31000
       ],
       "unlockValue": 0
     },
@@ -1316,7 +1316,7 @@
       ],
       "rewardCount": [
         1,
-        12800
+        32000
       ],
       "unlockValue": 0
     },
@@ -1336,7 +1336,7 @@
       ],
       "rewardCount": [
         1,
-        12800
+        32000
       ],
       "unlockValue": 0
     },
@@ -1356,7 +1356,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1376,7 +1376,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1396,7 +1396,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        33000
       ],
       "unlockValue": 0
     },
@@ -1416,7 +1416,7 @@
       ],
       "rewardCount": [
         1,
-        13600
+        34000
       ],
       "unlockValue": 0
     },
@@ -1436,7 +1436,7 @@
       ],
       "rewardCount": [
         1,
-        13600
+        34000
       ],
       "unlockValue": 0
     },
@@ -1456,7 +1456,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1476,7 +1476,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1496,7 +1496,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        35000
       ],
       "unlockValue": 0
     },
@@ -1516,7 +1516,7 @@
       ],
       "rewardCount": [
         1,
-        14400
+        36000
       ],
       "unlockValue": 0
     },
@@ -1536,7 +1536,7 @@
       ],
       "rewardCount": [
         1,
-        14400
+        36000
       ],
       "unlockValue": 0
     },
@@ -1556,7 +1556,7 @@
       ],
       "rewardCount": [
         1,
-        14800
+        37000
       ],
       "unlockValue": 0
     },
@@ -1576,7 +1576,7 @@
       ],
       "rewardCount": [
         1,
-        14800
+        37000
       ],
       "unlockValue": 0
     },
@@ -1596,7 +1596,7 @@
       ],
       "rewardCount": [
         1,
-        15200
+        38000
       ],
       "unlockValue": 0
     },
@@ -1616,7 +1616,7 @@
       ],
       "rewardCount": [
         1,
-        15200
+        38000
       ],
       "unlockValue": 0
     },
@@ -1636,7 +1636,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        39000
       ],
       "unlockValue": 0
     },
@@ -1656,7 +1656,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        39000
       ],
       "unlockValue": 0
     },
@@ -1676,7 +1676,7 @@
       ],
       "rewardCount": [
         1,
-        16000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1696,7 +1696,7 @@
       ],
       "rewardCount": [
         1,
-        16000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1716,7 +1716,7 @@
       ],
       "rewardCount": [
         1,
-        16400
+        41000
       ],
       "unlockValue": 0
     },
@@ -1736,7 +1736,7 @@
       ],
       "rewardCount": [
         1,
-        16400
+        41000
       ],
       "unlockValue": 0
     },
@@ -1756,7 +1756,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        42000
       ],
       "unlockValue": 0
     },
@@ -1776,7 +1776,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        42000
       ],
       "unlockValue": 0
     },
@@ -1796,7 +1796,7 @@
       ],
       "rewardCount": [
         1,
-        17200
+        43000
       ],
       "unlockValue": 0
     },
@@ -1816,7 +1816,7 @@
       ],
       "rewardCount": [
         1,
-        17200
+        43000
       ],
       "unlockValue": 0
     },
@@ -1836,7 +1836,7 @@
       ],
       "rewardCount": [
         1,
-        17600
+        44000
       ],
       "unlockValue": 0
     },
@@ -1856,7 +1856,7 @@
       ],
       "rewardCount": [
         1,
-        18000
+        45000
       ],
       "unlockValue": 0
     },
@@ -1876,7 +1876,7 @@
       ],
       "rewardCount": [
         1,
-        18400
+        46000
       ],
       "unlockValue": 0
     },
@@ -1896,7 +1896,7 @@
       ],
       "rewardCount": [
         1,
-        19200
+        48000
       ],
       "unlockValue": 0
     },
@@ -1916,7 +1916,7 @@
       ],
       "rewardCount": [
         1,
-        19600
+        49000
       ],
       "unlockValue": 0
     },
@@ -1936,7 +1936,7 @@
       ],
       "rewardCount": [
         1,
-        20000
+        50000
       ],
       "unlockValue": 0
     },
@@ -1956,7 +1956,7 @@
       ],
       "rewardCount": [
         1,
-        20400
+        51000
       ],
       "unlockValue": 0
     },
@@ -1976,7 +1976,7 @@
       ],
       "rewardCount": [
         1,
-        21200
+        53000
       ],
       "unlockValue": 0
     },
@@ -1996,7 +1996,7 @@
       ],
       "rewardCount": [
         1,
-        21600
+        54000
       ],
       "unlockValue": 0
     }

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -4968,7 +4968,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 2303318506788104112}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -1689,6 +1689,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Desc1
+    gameObject: {fileID: 7578527787724932468}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7117668935224744481
 GameObject:
@@ -1751,7 +1756,7 @@ GameObject:
   - component: {fileID: 7578527787724932468}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Desc (1)
+  m_Name: Text_Desc1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1771,9 +1776,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 185075131536662509}
   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: -639}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 173}
   m_SizeDelta: {x: 601.6, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2445952998002896366

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -177,7 +177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -389,7 +389,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1050,7 +1050,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1318,7 +1318,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.32941177}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1954,7 +1954,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2479,7 +2479,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.98823535, g: 0.93725497, b: 0.8235295, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -124,8 +124,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.0025177002, y: 0}
-  m_SizeDelta: {x: 750, y: 62.687}
+  m_AnchoredPosition: {x: 0, y: -41}
+  m_SizeDelta: {x: 640.2407, y: 161.3113}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710891575198841785
 CanvasRenderer:
@@ -157,10 +157,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -576,7 +576,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   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: 628, y: 1360}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:
@@ -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

@@ -1895,7 +1895,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10237
+  id: 10798
 --- !u!1 &2720669039826339307
 GameObject:
   m_ObjectHideFlags: 0
@@ -3242,7 +3242,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4352261052017720437
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1098,6 +1098,7 @@ RectTransform:
   - {fileID: 5473342035507285947}
   - {fileID: 753562404598425228}
   - {fileID: 1062516556747891371}
+  - {fileID: 3050497527537795491}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
   - {fileID: 2507585154746067127}
@@ -1405,6 +1406,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Btn_Rest
+    gameObject: {fileID: 7192584731598602621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -1605,6 +1615,230 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &2985746228315747806
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3050497527537795491}
+  - component: {fileID: 1738658701210907711}
+  - component: {fileID: 8779855129492413753}
+  - component: {fileID: 7192584731598602621}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3050497527537795491
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8100594656288996914}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -65.4, y: -45.4}
+  m_SizeDelta: {x: 53.0398, y: 53.0398}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &1738658701210907711
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_CullTransparentMesh: 1
+--- !u!114 &8779855129492413753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.24313727, g: 0.20784315, b: 0.14117648, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_yuan
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7192584731598602621
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2985746228315747806}
+  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: 8779855129492413753}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3191778558194080149
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8100594656288996914}
+  - component: {fileID: 4249454982721208177}
+  - component: {fileID: 7377174464466216454}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Rest (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8100594656288996914
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3050497527537795491}
+  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: 35.3188, y: 31.7271}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4249454982721208177
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  m_CullTransparentMesh: 1
+--- !u!114 &7377174464466216454
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191778558194080149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fuhao_cz
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3256041832133504665
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -112,6 +112,7 @@ public class PlayerManager : Singleton<PlayerManager>
             }
         }
 
+        EveryDayRefence();
         CalculateOfflineRewards();
         AccountFileInfo.Instance.SavePlayerData();
         SummonManager.CustomInit();
@@ -382,25 +383,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
 
         //每天刷新
-        if (TimeHelper.ClientNow() > AccountFileInfo.Instance.playerData.nextRefence)
-        {
-            AccountFileInfo.Instance.playerData.nextRefence =
-                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
-            AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
-            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
-
-            foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
-            {
-                playerDataSummonData.onePayCount = 0;
-                playerDataSummonData.tenPayCount = 0;
-                playerDataSummonData.oneFreeCount = 0;
-                playerDataSummonData.nextOneFreeTime = 0;
-                playerDataSummonData.tenFreeCount = 0;
-                playerDataSummonData.nextTenFreeTime = 0;
-            }
-
-            AccountFileInfo.Instance.SavePlayerData();
-        }
+        EveryDayRefence();
 
 
         foreach (var keyValuePair in AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas)
@@ -464,9 +447,33 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public async CTask ChangeMap(int mapId,bool isShowUI = true)
+    private void EveryDayRefence()
+    {
+        if (TimeHelper.ClientNow() > AccountFileInfo.Instance.playerData.nextRefence)
+        {
+            AccountFileInfo.Instance.playerData.nextRefence =
+                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+            AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
+            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
+
+            foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
+            {
+                playerDataSummonData.onePayCount = 0;
+                playerDataSummonData.tenPayCount = 0;
+                playerDataSummonData.oneFreeCount = 0;
+                playerDataSummonData.nextOneFreeTime = 0;
+                playerDataSummonData.tenFreeCount = 0;
+                playerDataSummonData.nextTenFreeTime = 0;
+            }
+
+            AccountFileInfo.Instance.SavePlayerData();
+        }
+    }
+
+    public async CTask ChangeMap(int mapId, bool isShowUI = true)
     {
-        SmallPlacesConfig currentSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+        SmallPlacesConfig currentSmallPlacesConfig =
+            ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
         if (smallPlacesConfig.ID == 0)
             return;
@@ -518,7 +525,6 @@ public class PlayerManager : Singleton<PlayerManager>
 
         if (currentSmallPlacesConfig.PlacesId == smallPlacesConfig.PlacesId)
         {
-        
             CombatController.currActiveCombat.ChangeState(CombatController.miniSceneSwitch);
         }
         else
@@ -526,9 +532,9 @@ public class PlayerManager : Singleton<PlayerManager>
             CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
         }
 
-    
+
         await _cTask;
-        if(isShowUI)
+        if (isShowUI)
             UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
     }
@@ -603,23 +609,54 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public void CalculateOfflineRewards()
     {
-        // return;
+        int exitMiao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
+        if (exitMiao <= 0)
+            return;
         if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <=
-            PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&
-            AccountFileInfo.Instance.playerData.ExitTime > 0)
+            gameConstantConfig.qiankundaiMaxTime &&
+            exitMiao > 0)
         {
-            int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
-            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >=
-                   PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime
-                ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao
+            int miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + exitMiao;
+            miao = miao >= gameConstantConfig.qiankundaiMaxTime
+                ?  gameConstantConfig.qiankundaiMaxTime - miao
                 : miao;
-            AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
             for (int i = 0; i < miao; i++)
             {
                 QianKunDaiAward();
             }
         }
 
+
+        HeroPowerUpConfig heroPowerUpConfig = myHero.powerUpConfig;
+
+        if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
+        {
+            int miao = 0;
+            if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
+                gameConstantConfig.shenshiPointRecSPD[0])
+            {
+                float todayResidueShenShi = gameConstantConfig.shenshiPointRecSPD[0] -
+                                            AccountFileInfo.Instance.playerData.todayDivineSensePoint;
+
+                miao = (int)(todayResidueShenShi / gameConstantConfig.shenshiPointRecSPD[1]);
+
+                float todayResidue = gameConstantConfig.shenshiPointRecSPD[1] * miao;
+                todayResidue = todayResidue > heroPowerUpConfig.ShenshiMax ? heroPowerUpConfig.ShenshiMax : todayResidue;
+                AccountFileInfo.Instance.playerData.todayDivineSensePoint += todayResidue;
+                AccountFileInfo.Instance.playerData.divineSensePoint += todayResidue;
+            }
+
+            int residueExitMiao = exitMiao - miao;
+            if (residueExitMiao > 0)
+            {
+                float todaySs2 = gameConstantConfig.shenshiPointRecSPD[2] * residueExitMiao;
+                todaySs2 = todaySs2 > heroPowerUpConfig.ShenshiMax ? heroPowerUpConfig.ShenshiMax : todaySs2;
+                AccountFileInfo.Instance.playerData.divineSensePoint += todaySs2;
+            }
+        }
+
+
+        EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
         AccountFileInfo.Instance.playerData.ExitTime = 0;
         AccountFileInfo.Instance.SavePlayerData();
     }

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -18,6 +18,8 @@ namespace GameLogic.Player
         //积分规则
         public Map<int, List<OpenBoxScoreRule>> openBoxScoreRuleMap = new Map<int, List<OpenBoxScoreRule>>();
 
+        private static readonly System.Random random = new System.Random();
+
         public void CustomInit()
         {
             OpenBoxConfig[] openBoxConfigs = ConfigComponent.Instance.GetAll<OpenBoxConfig>();
@@ -206,7 +208,7 @@ namespace GameLogic.Player
                     summonData.tenPayCount++;
                 }
             }
-            
+
             AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
@@ -223,18 +225,19 @@ namespace GameLogic.Player
 
             for (int i = 0; i < count; i++)
             {
-                // 十连保底1
-                if (summonData.baodiCount1 >= 9)
+                // 十连保底2
+                if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
                 {
-                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
+                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
                     allItem.AddRange(addItem);
                     continue;
                 }
 
-                // 十连保底2
-                if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
+
+                // 十连保底1
+                if (summonData.baodiCount1 >= 9)
                 {
-                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
+                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
                     allItem.AddRange(addItem);
                     continue;
                 }
@@ -251,9 +254,24 @@ namespace GameLogic.Player
 
 
             AccountFileInfo.Instance.SavePlayerData();
+            Shuffle(allItem);
             return allItem;
         }
 
+
+        public static void Shuffle<T>(IList<T> list)
+        {
+            int n = list.Count;
+            while (n > 1)
+            {
+                n--;
+                int k = random.Next(n + 1);
+                T value = list[k];
+                list[k] = list[n];
+                list[n] = value;
+            }
+        }
+
         // 计算保底物品集合
         private HashSet<int> CalculateBaodiItems(int rewardId)
         {
@@ -301,6 +319,7 @@ namespace GameLogic.Player
             var addItem = DropManager.Instance.DropItem(config.reward2);
             // PlayerManager.Instance.BagController.AddItem(addItem);
             summonData.baodiCount2 = 0;
+            summonData.baodiCount1 = 0;
             AccountFileInfo.Instance.SavePlayerData();
             return addItem;
         }
@@ -320,6 +339,7 @@ namespace GameLogic.Player
             {
                 int poolIndex = index % config.reward.Length;
                 addItem = DropManager.Instance.DropItem(config.reward[poolIndex]);
+                // summonData.baodiCount2++;
                 index++;
             }
 
@@ -327,6 +347,7 @@ namespace GameLogic.Player
             // PlayerManager.Instance.BagController.AddItem(addItem);
             summonData.baodiCount1++;
 
+
             return addItem;
         }
 

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -217,8 +217,7 @@ namespace Fort23.Mono
                 PlayerGuideManager.Instance.StepInit();
                 PlayerGuideManager.Instance.SetOnClickMask(true);
             }
-                
-    
+
 
             EventSystemManager.Instance.isTriggerEvent = true;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);

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

@@ -56,6 +56,7 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
+                Text_Desc1.gameObject.SetActive(true);
             }
             else
             {
@@ -63,6 +64,7 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
+                Text_Desc1.gameObject.SetActive(false);
             }
         }
 

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

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

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

@@ -120,6 +120,10 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+                else if (skillConfig.attribute == 0)
+                {
+                    icon.icon_name = "dec_gfbook_fuzhu";
+                }
 
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;

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

@@ -32,6 +32,8 @@ namespace Fort23.Mono
 
         private int currenRoadSkilId;
 
+        private SkillInfo currentOnclickskillWidget;
+
         /// <summary>
         /// 1.执行升级逻辑 2.执行更换逻辑
         /// </summary>
@@ -388,6 +390,8 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
                 showSkillInfo.Sort(Sort);
+       
+              
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
@@ -670,7 +674,15 @@ namespace Fort23.Mono
 
             CloseSelect();
             showSkillInfo.Sort(Sort);
-            Content.Init(this, showSkillInfo.Count);
+            int startIndex = 0;
+            for (int i = 0; i < showSkillInfo.Count; i++)
+            {
+                if (showSkillInfo[i] == currentOnclickskillWidget)
+                {
+                    startIndex = i;
+                }
+            }
+            Content.Init(this, showSkillInfo.Count,startIndex);
         }
 
         private int Sort(SkillInfo type1, SkillInfo type2)
@@ -1374,6 +1386,7 @@ namespace Fort23.Mono
             SkillWidget skillWidget = obj as SkillWidget;
             if (infoType == 1)
             {
+                currentOnclickskillWidget = skillWidget.skillConfigId;
                 GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(skillWidget.skillConfigId);
                 await gongFaUpgradePanel.UIClosed();
                 Sort(type1, type2);
@@ -1508,6 +1521,7 @@ namespace Fort23.Mono
             Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
+            currentOnclickskillWidget = null;
             // ChangeInfoType(1);
             await base.Close();
         }

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

@@ -6,6 +6,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Hero;
 using GameLogic.Player;
 using UnityEngine;
@@ -76,6 +77,72 @@ namespace Fort23.Mono
             Btn_UpStarOk.onClick.AddListener(() => { UpStarClick(); });
 
             Btn_UpGradeOkLongPress.longPress = () => { UpgradeClick(); };
+
+            Btn_Rest.onClick.AddListener(async() =>
+            {
+
+
+                bool relust = await TipsPanle.OpenPnael(10799);
+                if (!relust)
+                {
+                    return;
+                }
+                
+                Dictionary<int, ItemInfo> itemInfo = new Dictionary<int, ItemInfo>();
+
+                for (int i = 1; i < _skillInfo.SkillPowerupConfig.ID; i++)
+                {
+                    SkillPowerupConfig skillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(i);
+                    for (var i1 = 0; i1 < skillPowerupConfig.LevelupItem.Length; i1++)
+                    {
+                        if (itemInfo.ContainsKey(skillPowerupConfig.LevelupItem[i1]))
+                        {
+                            itemInfo[skillPowerupConfig.LevelupItem[i1]].count += skillPowerupConfig.LevelupItemNum[i1];
+                        }
+                        else
+                        {
+                            itemInfo.Add(skillPowerupConfig.LevelupItem[i1], new ItemInfo(
+                                skillPowerupConfig.LevelupItem[i1],
+                                skillPowerupConfig.LevelupItemNum[i1]));
+                        }
+                    }
+                }
+
+                // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
+                //
+                // SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
+                // int count = 0;
+                // for (int i = 0; i < _skillInfo.skillConfig.level - 1; i++)
+                // {
+                //     count += skillConstant.SkillPromoteNeedPieceNum[i];
+                // }
+                //
+                // if (count > 0)
+                // {
+                //     if (itemInfo.ContainsKey(_skillInfo.skillConfig.PieceID))
+                //     {
+                //         itemInfo[_skillInfo.skillConfig.PieceID].count += count;
+                //     }
+                //     else
+                //     {
+                //         itemInfo.Add(_skillInfo.skillConfig.PieceID, new ItemInfo(_skillInfo.skillConfig.PieceID,
+                //             count));
+                //     }
+                // }
+
+
+                // _skillInfo.SkillData.star = 1;
+                _skillInfo.SkillData.level = 1;
+                _skillInfo.CustomInt(_skillInfo.SkillData);
+                PlayerManager.Instance.myHero.ComputeHeroInfo();
+                CustomInit(_skillInfo);
+                foreach (var keyValuePair in itemInfo)
+                {
+                    PlayerManager.Instance.BagController.AddItem(keyValuePair.Value);
+                }
+
+                RewardsPanel.OpenPanel(itemInfo);
+            });
         }
 
         private void UpStarClick()
@@ -219,7 +286,6 @@ namespace Fort23.Mono
             {
                 QualityCsc.ChangeState(0);
                 Text_Quality.text = LanguageManager.Instance.Text(10797);
-              
             }
             else if (itemConfig.quality == 4)
             {
@@ -266,7 +332,7 @@ namespace Fort23.Mono
                     csc.ChangeState(4);
                     Icon_Attribute.icon_name = "dec_tu2";
                     break;
-                
+
                 case 0:
                     csc.ChangeState(5);
                     Icon_Attribute.icon_name = "dec_fuzhu2";

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

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

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

@@ -36,12 +36,19 @@ namespace Fort23.Mono
                 Icon_Dj.gameObject.SetActive(true);
             }
 
-            Text_Xw.text = LanguageManager.Instance.Text(10792,xw);
+            // //扣除失败后的经验
+            // float failbl = xw == 0
+            //     ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
+            //     : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * xw * 0.01f);
+            // int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
+
+            Text_Xw.text = LanguageManager.Instance.Text(10792, xw);
         }
 
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
         {
-            HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top,isShowBG:true);
+            HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughFailPanel.CustomInit(type, xw);
             return heroBreakthroughFailPanel;
         }

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

@@ -154,10 +154,10 @@ namespace Fort23.Mono
                     //失败
                     else
                     {
-                        RemoveHeroItem(list[1]);
+                        int xw =RemoveHeroItem(list[1]);
                         AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
                         HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                            await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                            await HeroBreakthroughFailPanel.OpenPanel(2, xw);
                         await heroBreakthroughFailPanel.UIClosed();
                         heroInformationPanel.RecoverDujie();
                         UIManager.Instance.HideUIUIPanel(this);
@@ -186,10 +186,11 @@ namespace Fort23.Mono
                         if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                         {
                             AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
-                            RemoveHeroItem(100);
+                            var list = GetBl();
+                            int xw = RemoveHeroItem(list[1]);
 
                             HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                                await HeroBreakthroughFailPanel.OpenPanel(3, 100);
+                                await HeroBreakthroughFailPanel.OpenPanel(3, xw);
                             await heroBreakthroughFailPanel.UIClosed();
                             heroInformationPanel.RecoverDujie();
                             UIManager.Instance.HideUIUIPanel(this);
@@ -239,19 +240,22 @@ namespace Fort23.Mono
             });
         }
 
-        private void RemoveHeroItem(int failBl)
+        private int RemoveHeroItem(int failBl)
         {
+            float allexp = HeroHerlp.GetHeroExp();
+            PlayerManager.Instance.myHero.heroData.exp += allexp;
             //扣除失败后的经验
             float failbl = failBl == 0
                 ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
                 : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
-            int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
-            float allexp = HeroHerlp.GetHeroExp();
-            PlayerManager.Instance.myHero.heroData.exp += allexp;
+            int failXw = (int)(PlayerManager.Instance.myHero.heroData.exp * failbl * 0.01f);
+
+
             PlayerManager.Instance.myHero.heroData.exp -= failXw;
             PlayerManager.Instance.myHero.heroData.upTime = TimeHelper.ClientNow();
             // PlayerManager.Instance.myHero.heroData.isCombat = false;
             AccountFileInfo.Instance.SavePlayerData();
+            return failXw;
         }
 
         // private async CTask UpHero(int type,HeroInfo nextHeroInfo)

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

@@ -245,7 +245,7 @@ namespace Fort23.Mono
         {
             if (isBj)
             {
-                if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null)
+                if (currentFaBaoInfo != selectedFaBaoInfo && selectedFaBaoInfo != null && currentFaBaoInfo != null)
                 {
                     if (currentFaBaoInfo == null ||
                         selectedFaBaoInfo.FabaoPowerupConfig.ID > currentFaBaoInfo.FabaoPowerupConfig.ID)

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -89,7 +89,7 @@ namespace Fort23.Mono
             txtlName.text = title;
         }
 
-        public async void InitRewardsPanel(Dictionary<string, ItemInfo> rewardsDic, Action onClose = null)
+        public async void InitRewardsPanel(Dictionary<int, ItemInfo> rewardsDic, Action onClose = null)
         {
             this.onClose = onClose;
             foreach (var widgetItem in widgetItems)
@@ -98,7 +98,7 @@ namespace Fort23.Mono
             }
 
             widgetItems.Clear();
-            foreach (KeyValuePair<string, ItemInfo> keyValuePair in rewardsDic)
+            foreach (KeyValuePair<int, ItemInfo> keyValuePair in rewardsDic)
             {
                 GenerateWidget(keyValuePair.Value);
             }
@@ -113,7 +113,7 @@ namespace Fort23.Mono
         }
 
 
-        public async static CTask<RewardsPanel> OpenPanel(Dictionary<string, ItemInfo> rewardsDic,
+        public async static CTask<RewardsPanel> OpenPanel(Dictionary<int, ItemInfo> rewardsDic,
             Action onClose = null)
         {
             RewardsPanel rewardsPanel =

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

@@ -160,7 +160,18 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_Price.text = _shopItemConfig.price.ToString();
+                
+                if (_shopItemConfig.price > PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId))
+                {
+                    Text_Price.text =
+                        $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}</color>/{_shopItemConfig.price.ToStringEx()}";
+                }
+                else
+                {
+                    Text_Price.text = $"{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}/{_shopItemConfig.price.ToStringEx()}";
+                }
+                
+               
                 ImageCurrency.gameObject.SetActive(true);
             }
 
@@ -289,7 +300,18 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
+                int allCount = count * _shopItemConfig.price;
+                
+                if (allCount > PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId))
+                {
+                    Text_Price.text =
+                        $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}</color>/{allCount.ToStringEx()}";
+                }
+                else
+                {
+                    Text_Price.text = $"{PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId).ToStringEx()}/{allCount.ToStringEx()}";
+                }
+                
                 ImageCurrency.gameObject.SetActive(true);
             }
 

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

@@ -97,6 +97,23 @@ namespace Fort23.Mono
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             shopId = int.Parse(uiData[0].ToString());
+            
+            foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
+            {
+                UIManager.Instance.DormancyGComponent(shopGroupWidgetType1);
+            }
+
+            _shopGroupWidgetType1s.Clear();
+  
+
+            foreach (var shopBtnWidget in _shopBtnWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shopBtnWidget);
+            }
+
+            _shopBtnWidgets.Clear();
+            currentSelectedShopBtnWidget = null;
+            
             List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
             shopGroupConfigs.Sort(Sort);
             foreach (var shopGroupConfig in shopGroupConfigs)
@@ -137,6 +154,37 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
+
+        public void SelectWidget(int shopId)
+        {
+            this.shopId = shopId;
+            currentSelectedShopBtnWidget = null;
+            if (currentSelectedShopBtnWidget == null)
+            {
+                foreach (var shopBtnWidget in _shopBtnWidgets)
+                {
+                    if (shopBtnWidget.ShopGroupConfig.ID == shopId)
+                    {
+                        currentSelectedShopBtnWidget = shopBtnWidget;
+                        break;
+                    }
+                }
+
+                if (currentSelectedShopBtnWidget == null)
+                {
+                    _shopBtnWidgets[0]?.OnPointerClick();
+                }
+                else
+                {
+                    currentSelectedShopBtnWidget.OnPointerClick();
+                }
+            }
+            else
+            {
+                currentSelectedShopBtnWidget.OnPointerClick();
+            }
+        }
+
         private async void OnClick(ItemWidgetBasic obj)
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
@@ -250,12 +298,7 @@ namespace Fort23.Mono
             }
 
             _shopGroupWidgetType1s.Clear();
-            // foreach (var widget in _energyWidgets)
-            // {
-            //     UIManager.Instance.DormancyGComponent(widget);
-            // }
-            //
-            // _energyWidgets.Clear();
+  
 
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {

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

@@ -271,13 +271,18 @@ namespace Fort23.Mono
             xianTuSaiXuanWidget1.OnClick = OnClick;
 
             BigMapConfig[] bigMapConfigs = ConfigComponent.Instance.GetAll<BigMapConfig>();
-            foreach (var bigMapConfig in bigMapConfigs)
-            {
-                XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
-                xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
-                xianTuSaiXuanWidget.OnClick = OnClick;
-                bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
-            }
+            // foreach (var bigMapConfig in bigMapConfigs)
+            // {
+            //     XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            //     xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
+            //     xianTuSaiXuanWidget.OnClick = OnClick;
+            //     bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
+            // }
+            
+            XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+            xianTuSaiXuanWidget.CustomInit(1, bigMapConfigs[0].ID);
+            xianTuSaiXuanWidget.OnClick = OnClick;
+            bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
 
             eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidgetGam, null);
 

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

@@ -41,7 +41,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_Name.text = LanguageManager.Instance.Text(_bigMapConfig.mapName);
+                    string[] fruits =  LanguageManager.Instance.Text(_bigMapConfig.mapName).Split('.');
+                    Text_Name.text =fruits[1];
                 }
             }
             else if (type == 2)

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,7 +34,16 @@ namespace Mono.Utility
                     return;
                 //商店界面
                 case 4:
-                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
+                    ShopPanel shopPanel = UIManager.Instance.GetComponent<ShopPanel>();
+                    if (shopPanel != null && !shopPanel.IsClose)
+                    {
+                        shopPanel.SelectWidget(skiptoConfig.SkipArguments[0]);
+                    }
+                    else
+                    {
+                        UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
+                    }
+
                     return;
                 //实用神识界面
                 case 5:

UserSettings/Layouts/default-2022.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1052
     height: 1171
   m_ShowMode: 4
-  m_Title: Project Settings
+  m_Title: Game
   m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -67,8 +67,8 @@ MonoBehaviour:
     y: 0
     width: 767
     height: 1115
-  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: 13}
   m_Panes:
   - {fileID: 13}
@@ -109,7 +109,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectSettingsWindow
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -118,15 +118,15 @@ MonoBehaviour:
     y: 635
     width: 533
     height: 486
-  m_MinSize: {x: 310, y: 200}
+  m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 16}
   - {fileID: 15}
   - {fileID: 14}
-  m_Selected: 2
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -151,7 +151,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 55
+  controlID: 49
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -227,7 +227,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 25
+  controlID: 48
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -260,7 +260,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: InspectorWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -269,14 +269,14 @@ MonoBehaviour:
     y: 0
     width: 533
     height: 635
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
   - {fileID: 18}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -455,9 +455,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 1684
-    y: 412
+    y: 743
     width: 532
-    height: 796
+    height: 465
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -473,7 +473,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: c650fdffdaf0ffff
+      m_ExpandedIDs: cef9ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -579,7 +579,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gameruntime
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -588,10 +588,9 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
-    - Assets/StreamingAssets
+    m_Folders: []
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gameruntime
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
@@ -604,9 +603,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: d4fa0000
-    m_LastClickedID: 64212
-    m_ExpandedIDs: 0000000070de000000ca9a3bffffff7f
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 0000000006cb000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -634,7 +633,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000070de0000
+    m_ExpandedIDs: 0000000006cb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -659,9 +658,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_SelectedInstanceIDs: 22b90000
+    m_LastClickedInstanceID: 47394
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -757,7 +756,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1