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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

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
+    - _Alpha: 0.43219617
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventConditionConfig.json

@@ -128,7 +128,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1003
+        1004
       ],
       "finishCount": 3,
       "RelatedEvents": [
@@ -258,7 +258,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1008
+        1009
       ],
       "finishCount": 1,
       "RelatedEvents": [

Assets/Res/Config/EventLinkConfig.json

@@ -22637,10 +22637,7 @@
       "DialogueType": 0,
       "EventID": 9162,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        916204
-      ]
+      "ResultType": 0
     },
     {
       "ID": 916204,
@@ -22655,10 +22652,7 @@
       "DialogueType": 0,
       "EventID": 9162,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        916205
-      ]
+      "ResultType": 0
     },
     {
       "ID": 916205,

Assets/Res/Config/GroupConfig.json

@@ -91,7 +91,7 @@
     {
       "ID": 1002,
       "GroupMonsterLevel": [
-        5
+        9
       ],
       "GroupMonster": [
         9002
@@ -100,7 +100,7 @@
     {
       "ID": 1003,
       "GroupMonsterLevel": [
-        15
+        16
       ],
       "GroupMonster": [
         9001
@@ -118,7 +118,7 @@
     {
       "ID": 1005,
       "GroupMonsterLevel": [
-        45
+        46
       ],
       "GroupMonster": [
         1008
@@ -127,7 +127,7 @@
     {
       "ID": 1006,
       "GroupMonsterLevel": [
-        50
+        51
       ],
       "GroupMonster": [
         5006
@@ -136,7 +136,7 @@
     {
       "ID": 1007,
       "GroupMonsterLevel": [
-        55
+        56
       ],
       "GroupMonster": [
         5007
@@ -145,13 +145,13 @@
     {
       "ID": 1008,
       "GroupMonsterLevel": [
-        85
+        86
       ]
     },
     {
       "ID": 1009,
       "GroupMonsterLevel": [
-        95
+        101
       ],
       "GroupMonster": [
         9002
@@ -160,7 +160,7 @@
     {
       "ID": 1010,
       "GroupMonsterLevel": [
-        100
+        121
       ],
       "GroupMonster": [
         9002
@@ -169,7 +169,7 @@
     {
       "ID": 1011,
       "GroupMonsterLevel": [
-        110
+        121
       ],
       "GroupMonster": [
         9001
@@ -178,7 +178,7 @@
     {
       "ID": 1012,
       "GroupMonsterLevel": [
-        120
+        121
       ],
       "GroupMonster": [
         9004
@@ -187,7 +187,7 @@
     {
       "ID": 1013,
       "GroupMonsterLevel": [
-        140
+        141
       ],
       "GroupMonster": [
         5007
@@ -196,7 +196,7 @@
     {
       "ID": 1014,
       "GroupMonsterLevel": [
-        150
+        151
       ],
       "GroupMonster": [
         1008,
@@ -248,7 +248,7 @@
     {
       "ID": 1016,
       "GroupMonsterLevel": [
-        65
+        69
       ],
       "GroupMonster": [
         9004
@@ -622,7 +622,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        40
+        15
       ],
       "GroupMonster": [
         1005
@@ -631,7 +631,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        60
+        25
       ],
       "GroupMonster": [
         9006
@@ -640,7 +640,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        40
+        20
       ],
       "GroupMonster": [
         1005
@@ -649,7 +649,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        50
+        30
       ],
       "GroupMonster": [
         1005
@@ -658,7 +658,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        60
+        30
       ],
       "GroupMonster": [
         5003
@@ -667,7 +667,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        70
+        40
       ],
       "GroupMonster": [
         5003
@@ -676,7 +676,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        80
+        60
       ],
       "GroupMonster": [
         5003
@@ -685,7 +685,7 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        90
+        60
       ],
       "GroupMonster": [
         9002
@@ -694,7 +694,7 @@
     {
       "ID": 3009,
       "GroupMonsterLevel": [
-        100
+        120
       ],
       "GroupMonster": [
         5003
@@ -703,7 +703,7 @@
     {
       "ID": 3010,
       "GroupMonsterLevel": [
-        120
+        130
       ],
       "GroupMonster": [
         5002
@@ -712,7 +712,7 @@
     {
       "ID": 3011,
       "GroupMonsterLevel": [
-        80
+        130
       ],
       "GroupMonster": [
         1006
@@ -721,7 +721,7 @@
     {
       "ID": 3012,
       "GroupMonsterLevel": [
-        100
+        150
       ],
       "GroupMonster": [
         5005
@@ -730,7 +730,7 @@
     {
       "ID": 3013,
       "GroupMonsterLevel": [
-        140
+        160
       ],
       "GroupMonster": [
         5001
@@ -739,7 +739,7 @@
     {
       "ID": 3014,
       "GroupMonsterLevel": [
-        150
+        170
       ],
       "GroupMonster": [
         5004
@@ -748,7 +748,7 @@
     {
       "ID": 3015,
       "GroupMonsterLevel": [
-        151
+        190
       ],
       "GroupMonster": [
         9001
@@ -766,232 +766,232 @@
     {
       "ID": 4001,
       "GroupMonsterLevel": [
-        30
+        1
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
       "ID": 4002,
       "GroupMonsterLevel": [
-        60
+        1
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
       "ID": 4003,
       "GroupMonsterLevel": [
-        90
+        5
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
       "ID": 4004,
       "GroupMonsterLevel": [
-        110
+        5
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
       "ID": 4005,
       "GroupMonsterLevel": [
-        120
+        5
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 4006,
       "GroupMonsterLevel": [
-        130
+        11
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
       "ID": 4007,
       "GroupMonsterLevel": [
-        140
+        11
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
       "ID": 4008,
       "GroupMonsterLevel": [
-        150
+        11
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
       "ID": 4009,
       "GroupMonsterLevel": [
-        160
+        21
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
       "ID": 4010,
       "GroupMonsterLevel": [
-        170
+        21
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 4011,
       "GroupMonsterLevel": [
-        180
+        31
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
       "ID": 4012,
       "GroupMonsterLevel": [
-        190
+        31
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
       "ID": 4013,
       "GroupMonsterLevel": [
-        200
+        31
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
       "ID": 4014,
       "GroupMonsterLevel": [
-        210
+        31
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
       "ID": 4015,
       "GroupMonsterLevel": [
-        220
+        41
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 4016,
       "GroupMonsterLevel": [
-        230
+        41
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
       "ID": 4017,
       "GroupMonsterLevel": [
-        240
+        41
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
       "ID": 4018,
       "GroupMonsterLevel": [
-        250
+        41
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
       "ID": 4019,
       "GroupMonsterLevel": [
-        260
+        41
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
       "ID": 4020,
       "GroupMonsterLevel": [
-        270
+        61
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 4021,
       "GroupMonsterLevel": [
-        280
+        61
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
       "ID": 4022,
       "GroupMonsterLevel": [
-        290
+        61
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
       "ID": 4023,
       "GroupMonsterLevel": [
-        300
+        81
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
       "ID": 4024,
       "GroupMonsterLevel": [
-        300
+        111
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
       "ID": 4025,
       "GroupMonsterLevel": [
-        300
+        131
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 5001,
       "GroupMonster": [
-        9001
+        1005
       ],
       "hpQiangDu": [
         60
@@ -1006,7 +1006,7 @@
     {
       "ID": 5002,
       "GroupMonster": [
-        9001
+        1006
       ],
       "hpQiangDu": [
         70
@@ -1021,7 +1021,7 @@
     {
       "ID": 5003,
       "GroupMonster": [
-        9001
+        1007
       ],
       "hpQiangDu": [
         80
@@ -1036,7 +1036,7 @@
     {
       "ID": 5004,
       "GroupMonster": [
-        9001
+        1008
       ],
       "hpQiangDu": [
         90
@@ -1051,7 +1051,7 @@
     {
       "ID": 5005,
       "GroupMonster": [
-        9001
+        1001
       ],
       "hpQiangDu": [
         100
@@ -1066,7 +1066,7 @@
     {
       "ID": 5006,
       "GroupMonster": [
-        9001
+        1005
       ],
       "hpQiangDu": [
         60
@@ -1081,7 +1081,7 @@
     {
       "ID": 5007,
       "GroupMonster": [
-        9001
+        1006
       ],
       "hpQiangDu": [
         70
@@ -1096,7 +1096,7 @@
     {
       "ID": 5008,
       "GroupMonster": [
-        9001
+        1007
       ],
       "hpQiangDu": [
         80
@@ -1111,7 +1111,7 @@
     {
       "ID": 5009,
       "GroupMonster": [
-        9001
+        1008
       ],
       "hpQiangDu": [
         90
@@ -1126,7 +1126,7 @@
     {
       "ID": 5010,
       "GroupMonster": [
-        9001
+        1001
       ],
       "hpQiangDu": [
         100

Assets/Res/Config/ItemConfig.json

@@ -775,7 +775,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        3000
+        4000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -803,7 +803,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        7000
+        8000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -831,7 +831,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        13000
+        12000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -859,7 +859,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        25000
+        20000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -4524,8 +4524,8 @@
     },
     {
       "ID": 20013,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10298,
+      "itemDesc": 10300,
       "icon": "icon_item_20013",
       "itemTag": 21,
       "quality": 2,
@@ -4549,8 +4549,8 @@
     },
     {
       "ID": 20014,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10299,
+      "itemDesc": 10301,
       "icon": "icon_item_20014",
       "itemTag": 21,
       "quality": 2,
@@ -4944,7 +4944,7 @@
       "itemDesc": 3250,
       "icon": "icon_item_22001",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -4969,7 +4969,7 @@
       "itemDesc": 3251,
       "icon": "icon_item_22002",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -4994,7 +4994,7 @@
       "itemDesc": 3252,
       "icon": "icon_item_22003",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -5019,7 +5019,7 @@
       "itemDesc": 3253,
       "icon": "icon_item_22004",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -5044,7 +5044,7 @@
       "itemDesc": 3254,
       "icon": "icon_item_22005",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -5069,7 +5069,7 @@
       "itemDesc": 3255,
       "icon": "icon_item_22006",
       "itemTag": 23,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
@@ -5094,6 +5094,181 @@
       "itemDesc": 3256,
       "icon": "icon_item_22007",
       "itemTag": 23,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22008,
+      "itemName": 2079,
+      "itemDesc": 10291,
+      "icon": "icon_item_22008",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22009,
+      "itemName": 2080,
+      "itemDesc": 10292,
+      "icon": "icon_item_22009",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22010,
+      "itemName": 2081,
+      "itemDesc": 10293,
+      "icon": "icon_item_22010",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22011,
+      "itemName": 2082,
+      "itemDesc": 10294,
+      "icon": "icon_item_22011",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22012,
+      "itemName": 2083,
+      "itemDesc": 10295,
+      "icon": "icon_item_22012",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22013,
+      "itemName": 2084,
+      "itemDesc": 10296,
+      "icon": "icon_item_22013",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 22014,
+      "itemName": 2085,
+      "itemDesc": 10297,
+      "icon": "icon_item_22014",
+      "itemTag": 23,
       "quality": 4,
       "stack": 0,
       "isSell": false,

Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道"
+      "txt": "玄黄道 "
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）"
+      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）\n"
     },
     {
       "ID": 702,
@@ -8314,31 +8314,31 @@
     },
     {
       "ID": 2079,
-      "txt": "0"
+      "txt": "支线感悟点1"
     },
     {
       "ID": 2080,
-      "txt": "0"
+      "txt": "支线感悟点2"
     },
     {
       "ID": 2081,
-      "txt": "0"
+      "txt": "支线感悟点3"
     },
     {
       "ID": 2082,
-      "txt": "0"
+      "txt": "支线感悟点4"
     },
     {
       "ID": 2083,
-      "txt": "0"
+      "txt": "支线感悟点5"
     },
     {
       "ID": 2084,
-      "txt": "0"
+      "txt": "支线感悟点6"
     },
     {
       "ID": 2085,
-      "txt": "0"
+      "txt": "支线感悟点7"
     },
     {
       "ID": 2086,
@@ -12970,59 +12970,59 @@
     },
     {
       "ID": 3243,
-      "txt": "感悟点1"
+      "txt": "主感悟点1"
     },
     {
       "ID": 3244,
-      "txt": "感悟点2"
+      "txt": "主感悟点2"
     },
     {
       "ID": 3245,
-      "txt": "感悟点3"
+      "txt": "主感悟点3"
     },
     {
       "ID": 3246,
-      "txt": "感悟点4"
+      "txt": "主感悟点4"
     },
     {
       "ID": 3247,
-      "txt": "感悟点5"
+      "txt": "主感悟点5"
     },
     {
       "ID": 3248,
-      "txt": "感悟点6"
+      "txt": "主感悟点6"
     },
     {
       "ID": 3249,
-      "txt": "感悟点7"
+      "txt": "主感悟点7"
     },
     {
       "ID": 3250,
-      "txt": "道具描述_感悟点1"
+      "txt": "道具描述_主感悟点1"
     },
     {
       "ID": 3251,
-      "txt": "道具描述_感悟点2"
+      "txt": "道具描述_主感悟点2"
     },
     {
       "ID": 3252,
-      "txt": "道具描述_感悟点3"
+      "txt": "道具描述_主感悟点3"
     },
     {
       "ID": 3253,
-      "txt": "道具描述_感悟点4"
+      "txt": "道具描述_主感悟点4"
     },
     {
       "ID": 3254,
-      "txt": "道具描述_感悟点5"
+      "txt": "道具描述_主感悟点5"
     },
     {
       "ID": 3255,
-      "txt": "道具描述_感悟点6"
+      "txt": "道具描述_主感悟点6"
     },
     {
       "ID": 3256,
-      "txt": "道具描述_感悟点7"
+      "txt": "道具描述_主感悟点7"
     },
     {
       "ID": 3257,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -17750,7 +17750,7 @@
     },
     {
       "ID": 5178,
-      "txt": "\"小鸟..\"现身吧！"
+      "txt": "现身吧！！"
     },
     {
       "ID": 5179,
@@ -22154,7 +22154,7 @@
     },
     {
       "ID": 6279,
-      "txt": "（受伤的状态）：你不要高兴太早，敢抢夺云雾宗密钥，你以为就只有我来追击吗？"
+      "txt": "（受伤的状态）你不要高兴太早，敢抢夺云雾宗密钥，你以为就只有我来追击吗？"
     },
     {
       "ID": 6280,
@@ -22162,7 +22162,7 @@
     },
     {
       "ID": 6281,
-      "txt": "（受伤的状态）：呸，冠冕堂皇。"
+      "txt": "（受伤的状态）呸，冠冕堂皇。"
     },
     {
       "ID": 6282,
@@ -22170,7 +22170,7 @@
     },
     {
       "ID": 6283,
-      "txt": "今天就先放过你，回去练练在出来吧哈哈（快速飞走）"
+      "txt": "今天就先放过你，回去练练再出来吧哈哈（快速飞走）"
     },
     {
       "ID": 6284,
@@ -22186,7 +22186,7 @@
     },
     {
       "ID": 6287,
-      "txt": "（受伤的状态）：道友何不现生。看了这么久相比道友也已知来龙去脉。"
+      "txt": "（受伤的状态）道友何不现身。看了这么久相信道友也已知来龙去脉。"
     },
     {
       "ID": 6288,
@@ -22206,11 +22206,11 @@
     },
     {
       "ID": 6292,
-      "txt": "（受伤的状态）这位道友看了这么久相比道友也已知来龙去脉。"
+      "txt": "（受伤的状态）这位道友看了这么久相信道友也已知来龙去脉。"
     },
     {
       "ID": 6293,
-      "txt": "（惊讶）：你早知我以到此地？"
+      "txt": "（惊讶）你早知我以到此地？"
     },
     {
       "ID": 6294,
@@ -22218,11 +22218,11 @@
     },
     {
       "ID": 6295,
-      "txt": "（受伤的状态）：道友……咳咳……在下柳轻烟，不知道友如何称呼？"
+      "txt": "（受伤的状态）道友……咳咳……在下柳轻烟，不知道友如何称呼？"
     },
     {
       "ID": 6296,
-      "txt": "我叫{玩家名}，柳道友现服下这颗丹药"
+      "txt": "我叫{玩家名}，柳道友先服下这颗丹药"
     },
     {
       "ID": 6297,
@@ -22322,7 +22322,7 @@
     },
     {
       "ID": 6321,
-      "txt": "  我的伤也可好得差不多了，也该回宗门了，这是一点心意还请道友收下。"
+      "txt": "我的伤也可好得差不多了，也该回宗门了，这是一点心意还请道友收下。"
     },
     {
       "ID": 6322,
@@ -22458,7 +22458,7 @@
     },
     {
       "ID": 6355,
-      "txt": "我也没有什么值钱的东西拿去拍卖，再加上我还有其他事需要做，拍卖会我就不参加了。"
+      "txt": "我没有什么物品值得拍卖,就不去了"
     },
     {
       "ID": 6356,
@@ -22482,7 +22482,7 @@
     },
     {
       "ID": 6361,
-      "txt": "说来话长，我和馨儿姑凉刚进入城中就被以男子从背后偷袭，我的碧云佩被抢了，此物本要送往天宝阁拍卖的。馨儿姑娘以前去追击那么男子去了。"
+      "txt": "说来话长，我与馨儿姑娘刚进城中就被一男子从背后偷袭，我的碧云佩被抢了，此物本要送往天宝阁拍卖的。馨儿姑娘前去追击那男子去了。"
     },
     {
       "ID": 6362,
@@ -22586,11 +22586,11 @@
     },
     {
       "ID": 6387,
-      "txt": "正是。不知道友有何事？（看到此人有点来者不善，玩家提高了警惕）"
+      "txt": "正是。不知道友有何事？（看到此人来者不善，你提高了警惕）"
     },
     {
       "ID": 6388,
-      "txt": "尧都刚举办完拍卖大会，不知道友可拍到什么值钱的东西吗？"
+      "txt": "尧都刚举办完拍卖大会，不知道友可拍到了什么值钱的东西？"
     },
     {
       "ID": 6389,
@@ -22638,7 +22638,7 @@
     },
     {
       "ID": 6400,
-      "txt": "尧都城主？在这山林之间把你毁灭了城主怎知？哈哈，这玄冥晶我就收下了，受死吧！"
+      "txt": "尧都城主？在这山林之间把你灭了城主怎知？哈哈，这玄冥晶我就收下了，受死吧！"
     },
     {
       "ID": 6401,
@@ -22734,7 +22734,7 @@
     },
     {
       "ID": 6424,
-      "txt": "（带伤）：拍卖会回来的路上被血海宗的人暗算，幸亏获得这位道兄相助才逃过此劫。"
+      "txt": "（带伤）：拍卖会回来的路上被血海宗的人暗算，幸亏有这位道兄相助才逃过此劫。"
     },
     {
       "ID": 6425,
@@ -22850,7 +22850,7 @@
     },
     {
       "ID": 6453,
-      "txt": "那可不必，我自由自在惯了。带我拿下你在逼问你说出来就行了。"
+      "txt": "那可不必，我自由自在惯了。待我拿下你在逼问你说出来就行了。"
     },
     {
       "ID": 6454,
@@ -22874,7 +22874,7 @@
     },
     {
       "ID": 6459,
-      "txt": "你竟敢杀我师弟！玄冥晶是你这散修能碰的，交出晶石。留你一个全尸。"
+      "txt": "你竟敢杀我师弟！玄冥晶岂是你这散修能碰的，交出晶石。留你一个全尸。"
     },
     {
       "ID": 6460,
@@ -22910,7 +22910,7 @@
     },
     {
       "ID": 6468,
-      "txt": "好的，居然前辈信任我那个这就前去一探究竟。"
+      "txt": "好的，既然前辈信任，我这就前去一探究竟"
     },
     {
       "ID": 6469,
@@ -22954,7 +22954,7 @@
     },
     {
       "ID": 6479,
-      "txt": "前辈先前许我的以后可随意来采摘药材可否当真。"
+      "txt": "前辈先前许诺我的，以后可随意来采摘药材可否当真。"
     },
     {
       "ID": 6480,
@@ -23050,7 +23050,7 @@
     },
     {
       "ID": 6503,
-      "txt": "我还有一点自己的事情需要处理，你们先行。有缘我们会在山顶相见。"
+      "txt": "我还有一点自己的事情需要处理，你们先行。我们山顶相见。"
     },
     {
       "ID": 6504,
@@ -23062,7 +23062,7 @@
     },
     {
       "ID": 6506,
-      "txt": "此处好像正在举行什么仪式？"
+      "txt": "此处好像在举行什么仪式？"
     },
     {
       "ID": 6507,
@@ -23078,7 +23078,7 @@
     },
     {
       "ID": 6510,
-      "txt": "龙族是上古时期最强妖族，后因上古之战全数陨落。这世间便在没有龙族了。你没听说过很正常，不是师尊偶然间告诉我我也不知。"
+      "txt": "龙族是上古时期最强妖族，后因上古之战全数陨落。这世间便再也没有龙族了。你没听说过很正常，我也只是听师尊偶然间提起。"
     },
     {
       "ID": 6511,
@@ -23090,7 +23090,7 @@
     },
     {
       "ID": 6513,
-      "txt": "妖兽提及圣地，灵脉气息确有古老威严，似非凡物。"
+      "txt": "妖兽提及圣地，灵脉气息的确古老威严，似有非凡物。"
     },
     {
       "ID": 6514,
@@ -23118,7 +23118,7 @@
     },
     {
       "ID": 6520,
-      "txt": "灵脉核心就在前面我们前去一探究竟。（天空中的灵气缓缓的归于平静）"
+      "txt": "灵脉核心就在前面，我们去一探究竟。（天空中的灵气缓缓的归于平静）"
     },
     {
       "ID": 6521,
@@ -23126,15 +23126,15 @@
     },
     {
       "ID": 6522,
-      "txt": "这里是否有一扇门，我们试试能不能打开。（柳如烟一起施法也无法打开）"
+      "txt": "这里有一扇门，我们试试能不能打开。（柳如烟一起施法也无法打开）"
     },
     {
       "ID": 6523,
-      "txt": "打不开怎么办？看着宝贝取不能拿。"
+      "txt": "打不开怎么办？看着宝贝却不能拿。"
     },
     {
       "ID": 6524,
-      "txt": "等等。你们开着石门上有几个凹槽，看起来是要什么物品才能开启此门。"
+      "txt": "等等。你们看这石门上有几个凹槽，看起来是要什么物品才能开启此门。"
     },
     {
       "ID": 6525,
@@ -23146,7 +23146,7 @@
     },
     {
       "ID": 6527,
-      "txt": "（惊讶）：啊，这不是上次我不要的东西吗？居然是个宝！"
+      "txt": "（惊讶）啊，这不是上次我不要的东西吗？居然是个宝！"
     },
     {
       "ID": 6528,
@@ -23154,7 +23154,7 @@
     },
     {
       "ID": 6529,
-      "txt": "(生气)：找死！"
+      "txt": "(生气)找死！"
     },
     {
       "ID": 6530,
@@ -23162,7 +23162,7 @@
     },
     {
       "ID": 6531,
-      "txt": "下次遇见在收拾你。"
+      "txt": "下次遇见再收拾你。"
     },
     {
       "ID": 6532,
@@ -37590,7 +37590,7 @@
     },
     {
       "ID": 10138,
-      "txt": "这里是主线事件"
+      "txt": "上方是主线事件"
     },
     {
       "ID": 10139,
@@ -37606,27 +37606,27 @@
     },
     {
       "ID": 10142,
-      "txt": "很好，你的境界提升了，可同时使用更多功法"
+      "txt": "你获得了一本新的功法，点击这里"
     },
     {
       "ID": 10143,
-      "txt": "这里可以调整功法，下方是你拥有的功法"
+      "txt": "这些是你拥有的功法，刚刚获得的也在这里"
     },
     {
       "ID": 10144,
-      "txt": "上方的功法盘，是正在使用的功法"
+      "txt": "上方的功法盘，显示了正在使用的功法"
     },
     {
       "ID": 10145,
-      "txt": "点击调整按钮，开始配置功法"
+      "txt": "点击这里，把新功法也用起来"
     },
     {
       "ID": 10146,
-      "txt": "点击想上阵的功法"
+      "txt": "先点击功法"
     },
     {
       "ID": 10147,
-      "txt": "可以将功法放入功法盘的任意空位"
+      "txt": "功法放入功法盘的任意空位"
     },
     {
       "ID": 10148,
@@ -38199,6 +38199,50 @@
     {
       "ID": 10290,
       "txt": "心情+{0} "
+    },
+    {
+      "ID": 10291,
+      "txt": "道具描述_支线感悟点1"
+    },
+    {
+      "ID": 10292,
+      "txt": "道具描述_支线感悟点2"
+    },
+    {
+      "ID": 10293,
+      "txt": "道具描述_支线感悟点3"
+    },
+    {
+      "ID": 10294,
+      "txt": "道具描述_支线感悟点4"
+    },
+    {
+      "ID": 10295,
+      "txt": "道具描述_支线感悟点5"
+    },
+    {
+      "ID": 10296,
+      "txt": "道具描述_支线感悟点6"
+    },
+    {
+      "ID": 10297,
+      "txt": "道具描述_支线感悟点7"
+    },
+    {
+      "ID": 10298,
+      "txt": "幽魂石"
+    },
+    {
+      "ID": 10299,
+      "txt": "云雾秘钥"
+    },
+    {
+      "ID": 10300,
+      "txt": "道具描述_幽魂石"
+    },
+    {
+      "ID": 10301,
+      "txt": "道具描述_云雾秘钥"
     }
   ]
 }

Assets/Res/Config/PlayerGuideConfig.json

@@ -259,8 +259,8 @@
       "groupID": 2,
       "FingerType": -1,
       "dialogPos": [
-        -125,
-        -262
+        -138,
+        262
       ],
       "NpcPos": [
         422,
@@ -295,8 +295,8 @@
       "groupID": 2,
       "FingerType": 1,
       "dialogPos": [
-        -43,
-        451
+        -174,
+        252
       ],
       "NpcPos": [
         422,
@@ -512,7 +512,7 @@
       "FingerType": -1,
       "dialogPos": [
         -213,
-        231
+        -487
       ],
       "NpcPos": [
         422,
@@ -583,8 +583,8 @@
       "groupID": 4,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        53
+        -336,
+        20
       ],
       "NpcPos": [
         422,
@@ -619,8 +619,8 @@
       "groupID": 4,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -336,
+        -408
       ],
       "NpcPos": [
         422,
@@ -671,7 +671,7 @@
       "SpeakerImage": 3,
       "desc": 10147,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.2,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -728,7 +728,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        -621
       ],
       "NpcPos": [
         422,

Assets/Res/Config/ShopItemConfig.json

@@ -234,7 +234,7 @@
       "ID": 11,
       "giftID": "",
       "itemId": [
-        21001
+        1201
       ],
       "itemCount": [
         99
@@ -257,7 +257,7 @@
       "ID": 12,
       "giftID": "",
       "itemId": [
-        21002
+        1202
       ],
       "itemCount": [
         99
@@ -280,7 +280,7 @@
       "ID": 13,
       "giftID": "",
       "itemId": [
-        21003
+        1203
       ],
       "itemCount": [
         99
@@ -303,7 +303,7 @@
       "ID": 14,
       "giftID": "",
       "itemId": [
-        21004
+        1204
       ],
       "itemCount": [
         99
@@ -326,7 +326,7 @@
       "ID": 15,
       "giftID": "",
       "itemId": [
-        21005
+        21001
       ],
       "itemCount": [
         99
@@ -349,7 +349,7 @@
       "ID": 16,
       "giftID": "",
       "itemId": [
-        21006
+        21002
       ],
       "itemCount": [
         99
@@ -372,7 +372,7 @@
       "ID": 17,
       "giftID": "",
       "itemId": [
-        21007
+        21003
       ],
       "itemCount": [
         99
@@ -395,7 +395,7 @@
       "ID": 18,
       "giftID": "",
       "itemId": [
-        21008
+        21004
       ],
       "itemCount": [
         99
@@ -418,7 +418,7 @@
       "ID": 19,
       "giftID": "",
       "itemId": [
-        21009
+        21005
       ],
       "itemCount": [
         99
@@ -441,7 +441,7 @@
       "ID": 20,
       "giftID": "",
       "itemId": [
-        21010
+        21006
       ],
       "itemCount": [
         99
@@ -464,7 +464,7 @@
       "ID": 21,
       "giftID": "",
       "itemId": [
-        21011
+        21007
       ],
       "itemCount": [
         99
@@ -487,7 +487,7 @@
       "ID": 22,
       "giftID": "",
       "itemId": [
-        21012
+        21008
       ],
       "itemCount": [
         99
@@ -509,6 +509,98 @@
     {
       "ID": 23,
       "giftID": "",
+      "itemId": [
+        21009
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 24,
+      "giftID": "",
+      "itemId": [
+        21010
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 25,
+      "giftID": "",
+      "itemId": [
+        21011
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 26,
+      "giftID": "",
+      "itemId": [
+        21012
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 27,
+      "giftID": "",
       "itemId": [
         21013
       ],

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -521,7 +521,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2740590189241338900
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2022,7 +2022,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5861481284069355833
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -854,6 +854,51 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10211
+--- !u!1 &736514497581052275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2610596099835913747}
+  - component: {fileID: 8199569670379203471}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: InfoPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2610596099835913747
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 736514497581052275}
+  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: 5648027232114921293}
+  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: -45.4}
+  m_SizeDelta: {x: 12.963, y: 12.963}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8199569670379203471
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 736514497581052275}
+  m_CullTransparentMesh: 1
 --- !u!1 &760159596962817389
 GameObject:
   m_ObjectHideFlags: 0
@@ -1274,6 +1319,95 @@ MonoBehaviour:
   - {fileID: 4886873273644485354}
   - {fileID: 4807656811939580993}
   _allChildObj: []
+--- !u!1 &1177225426465092490
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6485022638183304711}
+  - component: {fileID: 6304710687855109041}
+  - component: {fileID: 2559835212087887505}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6485022638183304711
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1177225426465092490}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5648027232114921293}
+  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: -2, y: 1.4}
+  m_SizeDelta: {x: 66.3194, y: 66.3194}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6304710687855109041
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1177225426465092490}
+  m_CullTransparentMesh: 1
+--- !u!114 &2559835212087887505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1177225426465092490}
+  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: 0
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s1302
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
+  imageH: 73.2665
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1274528990848997714
 GameObject:
   m_ObjectHideFlags: 0
@@ -1598,8 +1732,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 152.33276, y: 77.7761}
+  m_AnchoredPosition: {x: -23.870384, y: -83.20001}
+  m_SizeDelta: {x: 95.0599, y: 44.3668}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -1639,7 +1773,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
+  _icon_name: dec_juxing_135
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2065,8 +2199,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -0.0000076293945, y: 6.2588}
+  m_SizeDelta: {x: 0, y: -12.5176}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7692416409367587969
 CanvasRenderer:
@@ -2199,6 +2333,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &1928531406427978494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4312954336915430647}
+  - component: {fileID: 6250636331966676355}
+  - component: {fileID: 376652812643611464}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4312954336915430647
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1928531406427978494}
+  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: 5648027232114921293}
+  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: -2, y: 1.5591}
+  m_SizeDelta: {x: 73.426, y: 73.425}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6250636331966676355
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1928531406427978494}
+  m_CullTransparentMesh: 1
+--- !u!114 &376652812643611464
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1928531406427978494}
+  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.17254902, g: 0.2627451, b: 0.2784314, a: 1}
+  m_RaycastTarget: 0
+  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_yuanquan
+  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: 0dc26aad2093bf99c21596c28053b889
+  imageH: 82.141
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2064245649932131244
 GameObject:
   m_ObjectHideFlags: 0
@@ -2327,8 +2550,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -3.9500046}
-  m_SizeDelta: {x: 0, y: -7.8999}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6314345131758368494
 CanvasRenderer:
@@ -2359,9 +2582,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2554,6 +2777,102 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u6570\u91CF1/4"
+--- !u!1 &2418948171003182323
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5648027232114921293}
+  - component: {fileID: 9001547991263644030}
+  - component: {fileID: 8057222579343302831}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: SkillKongWidget1game
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5648027232114921293
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2418948171003182323}
+  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: 1629117646802417682}
+  - {fileID: 6485022638183304711}
+  - {fileID: 6979956510918802007}
+  - {fileID: 4312954336915430647}
+  - {fileID: 5287841079597663480}
+  - {fileID: 2610596099835913747}
+  m_Father: {fileID: 6694772361877173011}
+  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: 57.200005, y: 666.5}
+  m_SizeDelta: {x: 103.8345, y: 103.8345}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9001547991263644030
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2418948171003182323}
+  m_CullTransparentMesh: 1
+--- !u!114 &8057222579343302831
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2418948171003182323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: icon
+    gameObject: {fileID: 2559835212087887505}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: myBg
+    gameObject: {fileID: 376652812643611464}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: RemovePos
+    gameObject: {fileID: 5287841079597663480}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 9130306876885860502}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: InfoPos
+    gameObject: {fileID: 2610596099835913747}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_YingXiang
+    gameObject: {fileID: 6979956510918802007}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
 --- !u!1 &2767425949845752485
 GameObject:
   m_ObjectHideFlags: 0
@@ -2779,6 +3098,7 @@ RectTransform:
   - {fileID: 400790666199448005}
   - {fileID: 2365237549990123137}
   - {fileID: 4539129630901987991}
+  - {fileID: 5648027232114921293}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3225,6 +3545,21 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: SkillKongWidget1game
+    gameObject: {fileID: 2418948171003182323}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 0
 --- !u!1 &3362476855169369942
 GameObject:
@@ -3712,6 +4047,86 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10207
+--- !u!1 &3851054369208821631
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1629117646802417682}
+  - component: {fileID: 8232409899458930568}
+  - component: {fileID: 9130306876885860502}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1629117646802417682
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3851054369208821631}
+  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: 5648027232114921293}
+  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: 51.6}
+  m_SizeDelta: {x: 160, y: 23.1409}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8232409899458930568
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3851054369208821631}
+  m_CullTransparentMesh: 1
+--- !u!114 &9130306876885860502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3851054369208821631}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8F85\u52A9"
 --- !u!1 &3891518416558775222
 GameObject:
   m_ObjectHideFlags: 0
@@ -6099,6 +6514,140 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7965063745534618104
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5287841079597663480}
+  - component: {fileID: 4049461046131891338}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: RemovePos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5287841079597663480
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7965063745534618104}
+  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: 5648027232114921293}
+  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: 38.4, y: 30.2}
+  m_SizeDelta: {x: 12.963, y: 12.963}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4049461046131891338
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7965063745534618104}
+  m_CullTransparentMesh: 1
+--- !u!1 &7971065642728958861
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6979956510918802007}
+  - component: {fileID: 411376888578220129}
+  - component: {fileID: 5627915650027662113}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Icon_YingXiang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6979956510918802007
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7971065642728958861}
+  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: 5648027232114921293}
+  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: -2, y: 1.3999023}
+  m_SizeDelta: {x: 88.3675, y: 88.3674}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &411376888578220129
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7971065642728958861}
+  m_CullTransparentMesh: 1
+--- !u!114 &5627915650027662113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7971065642728958861}
+  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: 0.07874654, b: 0.0047169924, a: 1}
+  m_RaycastTarget: 0
+  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_yuanhuan_quse
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  imageH: 82.141
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8090296584909710456
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -128,6 +128,18 @@ namespace Fort23.Core
       /// 关闭LoadingUI
       /// </summary>
       CloseLoadingUI,
+      // /// <summary>
+      // /// 功法开始拖动
+      // /// </summary>
+      // SkillBeginDrag,
+      // /// <summary>
+      // /// 功法拖动中
+      // /// </summary>
+      // SkillDrag,
+      // /// <summary>
+      // /// 功法结束拖动
+      // /// </summary>
+      // SkillEndDrag,
 
     }
 }

Assets/Scripts/Core/Event/Event/DefaultEventData.cs

@@ -0,0 +1,11 @@
+using System;
+using Core.Utility.Event;
+using Fort23.Core;
+
+namespace Core.Event.Event
+{
+    public class DefaultEventData : EventDataBasic<DefaultEventData>
+    {
+        public object eventData;
+    }
+}

Assets/Scripts/Core/Event/Event/DefaultEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c5f0f73c54124ffda12312a926b74ec7
+timeCreated: 1758593337

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -1360,7 +1360,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 设置背景在需要显示背景的ui下面
         /// </summary>
-        public async void SetBackgroundPanel(UIPanel uiBase)
+        public async CTask SetBackgroundPanel(UIPanel uiBase)
         {
             if (AllShowBGUIs.Contains(uiBase))
             {

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -223,7 +223,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 关闭界面
         /// </summary>
-        public virtual async void Close()
+        public virtual async CTask Close()
         {
             if (IsClose)
             {
@@ -236,7 +236,7 @@ namespace Fort23.Mono
             IsClose = true;
             GObjectPoolInterface?.transform.SetSiblingIndex(0); //关闭界面的时候将他放在底部
             if (IsShowCustomBGPanel)
-                UIManager.Instance.SetBackgroundPanel(this);
+                await UIManager.Instance.SetBackgroundPanel(this);
 
 
             if (this == UIManager.Instance.currOpenPanel)

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -168,9 +168,9 @@ namespace Excel2Json
 		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
 #if !COMBAT_SERVER
-		public int EventConditionId;
+		public int[] EventConditionId;
 #else
-		public int EventConditionId{ set; get; }
+		public int[] EventConditionId{ set; get; }
 #endif
 		
 
@@ -188,9 +188,9 @@ namespace Excel2Json
 		///触发判定数量or次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int EventCount;
+		public int[] EventCount;
 #else
-		public int EventCount{ set; get; }
+		public int[] EventCount{ set; get; }
 #endif
 		
 

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -132,8 +132,8 @@ namespace GameLogic.Bag
         public bool AddItem(int itemId, long count, string guid = "")
         {
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
-            
-            if(count <= 0)
+
+            if (count <= 0)
                 return false;
 
             ItemInfo item = GetItemInfo(itemId, guidStr);
@@ -178,15 +178,16 @@ namespace GameLogic.Bag
                 return false;
             }
 
-            if( count <= 0 )
+            if (count <= 0)
                 return false;
 
 
             //法宝
             if (item.config.itemTag == 11)
             {
-                AccountFileInfo.FaBaoData faaData =  AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(f =>
-                    f.id == item.config.associateVlaue[1]);
+                AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(
+                    f =>
+                        f.id == item.config.associateVlaue[1]);
                 if (faaData != null)
                 {
                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
@@ -194,53 +195,57 @@ namespace GameLogic.Bag
                 else
                 {
                     faaData = new AccountFileInfo.FaBaoData();
-                    faaData.id =item.config.associateVlaue[1];
+                    faaData.id = item.config.associateVlaue[1];
                     faaData.level = 1;
                     faaData.useIndex = -1;
                     AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
                     FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
                     PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
                     return true;
-
                 }
-              
             }
             //功法
-            else if  (item.config.itemTag == 13)
+            else if (item.config.itemTag == 13)
             {
-                AccountFileInfo.SkillData skillData =  AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(s =>
-                    s.id == item.config.associateVlaue[1]);
+                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(
+                    s =>
+                        s.id == item.config.associateVlaue[1]);
                 if (skillData != null)
                 {
-                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
                 }
                 else
                 {
                     skillData = new AccountFileInfo.SkillData();
-                    skillData.id =item.config.associateVlaue[1];
+                    skillData.id = item.config.associateVlaue[1];
                     skillData.star = 1;
                     skillData.level = 1;
                     skillData.useIndex = -1;
                     AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
-                    
+
                     SkillInfo skillInfo = new SkillInfo(skillData);
                     skillInfo.index = skillData.useIndex;
                     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
                     return true;
                 }
-
-              
-
             }
-            else if  (item.config.itemTag == 9)
+            else if (item.config.itemTag == 2)
+            {
+                PlayerManager.Instance.myHero.heroData.exp += count;
+                AccountFileInfo.Instance.SavePlayerData();
+                return true;
+            }
+            else if (item.config.itemTag == 9)
             {
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
-            
+
             item.count += count;
 
-            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
-            EventManager.Instance.Dispatch(CustomEventType.AddItem, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
+            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
+                new ItemUpdateData() { ItemInfo = item, Count = (int)count });
+            EventManager.Instance.Dispatch(CustomEventType.AddItem,
+                new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
 
             return true;
@@ -414,6 +419,7 @@ namespace GameLogic.Bag
             {
                 return false;
             }
+
             if (item.config.ID <= 0)
             {
                 return false;

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -72,7 +72,7 @@ namespace GameLogic.Combat.CombatState
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
             if (maxCount > 0)
             {
-                CombatController.ChangeState("fight");
+                // CombatController.ChangeState("fight");
                 return;
             }
             

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -122,8 +122,8 @@ namespace GameLogic.Combat.CombatTool
             CombatTypeBasic.Init(this, startCombatInfo);
             await CombatTypeBasic.StartGame();
 
-            ChangeState("update");
-            isUpdate = true;
+            ChangeState("idle");
+            isUpdate = true; 
             EventManager.Instance.AddEventListener(CustomEventType.RefreshFull, RefreshFull);
             CombatEventManager.Instance.Dispatch(CombatEventType.GameStart, null);
         }

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -106,7 +106,7 @@ namespace GameLogic.Combat
 
             // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
             // mainPanel.transform.gameObject.SetActive(false);
-            CombatController.ChangeState(CombatController.update);
+            CombatController.ChangeState(CombatController.fight);
             await MarskPanel.ClosePanel();
         }
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1000,28 +1000,34 @@ public class EventSystemManager : Singleton<EventSystemManager>
         var evt = eventConfigs.Find(e => e.ID == eventID);
         if (evt.ID == 0)
             return false;
+        if (evt.EventConditionId == null)
+            return true;
 
-        switch (evt.EventConditionId)
+        for (var i = 0; i < evt.EventConditionId.Length; i++)
         {
-            //背包道具检测
-            case 1:
-                return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[0]) >= evt.EventCount;
-            //境界判断
-            case 2:
-                return PlayerManager.Instance.myHero.level >= evt.EventCount;
-            //概率判断
-            case 3:
-                int randomValue1 = Random.Range(0, 1001);
-
-                return randomValue1 <= evt.EventCount;
-            //完成事件判断
-            case 10:
-                AccountFileInfo.EventList eventList =
-                    AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
-                        ce.eventID == evt.EventValue[0]);
-                return eventList != null;
+            switch (evt.EventConditionId[i])
+            {
+                //背包道具检测
+                case 1:
+                    return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
+                //境界判断
+                case 2:
+                    return PlayerManager.Instance.myHero.level >= evt.EventCount[i];
+                //概率判断
+                case 3:
+                    int randomValue1 = Random.Range(0, 1001);
+
+                    return randomValue1 <= evt.EventCount[i];
+                //完成事件判断
+                case 10:
+                    AccountFileInfo.EventList eventList =
+                        AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                            ce.eventID == evt.EventValue[i]);
+                    return eventList != null;
+            }
         }
 
+
         return true;
     }
 

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

@@ -36,7 +36,7 @@ namespace Fort23.Mono
         private void DivineSensePointChange(IEventData e)
         {
             Text_divineSensePoint.text =
-                $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
         }
 
         public override void AddButtonEvent()

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanel.cs

@@ -235,10 +235,10 @@ namespace Fort23.Mono
         {
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             EnableBGBtn = true;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -80,7 +80,7 @@ namespace Fort23.Mono
             return battleSettlementPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             AudioManager.Instance.UnPauseBGM();
             foreach (var skipToWidget in skipToWidgets)
@@ -90,7 +90,7 @@ namespace Fort23.Mono
 
             skipToWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -145,10 +145,10 @@ namespace Fort23.Mono
             EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             CombatController.currActiveCombat.isUpdate = true;
-            base.Close();
+            await base.Close();
         }
 
         public void OpenPanel()

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

@@ -192,7 +192,7 @@ namespace Fort23.Mono
             return default;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             // foreach (var widgetItem in widgetItems)
             // {
@@ -214,7 +214,7 @@ namespace Fort23.Mono
                 OpenBoxScorePanel.OpenPanel();
             }
 
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask OpenPanel(List<ItemInfo> itemInfos, int type, int configId)

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

@@ -174,7 +174,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<OpenBoxScorePanel>(null, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var summonScoreRuleWidget in summonScoreRuleWidgets)
             {
@@ -192,7 +192,7 @@ namespace Fort23.Mono
 
             AwardSummonScore();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ChatPanel/ChatPanel.cs

@@ -106,13 +106,13 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<ChatPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             EventSystemManager.Instance.isOpenUi = false;
             isSend = false;
             UIManager.Instance.DormancyAllGComponent<ChatMessageWidget>();
             messages.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -156,12 +156,12 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _duiPingWidgets.Clear();
             UIManager.Instance.DormancyAllGComponent<HeroHpWidget>();
             UIManager.Instance.DormancyAllGComponent<DuiPingWidget>();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -30,7 +30,7 @@ namespace Fort23.Mono
         {
             zhuanPanLogic =
                 await UIManager.Instance.CreateGComponentForObject<ZhuanPanPanel>(ZhuanPanPanel, null, null);
-            zhuanPanLogic.ShowPanel();
+            await zhuanPanLogic.ShowPanel();
         }
 
         public override CTask GetFocus()

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

@@ -1,8 +1,12 @@
+using Common.Utility.CombatEvent;
+using Core.Event.Event;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 namespace Fort23.Mono
 {
@@ -27,6 +31,14 @@ namespace Fort23.Mono
         {
         }
 
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            isAddLongPressBtn = (bool)uiData[0];
+            isUseDrag = (bool)uiData[1];
+            return base.AsyncInit(uiData);
+        }
+
+
         public override void AddButtonEvent()
         {
             // myButton.onClick = delegate
@@ -44,10 +56,18 @@ namespace Fort23.Mono
             //     SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(skillConfig.name) , LanguageManager.Instance.Text(skillConfig.dec));
             // };
 
+
             base.AddButtonEvent();
+
+            // //添加拖拽事件
+            // longPressBtn.onDragStart = OnDragStart;
+            // longPressBtn.onDrag = OnDrag;
+            // longPressBtn.onDragEnd = OnDragEnd;
         }
 
-        public void SelectState(bool isSelect) 
+      
+
+        public void SelectState(bool isSelect)
         {
             _isSelect = isSelect;
             myBg.color = _isSelect ? Color.green : new Color32(44, 67, 71, 200);
@@ -63,6 +83,7 @@ namespace Fort23.Mono
         {
             this.SkillInfo = null;
             icon.gameObject.SetActive(false);
+            Text_Tips.gameObject.SetActive(false);
         }
 
         public void SetSKill(SkillInfo skillId)
@@ -77,8 +98,8 @@ namespace Fort23.Mono
             icon.gameObject.SetActive(true);
             SkillConfig skillConfig = SkillInfo.skillConfig;
             icon.icon_name = skillConfig.icon;
-            
-            
+
+
             Text_Tips.gameObject.SetActive(skillConfig.ID != 0 && skillConfig.SkillType == 2);
         }
 
@@ -90,7 +111,19 @@ namespace Fort23.Mono
             SkillInfo = null;
             Text_Tips.gameObject.SetActive(false);
         }
+
+        public void Translucency()
+        {
+            Color32 color = icon.color;
+            color.a = 80;
+            icon.color = color;
+        }
         
-      
+        public void Opaque()
+        {
+            Color32 color = icon.color;
+            color.a = 255;
+            icon.color = color;
+        }
     }
 }

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Audio;
+using Core.Event.Event;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -10,6 +11,8 @@ using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -74,10 +77,17 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            // EventManager.Instance.AddEventListener(CustomEventType.SkillBeginDrag, SkillBeginDragHandle);
+            // EventManager.Instance.AddEventListener(CustomEventType.SkillDrag, SkillDragHandle);
+            // EventManager.Instance.AddEventListener(CustomEventType.SkillEndDrag, SkillEndDragHandle);
         }
 
+
         protected override void DelEvent()
         {
+            // EventManager.Instance.RemoveEventListener(CustomEventType.SkillBeginDrag, SkillBeginDragHandle);
+            // EventManager.Instance.RemoveEventListener(CustomEventType.SkillDrag, SkillDragHandle);
+            // EventManager.Instance.RemoveEventListener(CustomEventType.SkillEndDrag, SkillEndDragHandle);
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
@@ -368,6 +378,124 @@ namespace Fort23.Mono
             });
         }
 
+        private bool isDraging = false;
+
+        //拖动得技能
+        private SkillKongWidget nowSkillKongWidget;
+
+        //进入的技能
+        private SkillKongWidget nowInSkillKongWidget;
+
+        //拖动中技能
+        private SkillKongWidget nowSkillKongWidget1;
+        // private Image _image;
+
+        private async void SkillBeginDragHandle(PointerEventData pointerEventData, ItemWidgetBasic itemWidgetBasic)
+        {
+            LogTool.Log("开始拖动");
+
+            if (infoType == 1)
+            {
+                return;
+            }
+
+            if (dianjiSkillKongWidget != null)
+            {
+                return;
+            }
+
+
+            SkillKongWidget skillKongWidget1 = itemWidgetBasic as SkillKongWidget;
+            if (skillKongWidget1.SkillInfo == null)
+                return;
+
+
+            isDraging = true;
+            //记录当前选中的格子
+            nowSkillKongWidget = skillKongWidget1;
+
+            nowSkillKongWidget.Translucency();
+            dianjiSkillKongWidget = skillKongWidget1;
+            SelectSkill(nowSkillKongWidget.SkillInfo, false, false);
+
+
+            nowSkillKongWidget1 = await UIManager.Instance.CreateGComponentForObject<SkillKongWidget>(
+                SkillKongWidget1game.gameObject,
+                null, transform.GetComponent<RectTransform>(), uiData: new object[] { false,false },
+                isInstance: false);
+            nowSkillKongWidget1.own.SetActive(true);
+            nowSkillKongWidget1.InitWidget(nowSkillKongWidget.index, this);
+            nowSkillKongWidget1.SetSKill(skillKongWidget1.SkillInfo);
+        }
+
+        private void SkillDragHandle(PointerEventData pointerEventData, ItemWidgetBasic itemWidgetBasic)
+        {
+            LogTool.Log("拖动中");
+
+            if (nowSkillKongWidget1 == null)
+                return;
+            Vector2 localPos;
+
+            RectTransformUtility.ScreenPointToLocalPointInRectangle(
+                transform.GetComponent<RectTransform>(),
+                pointerEventData.position,
+                pointerEventData.pressEventCamera,
+                out localPos);
+            nowSkillKongWidget1.transform.localPosition = localPos;
+        }
+
+        private void SkillEndDragHandle(PointerEventData pointerEventData, ItemWidgetBasic itemWidgetBasic)
+        {
+            LogTool.Log("结束拖动");
+            isDraging = false;
+            nowSkillKongWidget?.Opaque();
+            if (nowInSkillKongWidget == null)
+            {
+                CloseSelect();
+            }
+
+            nowInSkillKongWidget?.OnPointerClick();
+            nowSkillKongWidget = null;
+            if (nowInSkillKongWidget != null)
+            {
+                nowInSkillKongWidget.transform.localScale = Vector3.one;
+            }
+
+            nowInSkillKongWidget = null;
+
+
+            if (nowSkillKongWidget1 == null)
+                return;
+            nowSkillKongWidget1.own.SetActive(false);
+            nowSkillKongWidget1 = null;
+        }
+
+        private void SkillPointEnterHandle(ItemWidgetBasic itemWidgetBasic)
+        {
+            LogTool.Log("进入");
+
+            if (isDraging)
+            {
+                nowInSkillKongWidget = itemWidgetBasic as SkillKongWidget;
+                nowInSkillKongWidget.transform.localScale = Vector3.one * 1.1f;
+                return;
+            }
+        }
+
+
+        private void SkillPointExitHandle(ItemWidgetBasic itemWidgetBasic)
+        {
+            LogTool.Log("离开");
+            if (isDraging)
+            {
+                if (nowInSkillKongWidget != null)
+                    nowInSkillKongWidget.transform.localScale = Vector3.one;
+                nowInSkillKongWidget = null;
+                return;
+            }
+        }
+
+
         private void UpdateRoad()
         {
             if (currenRoadSkilId != 0)
@@ -569,12 +697,21 @@ namespace Fort23.Mono
                 Vector2 pos = new Vector2((float)x, (float)y);
                 SkillKongWidget skillKongWidget = await UIManager.Instance.CreateGComponentForObject<SkillKongWidget>(
                     kongdongs.gameObject,
-                    null, SkillKongWeiRoot,
+                    null, SkillKongWeiRoot, uiData: new object[] { true,true },
                     isInstance: true);
                 skillKongWidget.InitWidget(index, this);
                 skillKongWidget.SetSKill(allUseSkill[index]);
                 skillKongWidget.transform.anchoredPosition = pos;
                 skillKongWidget.OnClick = OnClickSkillKongWidget;
+
+                skillKongWidget.onDragStart = SkillBeginDragHandle;
+                skillKongWidget.onDrag = SkillDragHandle;
+                skillKongWidget.onDragEnd = SkillEndDragHandle;
+
+                skillKongWidget.onPointerEnter = SkillPointEnterHandle;
+
+                skillKongWidget.onPointerExit = SkillPointExitHandle;
+
                 allKongSkill.Add(skillKongWidget);
             }
 
@@ -933,8 +1070,9 @@ namespace Fort23.Mono
                 allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
             }
 
-            Text_Cd.text =  LanguageManager.Instance.Text(10208, ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
-                PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd));
+            Text_Cd.text = LanguageManager.Instance.Text(10208,
+                ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
+                    PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd));
         }
 
         public List<int> GetNumbers(int start, float offset)
@@ -1005,8 +1143,8 @@ namespace Fort23.Mono
 
             Text_GongFaCount.text = LanguageManager.Instance.Text(10210, GetMainGongFaCount(),
                 PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum);
-                Text_FuZhuGongFaCount.text = LanguageManager.Instance.Text(10209, GetPassiveGongFaCount(),
-                    PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum);
+            Text_FuZhuGongFaCount.text = LanguageManager.Instance.Text(10209, GetPassiveGongFaCount(),
+                PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum);
         }
 
         private async void OnClick(ItemWidgetBasic obj)
@@ -1118,7 +1256,7 @@ namespace Fort23.Mono
             _skillWidgets.Remove(widget as SkillWidget);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skillWidget in _skillWidgets)
             {
@@ -1143,7 +1281,7 @@ namespace Fort23.Mono
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
             // ChangeInfoType(1);
-            base.Close();
+            await base.Close();
         }
     }
 }

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

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

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

@@ -24,7 +24,9 @@ namespace Fort23.Mono
         private Map<WuXingType, WuXingGongFaWidget> _wuXingGongFaWidgets = new Map<WuXingType, WuXingGongFaWidget>();
 
         private ParticleSystemPool fx_ui_zhuangPan;
-        public async CTask ShowPanel()
+   
+
+        public  async CTask ShowPanel()
         {
             GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_shifang");
             GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_Noshifang");

Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs

@@ -1,11 +1,18 @@
+using System;
 using Fort23.Core;
 using Fort23.Mono;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 
 public class ItemWidgetBasic : UIComponent, IScorllListWidget
 {
+    public bool isUseDrag = false;
+    public bool isAddLongPressBtn = true;
+
     public LongPressBtn longPressBtn;
+    public LongPressDragBtn longPressDragBtn;
     public ButtonAnimation animation = null;
     protected RectTransform _rectTransform;
 
@@ -18,12 +25,12 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
             onClick = value;
             if (onContinueClick != null || onClick != null)
             {
-                if(animation != null) 
+                if (animation != null)
                     animation.isEnabled = true;
             }
             else
             {
-                if(animation != null) 
+                if (animation != null)
                     animation.isEnabled = false;
             }
         }
@@ -40,39 +47,71 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
 
             if (onContinueClick != null || onClick != null)
             {
-                if(animation != null) 
+                if (animation != null)
                     animation.isEnabled = true;
             }
             else
             {
-                if(animation != null) 
+                if (animation != null)
                     animation.isEnabled = false;
             }
         }
     }
 
 
+    /// <summary>
+    /// 拖拽开始事件
+    /// </summary>
+    public Action<PointerEventData, ItemWidgetBasic> onDragStart;
+
+    /// <summary>
+    /// 拖拽进行中事件
+    /// </summary>
+    public Action<PointerEventData, ItemWidgetBasic> onDrag;
+
+    /// <summary>
+    /// 拖拽结束事件
+    /// </summary>
+    public Action<PointerEventData, ItemWidgetBasic> onDragEnd;
+
+    public Action<ItemWidgetBasic> onPointerEnter;
+
+    public Action<ItemWidgetBasic> onPointerExit;
+
     private System.Action<ItemWidgetBasic> onContinueClick;
 
 
     public override void AddButtonEvent()
     {
-        longPressBtn = own.GetComponent<LongPressBtn>();
-        if (longPressBtn == null)
-            longPressBtn = own.AddComponent<LongPressBtn>();
-        longPressBtn.onClick = () => OnClick?.Invoke(this);
-        longPressBtn.longPress = () => OnContinueClick?.Invoke(this);
-        if (own.transform.Find("Button") != null)
-        {
-            animation = own.transform.Find("Button").gameObject.GetComponent<ButtonAnimation>();
-            if (animation == null)
-                animation = own.transform.Find("Button").gameObject.AddComponent<ButtonAnimation>();
+        base.AddButtonEvent();
+    }
 
-            animation.isEnabled = false;
-        }
 
+    private void OnPointerExit(PointerEventData obj)
+    {
+        onPointerExit?.Invoke(this);
+    }
 
-        base.AddButtonEvent();
+    private void OnPointerEnter(PointerEventData obj)
+    {
+        onPointerEnter?.Invoke(this);
+    }
+
+
+    private void OnDragStart(PointerEventData obj)
+    {
+        onDragStart?.Invoke(obj, this);
+    }
+
+
+    private void OnDrag(PointerEventData obj)
+    {
+        onDrag?.Invoke(obj, this);
+    }
+
+    private void OnDragEnd(PointerEventData obj)
+    {
+        onDragEnd?.Invoke(obj, this);
     }
 
     public override CTask<bool> AsyncInit(object[] uiData)
@@ -82,6 +121,40 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
             _rectTransform = GObjectPoolInterface.GetComponent<RectTransform>();
         }
 
+        if (isAddLongPressBtn)
+        {
+            if (isUseDrag)
+            {
+                longPressDragBtn = own.GetComponent<LongPressDragBtn>();
+                if (longPressDragBtn == null)
+                    longPressDragBtn = own.AddComponent<LongPressDragBtn>();
+                longPressDragBtn.onClick = () => OnClick?.Invoke(this);
+                longPressDragBtn.longPress = () => OnContinueClick?.Invoke(this);
+                longPressDragBtn.onDragStart = OnDragStart;
+                longPressDragBtn.onDrag = OnDrag;
+                longPressDragBtn.onDragEnd = OnDragEnd;
+
+                longPressDragBtn.onPointerEnter = OnPointerEnter;
+                longPressDragBtn.onPointerExit = OnPointerExit;
+            }
+            else
+            {
+                longPressBtn = own.GetComponent<LongPressBtn>();
+                if (longPressBtn == null)
+                    longPressBtn = own.AddComponent<LongPressBtn>();
+                longPressBtn.onClick = () => OnClick?.Invoke(this);
+                longPressBtn.longPress = () => OnContinueClick?.Invoke(this);
+            }
+        }
+
+        if (own.transform.Find("Button") != null)
+        {
+            animation = own.transform.Find("Button").gameObject.GetComponent<ButtonAnimation>();
+            if (animation == null)
+                animation = own.transform.Find("Button").gameObject.AddComponent<ButtonAnimation>();
+
+            animation.isEnabled = false;
+        }
 
         return base.AsyncInit(uiData);
     }
@@ -89,7 +162,7 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
 
     public void SetBtnAnimation(bool isEnable)
     {
-        if(animation)
+        if (animation)
             animation.isEnabled = isEnable;
     }
 
@@ -124,6 +197,4 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
     {
         OnContinueClick?.Invoke(this);
     }
-    
-  
 }

Assets/Scripts/GameUI/UI/Component/LongPressBtn.cs

@@ -5,7 +5,8 @@ using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler, IPointerClickHandler
+public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler,
+    IPointerClickHandler
 {
     private float _time;
 
@@ -47,12 +48,13 @@ public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
         {
             if (isPressd)
             {
-                if (_isTriggerLongPress ) // 触发了长按且不是离开，执行 longPressEnd
+                if (_isTriggerLongPress) // 触发了长按且不是离开，执行 longPressEnd
                 {
                     longPressEnd?.Invoke();
                     _isTriggerLongPress = false;
                 }
             }
+
             isPressd = false;
             _time = 0;
         }
@@ -93,6 +95,7 @@ public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
             {
                 longPressEnd?.Invoke();
             }
+
             _isTriggerLongPress = false;
             _time = 0;
         }
@@ -110,9 +113,7 @@ public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
 
     public void OnPointerExit(PointerEventData eventData)
     {
- 
         OnPress(false);
-     
     }
 
     public void OnPointerClick(PointerEventData eventData)
@@ -121,6 +122,7 @@ public class LongPressBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
         {
             onClick?.Invoke();
         }
+
         isPressd = false;
     }
 }

Assets/Scripts/GameUI/UI/Component/LongPressDragBtn.cs

@@ -0,0 +1,239 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class LongPressDragBtn : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IPointerExitHandler,
+    IPointerClickHandler, IDragHandler, IBeginDragHandler, IEndDragHandler, IPointerEnterHandler
+{
+    private float _time;
+
+    public float startTime = 0.5f;
+
+    public float intervalTime = 0.05f;
+
+    public Action onClick;
+
+    /// <summary>
+    /// 连按
+    /// </summary>
+    public Action longPress;
+
+    /// <summary>
+    /// 长按结束
+    /// </summary>
+    public Action longPressEnd;
+
+    /// <summary>
+    /// 是否按下状态
+    /// </summary>
+    [HideInInspector] public bool isPressd;
+
+    private bool _isTriggerLongPress;
+
+    /// <summary>
+    /// 是否触发了长按
+    /// </summary>
+    public bool IsTriggerLongPress => _isTriggerLongPress;
+
+    // 拖拽相关变量
+    private bool _isDragging;
+    private Vector2 _dragStartPosition;
+
+    /// <summary>
+    /// 拖拽阈值（像素），超过这个距离才认为是拖拽
+    /// </summary>
+    public float dragThreshold = 10f;
+
+    /// <summary>
+    /// 拖拽开始事件
+    /// </summary>
+    public Action<PointerEventData> onDragStart;
+
+    /// <summary>
+    /// 拖拽进行中事件
+    /// </summary>
+    public Action<PointerEventData> onDrag;
+
+    /// <summary>
+    /// 拖拽结束事件
+    /// </summary>
+    public Action<PointerEventData> onDragEnd;
+
+    public Action<PointerEventData> onPointerEnter;
+
+    public Action<PointerEventData> onPointerExit;
+
+    void OnPress(bool pressed)
+    {
+        if (pressed) // 按下
+        {
+            isPressd = true;
+            _isDragging = false; // 重置拖拽状态
+        }
+        else // 松开或离开
+        {
+            if (isPressd)
+            {
+                if (_isTriggerLongPress && !_isDragging) // 触发了长按且不是拖拽，执行 longPressEnd
+                {
+                    longPressEnd?.Invoke();
+                    _isTriggerLongPress = false;
+                }
+            }
+
+            isPressd = false;
+            _time = 0;
+        }
+    }
+
+    private void Update()
+    {
+        // 如果正在拖拽，不执行长按逻辑
+        if (_isDragging) return;
+
+        if (isPressd && !_isTriggerLongPress)
+        {
+            _time += Time.deltaTime;
+            if (_time >= startTime)
+            {
+                _isTriggerLongPress = true;
+                _time -= intervalTime;
+                longPress?.Invoke();
+            }
+        }
+        else if (isPressd && _isTriggerLongPress)
+        {
+            _time += Time.deltaTime;
+            if (_time >= intervalTime)
+            {
+                _time -= intervalTime;
+                longPress?.Invoke();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 终止
+    /// </summary>
+    public void Terminated()
+    {
+        if (isPressd)
+        {
+            isPressd = false;
+            if (_isTriggerLongPress)
+            {
+                longPressEnd?.Invoke();
+            }
+
+            _isTriggerLongPress = false;
+            _time = 0;
+        }
+
+        _isDragging = false; // 同时终止拖拽状态
+    }
+
+    public void OnPointerDown(PointerEventData eventData)
+    {
+        _dragStartPosition = eventData.position;
+        OnPress(true);
+    }
+
+    public void OnPointerUp(PointerEventData eventData)
+    {
+        // 如果正在拖拽，先触发拖拽结束
+        if (_isDragging)
+        {
+            OnEndDrag(eventData);
+        }
+
+        OnPress(false);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        onPointerExit?.Invoke(eventData);
+        // 如果正在拖拽，不处理退出事件（拖拽过程中允许离开按钮区域）
+        if (!_isDragging)
+        {
+            OnPress(false);
+        }
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        onPointerEnter?.Invoke(eventData);
+    }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        // 如果发生了拖拽，不触发点击事件
+        if (_isDragging || _isTriggerLongPress) return;
+
+        onClick?.Invoke();
+        isPressd = false;
+    }
+
+    // ========== 拖拽相关方法 ==========
+
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        // 检查是否达到拖拽阈值
+        if (Vector2.Distance(eventData.position, _dragStartPosition) >= dragThreshold && !_isDragging)
+        {
+            _isDragging = true;
+            // 开始拖拽时终止长按逻辑
+            if (_isTriggerLongPress)
+            {
+                longPressEnd?.Invoke();
+                _isTriggerLongPress = false;
+            }
+
+            onDragStart?.Invoke(eventData);
+        }
+    }
+
+    public void OnDrag(PointerEventData eventData)
+    {
+        if (_isDragging)
+        {
+            onDrag?.Invoke(eventData);
+        }
+        else
+        {
+            // 如果还没有正式开始拖拽，检查是否达到阈值
+            if (Vector2.Distance(eventData.position, _dragStartPosition) >= dragThreshold)
+            {
+                OnBeginDrag(eventData);
+            }
+        }
+    }
+
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        if (_isDragging)
+        {
+            onDragEnd?.Invoke(eventData);
+            _isDragging = false;
+        }
+    }
+
+    /// <summary>
+    /// 检查是否正在拖拽
+    /// </summary>
+    public bool IsDragging => _isDragging;
+
+    /// <summary>
+    /// 强制结束拖拽
+    /// </summary>
+    public void ForceEndDrag()
+    {
+        if (_isDragging)
+        {
+            _isDragging = false;
+            onDragEnd?.Invoke(null);
+        }
+    }
+}

Assets/Scripts/GameUI/UI/Component/LongPressDragBtn.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9b7bdefb697b46138c97c06f8ab1aaaa
+timeCreated: 1758609866

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouGuaJiAwardPanel.cs

@@ -77,7 +77,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouGuaJiAwardPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouGuaJiAwardWidget in _daoYouGuaJiAwardWidgets)
             {
@@ -86,7 +86,7 @@ namespace Fort23.Mono
 
             _daoYouGuaJiAwardWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouGuaJiPanel.cs

@@ -53,7 +53,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouGuaJiPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouGuaJiWidget in widgets)
             {
@@ -62,7 +62,7 @@ namespace Fort23.Mono
 
             widgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -522,7 +522,7 @@ namespace Fort23.Mono
             widgetItem1 = null;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             daoyouGiftConfigs = null;
 
@@ -557,7 +557,7 @@ namespace Fort23.Mono
 
             ClosePoolGive();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -109,7 +109,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null, UILayer.Top,isShowBG:true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouWidget in _daoYouWidgets)
             {
@@ -126,7 +126,7 @@ namespace Fort23.Mono
             _daoYouaaFfixWidgets.Clear();
 
             addDaoYouWidget = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouPanel.cs

@@ -61,7 +61,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouWidget in daoYouWidgets)
             {
@@ -69,7 +69,7 @@ namespace Fort23.Mono
             }
             daoYouWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -185,14 +185,14 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
             _isShowingOptions = false;
             _skipTyping = false;
             _timerEntity?.Dispose();
             _timerEntity = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -420,7 +420,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
             _isShowingOptions = false;
@@ -436,7 +436,7 @@ namespace Fort23.Mono
             // DialgueType2.gameObject.SetActive(false);
             // OptionMarsk.SetActive(false);
             isOver = false;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -224,7 +224,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoWidget in gongFaWidgetType2s)
             {
@@ -242,7 +242,7 @@ namespace Fort23.Mono
             Icon_Select.transform.SetParent(transform);
             Icon_Select.transform.SetAsFirstSibling();
             result?.SetResult(isOk);
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<bool> OpenPanel(int levebattleId)

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

@@ -267,7 +267,7 @@ namespace Fort23.Mono
             return divineSenceEventPreviewPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
             shengShiEventWidgetTypeList.Clear();
@@ -275,7 +275,7 @@ namespace Fort23.Mono
             saixuanType = 1;
             mainShengShiEventWidgetType2 = null;
             isTriggerEvent = false;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -157,7 +157,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack },isShowBG:true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var divineSenceItemWidget in _divineSenceItemWidgets)
             {
@@ -169,7 +169,7 @@ namespace Fort23.Mono
             itemInfos2.Clear();
             selectItemInit = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -79,7 +79,7 @@ namespace Fort23.Mono
             return await callBack;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skipToWidget in skipToWidgets)
             {
@@ -90,7 +90,7 @@ namespace Fort23.Mono
             callBack?.SetResult(isSkipto);
             isSkipto = false;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -458,7 +458,7 @@ namespace Fort23.Mono
             return gongFaUpgradePanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
             {
@@ -482,7 +482,7 @@ namespace Fort23.Mono
             isUpStar = false;
             isUpGrad = false;
             _skillInfo = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 
 namespace Fort23.Mono
@@ -76,7 +77,7 @@ namespace Fort23.Mono
             skillRoadSelecPanel.CustomInit(currentSelectId,callBack);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skillRoadWidget in _skillRoadWidgets)
             {
@@ -85,7 +86,7 @@ namespace Fort23.Mono
 
             _skillRoadWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -130,12 +130,12 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             GObjectPool.Instance.Recycle(GameObjectPool);
             GameObjectPool = null;
             CloseBtn.onClick.RemoveAllListeners();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -106,9 +106,9 @@ namespace Fort23.Mono
             OnClickMask.GetComponent<RectTransform>().sizeDelta = size;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
-            base.Close();
+            await base.Close();
             PlayerGuideManager.Instance._timerEntity?.Dispose();
             PlayerGuideManager.Instance._timerEntity = null;
         }

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

@@ -62,7 +62,8 @@ namespace Fort23.Mono
                 }
 
 
-                if (PlayerManager.Instance.myHero.heroData.exp + HeroHerlp.GetHeroExp() < PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+                if (PlayerManager.Instance.myHero.heroData.exp + HeroHerlp.GetHeroExp() <
+                    PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
                 {
                     return;
                 }
@@ -78,7 +79,9 @@ namespace Fort23.Mono
                     bool isHave = false;
                     for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                     {
-                        if (breakthroughItemWidgets[i1].itemInfo != null && PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] == breakthroughItemWidgets[i1].itemInfo.itemID)
+                        if (breakthroughItemWidgets[i1].itemInfo != null &&
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
+                            breakthroughItemWidgets[i1].itemInfo.itemID)
                         {
                             isHave = true;
                         }
@@ -86,7 +89,9 @@ namespace Fort23.Mono
 
                     if (!isHave)
                     {
-                        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i]);
+                        ItemConfig itemConfig =
+                            ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig
+                                .DujieMustItemIDs[i]);
                         string tips = "缺少" + LanguageManager.Instance.Text(itemConfig.itemName);
                         TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(tips);
                         return;
@@ -118,17 +123,20 @@ namespace Fort23.Mono
                     bool isTuPoSuccess = true;
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                     {
-                        if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null && PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
+                        if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null &&
+                            PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
                         {
                             type1 = 3;
-                            ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0], PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
+                            ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
+                                PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
                             //渡劫失败
                             if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                             {
                                 isTuPoSuccess = false;
                                 RemoveHeroItem(list[1]);
-                             
-                                HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
+
+                                HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                                    await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
                                 await heroBreakthroughFailPanel.UIClosed();
                                 // TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
                                 // await tipMessage.UIClosed();
@@ -147,7 +155,8 @@ namespace Fort23.Mono
                 {
                     RemoveHeroItem(list[1]);
                     AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
-                    HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                    HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                        await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                     await heroBreakthroughFailPanel.UIClosed();
                 }
 
@@ -188,7 +197,9 @@ namespace Fort23.Mono
         private void RemoveHeroItem(int failBl)
         {
             //扣除失败后的经验
-            float failbl = failBl == 0 ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
+            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;
@@ -204,7 +215,8 @@ namespace Fort23.Mono
             //小突破
             if (type == 1)
             {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+                heroAttributData =
+                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
             }
             //大突破
             else if (type == 2)
@@ -218,7 +230,8 @@ namespace Fort23.Mono
             }
 
             PlayerManager.Instance.myHero.Upgrade();
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
             await heroBreakthroughSuccessPanel.UIClosed();
         }
 
@@ -228,7 +241,8 @@ namespace Fort23.Mono
             type = 1;
             heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
             nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
-            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
+            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
 
             Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
@@ -237,14 +251,18 @@ namespace Fort23.Mono
             Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
-            
-            
-            LevelbattleConfig  levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
+
+
+            LevelbattleConfig levelbattleConfig =
+                ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
             GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            MonsterPowerUpConfig monsterPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+            HeroModelConfig heroModelConfig =
+                ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+            MonsterPowerUpConfig monsterPowerUpConfig =
+                ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
 
-            Text_CombatTitle.text = $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1) }{ LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2) }{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            Text_CombatTitle.text =
+                $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
@@ -307,36 +325,45 @@ namespace Fort23.Mono
             Btn_Affirm.transform.RecoverColor();
 
 
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<BreakthroughItemWidget>())
+            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
-                for (int i = 0; i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (int i = 0;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i++)
                 {
-                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+                    cTaskAwaitBuffer.AddTask(
+                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
                 }
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0,false);
+                breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)
                 {
-                    breakthroughItemWidgets[i].transform.anchoredPosition = new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+                    breakthroughItemWidgets[i].transform.anchoredPosition =
+                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
                 }
 
-                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count, 200);
+                Content.sizeDelta =
+                    new Vector2(
+                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+                        200);
             }
         }
 
@@ -354,7 +381,8 @@ namespace Fort23.Mono
                 bool isHave = false;
                 for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                 {
-                    if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] == breakthroughItemWidgets[i1].itemInfo.itemID)
+                    if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] ==
+                        breakthroughItemWidgets[i1].itemInfo.itemID)
                     {
                         isHave = true;
                     }
@@ -373,7 +401,9 @@ namespace Fort23.Mono
 
             var list = GetBl();
 
-            failbl = list[1] == 0 ? hero.powerUpConfig.FailureExpReduce : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
+            failbl = list[1] == 0
+                ? hero.powerUpConfig.FailureExpReduce
+                : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
             successBl = list[0];
 
             if (isCan)
@@ -458,7 +488,8 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }
@@ -467,7 +498,8 @@ namespace Fort23.Mono
         //渡劫预览
         public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit(heroInfo1);
             return heroBreakthroughPanel;
         }
@@ -477,7 +509,8 @@ namespace Fort23.Mono
             type = 2;
             heroPowerUpConfig = heroInfo1.powerUpConfig;
             nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
-            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, heroInfo1.heroData.heroPowerId + 1);
+            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                heroInfo1.heroData.heroPowerId + 1);
 
             Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
@@ -548,40 +581,63 @@ namespace Fort23.Mono
             Btn_Affirm.transform.Gray(false);
 
 
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<BreakthroughItemWidget>())
+            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
-                for (int i = 0; i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (int i = 0;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i++)
                 {
-                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+                    cTaskAwaitBuffer.AddTask(
+                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
                 }
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0,false);
+                breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)
                 {
-                    breakthroughItemWidgets[i].transform.anchoredPosition = new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+                    breakthroughItemWidgets[i].transform.anchoredPosition =
+                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
                 }
 
-                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count, 200);
+                Content.sizeDelta =
+                    new Vector2(
+                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+                        200);
             }
         }
 
-        public override void Close()
+
+        // [CustomMethod(CustomMethodType.Update)]
+        // public async void Update()
+        // {
+        //     if (Input.GetKeyDown(KeyCode.Y))
+        //     {
+        //         HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, 10);
+        //         await heroBreakthroughFailPanel.UIClosed();
+        //
+        //
+        //         // UIManager.Instance.HideUIUIPanel(this);
+        //     }
+        // }
+
+        public async override CTask Close()
         {
             foreach (var breakthroughItemWidget in breakthroughItemWidgets)
             {
@@ -594,7 +650,7 @@ namespace Fort23.Mono
 
             type = 0;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -81,7 +81,7 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(AttributeRoot.parent.GetComponent<RectTransform>());
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var heroAttributeWidget in heroAttributeWidgets)
             {
@@ -90,7 +90,7 @@ namespace Fort23.Mono
 
             heroAttributeWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -182,7 +182,7 @@ namespace Fort23.Mono
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
             Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
                 PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
-    
+
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -208,18 +208,16 @@ namespace Fort23.Mono
             {
                 Text_Speed.text = LanguageManager.Instance.Text(10230,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
-           
             }
             else
             {
-  
-                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
 
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.exp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{(int)PlayerManager.Instance.myHero.exp.Value}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
             {
@@ -241,7 +239,7 @@ namespace Fort23.Mono
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
 
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.heroData.exp + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{(int)(PlayerManager.Instance.myHero.heroData.exp + allexp)}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
                               (PlayerManager.Instance.myHero.heroData.exp + allexp)) /
@@ -250,12 +248,10 @@ namespace Fort23.Mono
             {
                 Text_Speed.text = LanguageManager.Instance.Text(10230,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
-           
             }
             else
             {
-  
-                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
         }
@@ -311,10 +307,10 @@ namespace Fort23.Mono
             return heroInformationPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             ClosePool();
-            base.Close();
+            await base.Close();
         }
 
         private void ClosePool()

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

@@ -193,7 +193,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<ImmortalBondPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoLvSkillWidget in _daoLvSkillWidgets)
             {
@@ -203,7 +203,7 @@ namespace Fort23.Mono
             _daoLvSkillWidgets.Clear();
 
             UIManager.Instance.DormancyAllGComponent<DaoYouWidget>();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -101,14 +101,14 @@ namespace Fort23.Mono
           
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             breakthrough.Icon_Select.gameObject.SetActive(false);
             breakthrough.transform.SetParent(weidgetFater);
             weidgetFater = null;
             breakthrough = null;
             callBack = null;
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)

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

@@ -152,7 +152,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             elixirItems.ForEach(e => UIManager.Instance.DormancyGComponent(e));
             elixirItems.Clear();
@@ -163,7 +163,7 @@ namespace Fort23.Mono
             breakthrough = null;
             weidgetFater = null;
             SelectWidget(null);
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<SelectElixirPanel> OpenPanel(BreakthroughItemWidget itemInfo, Action<ElixirItemWidget> callback = null)

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

@@ -79,7 +79,7 @@ namespace Fort23.Mono
             return useExpElixirPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var expElixirItemWidget in _expElixirItemWidgets)
             {
@@ -88,7 +88,7 @@ namespace Fort23.Mono
 
             _expElixirItemWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs

@@ -172,7 +172,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoAttributeWidget in faBaoWidgets)
             {
@@ -193,7 +193,7 @@ namespace Fort23.Mono
             currentFaBaoWidget = null;
             currentFaBaoInfo = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs

@@ -155,7 +155,7 @@ namespace Fort23.Mono
             return gongFaUpgradePanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
             {
@@ -178,7 +178,7 @@ namespace Fort23.Mono
             isUpStar = false;
             isUpGrad = false;
             _skillInfo = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                 uiData: new object[] { itemInfo }, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var itemDetailsWidget in itemDetailsWidgets)
             {
@@ -91,7 +91,7 @@ namespace Fort23.Mono
 
             itemDetailsWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -76,7 +76,7 @@ namespace Fort23.Mono
             return await callBack;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skipToWidget in skipToWidgets)
             {
@@ -87,7 +87,7 @@ namespace Fort23.Mono
             callBack?.SetResult(isSkipto);
             isSkipto = false;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -175,13 +175,13 @@ namespace Fort23.Mono
             levelChoosePanel.CustomInit();
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             placesItem?.Dispose();
             placesItem = null;
             _bigMapItem?.Dispose();
             _bigMapItem = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -67,16 +67,18 @@ namespace Fort23.Mono
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
-            int triggerCount = 0;
-            foreach (var i in placesConfig.MainTaskID)
-            {
-                if (EventSystemManager.Instance.IsEventTrigger(i))
-                {
-                    triggerCount++;
-                }
-            }
-
-            Text_PlacesComplteProgress.text = $"章节事件：{triggerCount}/{placesConfig.MainTaskID.Length}";
+            // int triggerCount = 0;
+            // foreach (var i in placesConfig.MainTaskID)
+            // {
+            //     if (EventSystemManager.Instance.IsEventTrigger(i))
+            //     {
+            //         triggerCount++;
+            //     }
+            // }
+
+            AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
+
+            Text_PlacesComplteProgress.text = $"章节事件：{placesData.progress}/{placesConfig.TotalScore}";
             return await base.AsyncInit(uiData);
         }
 
@@ -257,7 +259,7 @@ namespace Fort23.Mono
                 uiData: new object[] { placesId, callBack }, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {
@@ -274,7 +276,7 @@ namespace Fort23.Mono
                 callBack = null;
             }
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -178,7 +178,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyGComponent(modelObj);
             modelObj = null;
@@ -195,7 +195,7 @@ namespace Fort23.Mono
             }
 
             HeroAttributeWidgets.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -569,7 +569,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
             {
@@ -610,7 +610,7 @@ namespace Fort23.Mono
             selectedFaBaoInfo = null;
             SetSelectIcon(null);
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -343,7 +343,7 @@ namespace Fort23.Mono
             return mainPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
             {
@@ -357,7 +357,7 @@ namespace Fort23.Mono
             }
 
             widgets.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -94,7 +94,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var widgetItem in items)
             {
@@ -103,7 +103,7 @@ namespace Fort23.Mono
 
             items.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -109,7 +109,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var widgetItem in items)
             {
@@ -118,7 +118,7 @@ namespace Fort23.Mono
 
             items.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -37,7 +37,7 @@ namespace Fort23.Mono
             UIManager.Instance.HideUIUIPanel(this);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             onClose?.Invoke();
             foreach (var widgetItem in widgetItems)
@@ -46,7 +46,7 @@ namespace Fort23.Mono
             }
 
             widgetItems.Clear();
-            base.Close();
+            await base.Close();
         }
 
         private Action onClose;

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

@@ -57,13 +57,13 @@ namespace Fort23.Mono
             });
         }
 
-        public override void Close()
+        public  override void  Close()
         {
             UIManager.Instance.DormancyGComponent(this);
             _timerEntity?.Dispose();
             _timerEntity = null;
 
-            base.Close();
+             base.Close();
         }
     }
 }

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

@@ -270,7 +270,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<SentimentInfoPanel>(null, uiData: new object[] { sentimentData });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
             {
@@ -284,7 +284,7 @@ namespace Fort23.Mono
             // UIManager.Instance.DormancyGComponent(energyWidget);
             // energyWidget = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -119,7 +119,7 @@ namespace Fort23.Mono
         public override void Close()
         {
             CombatController.currActiveCombat.isUpdate = true;
-            base.Close();
+             base.Close();
         }
 
         public void CustomInit()

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

@@ -2,6 +2,7 @@ using System;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 
@@ -216,9 +217,9 @@ namespace Fort23.Mono
             Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
-            base.Close();
+            await base.Close();
             UIManager.Instance.DormancyAllGComponent<WidgetItem>(_poolName);
             _callback?.Invoke(_buyMark, currentSelectCount);
         }

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

@@ -121,14 +121,14 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             OneRoot.gameObject.SetActive(false);
             TenRoot.gameObject.SetActive(false);
             Text_Bl.gameObject.SetActive(false);
             Btn_ShuangBei.gameObject.SetActive(true);
 
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask OpenPanel(List<ItemInfo> itemInfos, int type, int configId)

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

@@ -162,7 +162,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
             {
@@ -192,7 +192,7 @@ namespace Fort23.Mono
             //     mainUIPanel.FindShop();
             // }
 
-            base.Close();
+            await base.Close();
         }
 
         public static async CTask<ShopPanel> OpenPanel(bool isPauseCombat = false)

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -130,7 +130,7 @@ namespace Fort23.Mono
             return taskInfoPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             if (PlayerGuideManager.Instance.GuideIsCanDo(2, 7))
             {
@@ -144,7 +144,7 @@ namespace Fort23.Mono
 
             widgetItems.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanelType2.cs

@@ -119,11 +119,11 @@ namespace Fort23.Mono
             _timerEntity = TimerComponent.Instance.AddTimer(2000, () => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _timerEntity?.Dispose();
             _timerEntity = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanle.cs

@@ -36,10 +36,10 @@ namespace Fort23.Mono
             });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _cTask = null;
-            base.Close();
+            await base.Close();
         }
 
         public void CustomInit(string title,string tips, CTask<bool> cTask,int showButCount)

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -192,12 +192,12 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyGComponent(widget as UIComponent);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _towerData = null;
             ulockId = 0;
             currentLevelWidget = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -250,7 +250,7 @@ namespace Fort23.Mono
             // }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             showXianTuLogInfoData.Clear();
             foreach (var uiComponent in components)
@@ -261,7 +261,7 @@ namespace Fort23.Mono
             components.Clear();
             // titleWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
 
         List<UIComponent> _components = new List<UIComponent>();

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

@@ -497,7 +497,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
@@ -525,7 +525,7 @@ namespace Fort23.Mono
             placesXaiXuan = 0;
             places.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }