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

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

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

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

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

Assets/Res/Config/EventConditionConfig.json

@@ -103,7 +103,7 @@
       "ConditionPara": [
         1004
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30003
       ],
@@ -119,7 +119,7 @@
       "ConditionPara": [
         1005
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30004
       ],
@@ -135,7 +135,7 @@
       "ConditionPara": [
         20003
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30011
       ],
@@ -351,7 +351,7 @@
       "ConditionPara": [
         20004
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30012
       ],
@@ -516,7 +516,7 @@
       "ConditionPara": [
         20006
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30015
       ],
@@ -548,7 +548,7 @@
       "ConditionPara": [
         20007
       ],
-      "finishCount": 3,
+      "finishCount": 2,
       "RelatedEvents": [
         30017
       ],

Assets/Res/Config/LanguageChineseConfig.json

@@ -13150,47 +13150,47 @@
     },
     {
       "ID": 4028,
-      "txt": "鲲鹏何在.神识未灭"
+      "txt": "鲲鹏何在"
     },
     {
       "ID": 4029,
-      "txt": "北海密径.御剑而行"
+      "txt": "北海密径"
     },
     {
       "ID": 4030,
-      "txt": "北海密径.雀笑大鹏"
+      "txt": "雀笑大鹏"
     },
     {
       "ID": 4031,
-      "txt": "古径阵法.击败结界兽"
+      "txt": "古径阵法"
     },
     {
       "ID": 4032,
-      "txt": "浮空之岛.初见疯道人"
+      "txt": "初见疯道人"
     },
     {
       "ID": 4033,
-      "txt": "浮空之岛.达到练气"
+      "txt": "浮空之岛"
     },
     {
       "ID": 4034,
-      "txt": "风中洞府.击败痴道人"
+      "txt": "风中洞府"
     },
     {
       "ID": 4035,
-      "txt": "风中洞府.疯痴相聚"
+      "txt": "疯痴相聚"
     },
     {
       "ID": 4036,
-      "txt": "风灵之力.练气后期"
+      "txt": "风灵之力"
     },
     {
       "ID": 4037,
-      "txt": "北海深处.妖兽横行"
+      "txt": "北海深处"
     },
     {
       "ID": 4038,
-      "txt": "北海深处.遇见鲲鹏"
+      "txt": "遇见鲲鹏"
     },
     {
       "ID": 4039,
@@ -13198,63 +13198,63 @@
     },
     {
       "ID": 4040,
-      "txt": "尧之都.尧让天下"
+      "txt": "尧让天下"
     },
     {
       "ID": 4041,
-      "txt": "山林清音.访贤许由"
+      "txt": "山林清音"
     },
     {
       "ID": 4042,
-      "txt": "山中劳作.割草喝茶"
+      "txt": "山中劳作"
     },
     {
       "ID": 4043,
-      "txt": "风起夜战.再来一杯"
+      "txt": "风起夜战"
     },
     {
       "ID": 4044,
-      "txt": "吃茶三问.战胜妖王"
+      "txt": "吃茶三问"
     },
     {
       "ID": 4045,
-      "txt": "尧让天下.复命尧帝"
+      "txt": "复命尧帝"
     },
     {
       "ID": 4046,
-      "txt": "无用之树.树下闲话"
+      "txt": "无用之树"
     },
     {
       "ID": 4047,
-      "txt": "樗木之灵.切磋"
+      "txt": "樗木之灵"
     },
     {
       "ID": 4048,
-      "txt": "游尧都.结丹中期"
+      "txt": "游尧都"
     },
     {
       "ID": 4049,
-      "txt": "再见尧帝.仙山传说"
+      "txt": "仙山传说"
     },
     {
       "ID": 4050,
-      "txt": "云海漫行.入山幻阵"
+      "txt": "入山幻阵"
     },
     {
       "ID": 4051,
-      "txt": "初见惠子.葫芦种子"
+      "txt": "葫芦种子"
     },
     {
       "ID": 4052,
-      "txt": "葫芦肥料.天肥地肥"
+      "txt": "天肥地肥"
     },
     {
       "ID": 4053,
-      "txt": "藐姑射山.登山"
+      "txt": "登仙山"
     },
     {
       "ID": 4054,
-      "txt": "藐姑射山.雾中幻径"
+      "txt": "雾中幻径"
     },
     {
       "ID": 4055,
@@ -13266,7 +13266,7 @@
     },
     {
       "ID": 4057,
-      "txt": "心魔之战.破除枷锁"
+      "txt": "破除枷锁"
     },
     {
       "ID": 4058,
@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10545,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10546,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10547,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10548,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10549,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10550,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10551,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10552,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10553,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10554,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10555,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10556,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10557,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10558,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10559,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10560,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10561,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10562,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10563,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10564,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10565,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10566,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10567,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10568,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10569,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10570,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10571,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10572,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10573,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10574,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10575,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10576,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10577,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10578,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10579,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10580,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10581,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10582,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10583,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10584,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10585,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10586,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10587,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10588,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10589,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10590,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10591,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10592,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10593,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10594,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10595,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10596,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10597,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10598,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10599,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10600,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10601,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10602,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10603,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10604,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10605,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10606,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10607,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10608,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10609,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10610,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10611,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10612,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10613,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10614,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10615,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10616,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10617,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10618,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10619,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10620,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10621,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10622,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10623,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10624,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10625,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10626,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10627,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10628,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10629,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10630,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10631,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10632,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10633,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10634,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10635,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10636,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10637,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10638,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10639,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10640,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10641,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10642,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10643,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10644,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10645,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10646,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10647,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10648,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10649,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10650,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10651,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10652,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10653,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10654,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10655,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10656,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10657,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10658,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10659,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10660,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10661,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10662,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10663,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10664,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10665,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10666,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10667,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10668,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10669,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10670,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10671,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10672,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10673,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10674,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10675,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10676,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10677,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10678,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10679,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10680,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10681,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10682,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10683,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10684,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10685,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10686,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10687,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10688,

Assets/Res/Config/TowerInfoConfig.json

@@ -16,7 +16,7 @@
       ],
       "rewardCount": [
         1,
-        7000
+        5200
       ],
       "unlockValue": 0
     },
@@ -36,7 +36,7 @@
       ],
       "rewardCount": [
         1,
-        7000
+        5200
       ],
       "unlockValue": 0
     },
@@ -56,7 +56,7 @@
       ],
       "rewardCount": [
         1,
-        7000
+        5600
       ],
       "unlockValue": 0
     },
@@ -76,7 +76,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        5600
       ],
       "unlockValue": 0
     },
@@ -96,7 +96,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        5600
       ],
       "unlockValue": 0
     },
@@ -116,7 +116,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        5600
       ],
       "unlockValue": 0
     },
@@ -136,7 +136,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        6000
       ],
       "unlockValue": 0
     },
@@ -156,7 +156,7 @@
       ],
       "rewardCount": [
         1,
-        8000
+        6000
       ],
       "unlockValue": 0
     },
@@ -176,7 +176,7 @@
       ],
       "rewardCount": [
         1,
-        8500
+        6000
       ],
       "unlockValue": 0
     },
@@ -196,7 +196,7 @@
       ],
       "rewardCount": [
         1,
-        8500
+        6000
       ],
       "unlockValue": 0
     },
@@ -216,7 +216,7 @@
       ],
       "rewardCount": [
         1,
-        8500
+        6400
       ],
       "unlockValue": 0
     },
@@ -236,7 +236,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        6400
       ],
       "unlockValue": 0
     },
@@ -256,7 +256,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        6400
       ],
       "unlockValue": 0
     },
@@ -276,7 +276,7 @@
       ],
       "rewardCount": [
         1,
-        9500
+        6400
       ],
       "unlockValue": 0
     },
@@ -296,7 +296,7 @@
       ],
       "rewardCount": [
         1,
-        9500
+        6800
       ],
       "unlockValue": 0
     },
@@ -316,7 +316,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        6800
       ],
       "unlockValue": 0
     },
@@ -336,7 +336,7 @@
       ],
       "rewardCount": [
         1,
-        10000
+        6800
       ],
       "unlockValue": 0
     },
@@ -356,7 +356,7 @@
       ],
       "rewardCount": [
         1,
-        10500
+        6800
       ],
       "unlockValue": 0
     },
@@ -376,7 +376,7 @@
       ],
       "rewardCount": [
         1,
-        10500
+        7200
       ],
       "unlockValue": 0
     },
@@ -396,7 +396,7 @@
       ],
       "rewardCount": [
         1,
-        11000
+        7200
       ],
       "unlockValue": 0
     },
@@ -416,7 +416,7 @@
       ],
       "rewardCount": [
         1,
-        11000
+        7200
       ],
       "unlockValue": 0
     },
@@ -436,7 +436,7 @@
       ],
       "rewardCount": [
         1,
-        11500
+        7200
       ],
       "unlockValue": 0
     },
@@ -456,7 +456,7 @@
       ],
       "rewardCount": [
         1,
-        11500
+        7600
       ],
       "unlockValue": 0
     },
@@ -476,7 +476,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        7600
       ],
       "unlockValue": 0
     },
@@ -496,7 +496,7 @@
       ],
       "rewardCount": [
         1,
-        12500
+        7600
       ],
       "unlockValue": 0
     },
@@ -516,7 +516,7 @@
       ],
       "rewardCount": [
         1,
-        12500
+        7600
       ],
       "unlockValue": 0
     },
@@ -536,7 +536,7 @@
       ],
       "rewardCount": [
         1,
-        13000
+        8000
       ],
       "unlockValue": 0
     },
@@ -556,7 +556,7 @@
       ],
       "rewardCount": [
         1,
-        13500
+        8000
       ],
       "unlockValue": 0
     },
@@ -576,7 +576,7 @@
       ],
       "rewardCount": [
         1,
-        13500
+        8000
       ],
       "unlockValue": 0
     },
@@ -596,7 +596,7 @@
       ],
       "rewardCount": [
         1,
-        14000
+        8000
       ],
       "unlockValue": 0
     },
@@ -616,7 +616,7 @@
       ],
       "rewardCount": [
         1,
-        14500
+        8400
       ],
       "unlockValue": 0
     },
@@ -636,7 +636,7 @@
       ],
       "rewardCount": [
         1,
-        15000
+        8400
       ],
       "unlockValue": 0
     },
@@ -656,7 +656,7 @@
       ],
       "rewardCount": [
         1,
-        15000
+        8400
       ],
       "unlockValue": 0
     },
@@ -676,7 +676,7 @@
       ],
       "rewardCount": [
         1,
-        15500
+        8400
       ],
       "unlockValue": 0
     },
@@ -696,7 +696,7 @@
       ],
       "rewardCount": [
         1,
-        16000
+        8800
       ],
       "unlockValue": 0
     },
@@ -716,7 +716,7 @@
       ],
       "rewardCount": [
         1,
-        16500
+        8800
       ],
       "unlockValue": 0
     },
@@ -736,7 +736,7 @@
       ],
       "rewardCount": [
         1,
-        16500
+        8800
       ],
       "unlockValue": 0
     },
@@ -756,7 +756,7 @@
       ],
       "rewardCount": [
         1,
-        17000
+        8800
       ],
       "unlockValue": 0
     },
@@ -776,7 +776,7 @@
       ],
       "rewardCount": [
         1,
-        17500
+        9200
       ],
       "unlockValue": 0
     },
@@ -796,7 +796,7 @@
       ],
       "rewardCount": [
         1,
-        18000
+        9200
       ],
       "unlockValue": 0
     },
@@ -816,7 +816,7 @@
       ],
       "rewardCount": [
         1,
-        18500
+        9200
       ],
       "unlockValue": 0
     },
@@ -836,7 +836,7 @@
       ],
       "rewardCount": [
         1,
-        19000
+        9200
       ],
       "unlockValue": 0
     },
@@ -856,7 +856,7 @@
       ],
       "rewardCount": [
         1,
-        19500
+        9600
       ],
       "unlockValue": 0
     },
@@ -876,7 +876,7 @@
       ],
       "rewardCount": [
         1,
-        20000
+        9600
       ],
       "unlockValue": 0
     },
@@ -896,7 +896,7 @@
       ],
       "rewardCount": [
         1,
-        20500
+        9600
       ],
       "unlockValue": 0
     },
@@ -916,7 +916,7 @@
       ],
       "rewardCount": [
         1,
-        20500
+        10000
       ],
       "unlockValue": 0
     },
@@ -936,7 +936,7 @@
       ],
       "rewardCount": [
         1,
-        21500
+        10000
       ],
       "unlockValue": 0
     },
@@ -956,7 +956,7 @@
       ],
       "rewardCount": [
         1,
-        22000
+        10000
       ],
       "unlockValue": 0
     },
@@ -976,7 +976,7 @@
       ],
       "rewardCount": [
         1,
-        22500
+        10400
       ],
       "unlockValue": 0
     },
@@ -996,7 +996,7 @@
       ],
       "rewardCount": [
         1,
-        23000
+        10400
       ],
       "unlockValue": 0
     },
@@ -1016,7 +1016,7 @@
       ],
       "rewardCount": [
         1,
-        23500
+        10400
       ],
       "unlockValue": 0
     },
@@ -1036,7 +1036,7 @@
       ],
       "rewardCount": [
         1,
-        24500
+        10800
       ],
       "unlockValue": 0
     },
@@ -1056,7 +1056,7 @@
       ],
       "rewardCount": [
         1,
-        25000
+        10800
       ],
       "unlockValue": 0
     },
@@ -1076,7 +1076,7 @@
       ],
       "rewardCount": [
         1,
-        25500
+        10800
       ],
       "unlockValue": 0
     },
@@ -1096,7 +1096,7 @@
       ],
       "rewardCount": [
         1,
-        26000
+        11200
       ],
       "unlockValue": 0
     },
@@ -1116,7 +1116,7 @@
       ],
       "rewardCount": [
         1,
-        27000
+        11200
       ],
       "unlockValue": 0
     },
@@ -1136,7 +1136,7 @@
       ],
       "rewardCount": [
         1,
-        27500
+        11200
       ],
       "unlockValue": 0
     },
@@ -1156,7 +1156,7 @@
       ],
       "rewardCount": [
         1,
-        28000
+        11600
       ],
       "unlockValue": 0
     },
@@ -1176,7 +1176,7 @@
       ],
       "rewardCount": [
         1,
-        29000
+        11600
       ],
       "unlockValue": 0
     },
@@ -1196,7 +1196,7 @@
       ],
       "rewardCount": [
         1,
-        30000
+        12000
       ],
       "unlockValue": 0
     },
@@ -1216,7 +1216,7 @@
       ],
       "rewardCount": [
         1,
-        30500
+        12000
       ],
       "unlockValue": 0
     },
@@ -1236,7 +1236,7 @@
       ],
       "rewardCount": [
         1,
-        31000
+        12000
       ],
       "unlockValue": 0
     },
@@ -1256,7 +1256,7 @@
       ],
       "rewardCount": [
         1,
-        32000
+        12400
       ],
       "unlockValue": 0
     },
@@ -1276,7 +1276,7 @@
       ],
       "rewardCount": [
         1,
-        33000
+        12400
       ],
       "unlockValue": 0
     },
@@ -1296,7 +1296,7 @@
       ],
       "rewardCount": [
         1,
-        33500
+        12400
       ],
       "unlockValue": 0
     },
@@ -1316,7 +1316,7 @@
       ],
       "rewardCount": [
         1,
-        34000
+        12800
       ],
       "unlockValue": 0
     },
@@ -1336,7 +1336,7 @@
       ],
       "rewardCount": [
         1,
-        35500
+        12800
       ],
       "unlockValue": 0
     },
@@ -1356,7 +1356,7 @@
       ],
       "rewardCount": [
         1,
-        36500
+        13200
       ],
       "unlockValue": 0
     },
@@ -1376,7 +1376,7 @@
       ],
       "rewardCount": [
         1,
-        37000
+        13200
       ],
       "unlockValue": 0
     },
@@ -1396,7 +1396,7 @@
       ],
       "rewardCount": [
         1,
-        38000
+        13200
       ],
       "unlockValue": 0
     },
@@ -1416,7 +1416,7 @@
       ],
       "rewardCount": [
         1,
-        39000
+        13600
       ],
       "unlockValue": 0
     },
@@ -1436,7 +1436,7 @@
       ],
       "rewardCount": [
         1,
-        40000
+        13600
       ],
       "unlockValue": 0
     },
@@ -1456,7 +1456,7 @@
       ],
       "rewardCount": [
         1,
-        41000
+        14000
       ],
       "unlockValue": 0
     },
@@ -1476,7 +1476,7 @@
       ],
       "rewardCount": [
         1,
-        42000
+        14000
       ],
       "unlockValue": 0
     },
@@ -1496,7 +1496,7 @@
       ],
       "rewardCount": [
         1,
-        43000
+        14000
       ],
       "unlockValue": 0
     },
@@ -1516,7 +1516,7 @@
       ],
       "rewardCount": [
         1,
-        44500
+        14400
       ],
       "unlockValue": 0
     },
@@ -1536,7 +1536,7 @@
       ],
       "rewardCount": [
         1,
-        45500
+        14400
       ],
       "unlockValue": 0
     },
@@ -1556,7 +1556,7 @@
       ],
       "rewardCount": [
         1,
-        46000
+        14800
       ],
       "unlockValue": 0
     },
@@ -1576,7 +1576,7 @@
       ],
       "rewardCount": [
         1,
-        47500
+        14800
       ],
       "unlockValue": 0
     },
@@ -1596,7 +1596,7 @@
       ],
       "rewardCount": [
         1,
-        49000
+        15200
       ],
       "unlockValue": 0
     },
@@ -1616,7 +1616,7 @@
       ],
       "rewardCount": [
         1,
-        50000
+        15200
       ],
       "unlockValue": 0
     },
@@ -1636,7 +1636,7 @@
       ],
       "rewardCount": [
         1,
-        51000
+        15600
       ],
       "unlockValue": 0
     },
@@ -1656,7 +1656,7 @@
       ],
       "rewardCount": [
         1,
-        52500
+        15600
       ],
       "unlockValue": 0
     },
@@ -1676,7 +1676,7 @@
       ],
       "rewardCount": [
         1,
-        54500
+        16000
       ],
       "unlockValue": 0
     },
@@ -1696,7 +1696,7 @@
       ],
       "rewardCount": [
         1,
-        55500
+        16000
       ],
       "unlockValue": 0
     },
@@ -1716,7 +1716,7 @@
       ],
       "rewardCount": [
         1,
-        56500
+        16400
       ],
       "unlockValue": 0
     },
@@ -1736,7 +1736,7 @@
       ],
       "rewardCount": [
         1,
-        58000
+        16400
       ],
       "unlockValue": 0
     },
@@ -1756,7 +1756,7 @@
       ],
       "rewardCount": [
         1,
-        60000
+        16800
       ],
       "unlockValue": 0
     },
@@ -1776,7 +1776,7 @@
       ],
       "rewardCount": [
         1,
-        61000
+        16800
       ],
       "unlockValue": 0
     },
@@ -1796,7 +1796,7 @@
       ],
       "rewardCount": [
         1,
-        62500
+        17200
       ],
       "unlockValue": 0
     },
@@ -1816,7 +1816,7 @@
       ],
       "rewardCount": [
         1,
-        64500
+        17200
       ],
       "unlockValue": 0
     },
@@ -1836,7 +1836,7 @@
       ],
       "rewardCount": [
         1,
-        67000
+        17600
       ],
       "unlockValue": 0
     },
@@ -1856,7 +1856,7 @@
       ],
       "rewardCount": [
         1,
-        70500
+        18000
       ],
       "unlockValue": 0
     },
@@ -1876,7 +1876,7 @@
       ],
       "rewardCount": [
         1,
-        74000
+        18400
       ],
       "unlockValue": 0
     },
@@ -1896,7 +1896,7 @@
       ],
       "rewardCount": [
         1,
-        78000
+        19200
       ],
       "unlockValue": 0
     },
@@ -1916,7 +1916,7 @@
       ],
       "rewardCount": [
         1,
-        82000
+        19600
       ],
       "unlockValue": 0
     },
@@ -1936,7 +1936,7 @@
       ],
       "rewardCount": [
         1,
-        86000
+        20000
       ],
       "unlockValue": 0
     },
@@ -1956,7 +1956,7 @@
       ],
       "rewardCount": [
         1,
-        90500
+        20400
       ],
       "unlockValue": 0
     },
@@ -1976,7 +1976,7 @@
       ],
       "rewardCount": [
         1,
-        95000
+        21200
       ],
       "unlockValue": 0
     },
@@ -1996,7 +1996,7 @@
       ],
       "rewardCount": [
         1,
-        100000
+        21600
       ],
       "unlockValue": 0
     }

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -262,6 +262,7 @@ GameObject:
   - component: {fileID: 4251176618484867663}
   - component: {fileID: 7108258747564116440}
   - component: {fileID: 9137017659689659031}
+  - component: {fileID: 7933938423984907002}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -341,6 +342,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7933938423984907002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1947865541254548843
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,7 +794,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1125, y: 2436}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

Assets/Res/UI/BackgroundPanel/BackgroundPanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4070827671308158698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 810763235306784088}
+  - component: {fileID: 2755124539871209744}
+  - component: {fileID: 9111540240264165761}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &810763235306784088
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4070827671308158698}
+  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: 6511359846853301410}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2755124539871209744
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4070827671308158698}
+  m_CullTransparentMesh: 1
+--- !u!114 &9111540240264165761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4070827671308158698}
+  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: 0.003921569}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6511359846853301411
 GameObject:
   m_ObjectHideFlags: 0
@@ -32,6 +121,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 810763235306784088}
   - {fileID: 6511359847547714941}
   - {fileID: 6511359847641744680}
   m_Father: {fileID: 0}
@@ -39,7 +129,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6511359846853301409
 MonoBehaviour:

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -225,7 +225,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -2119,7 +2119,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7720912462477243599
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2134,10 +2134,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7858018693182147813}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3131905602591714602
 CanvasRenderer:
@@ -2160,7 +2160,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/CombatHPPanel.prefab

@@ -426,7 +426,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -491,8 +491,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -49.999996, y: 0}
-  m_SizeDelta: {x: 100, y: 9}
+  m_AnchoredPosition: {x: -49.5, y: 0}
+  m_SizeDelta: {x: 99, y: 8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2768628954572887385
 CanvasRenderer:

Assets/Res/UI/CombatPanel.prefab

@@ -940,6 +940,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4287798501111193387}
   - component: {fileID: 8588517758620161246}
+  - component: {fileID: 6678406076135109507}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ' BossHpRoot'
@@ -992,6 +993,21 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!114 &6678406076135109507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340706786225753752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1343676762713764609
 GameObject:
   m_ObjectHideFlags: 0
@@ -9725,7 +9741,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1170, y: 2532}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -30,15 +30,16 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2896655462721008753}
   - {fileID: 9201402782951942412}
+  - {fileID: 5727707923846954762}
+  - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -123,6 +124,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: BackgroundComRoot
+    gameObject: {fileID: 5727707923846954762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1269031383078709346
 GameObject:
@@ -2297,7 +2303,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2896655462721008753
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2338,7 +2344,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2399,6 +2405,51 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7305190763264252453
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5727707923846954762}
+  - component: {fileID: 9014541910258728495}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BackgroundComRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5727707923846954762
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7305190763264252453}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9014541910258728495
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7305190763264252453}
+  m_CullTransparentMesh: 1
 --- !u!1 &7488814943693437896
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -459,7 +459,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 898, y: 1944}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -1196,6 +1196,7 @@ GameObject:
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
   - component: {fileID: 7009910568533120546}
+  - component: {fileID: 3054755758390033935}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1278,6 +1279,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10151
+--- !u!114 &3054755758390033935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

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

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -835,11 +835,11 @@ RectTransform:
   - {fileID: 4792204723085321954}
   m_Father: {fileID: 8727043245965595146}
   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.002319336, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 2205.539, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -877,7 +877,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -202,11 +202,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5861910991656876453}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 0}
-  m_Pivot: {x: 0.5, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &49434551961163824
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -214,7 +214,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2334654530509091999}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -228,7 +228,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2334654530509091999}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -238,7 +238,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 7
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -1948,10 +1948,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7939915476203004500}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &273182018649462892
 CanvasRenderer:
@@ -1974,7 +1974,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.10588236, g: 0.16862746, b: 0.21960786, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab

@@ -33,16 +33,12 @@ RectTransform:
   m_Children:
   - {fileID: 8577276363370351875}
   - {fileID: 5795167107488113912}
-  - {fileID: 642166502082881739}
-  - {fileID: 7275756716955270112}
-  - {fileID: 3462782198931448394}
-  - {fileID: 2155455756640062929}
   m_Father: {fileID: 0}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4337750289727126355
 CanvasRenderer:
@@ -116,12 +112,16 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 642166502082881739}
+  - {fileID: 7275756716955270112}
+  - {fileID: 3462782198931448394}
+  - {fileID: 2155455756640062929}
   m_Father: {fileID: 7590336990808084973}
   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: -812}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5874766811546312704
@@ -193,7 +193,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8577276363370351875
 RectTransform:
   m_ObjectHideFlags: 0
@@ -208,10 +208,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7590336990808084973}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5826178889770156698
 CanvasRenderer:
@@ -234,7 +234,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -270,7 +270,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 7590336990808084973}
+    m_TransformParent: {fileID: 5795167107488113912}
     m_Modifications:
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Pivot.x
@@ -409,7 +409,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 7590336990808084973}
+    m_TransformParent: {fileID: 5795167107488113912}
     m_Modifications:
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Pivot.x
@@ -524,7 +524,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 7590336990808084973}
+    m_TransformParent: {fileID: 5795167107488113912}
     m_Modifications:
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Pivot.x
@@ -667,7 +667,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 7590336990808084973}
+    m_TransformParent: {fileID: 5795167107488113912}
     m_Modifications:
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Pivot.x

Assets/Res/UI/LevelChoosePanel/Places/地图.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CSsd4H+tAS3Q7HPjhde13RnagSF15EnlvZrkF8CSfSDi2ISId2oOZR1zhsTv
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u5730\u56FE"
-  assetBundleVariant: 

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1053,6 +1053,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1798015912972164048}
   - component: {fileID: 5298345569981142061}
+  - component: {fileID: 7484319669545627100}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: PlayerInfo
@@ -1076,10 +1077,10 @@ RectTransform:
   - {fileID: 7383390820428798537}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 63.271}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -220, y: 0}
+  m_SizeDelta: {x: 440, y: 63.271}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5298345569981142061
 CanvasRenderer:
@@ -1089,6 +1090,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1760937640502948944}
   m_CullTransparentMesh: 1
+--- !u!114 &7484319669545627100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760937640502948944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1843990269898586624
 GameObject:
   m_ObjectHideFlags: 0
@@ -1324,6 +1340,7 @@ GameObject:
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
   - component: {fileID: 4472099066628972237}
+  - component: {fileID: 6709258874224180911}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -1460,6 +1477,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &6709258874224180911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -5088,6 +5120,7 @@ GameObject:
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
   - component: {fileID: 7489813112688999977}
+  - component: {fileID: 3102808955735513020}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -5224,6 +5257,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3102808955735513020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0
@@ -5345,7 +5393,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 439, y: 951}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -287,7 +287,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8245128900902318849
 RectTransform:
   m_ObjectHideFlags: 0
@@ -328,7 +328,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 8433458334176511681}
   - component: {fileID: 4170656597210444513}
   - component: {fileID: 4909662600279504468}
+  - component: {fileID: 8077185464686204676}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -435,6 +436,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8077185464686204676
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &5692448650326671997
 GameObject:
   m_ObjectHideFlags: 0
@@ -749,7 +765,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

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

@@ -176,7 +176,7 @@ namespace Fort23.Mono
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
 
-            current = EventSystem.current;
+            current = Canvas.GetComponentInChildren<EventSystem>();
             Assembly assembly = Assembly.Load("Fort23.Mono");
             BackgroundPanelType = assembly.GetType(" Fort23.Mono.BackgroundPanel");
 
@@ -240,7 +240,7 @@ namespace Fort23.Mono
         public void SetEventSystemEnable(bool value)
         {
             if (current != null)
-                current.enabled = value;
+                current.gameObject.SetActive(value);
         }
 
         [CustomMethod(CustomMethodType.Update)]
@@ -362,7 +362,7 @@ namespace Fort23.Mono
                 {
                     if (current != null)
                     {
-                        SetEventSystemEnable(false);
+                        // SetEventSystemEnable(false);
                     }
 
 
@@ -439,7 +439,7 @@ namespace Fort23.Mono
 
                         if (current != null)
                         {
-                            SetEventSystemEnable(true);
+                            // SetEventSystemEnable(true);
                         }
 
 
@@ -464,7 +464,7 @@ namespace Fort23.Mono
                     {
                         if (current != null)
                         {
-                            SetEventSystemEnable(true);
+                            // SetEventSystemEnable(true);
                         }
 
                         // 界面数据没准备好，因此本次操作将被销毁
@@ -581,8 +581,7 @@ namespace Fort23.Mono
                     if (isShowBG)
                     {
                         uiPanel.IsShowCustomBGPanel = true;
-                        if (!AllShowBGUIs.Contains(uiPanel))
-                            AllShowBGUIs.Add(uiPanel);
+
                         await GetBackgroundPanel(uiPanel, GetLayer(layer));
                     }
 
@@ -621,12 +620,6 @@ namespace Fort23.Mono
                         await uiPanel.Open();
 
 
-                        if (current != null)
-                        {
-                            SetEventSystemEnable(true);
-                        }
-
-
                         await TimerComponent.Instance.WaitAsync(1); //等待一帧 让渲染完成后在执行完成逻辑
                         callback?.Invoke(uiPanel);
 
@@ -636,14 +629,16 @@ namespace Fort23.Mono
 
                         if (isShowBG)
                         {
+                            if (!AllShowBGUIs.Contains(uiPanel))
+                                AllShowBGUIs.Add(uiPanel);
                             var popupPanel = GetComponent(BackgroundPanelType) as UIPanel;
-                            // popupPanel.transform.SetAsFirstSibling();
                             int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
                             popupPanel.transform.SetSiblingIndex(index01 - 1);
-                            // uiPanel.IsShowCustomBGPanel = true;
-                            // if (!AllShowBGUIs.Contains(uiPanel))
-                            //     AllShowBGUIs.Add(uiPanel);
-                            // await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                        }
+
+                        if (current != null)
+                        {
+                            SetEventSystemEnable(true);
                         }
 
                         return uiPanel;

Assets/Scripts/Core/UI/UTool/UIAdapter/UIAdapterForSafeArea.cs

@@ -9,6 +9,8 @@ namespace Utility.UIAdapter
         {
             Left,
             Right,
+            Up,
+            Down,
         }
 
         [Header("固定偏移")] public float offsetX;
@@ -52,7 +54,23 @@ namespace Utility.UIAdapter
             var safeArea = Screen.safeArea;
             float ratio = _canvasScaler.referenceResolution.y * _canvasScaler.matchWidthOrHeight / Screen.height -
                           _canvasScaler.referenceResolution.x * (_canvasScaler.matchWidthOrHeight - 1) / Screen.width;
-            if (anchorPointType == AnchorPointType.Left)
+            if (anchorPointType == AnchorPointType.Up)
+            {
+                if (safeArea.yMin > 0)
+                {
+                    if (offsetX > 0)
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y- offsetX);
+                    }
+                    else
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y- safeArea.yMin * ratio);
+                    }
+                }
+            }
+            else if (anchorPointType == AnchorPointType.Left)
             {
                 if (safeArea.xMin > 0)
                 {
@@ -68,7 +86,7 @@ namespace Utility.UIAdapter
                     }
                 }
             }
-            else
+            else if (anchorPointType == AnchorPointType.Right)
             {
                 if (safeArea.xMin > 0)
                 {

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -64,7 +64,7 @@ namespace GameLogic.Combat.CombatType
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             await TestCombat(cTaskAwaitBuffer);
-
+           
             await cTaskAwaitBuffer.WaitAll();
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
@@ -154,7 +154,11 @@ namespace GameLogic.Combat.CombatType
             heroEntity.isCreateHeroHp = index != 0;
             Vector3 pos = startPos + quaternion * enemyHeroPosOff[index];
             cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), heroInfo, pos,
-                delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
+                delegate(CombatHeroEntity entity)
+                {
+                    combatController.CombatHeroController.AddHero(entity);
+                    entity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
+                }));
         }
 
         protected override void ProUpdate(float t)
@@ -182,10 +186,11 @@ namespace GameLogic.Combat.CombatType
             heroEntity.number = 0;
 
             HeroInfo heroInfo = PlayerManager.Instance.myHero;
-            if (_startCombatInfo.levelBattleId== 10001)
+            if (_startCombatInfo.levelBattleId == 10001)
             {
                 heroInfo = PlayerManager.Instance.yindaoHeroData;
             }
+
             if (CombatController.currActiveCombat.playerHeroEntity != null)
             {
                 GameObjectPool gameObjectPool = CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject
@@ -204,8 +209,6 @@ namespace GameLogic.Combat.CombatType
             }
             else
             {
-                
-
                 Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -95,6 +95,10 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
 
         poolInterface.own.transform.position = pos;
+        if (IsEnemy)
+        {
+            poolInterface.own.SetActive(false);
+        }
         // if (!IsEnemy)
         // {
         //     GameObjectPool fx_hero_quan =
@@ -167,7 +171,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         //     combatHeroAnimtion = new CombatHeroGPUAnimtion();
         // }
 
-        poolInterface.own.SetActive(true);
+      
         combatHeroAnimtion.Init(this);
         CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
         if (isCreateHeroHp)
@@ -179,8 +183,9 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
         await heroMagicWeaponControl.InitMagicWeapon(this, isPlayer);
         CombatReportManager.Instance.AddCombatReportInfo(this);
+        poolInterface.own.SetActive(true);
         callBack?.Invoke(this);
-
+      
         return this;
     }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -1,5 +1,6 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
@@ -15,52 +16,44 @@ namespace GameLogic.Combat.Hero.State
         {
         }
 
-        public override bool IsUpdateLockTarget()
-        {
-            return false;
-        }
 
         protected override void ProEnter()
         {
-            stratPos = combatHeroEntity.dotPos;
-            currTime = 0;
-            // endpos
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
-                delegate(ParticleSystemPool obj)
-                {
-                    loopFx = obj;
-                    obj.own.transform.position = stratPos;
-                });
-            // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-            // //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-            // //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
-            // // if (timeLineEventLogicGroup != null)
-            // // {
-            // //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-            // //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
-            // //     {
-            // //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // //         combatHeroEntity.CombatAIBasic.isAlert = false;
-            // //     };
-            // //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            // // }
-            // // else
-            // // {
-            // //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // //     combatHeroEntity.CombatAIBasic.isAlert = false;
-            // //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // // }
+            if (combatHeroEntity.IsEnemy)
+            {
+                combatHeroEntity.GameObject.SetActive(false);
+                stratPos = combatHeroEntity.dotPos+CombatController.currActiveCombat.playerHeroEntity.faceDir*100;
+                endpos = combatHeroEntity.dotPos;
+                currTime = 0;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
+                    delegate(ParticleSystemPool obj)
+                    {
+                        loopFx = obj;
+                        obj.own.transform.position = stratPos;
+                    });
+            }
+            else
+            {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            }
         }
 
         protected override void ProUpdate(float t)
         {
-            currTime += t;
-            if (currTime > 2)
+            currTime += t*1.3f;
+            if (loopFx != null)
+            {
+                loopFx.own.transform.position = Vector3.Lerp(stratPos, endpos, currTime);
+            }
+
+            if (currTime > 1)
             {
+                combatHeroEntity.GameObject.SetActive(true);
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab",
-                    delegate(ParticleSystemPool obj) { obj.own.transform.position = stratPos; });
+                    delegate(ParticleSystemPool obj)
+                    {
+                        obj.own.transform.position = endpos;
+                    });
                 GObjectPool.Instance.Recycle(loopFx);
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
             }

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -26,6 +26,8 @@ namespace GameLogic.Combat
             assetHandle.AssetObject<GameObject>().SetActive(true);
             EventManager.Instance.AddEventListener(CustomEventType.ShowLoadingUI, ShowLoadingUI);
             EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI, CloseLoadingUI);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab", Prestore: true);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab", Prestore: true);
 
             // 
         }
@@ -34,10 +36,12 @@ namespace GameLogic.Combat
         {
             LoadingPanel.OpenLodingPanel();
         }
+
         private void CloseLoadingUI(IEventData eventData)
         {
             UIManager.Instance.HideUIUIPanel<LoadingPanel>();
         }
+
         public void AddCombatController(CombatController combatController)
         {
             this.CombatController = combatController;
@@ -67,7 +71,8 @@ namespace GameLogic.Combat
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 
-        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi,int level, System.Action<bool> caombatFinish = null)
+        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi, int level,
+            System.Action<bool> caombatFinish = null)
         {
             await MarskPanel.OpenPanel();
             UIManager.Instance.HindCurrAllShowPanel();
@@ -76,7 +81,7 @@ namespace GameLogic.Combat
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;
             startCombatInfo.monsterLevel = level;
-            startCombatInfo.levelBattleId= levelBattleId;
+            startCombatInfo.levelBattleId = levelBattleId;
             startCombatInfo.isAutoCombat = AccountFileInfo.Instance.playerData.isAutoCombat;
             await StartCombat(startCombatInfo);
 

Assets/Scripts/GameUI/UI/BackgroundCom.cs

@@ -29,6 +29,8 @@ namespace Fort23.Mono
         }
         
         
+        
+        
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {

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

@@ -46,12 +46,13 @@ namespace Fort23.Mono
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             transform.position = p2;
+            icon.color = combatMagicWeaponEntity.IsEnemy ? new Color(0.88f, 0.13f, 0.11f):new Color(0.43f, 0.87f, 0.52f);
         }
 
         public void UpdateHp()
         {
             float bl = combatMagicWeaponEntity.HpBl / combatMagicWeaponEntity.MaxHp;
-            rectTransform.sizeDelta = new Vector2(100 * bl, 9);
+            rectTransform.sizeDelta = new Vector2(99 * bl, 8);
         }
     }
 }

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

@@ -14,6 +14,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "BossInfoPanel")]
     public partial class BossInfoPanel : UIPanel
     {
+        private BackgroundCom _backgroundCom;
         private bool isOk;
 
         private LevelbattleConfig levelbattleConfig;
@@ -37,6 +38,13 @@ namespace Fort23.Mono
         {
         }
 
+        protected async override CTask ProOpen()
+        {
+            _backgroundCom = await UIManager.Instance.CreateGComponent<BackgroundCom>(null, root: BackgroundComRoot);
+            await base.ProOpen();
+            return;
+        }
+
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -80,8 +88,18 @@ namespace Fort23.Mono
                 //玩家等级
                 if (groupConfig.GroupMonsterLevel == null || groupConfig.GroupMonsterLevel[i] == -1)
                 {
-                    MonsterPowerUpConfig heroPowerUpConfig =
-                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+                    MonsterPowerUpConfig heroPowerUpConfig = default;
+                    if (eventList == null)
+                    {
+                        heroPowerUpConfig =
+                            ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero
+                                .powerUpConfig.ID);
+                    }
+                    else
+                    {
+                        heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+                    }
+
 
                     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
                 }
@@ -100,19 +118,8 @@ namespace Fort23.Mono
                 bossInfoHeadWidget.OnClick = OnClick;
                 BossInfoHeadWidgets.Add(bossInfoHeadWidget);
             }
-            // foreach (var i in groupConfig.GroupMonster)
-            // {
-            //    
-            //   
-            // }
-
-            // heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            // heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
-            //
-            // CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-            // combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+
             BossInfoHeadWidgets[0].OnPointerClick();
-            // UpdateInfo(2,BossInfoHeadWidgets[0]);
         }
 
         private void OnClick(ItemWidgetBasic obj)
@@ -270,6 +277,8 @@ namespace Fort23.Mono
 
         public async override CTask Close()
         {
+            UIManager.Instance.DormancyGComponent(_backgroundCom);
+            _backgroundCom = null;
             foreach (var faBaoWidget in gongFaWidgetType2s)
             {
                 UIManager.Instance.DormancyGComponent(faBaoWidget);
@@ -292,9 +301,7 @@ namespace Fort23.Mono
         public async static CTask OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
         {
             BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
-                uiData: new object[] { levebattleId, CurrentEventList, }, isShowBG: true);
-            // bossInfoPanel.CustomInit(levebattleId, result);
-            // return await result;
+                uiData: new object[] { levebattleId, CurrentEventList, });
         }
     }
 }

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

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

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

@@ -157,22 +157,7 @@ namespace Fort23.Mono
 
                 Text_Eventcondition.text = desc;
             }
-
-            // if (eventList.isCompleted)
-            // {
-            //     Text_Go.text = LanguageManager.Instance.Text(10240);
-            //     Btn_Go.image.color = new Color32(200, 199, 199, 255);
-            // }
-            // else if (eventList.isCompleted1)
-            // {
-            //     Text_Go.text = LanguageManager.Instance.Text(10157);
-            //     Btn_Go.image.color = new Color32(179, 39, 65, 255);
-            // }
-            // else
-            // {
-            //     Btn_Go.image.color = new Color32(206, 168, 105, 255);
-            // }
-
+            
 
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
                                               eventList.guid);

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

@@ -53,12 +53,12 @@ namespace Fort23.Mono.Phases
         {
             if (actionList.Count > guideIdx)
             {
-                pgm.SetOnClickMask(true);
+                UIManager.Instance.SetEventSystemEnable(false);
                 pgm.ResetPlayerGuide();
                 guideIdx++;
                 SaveStep(guideIdx);
                 await actionList[guideIdx](null);
-                pgm.SetOnClickMask(false);
+                UIManager.Instance.SetEventSystemEnable(true);
                 if (isCompleted)
                 {
                     EventManager.Instance.Dispatch(CustomEventType.GuideComplete, null);

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

@@ -539,7 +539,7 @@ namespace Fort23.Mono
                 return;
             }
 
-            UIManager.Instance.SetEventSystemEnable(false);
+            // UIManager.Instance.SetEventSystemEnable(false);
 
 
             curPhase = phase;
@@ -551,7 +551,7 @@ namespace Fort23.Mono
             GuidePanel guildPanel =
                 await UIManager.Instance.LoadAndOpenPanel<GuidePanel>(null, UILayer.Top, isFocus: false);
             dialogBox.Init();
-            UIManager.Instance.SetEventSystemEnable(true);
+            // UIManager.Instance.SetEventSystemEnable(true);
 
             finger = guildPanel.GuideHand;
             fxTrans01 = guildPanel.FocusFrame01;
@@ -754,7 +754,7 @@ namespace Fort23.Mono
             SetBlackAlpha(guideConfig.blackAlpha);
             ShowDialogBox(action, str);
             await dialogBox.SetDiTex(guideConfig, guideConfig.SpeakerImage);
-            UIManager.Instance.SetEventSystemEnable(true);
+            // UIManager.Instance.SetEventSystemEnable(true);
         }
 
         /// <summary>
@@ -1215,7 +1215,7 @@ namespace Fort23.Mono
         /// </summary>
         public void StepInit()
         {
-            UIManager.Instance.SetEventSystemEnable(false);
+           
             _customVectorTween?.Kill();
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();

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

@@ -120,6 +120,7 @@ namespace Fort23.Mono
                     //小突破
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
+                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
                         var heroAttributData =
                             HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
                         PlayerManager.Instance.myHero.Upgrade();
@@ -156,7 +157,7 @@ namespace Fort23.Mono
                         await heroBreakthroughSuccessPanel.UIClosed();
 
 
-                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
+                      
                     }
                     //大突破
                     else

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

@@ -141,7 +141,8 @@ namespace Fort23.Mono
                 await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
             gameObjectPool2.own.transform.parent = PlacesRoot;
             gameObjectPool2.own.transform.localScale = Vector3.one;
-            gameObjectPool2.own.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
+            gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMin = Vector2.zero;
+            gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMax = Vector2.zero;
 
             placesItem = new PlacesItem();
             await placesItem.CustomInit(bigMapConfig.ID, gameObjectPool2, PlacesOnClick);

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

@@ -56,6 +56,7 @@ namespace Fort23.Mono
             }
 
 
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
             foreach (var qiankundaiConfig in qiankundaiConfigs)
             {
                 for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
@@ -64,6 +65,7 @@ namespace Fort23.Mono
                     {
                         List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
                             qiankundaiConfig.DropCount[i]);
+                        itemInfos.AddRange(itemInfo);
                         foreach (var info in itemInfo)
                         {
                             WidgetItem widgetItem =
@@ -77,15 +79,32 @@ namespace Fort23.Mono
                         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.ChoukaID[i]);
                         foreach (var i1 in dropConfig.showItemId)
                         {
-                            WidgetItem widgetItem =
-                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                            widgetItem.InitWidget(new ItemInfo(i1, 0));
-                            items.Add(widgetItem);
+                            itemInfos.Add(new ItemInfo(i1, 0));
+                            // WidgetItem widgetItem =
+                            //     await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            // widgetItem.InitWidget(new ItemInfo(i1, 0));
+                            // items.Add(widgetItem);
                         }
                     }
                 }
             }
 
+
+            using (CTaskAwaitBuffer<WidgetItem> cta = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                foreach (var itemInfo in itemInfos)
+                {
+                    cta.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, Content));
+                  
+                }
+                items = await cta.WaitAll();
+            }
+
+            for (var i = 0; i < itemInfos.Count; i++)
+            {
+                items[i].InitWidget(itemInfos[i]);
+            }
+
             return await base.AsyncInit(uiData);
         }
 

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

@@ -73,7 +73,7 @@ namespace Fort23.Mono
 
                 RewardsPanel.OpenPanel(itemInfos);
                 CustomInit();
-                
+
                 RedDotManager.Instance.AllRedDotUpDate();
             });
 
@@ -94,14 +94,16 @@ namespace Fort23.Mono
             }
 
             items.Clear();
-   
+
             Text_Desc.text =
                 LanguageManager.Instance.Text(10172,
                     UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
                     UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
-    
-            
-            
+
+
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
+
+
             //可以掉落每日刷新奖励
             if (TimeHelper.ClientNow() >= AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime)
             {
@@ -112,24 +114,32 @@ namespace Fort23.Mono
                     {
                         List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
                             qiankundaiConfig.DropCount[i]);
-                        foreach (var info in itemInfo)
-                        {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                            widgetItem.InitWidget(info);
-                            items.Add(widgetItem);
-                        }
+                        itemInfos.AddRange(itemInfo);
+          
                     }
                 }
             }
-            
-            
+
+
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                widgetItem.InitWidget(new ItemInfo(playerDataQiankundaiItemData));
-                items.Add(widgetItem);
+                itemInfos.Add(new ItemInfo(playerDataQiankundaiItemData));
+   
             }
 
+            using (CTaskAwaitBuffer<WidgetItem> cta = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                for (var i = 0; i < itemInfos.Count; i++)
+                {
+                    cta.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, Content));
+                }
+                items = await cta.WaitAll();
+            }
+
+            for (var i = 0; i < itemInfos.Count; i++)
+            {
+                items[i].InitWidget(itemInfos[i]);
+            }
         }
 
         public static async CTask OpenPanel()

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

@@ -45,7 +45,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                    Text_RefenceTime.text =
+                        PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 }
             }
         }
@@ -70,7 +71,8 @@ namespace Fort23.Mono
             Text_Title.text = LanguageManager.Instance.Text(_shopConfig.shopName);
             if (this.shopData.refreshTime != -1)
             {
-                Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                Text_RefenceTime.text =
+                    PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 RefenceTimeRoot.gameObject.SetActive(true);
             }
             else
@@ -79,21 +81,36 @@ namespace Fort23.Mono
             }
 
 
-            foreach (var shopItem in shopData.shopItemList)
+            using (CTaskAwaitBuffer<ShopItemWidgetType2> cts = new CTaskAwaitBuffer<ShopItemWidgetType2>())
             {
-                // if (shopData.id == 1 || shopData.id == 5)
-                // {
-                //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
-                //     shopItemWidgetType1.CustomInit(shopItem);
-                //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
-                // }
-                // else
+                foreach (var shopItem in shopData.shopItemList)
                 {
-                    ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
-                    shopItemWidgetType1.CustomInit(shopItem);
-                    _shopItemWidgetType2s.Add(shopItemWidgetType1);
+                    cts.AddTask(UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect));
                 }
+
+                _shopItemWidgetType2s = await cts.WaitAll();
             }
+
+            for (var i = 0; i < shopData.shopItemList.Count; i++)
+            {
+                _shopItemWidgetType2s[i].CustomInit(shopData.shopItemList[i]);
+            }
+
+            // foreach (var shopItem in shopData.shopItemList)
+            // {
+            //     // if (shopData.id == 1 || shopData.id == 5)
+            //     // {
+            //     //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
+            //     //     shopItemWidgetType1.CustomInit(shopItem);
+            //     //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
+            //     // }
+            //     // else
+            //     {
+            //         ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
+            //         shopItemWidgetType1.CustomInit(shopItem);
+            //         _shopItemWidgetType2s.Add(shopItemWidgetType1);
+            //     }
+            // }
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }

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

@@ -34,8 +34,10 @@ namespace Fort23.Mono
 
             Btn_GetWard.onClick.AddListener(async () =>
             {
-                if (towerLevelData == null || towerLevelData.reward)
+                if (towerLevelData == null || towerLevelData.reward ||  !towerLevelData.finish)
                 {
+                    ItemDetailsPanel.OpenPanel(
+                        new ItemInfo(_towerInfoConfig.reward[0], _towerInfoConfig.rewardCount[0]));
                     return;
                 }
 

UserSettings/EditorUserSettings.asset

@@ -54,7 +54,7 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969d89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf