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

Assets/Res/Config/EventConditionConfig.json

@@ -74,10 +74,7 @@
       "ConditionType": 8,
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {

Assets/Res/Config/LanguageChineseConfig.json

@@ -7682,7 +7682,7 @@
     },
     {
       "ID": 1921,
-      "txt": "蓬莱岛"
+      "txt": "第一章.逍遥游"
     },
     {
       "ID": 1922,
@@ -7694,15 +7694,15 @@
     },
     {
       "ID": 1924,
-      "txt": "碧霞仙屿"
+      "txt": "北海"
     },
     {
       "ID": 1925,
-      "txt": "云渺港"
+      "txt": "尧之都"
     },
     {
       "ID": 1926,
-      "txt": "青莲峰"
+      "txt": "藐姑射山"
     },
     {
       "ID": 1927,
@@ -37043,6 +37043,190 @@
     {
       "ID": 10001,
       "txt": "血祭神通碎片"
+    },
+    {
+      "ID": 10002,
+      "txt": "金煞决碎片"
+    },
+    {
+      "ID": 10003,
+      "txt": "毒瘴领域碎片"
+    },
+    {
+      "ID": 10004,
+      "txt": "毒爆碎片"
+    },
+    {
+      "ID": 10005,
+      "txt": "异常转移碎片"
+    },
+    {
+      "ID": 10006,
+      "txt": "阴水碎片"
+    },
+    {
+      "ID": 10007,
+      "txt": "灵油碎片"
+    },
+    {
+      "ID": 10008,
+      "txt": "厚土护体碎片"
+    },
+    {
+      "ID": 10009,
+      "txt": "金沙碎片"
+    },
+    {
+      "ID": 10010,
+      "txt": "[临时]血祭神通碎片描述"
+    },
+    {
+      "ID": 10011,
+      "txt": "[临时]金煞决碎片描述"
+    },
+    {
+      "ID": 10012,
+      "txt": "[临时]毒瘴领域碎片描述"
+    },
+    {
+      "ID": 10013,
+      "txt": "[临时]毒爆碎片描述"
+    },
+    {
+      "ID": 10014,
+      "txt": "[临时]异常转移碎片描述"
+    },
+    {
+      "ID": 10015,
+      "txt": "[临时]阴水碎片描述"
+    },
+    {
+      "ID": 10016,
+      "txt": "[临时]灵油碎片描述"
+    },
+    {
+      "ID": 10017,
+      "txt": "[临时]厚土护体碎片描述"
+    },
+    {
+      "ID": 10018,
+      "txt": "[临时]金沙碎片描述"
+    },
+    {
+      "ID": 10019,
+      "txt": "甘露"
+    },
+    {
+      "ID": 10020,
+      "txt": "风铃"
+    },
+    {
+      "ID": 10021,
+      "txt": "风灵碎片"
+    },
+    {
+      "ID": 10022,
+      "txt": "浮岛灵石"
+    },
+    {
+      "ID": 10023,
+      "txt": "云隐宗长老密信"
+    },
+    {
+      "ID": 10024,
+      "txt": "尧都玉佩"
+    },
+    {
+      "ID": 10025,
+      "txt": "山野灵草"
+    },
+    {
+      "ID": 10026,
+      "txt": "秘境种子"
+    },
+    {
+      "ID": 10027,
+      "txt": "甜蜜果实"
+    },
+    {
+      "ID": 10028,
+      "txt": "[临时]甘露描述"
+    },
+    {
+      "ID": 10029,
+      "txt": "[临时]风铃描述"
+    },
+    {
+      "ID": 10030,
+      "txt": "[临时]风灵碎片描述"
+    },
+    {
+      "ID": 10031,
+      "txt": "[临时]浮岛灵石描述"
+    },
+    {
+      "ID": 10032,
+      "txt": "[临时]云隐宗长老密信描述"
+    },
+    {
+      "ID": 10033,
+      "txt": "[临时]尧都玉佩描述"
+    },
+    {
+      "ID": 10034,
+      "txt": "[临时]山野灵草描述"
+    },
+    {
+      "ID": 10035,
+      "txt": "[临时]秘境种子描述"
+    },
+    {
+      "ID": 10036,
+      "txt": "[临时]甜蜜果实描述"
+    },
+    {
+      "ID": 10037,
+      "txt": "海边"
+    },
+    {
+      "ID": 10038,
+      "txt": "秘境"
+    },
+    {
+      "ID": 10039,
+      "txt": "浮岛"
+    },
+    {
+      "ID": 10040,
+      "txt": "深处"
+    },
+    {
+      "ID": 10041,
+      "txt": "主城"
+    },
+    {
+      "ID": 10042,
+      "txt": "山林"
+    },
+    {
+      "ID": 10043,
+      "txt": "郊外"
+    },
+    {
+      "ID": 10044,
+      "txt": "山脚"
+    },
+    {
+      "ID": 10045,
+      "txt": "山径"
+    },
+    {
+      "ID": 10046,
+      "txt": "山顶"
+    },
+    {
+      "ID": 10047,
+      "txt": "使用神识"
     }
   ]
 }

Assets/Res/Config/OpenBoxDropListConfig.json.meta → Assets/Res/Config/OpenBoxProgressReward.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CiwZtCv5Uy/a8ZOWqSu6uILfLbQ+SRw1P571P/6DI0Yb9VgMLRWAOQWA0xKB
+guid: DywWtX+lAim7cZfLP1rGfFzOnyiZ2IO59DVtLTfDO783dqEky3IoJpW+0g3F
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Res/Config/OpenBoxScoreRule.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CilLvCOoUHLs9A5+lMb5c347fZHLgpU9v6UBDKbkSpxkE0Uv5g1yYJFQbMtl
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/SkillConfig.json

@@ -5592,7 +5592,11 @@
       "intensifierIndex": [
         0
       ],
-      "PromoteLan": -1
+      "PromoteLan": -1,
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
+      ]
     },
     {
       "ID": 20081,
@@ -5625,6 +5629,10 @@
       "PromoteLan": 1260,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5658,6 +5666,10 @@
       "PromoteLan": 1261,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5691,6 +5703,10 @@
       "PromoteLan": 1262,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {
@@ -5724,6 +5740,10 @@
       "PromoteLan": 1263,
       "PromoteLanPara": [
         3.0
+      ],
+      "PromoteLanPara_1": [
+        0.0,
+        -1.0
       ]
     },
     {

Assets/Res/Config/SkillPowerupConfig.json

@@ -9,8 +9,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1125,
-        188
+        26285,
+        656
       ],
       "PlayerLevelLimit": 6
     },
@@ -23,8 +23,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1500,
-        250
+        27635,
+        694
       ],
       "PlayerLevelLimit": 11
     },
@@ -37,8 +37,8 @@
         1005
       ],
       "LevelupItemNum": [
-        1875,
-        313
+        29055,
+        725
       ],
       "PlayerLevelLimit": 16
     },
@@ -51,8 +51,8 @@
         1005
       ],
       "LevelupItemNum": [
-        2250,
-        375
+        30548,
+        763
       ],
       "PlayerLevelLimit": 21
     },
@@ -65,8 +65,8 @@
         1005
       ],
       "LevelupItemNum": [
-        2625,
-        438
+        32115,
+        800
       ],
       "PlayerLevelLimit": 26
     },
@@ -79,8 +79,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3000,
-        500
+        33765,
+        844
       ],
       "PlayerLevelLimit": 31
     },
@@ -93,8 +93,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3375,
-        563
+        35500,
+        888
       ],
       "PlayerLevelLimit": 36
     },
@@ -107,8 +107,8 @@
         1005
       ],
       "LevelupItemNum": [
-        3750,
-        625
+        37325,
+        931
       ],
       "PlayerLevelLimit": 41
     },
@@ -121,8 +121,8 @@
         1005
       ],
       "LevelupItemNum": [
-        4140,
-        688
+        39243,
+        981
       ],
       "PlayerLevelLimit": 46
     },
@@ -135,8 +135,8 @@
         1005
       ],
       "LevelupItemNum": [
-        4570,
-        750
+        41258,
+        1031
       ],
       "PlayerLevelLimit": 51
     },
@@ -149,8 +149,8 @@
         1005
       ],
       "LevelupItemNum": [
-        5048,
-        825
+        43378,
+        1088
       ],
       "PlayerLevelLimit": 56
     },
@@ -163,8 +163,8 @@
         1005
       ],
       "LevelupItemNum": [
-        5573,
-        919
+        45605,
+        1138
       ],
       "PlayerLevelLimit": 61
     },
@@ -177,8 +177,8 @@
         1005
       ],
       "LevelupItemNum": [
-        6150,
-        1013
+        47948,
+        1200
       ],
       "PlayerLevelLimit": 66
     },
@@ -191,8 +191,8 @@
         1005
       ],
       "LevelupItemNum": [
-        6788,
-        1106
+        50413,
+        1263
       ],
       "PlayerLevelLimit": 71
     },
@@ -205,8 +205,8 @@
         1005
       ],
       "LevelupItemNum": [
-        7493,
-        1231
+        53000,
+        1325
       ],
       "PlayerLevelLimit": 76
     },
@@ -219,8 +219,8 @@
         1005
       ],
       "LevelupItemNum": [
-        8273,
-        1356
+        55725,
+        1394
       ],
       "PlayerLevelLimit": 81
     },
@@ -233,8 +233,8 @@
         1005
       ],
       "LevelupItemNum": [
-        9135,
-        1500
+        58588,
+        1463
       ],
       "PlayerLevelLimit": 86
     },
@@ -247,8 +247,8 @@
         1005
       ],
       "LevelupItemNum": [
-        10088,
-        1656
+        61598,
+        1538
       ],
       "PlayerLevelLimit": 91
     },
@@ -261,8 +261,8 @@
         1005
       ],
       "LevelupItemNum": [
-        11138,
-        1831
+        64760,
+        1619
       ],
       "PlayerLevelLimit": 96
     },
@@ -275,8 +275,8 @@
         1005
       ],
       "LevelupItemNum": [
-        12298,
-        2019
+        68088,
+        1700
       ],
       "PlayerLevelLimit": 101
     },
@@ -289,8 +289,8 @@
         1005
       ],
       "LevelupItemNum": [
-        13573,
-        2231
+        71585,
+        1788
       ],
       "PlayerLevelLimit": 106
     },
@@ -303,8 +303,8 @@
         1005
       ],
       "LevelupItemNum": [
-        14988,
-        2463
+        75263,
+        1881
       ],
       "PlayerLevelLimit": 111
     },
@@ -317,8 +317,8 @@
         1005
       ],
       "LevelupItemNum": [
-        16548,
-        2719
+        79130,
+        1981
       ],
       "PlayerLevelLimit": 116
     },
@@ -331,8 +331,8 @@
         1005
       ],
       "LevelupItemNum": [
-        18268,
-        3000
+        83195,
+        2081
       ],
       "PlayerLevelLimit": 121
     },
@@ -345,8 +345,8 @@
         1005
       ],
       "LevelupItemNum": [
-        20168,
-        3313
+        87468,
+        2188
       ],
       "PlayerLevelLimit": 126
     },
@@ -359,8 +359,8 @@
         1005
       ],
       "LevelupItemNum": [
-        22268,
-        3656
+        91963,
+        2300
       ],
       "PlayerLevelLimit": 131
     },
@@ -373,8 +373,8 @@
         1005
       ],
       "LevelupItemNum": [
-        24585,
-        4038
+        96685,
+        2419
       ],
       "PlayerLevelLimit": 136
     },
@@ -387,8 +387,8 @@
         1005
       ],
       "LevelupItemNum": [
-        27148,
-        4456
+        101653,
+        2544
       ],
       "PlayerLevelLimit": 141
     },
@@ -401,8 +401,8 @@
         1005
       ],
       "LevelupItemNum": [
-        29973,
-        4919
+        106875,
+        2669
       ],
       "PlayerLevelLimit": 146
     },
@@ -415,8 +415,8 @@
         1005
       ],
       "LevelupItemNum": [
-        33093,
-        5431
+        112365,
+        2806
       ],
       "PlayerLevelLimit": 151
     },
@@ -429,8 +429,8 @@
         1005
       ],
       "LevelupItemNum": [
-        36538,
-        5994
+        118138,
+        2956
       ],
       "PlayerLevelLimit": 156
     },
@@ -443,8 +443,8 @@
         1005
       ],
       "LevelupItemNum": [
-        40338,
-        6619
+        124205,
+        3106
       ],
       "PlayerLevelLimit": 161
     },
@@ -457,8 +457,8 @@
         1005
       ],
       "LevelupItemNum": [
-        44535,
-        7306
+        130588,
+        3263
       ],
       "PlayerLevelLimit": 166
     },
@@ -471,8 +471,8 @@
         1005
       ],
       "LevelupItemNum": [
-        49170,
-        8063
+        137295,
+        3431
       ],
       "PlayerLevelLimit": 171
     },
@@ -485,8 +485,8 @@
         1005
       ],
       "LevelupItemNum": [
-        54285,
-        8900
+        144348,
+        3606
       ],
       "PlayerLevelLimit": 176
     },
@@ -499,8 +499,8 @@
         1005
       ],
       "LevelupItemNum": [
-        59935,
-        9825
+        151765,
+        3794
       ],
       "PlayerLevelLimit": 181
     },
@@ -513,8 +513,8 @@
         1005
       ],
       "LevelupItemNum": [
-        66173,
-        10844
+        159560,
+        3988
       ],
       "PlayerLevelLimit": 186
     },
@@ -527,8 +527,8 @@
         1005
       ],
       "LevelupItemNum": [
-        73060,
-        11975
+        167758,
+        4194
       ],
       "PlayerLevelLimit": 191
     },
@@ -541,8 +541,8 @@
         1005
       ],
       "LevelupItemNum": [
-        80663,
-        13219
+        176375,
+        4413
       ],
       "PlayerLevelLimit": 196
     },
@@ -555,8 +555,8 @@
         1005
       ],
       "LevelupItemNum": [
-        89055,
-        14594
+        185435,
+        4638
       ],
       "PlayerLevelLimit": 201
     },
@@ -569,8 +569,8 @@
         1005
       ],
       "LevelupItemNum": [
-        98323,
-        16125
+        194963,
+        4875
       ],
       "PlayerLevelLimit": 206
     },
@@ -583,8 +583,8 @@
         1005
       ],
       "LevelupItemNum": [
-        108555,
-        17813
+        204978,
+        5125
       ],
       "PlayerLevelLimit": 211
     },
@@ -597,8 +597,8 @@
         1005
       ],
       "LevelupItemNum": [
-        119855,
-        19663
+        215508,
+        5388
       ],
       "PlayerLevelLimit": 216
     },
@@ -611,8 +611,8 @@
         1005
       ],
       "LevelupItemNum": [
-        132333,
-        21706
+        226580,
+        5663
       ],
       "PlayerLevelLimit": 221
     },
@@ -625,8 +625,8 @@
         1005
       ],
       "LevelupItemNum": [
-        146105,
-        23963
+        238218,
+        5956
       ],
       "PlayerLevelLimit": 226
     },
@@ -639,8 +639,8 @@
         1005
       ],
       "LevelupItemNum": [
-        161310,
-        26456
+        250458,
+        6263
       ],
       "PlayerLevelLimit": 231
     },
@@ -653,8 +653,8 @@
         1005
       ],
       "LevelupItemNum": [
-        178098,
-        29213
+        263323,
+        6581
       ],
       "PlayerLevelLimit": 236
     },
@@ -667,8 +667,8 @@
         1005
       ],
       "LevelupItemNum": [
-        196633,
-        32244
+        276850,
+        6919
       ],
       "PlayerLevelLimit": 241
     },
@@ -681,8 +681,8 @@
         1005
       ],
       "LevelupItemNum": [
-        217100,
-        35594
+        291073,
+        7275
       ],
       "PlayerLevelLimit": 246
     },
@@ -695,8 +695,8 @@
         1005
       ],
       "LevelupItemNum": [
-        239698,
-        39300
+        306025,
+        7650
       ],
       "PlayerLevelLimit": 251
     },
@@ -709,8 +709,8 @@
         1005
       ],
       "LevelupItemNum": [
-        264648,
-        43388
+        321748,
+        8044
       ],
       "PlayerLevelLimit": 256
     },
@@ -723,8 +723,8 @@
         1005
       ],
       "LevelupItemNum": [
-        292195,
-        47900
+        338275,
+        8456
       ],
       "PlayerLevelLimit": 261
     },
@@ -737,8 +737,8 @@
         1005
       ],
       "LevelupItemNum": [
-        322608,
-        52881
+        355653,
+        8894
       ],
       "PlayerLevelLimit": 266
     },
@@ -751,8 +751,8 @@
         1005
       ],
       "LevelupItemNum": [
-        356185,
-        58388
+        373923,
+        9350
       ],
       "PlayerLevelLimit": 271
     },
@@ -765,8 +765,8 @@
         1005
       ],
       "LevelupItemNum": [
-        393255,
-        64463
+        393133,
+        9831
       ],
       "PlayerLevelLimit": 276
     },
@@ -779,8 +779,8 @@
         1005
       ],
       "LevelupItemNum": [
-        434185,
-        71169
+        413330,
+        10331
       ],
       "PlayerLevelLimit": 281
     },
@@ -793,8 +793,8 @@
         1005
       ],
       "LevelupItemNum": [
-        479375,
-        78581
+        434563,
+        10863
       ],
       "PlayerLevelLimit": 286
     },
@@ -807,8 +807,8 @@
         1005
       ],
       "LevelupItemNum": [
-        529270,
-        86756
+        456888,
+        11425
       ],
       "PlayerLevelLimit": 291
     },
@@ -821,8 +821,8 @@
         1005
       ],
       "LevelupItemNum": [
-        584355,
-        95794
+        480358,
+        12006
       ],
       "PlayerLevelLimit": 296
     },
@@ -835,8 +835,8 @@
         1005
       ],
       "LevelupItemNum": [
-        632525,
-        103694
+        500000,
+        12500
       ],
       "PlayerLevelLimit": 300
     },

Assets/Res/Config/SkiptoConfig.json

@@ -12,21 +12,28 @@
       "SkipType": 2,
       "SkipID": 2,
       "SkipTxt1": 3258,
-      "SkipTxt2": 405487
+      "SkipTxt2": -1
     },
     {
       "ID": 3,
       "SkipType": 3,
       "SkipID": 3,
       "SkipTxt1": 3259,
-      "SkipTxt2": 405488
+      "SkipTxt2": -1
     },
     {
       "ID": 4,
       "SkipType": 4,
       "SkipID": 4,
       "SkipTxt1": 3260,
-      "SkipTxt2": 405489
+      "SkipTxt2": -1
+    },
+    {
+      "ID": 5,
+      "SkipType": 5,
+      "SkipID": 5,
+      "SkipTxt1": 10047,
+      "SkipTxt2": -1
     }
   ]
 }

Assets/Res/Config/SmallPlacesConfig.json

@@ -2,70 +2,70 @@
   "configList": [
     {
       "ID": 1,
-      "placeName": 0,
+      "placeName": 10037,
       "PlacesId": 1,
       "CompletionEventCount": 0,
       "UnlockEnvetid": 0
     },
     {
       "ID": 2,
-      "placeName": 0,
+      "placeName": 10038,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10001
     },
     {
       "ID": 3,
-      "placeName": 0,
+      "placeName": 10039,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10004
     },
     {
       "ID": 4,
-      "placeName": 0,
+      "placeName": 10040,
       "PlacesId": 1,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10009
     },
     {
       "ID": 5,
-      "placeName": 0,
+      "placeName": 10041,
       "PlacesId": 2,
       "CompletionEventCount": 5,
       "UnlockEnvetid": 10012
     },
     {
       "ID": 6,
-      "placeName": 0,
+      "placeName": 10042,
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10013
     },
     {
       "ID": 7,
-      "placeName": 0,
+      "placeName": 10043,
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10018
     },
     {
       "ID": 8,
-      "placeName": 0,
+      "placeName": 10044,
       "PlacesId": 3,
       "CompletionEventCount": 5,
       "UnlockEnvetid": 10022
     },
     {
       "ID": 9,
-      "placeName": 0,
+      "placeName": 10045,
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10025
     },
     {
       "ID": 10,
-      "placeName": 0,
+      "placeName": 10046,
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 10028

Assets/Scripts/GameData/ExcelConfig/OpenBoxDropListConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: DX5NvHz8VX7R9uDl0A0fodX/qtxIPsvODQhebIk8cn6pJ24YJoJYXx3iKXlT
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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/GameUI/Combat/CombatDrive.cs

@@ -61,7 +61,7 @@ namespace GameLogic.Combat
         {
             await MarskPanel.OpenPanel();
             UIManager.Instance.HindCurrAllShowPanel();
-            UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+            // UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
             StartCombatInfo startCombatInfo = new StartCombatInfo();
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;

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

@@ -42,7 +42,7 @@ namespace Fort23.Mono
         {
             Btn_Shop.onClick.AddListener(async () => { Btn_Shop_Click(); });
 
-            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); });
+            bnt_shengShi.onClick.AddListener(() => { Bnt_ShengShi_Click();});
             Btn_GongFa.onClick.AddListener(async () => { Btn_GongFa_Click(); });
             Btn_HeroInfomation.onClick.AddListener(async () => { Btn_HeroInfomation_Click(); });
             Btn_DongFu.onClick.AddListener(async () => { Bne_dongfu_Click(); });
@@ -80,6 +80,11 @@ namespace Fort23.Mono
             MenuRoot.SetActive(false);
         }
 
+        public async void Bnt_ShengShi_Click()
+        {
+            DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); 
+        }
+        
         public async void Btn_Shop_Click()
         {
             if (currentOpenUIPanel is ShopPanel)

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

@@ -735,85 +735,85 @@ namespace Fort23.Mono
 
             if (!max)
             {
-                if (isClick)
-                {
-                    int index = 0;
-
-                    //金
-                    if (skillConfig.skillConfig.attribute == 1)
-                    {
-                        index = 0;
-                    }
-
-                    //木
-                    if (skillConfig.skillConfig.attribute == 2)
-                    {
-                        index = 1;
-                    }
-
-                    //水
-                    if (skillConfig.skillConfig.attribute == 4)
-                    {
-                        index = 2;
-                    }
-
-                    //火
-                    if (skillConfig.skillConfig.attribute == 8)
-                    {
-                        index = 3;
-                    }
-
-                    //土
-                    if (skillConfig.skillConfig.attribute == 16)
-                    {
-                        index = 4;
-                    }
-
-                    bool isSuccess = false;
-
-                    //先上对应位置
-                    foreach (var i in indexList[index])
-                    {
-                        if (allKongSkill[i].SkillInfo == null)
-                        {
-                            allKongSkill[i].SetSKill(skillConfig);
-                            allUseSkill[i] = skillConfig;
-                            isSuccess = true;
-                            break;
-                        }
-                    }
-
-                    //对应位置已经上了 ，就随便找给位置上
-                    if (!isSuccess)
-                    {
-                        for (var i = 0; i < allKongSkill.Count; i++)
-                        {
-                            if (allKongSkill[i].SkillInfo == null)
-                            {
-                                allKongSkill[i].SetSKill(skillConfig);
-                                allUseSkill[i] = skillConfig;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (isSuccess)
-                    {
-                        BaoChun();
-                        ChangeFuZhuYingXiang();
-                        UpdateSkillWidget();
-                        showSkillInfo.Sort(Sort);
-                        Content.Init(this, showSkillInfo.Count);
-                    }
-                    else
-                    {
-                        for (int i = 0; i < allKongSkill.Count; i++)
-                        {
-                            allKongSkill[i].SelectState(true);
-                        }
-                    }
-                }
-                else
+                // if (isClick)
+                // {
+                //     int index = 0;
+                //
+                //     //金
+                //     if (skillConfig.skillConfig.attribute == 1)
+                //     {
+                //         index = 0;
+                //     }
+                //
+                //     //木
+                //     if (skillConfig.skillConfig.attribute == 2)
+                //     {
+                //         index = 1;
+                //     }
+                //
+                //     //水
+                //     if (skillConfig.skillConfig.attribute == 4)
+                //     {
+                //         index = 2;
+                //     }
+                //
+                //     //火
+                //     if (skillConfig.skillConfig.attribute == 8)
+                //     {
+                //         index = 3;
+                //     }
+                //
+                //     //土
+                //     if (skillConfig.skillConfig.attribute == 16)
+                //     {
+                //         index = 4;
+                //     }
+                //
+                //     bool isSuccess = false;
+                //
+                //     //先上对应位置
+                //     foreach (var i in indexList[index])
+                //     {
+                //         if (allKongSkill[i].SkillInfo == null)
+                //         {
+                //             allKongSkill[i].SetSKill(skillConfig);
+                //             allUseSkill[i] = skillConfig;
+                //             isSuccess = true;
+                //             break;
+                //         }
+                //     }
+                //
+                //     //对应位置已经上了 ，就随便找给位置上
+                //     if (!isSuccess)
+                //     {
+                //         for (var i = 0; i < allKongSkill.Count; i++)
+                //         {
+                //             if (allKongSkill[i].SkillInfo == null)
+                //             {
+                //                 allKongSkill[i].SetSKill(skillConfig);
+                //                 allUseSkill[i] = skillConfig;
+                //                 break;
+                //             }
+                //         }
+                //     }
+                //
+                //     if (isSuccess)
+                //     {
+                //         BaoChun();
+                //         ChangeFuZhuYingXiang();
+                //         UpdateSkillWidget();
+                //         showSkillInfo.Sort(Sort);
+                //         Content.Init(this, showSkillInfo.Count);
+                //     }
+                //     else
+                //     {
+                //         for (int i = 0; i < allKongSkill.Count; i++)
+                //         {
+                //             allKongSkill[i].SelectState(true);
+                //         }
+                //     }
+                // }
+                // else
                 {
                     selectSkillConfig = skillConfig;
                     _isSelectSkill = true;

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,6 +34,10 @@ namespace Mono.Utility
                 case 4:
                     UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click();
                     return;
+                //实用神识界面
+                case 5:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
+                    return;
 
                 default:
                     return;