瀏覽代碼

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
#	Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
DESKTOP-BGJIU14\ck 1 天之前
父節點
當前提交
d480a00c7d
共有 38 個文件被更改,包括 2452 次插入1217 次删除
  1. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
  2. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat
  3. 2 2
      Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
  4. 1055 0
      Assets/Art/cs3.scene
  5. 117 117
      Assets/Res/Config/EventConfig.json
  6. 112 112
      Assets/Res/Config/FabaoPowerupConfig.json
  7. 174 174
      Assets/Res/Config/LanguageChineseConfig.json
  8. 112 112
      Assets/Res/Config/MonsterPowerUpConfig.json
  9. 243 243
      Assets/Res/Config/ResourceLevelConfig.json
  10. 100 100
      Assets/Res/Config/TowerInfoConfig.json
  11. 91 1
      Assets/Res/UI/BackgroundPanel/BackgroundPanel.prefab
  12. 6 6
      Assets/Res/UI/BoxPanel/BoxPanel.prefab
  13. 55 4
      Assets/Res/UI/DivineSence/BossInfoPanel.prefab
  14. 1 1
      Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab
  15. 72 0
      Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller
  16. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller.meta
  17. 127 0
      Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim
  18. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim.meta
  19. 5 5
      Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab
  20. 53 31
      Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab
  21. 11 11
      Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab
  22. 20 20
      Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab
  23. 二進制
      Assets/Res/UI/LevelChoosePanel/Places/地图.png
  24. 0 203
      Assets/Res/UI/LevelChoosePanel/Places/地图.png.meta
  25. 3 3
      Assets/Res/UI/SentimentPanel/SentimentPanel.prefab
  26. 23 23
      Assets/Res/UI/ShopPanel/DaiJinJuanWidgetopen.anim
  27. 8 26
      Assets/Res/UI/TipMessagePanel/showTips.anim
  28. 2 0
      Assets/Scripts/GameUI/UI/BackgroundCom.cs
  29. 24 17
      Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs
  30. 11 0
      Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanelData.cs
  31. 2 2
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs
  32. 2 1
      Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs
  33. 3 1
      Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs
  34. 二進制
      Excel2Json/Excel/EventConfig.xlsx
  35. 二進制
      Excel2Json/Excel/FabaoConfig.xlsx
  36. 二進制
      Excel2Json/Excel/MonsterPowerUp.xlsx
  37. 二進制
      Excel2Json/Excel/ResourceLevel.xlsx
  38. 二進制
      Excel2Json/Excel/Tower.xlsx

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

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

+ 2 - 2
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.1563037
+    - _Alpha: 0.32599068
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.26742887
+    - _MainTexOffsetU: 0.07113081
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

文件差異過大導致無法顯示
+ 1055 - 0
Assets/Art/cs3.scene


+ 117 - 117
Assets/Res/Config/EventConfig.json

@@ -83,7 +83,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -10000
+        -5000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -362,7 +362,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -15000
+        -7500
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -641,7 +641,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -20000
+        -10000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -920,7 +920,7 @@
       ],
       "PrizeNums": [
         -20000,
-        -30000
+        -15000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -1199,7 +1199,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -50000
+        -20000
       ],
       "RefreshProbability": 200,
       "RefreshCount": 0,
@@ -1844,7 +1844,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        650
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1878,7 +1878,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        650
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1965,7 +1965,7 @@
       "PrizeNums": [
         1,
         1,
-        750
+        700
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2002,7 +2002,7 @@
       "PrizeNums": [
         1,
         1,
-        800
+        750
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2041,7 +2041,7 @@
       "PrizeNums": [
         1,
         1,
-        850
+        750
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2083,7 +2083,7 @@
       "PrizeNums": [
         1,
         1,
-        850
+        800
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2122,7 +2122,7 @@
       "PrizeNums": [
         1,
         1,
-        900
+        800
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2171,7 +2171,7 @@
       "PrizeNums": [
         1,
         1,
-        950
+        800
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2202,7 +2202,7 @@
       "PrizeNums": [
         1,
         1,
-        1000
+        850
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2235,7 +2235,7 @@
       "PrizeNums": [
         1,
         1,
-        1000
+        850
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2277,7 +2277,7 @@
       "PrizeNums": [
         1,
         1,
-        1100
+        900
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2309,7 +2309,7 @@
       "PrizeNums": [
         1,
         1,
-        1150
+        950
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2352,7 +2352,7 @@
       "PrizeNums": [
         1,
         1,
-        1150
+        900
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2389,7 +2389,7 @@
       "PrizeNums": [
         1,
         1,
-        1350
+        1000
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2427,7 +2427,7 @@
       "PrizeNums": [
         1,
         1,
-        1500
+        1050
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2492,7 +2492,7 @@
       "PrizeNums": [
         1,
         1,
-        1650
+        1100
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2522,7 +2522,7 @@
       "PrizeNums": [
         1,
         1,
-        1750
+        1150
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2571,7 +2571,7 @@
       "PrizeNums": [
         1,
         1,
-        1850
+        1150
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2608,7 +2608,7 @@
       "PrizeNums": [
         1,
         1,
-        2050
+        1200
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -2653,7 +2653,7 @@
       "PrizeNums": [
         1,
         1,
-        2250
+        1300
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -3623,7 +3623,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3806,7 +3806,7 @@
       "PrizeNums": [
         1,
         2,
-        700
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3896,7 +3896,7 @@
       "PrizeNums": [
         1,
         1,
-        750
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3978,7 +3978,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        650
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4059,7 +4059,7 @@
       "PrizeNums": [
         1,
         2,
-        750
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4100,7 +4100,7 @@
       "PrizeNums": [
         1,
         2,
-        800
+        750
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4144,7 +4144,7 @@
       "PrizeNums": [
         1,
         1,
-        850
+        750
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4189,7 +4189,7 @@
       "PrizeNums": [
         1,
         1,
-        2050
+        1200
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -4228,7 +4228,7 @@
       "PrizeNums": [
         1,
         1,
-        2050
+        1250
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4270,7 +4270,7 @@
       "PrizeNums": [
         1,
         1,
-        2050
+        1250
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4310,7 +4310,7 @@
       "PrizeNums": [
         1,
         2,
-        2100
+        1250
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4350,7 +4350,7 @@
       "PrizeNums": [
         1,
         2,
-        2100
+        1250
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4393,7 +4393,7 @@
       "PrizeNums": [
         1,
         1,
-        2150
+        1250
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4434,7 +4434,7 @@
       "PrizeNums": [
         1,
         1,
-        850
+        800
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -4473,7 +4473,7 @@
       "PrizeNums": [
         1,
         1,
-        950
+        850
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4513,7 +4513,7 @@
       "PrizeNums": [
         1,
         1,
-        1050
+        900
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4554,7 +4554,7 @@
       "PrizeNums": [
         1,
         2,
-        1150
+        950
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4595,7 +4595,7 @@
       "PrizeNums": [
         1,
         2,
-        1300
+        1000
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4634,7 +4634,7 @@
       "PrizeNums": [
         1,
         1,
-        1450
+        1050
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4675,7 +4675,7 @@
       "PrizeNums": [
         1,
         1,
-        1150
+        950
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -4714,7 +4714,7 @@
       "PrizeNums": [
         1,
         1,
-        1300
+        1000
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4755,7 +4755,7 @@
       "PrizeNums": [
         1,
         1,
-        1450
+        1050
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4796,7 +4796,7 @@
       "PrizeNums": [
         1,
         2,
-        1600
+        1100
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4839,7 +4839,7 @@
       "PrizeNums": [
         1,
         1,
-        1750
+        1150
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4889,7 +4889,7 @@
         1003
       ],
       "PrizeNums": [
-        5300,
+        2650,
         550
       ],
       "RefreshProbability": 35,
@@ -4929,7 +4929,7 @@
         1003
       ],
       "PrizeNums": [
-        5500,
+        2750,
         550
       ],
       "RefreshProbability": 35,
@@ -4971,7 +4971,7 @@
       ],
       "PrizeNums": [
         1,
-        5800,
+        2900,
         600
       ],
       "RefreshProbability": 30,
@@ -5014,7 +5014,7 @@
         1003
       ],
       "PrizeNums": [
-        6100,
+        3000,
         600
       ],
       "RefreshProbability": 25,
@@ -5053,7 +5053,7 @@
       ],
       "PrizeNums": [
         3,
-        6400,
+        3150,
         650
       ],
       "RefreshProbability": 20,
@@ -5110,8 +5110,8 @@
       ],
       "PrizeNums": [
         1,
-        6800,
-        700
+        3250,
+        650
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5157,7 +5157,7 @@
         1003
       ],
       "PrizeNums": [
-        5500,
+        2750,
         550
       ],
       "RefreshProbability": 40,
@@ -5198,7 +5198,7 @@
         1003
       ],
       "PrizeNums": [
-        5800,
+        2900,
         600
       ],
       "RefreshProbability": 35,
@@ -5246,7 +5246,7 @@
         1003
       ],
       "PrizeNums": [
-        6100,
+        3000,
         600
       ],
       "RefreshProbability": 30,
@@ -5291,7 +5291,7 @@
       ],
       "PrizeNums": [
         1,
-        6400,
+        3150,
         650
       ],
       "RefreshProbability": 25,
@@ -5332,8 +5332,8 @@
         1003
       ],
       "PrizeNums": [
-        6800,
-        700
+        3250,
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5384,7 +5384,7 @@
       ],
       "PrizeNums": [
         1,
-        7100,
+        3400,
         700
       ],
       "RefreshProbability": 15,
@@ -5448,7 +5448,7 @@
         1003
       ],
       "PrizeNums": [
-        6100,
+        3000,
         600
       ],
       "RefreshProbability": 40,
@@ -5484,7 +5484,7 @@
         1003
       ],
       "PrizeNums": [
-        6400,
+        3150,
         650
       ],
       "RefreshProbability": 35,
@@ -5524,8 +5524,8 @@
       ],
       "PrizeNums": [
         1,
-        6800,
-        700
+        3250,
+        650
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5565,7 +5565,7 @@
       ],
       "PrizeNums": [
         1,
-        7100,
+        3400,
         700
       ],
       "RefreshProbability": 25,
@@ -5609,8 +5609,8 @@
         1003
       ],
       "PrizeNums": [
-        6800,
-        700
+        3250,
+        650
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5649,8 +5649,8 @@
         1003
       ],
       "PrizeNums": [
-        7500,
-        750
+        3500,
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5701,8 +5701,8 @@
       ],
       "PrizeNums": [
         1,
-        8300,
-        850
+        3750,
+        750
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5743,8 +5743,8 @@
         1003
       ],
       "PrizeNums": [
-        7900,
-        800
+        3650,
+        750
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5780,8 +5780,8 @@
         1003
       ],
       "PrizeNums": [
-        8700,
-        850
+        3900,
+        800
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5830,8 +5830,8 @@
       ],
       "PrizeNums": [
         1,
-        9600,
-        950
+        4150,
+        850
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5874,8 +5874,8 @@
         1003
       ],
       "PrizeNums": [
-        9100,
-        900
+        4000,
+        800
       ],
       "RefreshProbability": 40,
       "RefreshCount": 1,
@@ -5924,8 +5924,8 @@
         1003
       ],
       "PrizeNums": [
-        9600,
-        950
+        4150,
+        850
       ],
       "RefreshProbability": 35,
       "RefreshCount": 1,
@@ -5965,8 +5965,8 @@
       ],
       "PrizeNums": [
         1,
-        10100,
-        1000
+        4250,
+        850
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -6005,8 +6005,8 @@
         1003
       ],
       "PrizeNums": [
-        10600,
-        1050
+        4400,
+        900
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -6047,8 +6047,8 @@
         1003
       ],
       "PrizeNums": [
-        11100,
-        1100
+        4500,
+        900
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -6093,8 +6093,8 @@
       ],
       "PrizeNums": [
         1,
-        11700,
-        1150
+        4650,
+        950
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -6137,8 +6137,8 @@
         1003
       ],
       "PrizeNums": [
-        10600,
-        1050
+        4400,
+        900
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -6175,8 +6175,8 @@
       ],
       "PrizeNums": [
         1,
-        11700,
-        1150
+        4650,
+        950
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -6218,8 +6218,8 @@
         1003
       ],
       "PrizeNums": [
-        12300,
-        1250
+        4750,
+        950
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -6259,8 +6259,8 @@
       ],
       "PrizeNums": [
         1,
-        13600,
-        1350
+        5000,
+        1000
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -6306,8 +6306,8 @@
         1003
       ],
       "PrizeNums": [
-        15100,
-        1500
+        5250,
+        1050
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -6345,8 +6345,8 @@
       ],
       "PrizeNums": [
         1,
-        16600,
-        1650
+        5550,
+        1100
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -6393,8 +6393,8 @@
         1003
       ],
       "PrizeNums": [
-        18400,
-        1850
+        5800,
+        1150
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -6441,8 +6441,8 @@
       ],
       "PrizeNums": [
         1,
-        20300,
-        2050
+        6100,
+        1200
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -6607,7 +6607,7 @@
         1003
       ],
       "PrizeNums": [
-        -10000,
+        -5000,
         -6000
       ],
       "RefreshProbability": 50,
@@ -6827,7 +6827,7 @@
         1003
       ],
       "PrizeNums": [
-        -15000,
+        -7500,
         -9000
       ],
       "RefreshProbability": 50,
@@ -6867,7 +6867,7 @@
         1003
       ],
       "PrizeNums": [
-        -20000,
+        -10000,
         -12000
       ],
       "RefreshProbability": 50,
@@ -6898,7 +6898,7 @@
         1003
       ],
       "PrizeNums": [
-        -30000,
+        -15000,
         -20000
       ],
       "RefreshProbability": 50,
@@ -6929,7 +6929,7 @@
         1003
       ],
       "PrizeNums": [
-        -10000,
+        -5000,
         -6000
       ],
       "RefreshProbability": 50,
@@ -6960,7 +6960,7 @@
         1003
       ],
       "PrizeNums": [
-        -15000,
+        -7500,
         -9000
       ],
       "RefreshProbability": 50,
@@ -6992,7 +6992,7 @@
         1003
       ],
       "PrizeNums": [
-        -20000,
+        -10000,
         -12000
       ],
       "RefreshProbability": 50,
@@ -7024,7 +7024,7 @@
         1003
       ],
       "PrizeNums": [
-        -30000,
+        -15000,
         -20000
       ],
       "RefreshProbability": 50,
@@ -7056,7 +7056,7 @@
         1003
       ],
       "PrizeNums": [
-        -15000,
+        -7500,
         -9000
       ],
       "RefreshProbability": 50,

文件差異過大導致無法顯示
+ 112 - 112
Assets/Res/Config/FabaoPowerupConfig.json


+ 174 - 174
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,

文件差異過大導致無法顯示
+ 112 - 112
Assets/Res/Config/MonsterPowerUpConfig.json


文件差異過大導致無法顯示
+ 243 - 243
Assets/Res/Config/ResourceLevelConfig.json


+ 100 - 100
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
     }

+ 91 - 1
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:

+ 6 - 6
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

+ 55 - 4
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

+ 1 - 1
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:

+ 72 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-8724106998535025409
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanelopen
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 1cc8d2539cc579e4986e1999780bc5d0, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 9043207564023730481}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &9043207564023730481
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -8724106998535025409}
+    m_Position: {x: 166.50003, y: 322.00003, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -8724106998535025409}

+ 8 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XCtN5yL8US8PAOTLhMfbDlsoXrGTJ0+LPCv6Y3Jt2tKU+pdcI/Nz1ff06Ab6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 127 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim

@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanelopen
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -691
+        inSlope: 287.59445
+        outSlope: 287.59445
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.3647568
+      - serializedVersion: 3
+        time: 0.26666668
+        value: -644
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: myImage
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2583589396
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.26666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -691
+        inSlope: 287.59445
+        outSlope: 287.59445
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.3647568
+      - serializedVersion: 3
+        time: 0.26666668
+        value: -644
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: myImage
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

+ 8 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DilMvX6vVngLwR7e8ZV+HO1W3bRH/cXIALaEadmSAjhgFIz4NEjtlqBW0XhF
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 5
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:

+ 53 - 31
Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -311,7 +311,7 @@ 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: 80, y: 176}
+  m_AnchoredPosition: {x: 48, y: 156}
   m_SizeDelta: {x: 160, y: 33.5608}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6217484099708709913
@@ -335,7 +335,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5411765, g: 0.45882356, b: 0.38431376, a: 1}
+  m_Color: {r: 0.3254902, g: 0.3019608, b: 0.27058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -673,7 +673,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.4156863, b: 0.121568635, a: 1}
+  m_Color: {r: 0.8632074, g: 0.4802922, b: 0.044788964, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -935,7 +935,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.40784317, b: 0.21960786, a: 1}
+  m_Color: {r: 0.5188678, g: 0.43180707, b: 0.3157261, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1015,7 +1015,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.30980393, g: 0.20000002, b: 0.09019608, a: 1}
+  m_Color: {r: 0.9339621, g: 0.9339621, b: 0.9339621, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1024,8 +1024,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 1
+    m_FontSize: 22
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -1095,7 +1095,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9725491, g: 0.9490197, b: 0.8745099, a: 1}
+  m_Color: {r: 0.9811319, g: 0.96154314, b: 0.8608044, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1104,8 +1104,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 1
+    m_FontSize: 30
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -1340,7 +1340,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -643.9}
+  m_AnchoredPosition: {x: 0, y: -644}
   m_SizeDelta: {x: 750, y: 485.64966}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &524714867080188752
@@ -1455,7 +1455,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.58431375, g: 0.49411768, b: 0.3372549, a: 1}
+  m_Color: {r: 0.34117648, g: 0.56078434, b: 0.5568628, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1590,7 +1590,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7372549}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1607,7 +1607,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_lingwu
+  _icon_name: btn_04_h
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1699,8 +1699,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -329.4, y: -12.099976}
-  m_SizeDelta: {x: 169.4441, y: 27.0412}
+  m_AnchoredPosition: {x: -329.4, y: -9}
+  m_SizeDelta: {x: 169.4, y: 31.7}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6016738999040956583
 CanvasRenderer:
@@ -1723,7 +1723,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.76470596, g: 0.6156863, b: 0.47058827, a: 1}
+  m_Color: {r: 0.1556601, g: 0.08721405, b: 0.02202735, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1732,10 +1732,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 1
+    m_FontSize: 28
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 0
     m_AlignByGeometry: 0
@@ -1779,8 +1779,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: -185.02562, y: 25.8}
-  m_SizeDelta: {x: 183.7099, y: 301.7909}
+  m_AnchoredPosition: {x: -189, y: 25.8}
+  m_SizeDelta: {x: 210, y: 300.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8612881284138927429
 CanvasRenderer:
@@ -1803,7 +1803,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.85098046, g: 0.83921576, b: 0.7843138, a: 1}
+  m_Color: {r: 0.8396225, g: 0.831763, b: 0.75249183, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1892,7 +1892,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8078432, g: 0.79215693, b: 0.7176471, a: 1}
+  m_Color: {r: 0.64705884, g: 0.7294118, b: 0.67058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2008,6 +2008,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5318323102501209997}
   - component: {fileID: 3563408254755769735}
+  - component: {fileID: 8883357906726470524}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: SelectBreakthroughItemPanel
@@ -2107,6 +2108,27 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!95 &8883357906726470524
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7308605241962880610}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: cabb8a2d44bd6544397e1c7d7ba5d4be, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &7472297620610942561
 GameObject:
   m_ObjectHideFlags: 0
@@ -2248,7 +2270,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7372549}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2265,7 +2287,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_quxiao
+  _icon_name: btn_05_h
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2357,8 +2379,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: 137, y: 61.9}
-  m_SizeDelta: {x: 281.6704, y: 175.7678}
+  m_AnchoredPosition: {x: 137, y: 41}
+  m_SizeDelta: {x: 341.9, y: 165.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4288302572715536881
 CanvasRenderer:
@@ -2381,7 +2403,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.654902, g: 0.58431375, b: 0.50980395, a: 1}
+  m_Color: {r: 0.3254902, g: 0.3019608, b: 0.27058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2391,7 +2413,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2400,7 +2422,7 @@ MonoBehaviour:
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 1.5
+    m_LineSpacing: 1
   m_Text: "\u78A7\u7389\u846B\u82A6\u662F\u4E0A\u53E4\u65F6\u671F\u7559\u4E0B\u7684xxxxx\uFF0C\u62E5\u6709xxx\u7684\u795E\u5947\u80FD\u529B\uFF0C\u53EF\u4EE5\u4E3A\u5143\u5A74\u671F\u7684\u4FEE\u58EB\uFF0C\u63D0\u5173\u952E\u7684\u5E2E\u52A9\uFF01"
 --- !u!1 &9180492859032817554
 GameObject:

+ 11 - 11
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

+ 20 - 20
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


+ 0 - 203
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: 

+ 3 - 3
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
@@ -749,7 +749,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:

+ 23 - 23
Assets/Res/UI/ShopPanel/DaiJinJuanWidgetopen.anim

@@ -22,14 +22,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: {x: 0.13125, y: 1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        inSlope: {x: 7.6994, y: 0, z: 0}
+        outSlope: {x: 7.6994, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.19610591, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: {x: 1, y: 1, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -49,14 +49,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 8.863149
+        outSlope: 8.863149
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.23663446
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -73,7 +73,7 @@ AnimationClip:
     script: {fileID: 0}
     flags: 0
   m_PPtrCurves: []
-  m_SampleRate: 30
+  m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -104,7 +104,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.2
+    m_StopTime: 0.16666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -127,14 +127,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 8.863149
+        outSlope: 8.863149
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.23663446
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -157,14 +157,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0.13125
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 7.6994
+        outSlope: 7.6994
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.19610591
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -194,7 +194,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -224,7 +224,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0

+ 8 - 26
Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -30,23 +30,14 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.75
-        value: 15
-        inSlope: 36
-        outSlope: 36
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 150
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 261.38235
+        outSlope: 261.38235
+        tangentMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
+        inWeight: 0.13191552
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
@@ -156,23 +147,14 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.75
-        value: 15
-        inSlope: 36
-        outSlope: 36
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 150
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 261.38235
+        outSlope: 261.38235
+        tangentMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
+        inWeight: 0.13191552
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2

+ 2 - 0
Assets/Scripts/GameUI/UI/BackgroundCom.cs

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

+ 24 - 17
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, });
         }
     }
 }

+ 11 - 0
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)
 	{

+ 2 - 2
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);

+ 2 - 1
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);

+ 3 - 1
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;
                 }
 

二進制
Excel2Json/Excel/EventConfig.xlsx


二進制
Excel2Json/Excel/FabaoConfig.xlsx


二進制
Excel2Json/Excel/MonsterPowerUp.xlsx


二進制
Excel2Json/Excel/ResourceLevel.xlsx


二進制
Excel2Json/Excel/Tower.xlsx


部分文件因文件數量過多而無法顯示