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

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

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

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

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

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

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

Assets/Res/Aduio/Bgm/battle1.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.31
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/battle2.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/dongfu.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/dujiebgm.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/xunlongduobao.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 2
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/xunlongduobao1.wav.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Bgm/yunmengze.mp3.meta

@@ -5,11 +5,11 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 0
+    loadType: 1
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.22
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}

Assets/Res/Aduio/Skill/fb10001/chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fabaochuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fabaohit.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10002gj.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10003cixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10004chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10004hit.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10007shengxiao.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10008chixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10008loop.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10010chixu.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_10010chuxian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_duiping.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_duipingbaozha.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_feixing.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/Skill/fb10001/fb_xiaopengzhuang.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/combat_win.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/dujie_pizhong.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/openui.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/shibai.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_button.ogg.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_cexiadaolv.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_chaozuoshibai.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_chouqugongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_daoyou_nv_gx1.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_fanhui.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_fbgfsj.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_fzgf_yx.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_jianglimianban.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_jinduwancheng.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shangdian.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shanggongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shangzhengdaolv.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shengji.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shengshitansuo.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_shiyonghuode.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_tupo.WAV.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_tuposhibai.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_tycg.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_xiazhenggongfa.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/ui_zbfbcg.wav.meta

@@ -8,14 +8,14 @@ AudioImporter:
     loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 1
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -5,17 +5,17 @@ AudioImporter:
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
-    compressionFormat: 1
+    compressionFormat: 0
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 0
+    preloadAudioData: 1
   platformSettingOverrides: {}
   forceToMono: 1
   normalize: 1
-  loadInBackground: 0
+  loadInBackground: 1
   ambisonic: 0
   3D: 1
   userData: 

Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -47,7 +47,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 1381729068282112590}
-  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
   fogColor: {r: 0.1794, g: 0.43469998, b: 0.69, a: 1}
   fogStartDistance: 80
   fogEndDistance: 150

Assets/Res/Config/EventConditionConfig.json

@@ -352,6 +352,9 @@
         20004
       ],
       "finishCount": 3,
+      "RelatedEvents": [
+        30012
+      ],
       "SkiptoIds": [
         5
       ]
@@ -482,6 +485,9 @@
         20005
       ],
       "finishCount": 3,
+      "RelatedEvents": [
+        30013
+      ],
       "SkiptoIds": [
         5
       ]

Assets/Res/Config/EventLinkConfig.json

@@ -7750,7 +7750,7 @@
       "EventID": 30008,
       "optionType": 2,
       "optionPara1": [
-        1008
+        1009
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,562 +3,2585 @@
     {
       "ID": 1,
       "Power": 100,
-      "HP": 225.0,
-      "DEF": 15.0,
-      "ATK": 37.5,
-      "NeedLv": 11,
+      "HP": 47.71,
+      "DEF": 15.19,
+      "ATK": 15.19,
+      "NeedLv": 3,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        110540,
-        2775
+        20404,
+        510
       ],
       "SkillLevel": 1
     },
     {
       "ID": 2,
-      "Power": 126,
-      "HP": 319.21,
-      "DEF": 17.15,
-      "ATK": 42.88,
-      "NeedLv": 21,
+      "Power": 108,
+      "HP": 53.32,
+      "DEF": 15.58,
+      "ATK": 15.58,
+      "NeedLv": 5,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        122190,
-        3050
+        20818,
+        520
       ],
       "SkillLevel": 1
     },
     {
       "ID": 3,
-      "Power": 159,
-      "HP": 488.06,
-      "DEF": 21.57,
-      "ATK": 53.93,
-      "NeedLv": 31,
+      "Power": 117,
+      "HP": 59.19,
+      "DEF": 15.99,
+      "ATK": 15.99,
+      "NeedLv": 7,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        135060,
-        3375
+        21240,
+        530
       ],
       "SkillLevel": 1
     },
     {
       "ID": 4,
-      "Power": 200,
-      "HP": 722.73,
-      "DEF": 27.13,
-      "ATK": 67.83,
-      "NeedLv": 41,
+      "Power": 126,
+      "HP": 65.32,
+      "DEF": 16.4,
+      "ATK": 16.4,
+      "NeedLv": 9,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        149300,
-        3725
+        21670,
+        540
       ],
       "SkillLevel": 1
     },
     {
       "ID": 5,
-      "Power": 252,
-      "HP": 1426.29,
-      "DEF": 46.53,
-      "ATK": 116.33,
-      "NeedLv": 51,
+      "Power": 136,
+      "HP": 71.73,
+      "DEF": 16.82,
+      "ATK": 16.82,
+      "NeedLv": 11,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        165030,
-        4125
+        22108,
+        555
       ],
       "SkillLevel": 1
     },
     {
       "ID": 6,
-      "Power": 318,
-      "HP": 2028.76,
-      "DEF": 58.52,
-      "ATK": 146.31,
-      "NeedLv": 61,
+      "Power": 147,
+      "HP": 85.18,
+      "DEF": 18.74,
+      "ATK": 18.74,
+      "NeedLv": 13,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        182420,
-        4550
-      ],
-      "PromotePieceNum": [
-        0,
-        0,
-        30,
-        30,
-        30
+        22556,
+        565
       ],
       "SkillLevel": 1
     },
     {
       "ID": 7,
-      "Power": 401,
-      "HP": 2847.04,
-      "DEF": 73.61,
-      "ATK": 184.02,
-      "NeedLv": 71,
+      "Power": 159,
+      "HP": 92.78,
+      "DEF": 19.22,
+      "ATK": 19.22,
+      "NeedLv": 15,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        201650,
-        5050
+        23012,
+        575
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 8,
-      "Power": 505,
-      "HP": 5389.58,
-      "DEF": 126.24,
-      "ATK": 315.61,
-      "NeedLv": 81,
+      "Power": 172,
+      "HP": 100.71,
+      "DEF": 19.72,
+      "ATK": 19.72,
+      "NeedLv": 17,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        222900,
-        5575
+        23478,
+        585
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 9,
-      "Power": 636,
-      "HP": 7415.87,
-      "DEF": 158.78,
-      "ATK": 396.95,
-      "NeedLv": 91,
+      "Power": 186,
+      "HP": 109.0,
+      "DEF": 20.23,
+      "ATK": 20.23,
+      "NeedLv": 19,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        246390,
-        6150
+        23952,
+        600
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 10,
-      "Power": 801,
-      "HP": 10128.63,
-      "DEF": 199.7,
-      "ATK": 499.25,
-      "NeedLv": 101,
+      "Power": 201,
+      "HP": 117.64,
+      "DEF": 20.75,
+      "ATK": 20.75,
+      "NeedLv": 21,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        272350,
-        6800
+        24438,
+        610
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 11,
-      "Power": 1009,
-      "HP": 18746.05,
-      "DEF": 342.5,
-      "ATK": 856.26,
-      "NeedLv": 111,
+      "Power": 217,
+      "HP": 137.55,
+      "DEF": 23.12,
+      "ATK": 23.12,
+      "NeedLv": 23,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        301050,
-        7525
+        24932,
+        625
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 12,
-      "Power": 1271,
-      "HP": 25306.32,
-      "DEF": 430.78,
-      "ATK": 1076.94,
-      "NeedLv": 121,
+      "Power": 234,
+      "HP": 147.77,
+      "DEF": 23.72,
+      "ATK": 23.72,
+      "NeedLv": 25,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        332780,
-        8325
-      ],
-      "PromotePieceNum": [
-        0,
-        0,
-        75,
-        60,
-        30
+        25436,
+        635
       ],
-      "SkillLevel": 2
+      "SkillLevel": 1
     },
     {
       "ID": 13,
-      "Power": 1601,
-      "HP": 34002.94,
-      "DEF": 541.8,
-      "ATK": 1354.5,
-      "NeedLv": 131,
+      "Power": 253,
+      "HP": 158.41,
+      "DEF": 24.33,
+      "ATK": 24.33,
+      "NeedLv": 27,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        367850,
-        9200
+        25952,
+        650
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 14,
-      "Power": 2017,
-      "HP": 62047.29,
-      "DEF": 929.23,
-      "ATK": 2323.08,
-      "NeedLv": 141,
+      "Power": 273,
+      "HP": 169.51,
+      "DEF": 24.96,
+      "ATK": 24.96,
+      "NeedLv": 29,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        406610,
-        10175
+        26476,
+        660
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 15,
-      "Power": 2541,
-      "HP": 82729.21,
-      "DEF": 1168.72,
-      "ATK": 2921.81,
-      "NeedLv": 151,
+      "Power": 295,
+      "HP": 181.08,
+      "DEF": 25.6,
+      "ATK": 25.6,
+      "NeedLv": 31,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        449460,
-        11225
+        27012,
+        675
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 16,
-      "Power": 3202,
-      "HP": 109950.344,
-      "DEF": 1469.94,
-      "ATK": 3674.84,
-      "NeedLv": 161,
+      "Power": 319,
+      "HP": 247.88,
+      "DEF": 33.71,
+      "ATK": 33.71,
+      "NeedLv": 33,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        496820,
-        12425
+        27560,
+        690
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 17,
-      "Power": 4035,
-      "HP": 198692.172,
-      "DEF": 2521.07,
-      "ATK": 6302.67,
-      "NeedLv": 171,
+      "Power": 345,
+      "HP": 263.99,
+      "DEF": 34.57,
+      "ATK": 34.57,
+      "NeedLv": 35,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        549180,
-        13725
+        28118,
+        705
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 18,
-      "Power": 5084,
-      "HP": 262626.6,
-      "DEF": 3170.82,
-      "ATK": 7927.05,
-      "NeedLv": 181,
+      "Power": 373,
+      "HP": 280.77,
+      "DEF": 35.47,
+      "ATK": 35.47,
+      "NeedLv": 37,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        607060,
-        15175
-      ],
-      "PromotePieceNum": [
-        0,
-        0,
-        120,
-        90,
-        60
+        28686,
+        715
       ],
-      "SkillLevel": 3
+      "SkillLevel": 1
     },
     {
       "ID": 19,
-      "Power": 6406,
-      "HP": 346318.563,
-      "DEF": 3988.03,
-      "ATK": 9970.08,
-      "NeedLv": 191,
+      "Power": 403,
+      "HP": 298.23,
+      "DEF": 36.38,
+      "ATK": 36.38,
+      "NeedLv": 39,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        671030,
-        16775
+        29268,
+        730
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 20,
-      "Power": 8072,
-      "HP": 621416.5,
-      "DEF": 6839.81,
-      "ATK": 17099.53,
-      "NeedLv": 201,
+      "Power": 435,
+      "HP": 316.41,
+      "DEF": 37.32,
+      "ATK": 37.32,
+      "NeedLv": 41,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        741740,
-        18550
+        29860,
+        745
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 21,
-      "Power": 10171,
-      "HP": 816099.1,
-      "DEF": 8602.63,
-      "ATK": 21506.58,
-      "NeedLv": 211,
+      "Power": 470,
+      "HP": 364.2,
+      "DEF": 41.58,
+      "ATK": 41.58,
+      "NeedLv": 43,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        819910,
-        20500
+        30464,
+        760
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 22,
-      "Power": 12815,
-      "HP": 1069855.38,
-      "DEF": 10819.78,
-      "ATK": 27049.45,
-      "NeedLv": 221,
+      "Power": 508,
+      "HP": 385.57,
+      "DEF": 42.65,
+      "ATK": 42.65,
+      "NeedLv": 45,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        906320,
-        22650
+        31080,
+        775
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 23,
-      "Power": 16147,
-      "HP": 1909368.5,
-      "DEF": 18556.84,
-      "ATK": 46392.1,
-      "NeedLv": 231,
+      "Power": 549,
+      "HP": 407.81,
+      "DEF": 43.75,
+      "ATK": 43.75,
+      "NeedLv": 47,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1001830,
-        25050
+        31710,
+        795
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 24,
-      "Power": 20345,
-      "HP": 2495138.25,
-      "DEF": 23339.48,
-      "ATK": 58348.69,
-      "NeedLv": 241,
+      "Power": 593,
+      "HP": 430.94,
+      "DEF": 44.88,
+      "ATK": 44.88,
+      "NeedLv": 49,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1107400,
-        27675
-      ],
-      "PromotePieceNum": [
-        0,
-        0,
-        180,
-        120,
-        60
+        32352,
+        810
       ],
-      "SkillLevel": 4
+      "SkillLevel": 1
     },
     {
       "ID": 25,
-      "Power": 25635,
-      "HP": 3256019.25,
-      "DEF": 29354.73,
-      "ATK": 73386.84,
-      "NeedLv": 251,
+      "Power": 640,
+      "HP": 454.99,
+      "DEF": 46.04,
+      "ATK": 46.04,
+      "NeedLv": 51,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1224100,
-        30600
+        33006,
+        825
       ],
-      "SkillLevel": 5
+      "SkillLevel": 1
     },
     {
       "ID": 26,
-      "Power": 32300,
-      "HP": 5786407.0,
-      "DEF": 50345.86,
-      "ATK": 125864.656,
-      "NeedLv": 261,
+      "Power": 691,
+      "HP": 521.32,
+      "DEF": 51.29,
+      "ATK": 51.29,
+      "NeedLv": 53,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1353100,
-        33825
+        33674,
+        840
       ],
-      "SkillLevel": 5
+      "SkillLevel": 1
     },
     {
       "ID": 27,
-      "Power": 40698,
-      "HP": 7531864.5,
-      "DEF": 63321.45,
-      "ATK": 158303.625,
-      "NeedLv": 271,
+      "Power": 746,
+      "HP": 549.55,
+      "DEF": 52.61,
+      "ATK": 52.61,
+      "NeedLv": 55,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1495690,
-        37400
+        34356,
+        860
       ],
-      "SkillLevel": 5
+      "SkillLevel": 1
     },
     {
       "ID": 28,
-      "Power": 51279,
-      "HP": 9792674.0,
-      "DEF": 79641.22,
-      "ATK": 199103.063,
-      "NeedLv": 281,
+      "Power": 806,
+      "HP": 578.89,
+      "DEF": 53.97,
+      "ATK": 53.97,
+      "NeedLv": 57,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1653320,
-        41325
+        35052,
+        875
       ],
-      "SkillLevel": 5
+      "SkillLevel": 1
     },
     {
       "ID": 29,
-      "Power": 64612,
-      "HP": 17343462.0,
-      "DEF": 136591.469,
-      "ATK": 341478.656,
-      "NeedLv": 291,
+      "Power": 870,
+      "HP": 609.38,
+      "DEF": 55.36,
+      "ATK": 55.36,
+      "NeedLv": 59,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        1827550,
-        45700
+        35760,
+        895
       ],
-      "SkillLevel": 5
+      "SkillLevel": 1
     },
     {
       "ID": 30,
-      "Power": 81411,
-      "HP": 22502852.0,
-      "DEF": 171795.047,
-      "ATK": 429487.625,
-      "NeedLv": 300,
+      "Power": 940,
+      "HP": 641.06,
+      "DEF": 56.79,
+      "ATK": 56.79,
+      "NeedLv": 61,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        2000000,
-        50000
+        36484,
+        910
       ],
       "PromotePieceNum": [
+        -1,
         0,
-        0,
-        300,
-        200,
-        90
+        30,
+        30,
+        30
       ],
-      "SkillLevel": 5
+      "SkillLevel": 2
     },
     {
       "ID": 31,
-      "Power": 102578,
-      "HP": 29169666.0,
-      "DEF": 216071.609,
-      "ATK": 540179.0,
-      "NeedLv": 310,
+      "Power": 1015,
+      "HP": 865.06,
+      "DEF": 74.78,
+      "ATK": 74.78,
+      "NeedLv": 63,
       "PowerupItemIDs": [
         1001,
         1006
       ],
       "PowerupItemCosts": [
-        9999999,
-        999999
+        37222,
+        930
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 32,
+      "Power": 1096,
+      "HP": 908.93,
+      "DEF": 76.71,
+      "ATK": 76.71,
+      "NeedLv": 65,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        37976,
+        950
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 33,
+      "Power": 1184,
+      "HP": 954.49,
+      "DEF": 78.69,
+      "ATK": 78.69,
+      "NeedLv": 67,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        38744,
+        970
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 34,
+      "Power": 1279,
+      "HP": 1001.79,
+      "DEF": 80.72,
+      "ATK": 80.72,
+      "NeedLv": 69,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        39530,
+        990
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 35,
+      "Power": 1381,
+      "HP": 1050.9,
+      "DEF": 82.8,
+      "ATK": 82.8,
+      "NeedLv": 71,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        40330,
+        1010
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 36,
+      "Power": 1491,
+      "HP": 1196.72,
+      "DEF": 92.25,
+      "ATK": 92.25,
+      "NeedLv": 73,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        41146,
+        1030
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 37,
+      "Power": 1610,
+      "HP": 1254.18,
+      "DEF": 94.62,
+      "ATK": 94.62,
+      "NeedLv": 75,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        41978,
+        1050
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 38,
+      "Power": 1739,
+      "HP": 1313.8,
+      "DEF": 97.07,
+      "ATK": 97.07,
+      "NeedLv": 77,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        42828,
+        1070
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 39,
+      "Power": 1878,
+      "HP": 1375.67,
+      "DEF": 99.57,
+      "ATK": 99.57,
+      "NeedLv": 79,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        43694,
+        1090
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 40,
+      "Power": 2028,
+      "HP": 1439.86,
+      "DEF": 102.14,
+      "ATK": 102.14,
+      "NeedLv": 81,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        44580,
+        1115
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 41,
+      "Power": 2190,
+      "HP": 1636.11,
+      "DEF": 113.79,
+      "ATK": 113.79,
+      "NeedLv": 83,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        45482,
+        1135
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 42,
+      "Power": 2365,
+      "HP": 1711.12,
+      "DEF": 116.73,
+      "ATK": 116.73,
+      "NeedLv": 85,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        46402,
+        1160
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 43,
+      "Power": 2554,
+      "HP": 1788.9,
+      "DEF": 119.74,
+      "ATK": 119.74,
+      "NeedLv": 87,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        47342,
+        1185
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 44,
+      "Power": 2758,
+      "HP": 1869.56,
+      "DEF": 122.83,
+      "ATK": 122.83,
+      "NeedLv": 89,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        48300,
+        1205
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 45,
+      "Power": 2979,
+      "HP": 1953.2,
+      "DEF": 126.0,
+      "ATK": 126.0,
+      "NeedLv": 91,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        49278,
+        1230
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 46,
+      "Power": 3217,
+      "HP": 2618.31,
+      "DEF": 165.9,
+      "ATK": 165.9,
+      "NeedLv": 93,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        50274,
+        1255
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 47,
+      "Power": 3474,
+      "HP": 2733.67,
+      "DEF": 170.18,
+      "ATK": 170.18,
+      "NeedLv": 95,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        51292,
+        1280
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 48,
+      "Power": 3752,
+      "HP": 2853.24,
+      "DEF": 174.57,
+      "ATK": 174.57,
+      "NeedLv": 97,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        52330,
+        1310
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 49,
+      "Power": 4052,
+      "HP": 2977.16,
+      "DEF": 179.07,
+      "ATK": 179.07,
+      "NeedLv": 99,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        53390,
+        1335
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 50,
+      "Power": 4376,
+      "HP": 3105.57,
+      "DEF": 183.69,
+      "ATK": 183.69,
+      "NeedLv": 101,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        54470,
+        1360
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 51,
+      "Power": 4726,
+      "HP": 3517.41,
+      "DEF": 204.65,
+      "ATK": 204.65,
+      "NeedLv": 103,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        55572,
+        1390
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 52,
+      "Power": 5104,
+      "HP": 3667.14,
+      "DEF": 209.93,
+      "ATK": 209.93,
+      "NeedLv": 105,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        56698,
+        1415
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 53,
+      "Power": 5512,
+      "HP": 3822.25,
+      "DEF": 215.35,
+      "ATK": 215.35,
+      "NeedLv": 107,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        57844,
+        1445
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 54,
+      "Power": 5953,
+      "HP": 3982.92,
+      "DEF": 220.9,
+      "ATK": 220.9,
+      "NeedLv": 109,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        59016,
+        1475
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 55,
+      "Power": 6429,
+      "HP": 4149.34,
+      "DEF": 226.6,
+      "ATK": 226.6,
+      "NeedLv": 111,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        60210,
+        1505
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 56,
+      "Power": 6943,
+      "HP": 4693.7,
+      "DEF": 252.46,
+      "ATK": 252.46,
+      "NeedLv": 113,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        61428,
+        1535
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 57,
+      "Power": 7498,
+      "HP": 4887.55,
+      "DEF": 258.97,
+      "ATK": 258.97,
+      "NeedLv": 115,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        62672,
+        1565
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 58,
+      "Power": 8098,
+      "HP": 5088.28,
+      "DEF": 265.65,
+      "ATK": 265.65,
+      "NeedLv": 117,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        63940,
+        1600
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 59,
+      "Power": 8746,
+      "HP": 5296.11,
+      "DEF": 272.51,
+      "ATK": 272.51,
+      "NeedLv": 119,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        65234,
+        1630
+      ],
+      "SkillLevel": 2
+    },
+    {
+      "ID": 60,
+      "Power": 9446,
+      "HP": 5511.28,
+      "DEF": 279.54,
+      "ATK": 279.54,
+      "NeedLv": 121,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        66556,
+        1665
+      ],
+      "PromotePieceNum": [
+        -1,
+        0,
+        75,
+        60,
+        30
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 61,
+      "Power": 10202,
+      "HP": 7359.91,
+      "DEF": 368.06,
+      "ATK": 368.06,
+      "NeedLv": 123,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        67902,
+        1700
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 62,
+      "Power": 11018,
+      "HP": 7655.86,
+      "DEF": 377.55,
+      "ATK": 377.55,
+      "NeedLv": 125,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        69276,
+        1730
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 63,
+      "Power": 11899,
+      "HP": 7962.18,
+      "DEF": 387.29,
+      "ATK": 387.29,
+      "NeedLv": 127,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        70678,
+        1765
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 64,
+      "Power": 12851,
+      "HP": 8279.21,
+      "DEF": 397.29,
+      "ATK": 397.29,
+      "NeedLv": 129,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        72110,
+        1805
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 65,
+      "Power": 13879,
+      "HP": 8607.31,
+      "DEF": 407.54,
+      "ATK": 407.54,
+      "NeedLv": 131,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        73570,
+        1840
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 66,
+      "Power": 14989,
+      "HP": 9716.95,
+      "DEF": 454.03,
+      "ATK": 454.03,
+      "NeedLv": 133,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        75058,
+        1875
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 67,
+      "Power": 16188,
+      "HP": 10098.49,
+      "DEF": 465.75,
+      "ATK": 465.75,
+      "NeedLv": 135,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        76578,
+        1915
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 68,
+      "Power": 17483,
+      "HP": 10493.25,
+      "DEF": 477.76,
+      "ATK": 477.76,
+      "NeedLv": 137,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        78128,
+        1955
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 69,
+      "Power": 18882,
+      "HP": 10901.65,
+      "DEF": 490.09,
+      "ATK": 490.09,
+      "NeedLv": 139,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        79708,
+        1995
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 70,
+      "Power": 20393,
+      "HP": 11324.15,
+      "DEF": 502.74,
+      "ATK": 502.74,
+      "NeedLv": 141,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        81322,
+        2035
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 71,
+      "Power": 22024,
+      "HP": 12773.58,
+      "DEF": 560.1,
+      "ATK": 560.1,
+      "NeedLv": 143,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        82968,
+        2075
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 72,
+      "Power": 23786,
+      "HP": 13264.55,
+      "DEF": 574.55,
+      "ATK": 574.55,
+      "NeedLv": 145,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        84648,
+        2115
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 73,
+      "Power": 25689,
+      "HP": 13772.34,
+      "DEF": 589.37,
+      "ATK": 589.37,
+      "NeedLv": 147,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        86360,
+        2160
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 74,
+      "Power": 27744,
+      "HP": 14297.51,
+      "DEF": 604.58,
+      "ATK": 604.58,
+      "NeedLv": 149,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        88108,
+        2205
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 75,
+      "Power": 29964,
+      "HP": 14840.61,
+      "DEF": 620.17,
+      "ATK": 620.17,
+      "NeedLv": 151,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        89892,
+        2245
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 76,
+      "Power": 32361,
+      "HP": 19769.48,
+      "DEF": 816.56,
+      "ATK": 816.56,
+      "NeedLv": 153,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        91712,
+        2295
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 77,
+      "Power": 34950,
+      "HP": 20514.85,
+      "DEF": 837.63,
+      "ATK": 837.63,
+      "NeedLv": 155,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        93568,
+        2340
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 78,
+      "Power": 37746,
+      "HP": 21285.52,
+      "DEF": 859.24,
+      "ATK": 859.24,
+      "NeedLv": 157,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        95462,
+        2385
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 79,
+      "Power": 40766,
+      "HP": 22082.29,
+      "DEF": 881.41,
+      "ATK": 881.41,
+      "NeedLv": 159,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        97394,
+        2435
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 80,
+      "Power": 44027,
+      "HP": 22906.02,
+      "DEF": 904.15,
+      "ATK": 904.15,
+      "NeedLv": 161,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        99364,
+        2485
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 81,
+      "Power": 47549,
+      "HP": 25802.57,
+      "DEF": 1007.31,
+      "ATK": 1007.31,
+      "NeedLv": 163,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        101376,
+        2535
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 82,
+      "Power": 51353,
+      "HP": 26758.56,
+      "DEF": 1033.3,
+      "ATK": 1033.3,
+      "NeedLv": 165,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        103428,
+        2585
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 83,
+      "Power": 55461,
+      "HP": 27746.7,
+      "DEF": 1059.95,
+      "ATK": 1059.95,
+      "NeedLv": 167,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        105522,
+        2640
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 84,
+      "Power": 59898,
+      "HP": 28768.02,
+      "DEF": 1087.3,
+      "ATK": 1087.3,
+      "NeedLv": 169,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        107658,
+        2690
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 85,
+      "Power": 64690,
+      "HP": 29823.56,
+      "DEF": 1115.35,
+      "ATK": 1115.35,
+      "NeedLv": 171,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        109836,
+        2745
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 86,
+      "Power": 69865,
+      "HP": 33575.51,
+      "DEF": 1242.61,
+      "ATK": 1242.61,
+      "NeedLv": 173,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        112060,
+        2800
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 87,
+      "Power": 75454,
+      "HP": 34799.85,
+      "DEF": 1274.67,
+      "ATK": 1274.67,
+      "NeedLv": 175,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        114328,
+        2860
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 88,
+      "Power": 81490,
+      "HP": 36065.02,
+      "DEF": 1307.56,
+      "ATK": 1307.56,
+      "NeedLv": 177,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        116642,
+        2915
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 89,
+      "Power": 88009,
+      "HP": 37372.3,
+      "DEF": 1341.29,
+      "ATK": 1341.29,
+      "NeedLv": 179,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        119002,
+        2975
+      ],
+      "SkillLevel": 3
+    },
+    {
+      "ID": 90,
+      "Power": 95050,
+      "HP": 38723.03,
+      "DEF": 1375.9,
+      "ATK": 1375.9,
+      "NeedLv": 181,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        121412,
+        3035
+      ],
+      "PromotePieceNum": [
+        -1,
+        0,
+        120,
+        90,
+        60
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 91,
+      "Power": 102654,
+      "HP": 51494.12,
+      "DEF": 1811.59,
+      "ATK": 1811.59,
+      "NeedLv": 183,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        123868,
+        3095
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 92,
+      "Power": 110866,
+      "HP": 53344.73,
+      "DEF": 1858.33,
+      "ATK": 1858.33,
+      "NeedLv": 185,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        126376,
+        3160
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 93,
+      "Power": 119735,
+      "HP": 55256.55,
+      "DEF": 1906.28,
+      "ATK": 1906.28,
+      "NeedLv": 187,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        128934,
+        3225
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 94,
+      "Power": 129314,
+      "HP": 57231.5,
+      "DEF": 1955.46,
+      "ATK": 1955.46,
+      "NeedLv": 189,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        131544,
+        3290
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 95,
+      "Power": 139659,
+      "HP": 59271.59,
+      "DEF": 2005.91,
+      "ATK": 2005.91,
+      "NeedLv": 191,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        134206,
+        3355
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 96,
+      "Power": 150832,
+      "HP": 66662.28,
+      "DEF": 2234.78,
+      "ATK": 2234.78,
+      "NeedLv": 193,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        136922,
+        3425
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 97,
+      "Power": 162899,
+      "HP": 69026.17,
+      "DEF": 2292.44,
+      "ATK": 2292.44,
+      "NeedLv": 195,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        139694,
+        3490
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 98,
+      "Power": 175931,
+      "HP": 71467.67,
+      "DEF": 2351.58,
+      "ATK": 2351.58,
+      "NeedLv": 197,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        142522,
+        3565
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 99,
+      "Power": 190005,
+      "HP": 73989.2,
+      "DEF": 2412.25,
+      "ATK": 2412.25,
+      "NeedLv": 199,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        145406,
+        3635
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 100,
+      "Power": 205205,
+      "HP": 76593.27,
+      "DEF": 2474.49,
+      "ATK": 2474.49,
+      "NeedLv": 201,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        148348,
+        3710
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 101,
+      "Power": 221621,
+      "HP": 86107.01,
+      "DEF": 2756.83,
+      "ATK": 2756.83,
+      "NeedLv": 203,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        151352,
+        3785
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 102,
+      "Power": 239351,
+      "HP": 89123.01,
+      "DEF": 2827.95,
+      "ATK": 2827.95,
+      "NeedLv": 205,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        154414,
+        3860
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 103,
+      "Power": 258499,
+      "HP": 92237.33,
+      "DEF": 2900.91,
+      "ATK": 2900.91,
+      "NeedLv": 207,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        157540,
+        3940
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 104,
+      "Power": 279179,
+      "HP": 95453.01,
+      "DEF": 2975.75,
+      "ATK": 2975.75,
+      "NeedLv": 209,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        160728,
+        4020
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 105,
+      "Power": 301513,
+      "HP": 98773.23,
+      "DEF": 3052.53,
+      "ATK": 3052.53,
+      "NeedLv": 211,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        163982,
+        4100
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 106,
+      "Power": 325634,
+      "HP": 131180.188,
+      "DEF": 4019.15,
+      "ATK": 4019.15,
+      "NeedLv": 213,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        167302,
+        4185
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 107,
+      "Power": 351685,
+      "HP": 135722.844,
+      "DEF": 4122.84,
+      "ATK": 4122.84,
+      "NeedLv": 215,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        170688,
+        4265
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 108,
+      "Power": 379820,
+      "HP": 140412.6,
+      "DEF": 4229.21,
+      "ATK": 4229.21,
+      "NeedLv": 217,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        174142,
+        4355
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 109,
+      "Power": 410206,
+      "HP": 145253.969,
+      "DEF": 4338.32,
+      "ATK": 4338.32,
+      "NeedLv": 219,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        177668,
+        4440
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 110,
+      "Power": 443022,
+      "HP": 150251.7,
+      "DEF": 4450.25,
+      "ATK": 4450.25,
+      "NeedLv": 221,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        181264,
+        4530
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 111,
+      "Power": 478464,
+      "HP": 168788.234,
+      "DEF": 4958.02,
+      "ATK": 4958.02,
+      "NeedLv": 223,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        184932,
+        4625
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 112,
+      "Power": 516741,
+      "HP": 174571.734,
+      "DEF": 5085.93,
+      "ATK": 5085.93,
+      "NeedLv": 225,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        188676,
+        4715
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 113,
+      "Power": 558080,
+      "HP": 180541.313,
+      "DEF": 5217.15,
+      "ATK": 5217.15,
+      "NeedLv": 227,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        192494,
+        4810
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 114,
+      "Power": 602726,
+      "HP": 186702.719,
+      "DEF": 5351.75,
+      "ATK": 5351.75,
+      "NeedLv": 229,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        196390,
+        4910
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 115,
+      "Power": 650944,
+      "HP": 193061.875,
+      "DEF": 5489.82,
+      "ATK": 5489.82,
+      "NeedLv": 231,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        200366,
+        5010
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 116,
+      "Power": 703020,
+      "HP": 216808.391,
+      "DEF": 6116.21,
+      "ATK": 6116.21,
+      "NeedLv": 233,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        204420,
+        5110
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 117,
+      "Power": 759262,
+      "HP": 224164.563,
+      "DEF": 6274.01,
+      "ATK": 6274.01,
+      "NeedLv": 235,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        208558,
+        5215
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 118,
+      "Power": 820003,
+      "HP": 231756.016,
+      "DEF": 6435.87,
+      "ATK": 6435.87,
+      "NeedLv": 237,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        212780,
+        5320
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 119,
+      "Power": 885603,
+      "HP": 239589.953,
+      "DEF": 6601.92,
+      "ATK": 6601.92,
+      "NeedLv": 239,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        217086,
+        5425
+      ],
+      "SkillLevel": 4
+    },
+    {
+      "ID": 120,
+      "Power": 956451,
+      "HP": 247673.859,
+      "DEF": 6772.24,
+      "ATK": 6772.24,
+      "NeedLv": 241,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        221480,
+        5535
+      ],
+      "PromotePieceNum": [
+        -1,
+        0,
+        180,
+        120,
+        60
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 121,
+      "Power": 1032967,
+      "HP": 328608.031,
+      "DEF": 8916.76,
+      "ATK": 8916.76,
+      "NeedLv": 243,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        225964,
+        5650
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 122,
+      "Power": 1115604,
+      "HP": 339655.7,
+      "DEF": 9146.81,
+      "ATK": 9146.81,
+      "NeedLv": 245,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        230536,
+        5765
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 123,
+      "Power": 1204852,
+      "HP": 351054.656,
+      "DEF": 9382.8,
+      "ATK": 9382.8,
+      "NeedLv": 247,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        235202,
+        5880
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 124,
+      "Power": 1301240,
+      "HP": 362815.719,
+      "DEF": 9624.87,
+      "ATK": 9624.87,
+      "NeedLv": 249,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        239964,
+        6000
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 125,
+      "Power": 1405339,
+      "HP": 374949.969,
+      "DEF": 9873.19,
+      "ATK": 9873.19,
+      "NeedLv": 251,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        244820,
+        6120
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 126,
+      "Power": 1517766,
+      "HP": 420821.781,
+      "DEF": 10999.71,
+      "ATK": 10999.71,
+      "NeedLv": 253,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        249776,
+        6245
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 127,
+      "Power": 1639187,
+      "HP": 434848.781,
+      "DEF": 11283.5,
+      "ATK": 11283.5,
+      "NeedLv": 255,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        254832,
+        6370
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 128,
+      "Power": 1770322,
+      "HP": 449319.438,
+      "DEF": 11574.61,
+      "ATK": 11574.61,
+      "NeedLv": 257,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        259990,
+        6500
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 129,
+      "Power": 1911948,
+      "HP": 464247.375,
+      "DEF": 11873.23,
+      "ATK": 11873.23,
+      "NeedLv": 259,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        265252,
+        6630
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 130,
+      "Power": 2064904,
+      "HP": 479646.469,
+      "DEF": 12179.56,
+      "ATK": 12179.56,
+      "NeedLv": 261,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        270620,
+        6765
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 131,
+      "Power": 2230096,
+      "HP": 538185.938,
+      "DEF": 13569.24,
+      "ATK": 13569.24,
+      "NeedLv": 263,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        276098,
+        6900
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 132,
+      "Power": 2408504,
+      "HP": 555981.4,
+      "DEF": 13919.32,
+      "ATK": 13919.32,
+      "NeedLv": 265,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        281686,
+        7040
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 133,
+      "Power": 2601184,
+      "HP": 574336.9,
+      "DEF": 14278.43,
+      "ATK": 14278.43,
+      "NeedLv": 267,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        287388,
+        7185
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 134,
+      "Power": 2809279,
+      "HP": 593269.4,
+      "DEF": 14646.81,
+      "ATK": 14646.81,
+      "NeedLv": 269,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        293204,
+        7330
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 135,
+      "Power": 3034021,
+      "HP": 612796.5,
+      "DEF": 15024.69,
+      "ATK": 15024.69,
+      "NeedLv": 271,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        299138,
+        7480
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 136,
+      "Power": 3276743,
+      "HP": 812404.063,
+      "DEF": 19782.46,
+      "ATK": 19782.46,
+      "NeedLv": 273,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        305194,
+        7630
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 137,
+      "Power": 3538882,
+      "HP": 839064.8,
+      "DEF": 20292.84,
+      "ATK": 20292.84,
+      "NeedLv": 275,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        311370,
+        7785
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 138,
+      "Power": 3821993,
+      "HP": 866560.438,
+      "DEF": 20816.39,
+      "ATK": 20816.39,
+      "NeedLv": 277,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        317674,
+        7940
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 139,
+      "Power": 4127752,
+      "HP": 894916.4,
+      "DEF": 21353.44,
+      "ATK": 21353.44,
+      "NeedLv": 279,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        324104,
+        8105
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 140,
+      "Power": 4457972,
+      "HP": 924158.6,
+      "DEF": 21904.35,
+      "ATK": 21904.35,
+      "NeedLv": 281,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        330664,
+        8265
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 141,
+      "Power": 4814610,
+      "HP": 1036460.5,
+      "DEF": 24403.63,
+      "ATK": 24403.63,
+      "NeedLv": 283,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        337356,
+        8435
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 142,
+      "Power": 5199779,
+      "HP": 1070233.5,
+      "DEF": 25033.23,
+      "ATK": 25033.23,
+      "NeedLv": 285,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        344184,
+        8605
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 143,
+      "Power": 5615761,
+      "HP": 1105059.38,
+      "DEF": 25679.08,
+      "ATK": 25679.08,
+      "NeedLv": 287,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        351150,
+        8780
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 144,
+      "Power": 6065022,
+      "HP": 1140969.88,
+      "DEF": 26341.59,
+      "ATK": 26341.59,
+      "NeedLv": 289,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        358258,
+        8955
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 145,
+      "Power": 6550224,
+      "HP": 1177997.75,
+      "DEF": 27021.2,
+      "ATK": 27021.2,
+      "NeedLv": 291,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        365510,
+        9140
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 146,
+      "Power": 7074242,
+      "HP": 1320864.0,
+      "DEF": 30104.3,
+      "ATK": 30104.3,
+      "NeedLv": 293,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        372908,
+        9325
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 147,
+      "Power": 7640181,
+      "HP": 1363617.38,
+      "DEF": 30880.98,
+      "ATK": 30880.98,
+      "NeedLv": 295,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        380456,
+        9510
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 148,
+      "Power": 8251395,
+      "HP": 1407697.63,
+      "DEF": 31677.7,
+      "ATK": 31677.7,
+      "NeedLv": 297,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        388156,
+        9705
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 149,
+      "Power": 8911507,
+      "HP": 1453144.75,
+      "DEF": 32494.97,
+      "ATK": 32494.97,
+      "NeedLv": 299,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        396012,
+        9900
+      ],
+      "SkillLevel": 5
+    },
+    {
+      "ID": 150,
+      "Power": 9624428,
+      "HP": 1500000.0,
+      "DEF": 33333.33,
+      "ATK": 33333.33,
+      "NeedLv": 999,
+      "PowerupItemIDs": [
+        1001,
+        1006
+      ],
+      "PowerupItemCosts": [
+        999999,
+        999999
+      ],
+      "PromotePieceNum": [
+        -1,
+        0,
+        300,
+        200,
+        90
       ],
       "SkillLevel": 6
     }

Assets/Res/Config/GroupConfig.json

@@ -146,6 +146,9 @@
       "ID": 1008,
       "GroupMonsterLevel": [
         86
+      ],
+      "GroupMonster": [
+        9001
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -8,10 +8,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 1,
-      "attack": 250,
-      "hp": 250,
+      "attack": 100,
+      "hp": 100,
       "def": 100,
-      "shield": 250,
+      "shield": 100,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -66,10 +66,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 1,
-      "attack": 250,
-      "hp": 250,
+      "attack": 100,
+      "hp": 100,
       "def": 100,
-      "shield": 250,
+      "shield": 100,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 200,
-      "hp": 200,
+      "attack": 80,
+      "hp": 80,
       "def": 100,
-      "shield": 200,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -181,10 +181,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 222,
+      "attack": 72,
+      "hp": 89,
       "def": 100,
-      "shield": 222,
+      "shield": 89,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -238,10 +238,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 200,
-      "hp": 200,
+      "attack": 80,
+      "hp": 80,
       "def": 100,
-      "shield": 200,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -296,10 +296,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 200,
-      "hp": 200,
+      "attack": 80,
+      "hp": 80,
       "def": 100,
-      "shield": 200,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -354,10 +354,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 80,
-      "hp": 200,
+      "attack": 32,
+      "hp": 80,
       "def": 100,
-      "shield": 200,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -412,10 +412,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 120,
-      "hp": 240,
+      "attack": 48,
+      "hp": 96,
       "def": 100,
-      "shield": 400,
+      "shield": 160,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -470,10 +470,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 120,
-      "hp": 240,
+      "attack": 48,
+      "hp": 96,
       "def": 100,
-      "shield": 400,
+      "shield": 160,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -528,10 +528,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 210,
-      "hp": 190,
+      "attack": 84,
+      "hp": 76,
       "def": 100,
-      "shield": 190,
+      "shield": 76,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 303,
-      "hp": 250,
+      "attack": 121,
+      "hp": 100,
       "def": 100,
-      "shield": 250,
+      "shield": 100,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 248,
-      "hp": 306,
+      "attack": 99,
+      "hp": 122,
       "def": 100,
-      "shield": 306,
+      "shield": 122,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 275,
-      "hp": 275,
+      "attack": 110,
+      "hp": 110,
       "def": 100,
-      "shield": 275,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 330,
-      "hp": 229,
+      "attack": 132,
+      "hp": 92,
       "def": 100,
-      "shield": 229,
+      "shield": 92,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 220,
-      "hp": 344,
+      "attack": 88,
+      "hp": 138,
       "def": 100,
-      "shield": 344,
+      "shield": 138,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 316,
-      "hp": 239,
+      "attack": 127,
+      "hp": 96,
       "def": 100,
-      "shield": 239,
+      "shield": 96,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 289,
-      "hp": 262,
+      "attack": 116,
+      "hp": 105,
       "def": 100,
-      "shield": 262,
+      "shield": 105,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -992,10 +992,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 270,
-      "hp": 360,
+      "attack": 108,
+      "hp": 144,
       "def": 100,
-      "shield": 244,
+      "shield": 98,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1050,10 +1050,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 150,
-      "hp": 300,
+      "attack": 60,
+      "hp": 120,
       "def": 100,
-      "shield": 300,
+      "shield": 120,
       "speed_atk": 2.0,
       "Linggen": [
         100,
@@ -1108,10 +1108,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 150,
-      "hp": 270,
+      "attack": 60,
+      "hp": 108,
       "def": 200,
-      "shield": 270,
+      "shield": 108,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1166,10 +1166,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 270,
+      "attack": 84,
+      "hp": 108,
       "def": 100,
-      "shield": 270,
+      "shield": 108,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1224,10 +1224,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 270,
-      "hp": 333,
+      "attack": 108,
+      "hp": 133,
       "def": 100,
-      "shield": 333,
+      "shield": 133,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1282,10 +1282,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 270,
-      "hp": 333,
+      "attack": 108,
+      "hp": 133,
       "def": 100,
-      "shield": 333,
+      "shield": 133,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/ItemConfig.json

@@ -874,7 +874,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        8000
+        7000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -906,7 +906,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        12000
+        11000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -938,7 +938,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        20000
+        19000
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/MitigationParaConfig.json

@@ -2,403 +2,403 @@
   "configList": [
     {
       "ID": 1,
-      "mitigationPara": 150.0
+      "mitigationPara": 149.0
     },
     {
       "ID": 2,
-      "mitigationPara": 150.0
+      "mitigationPara": 148.0
     },
     {
       "ID": 3,
-      "mitigationPara": 150.0
+      "mitigationPara": 147.0
     },
     {
       "ID": 4,
-      "mitigationPara": 150.0
+      "mitigationPara": 146.0
     },
     {
       "ID": 5,
-      "mitigationPara": 140.0
+      "mitigationPara": 145.0
     },
     {
       "ID": 6,
-      "mitigationPara": 133.333328
+      "mitigationPara": 144.0
     },
     {
       "ID": 7,
-      "mitigationPara": 128.571426
+      "mitigationPara": 143.0
     },
     {
       "ID": 8,
-      "mitigationPara": 125.0
+      "mitigationPara": 142.0
     },
     {
       "ID": 9,
-      "mitigationPara": 122.222221
+      "mitigationPara": 141.0
     },
     {
       "ID": 10,
-      "mitigationPara": 120.0
+      "mitigationPara": 140.0
     },
     {
       "ID": 11,
-      "mitigationPara": 118.181816
+      "mitigationPara": 139.0
     },
     {
       "ID": 12,
-      "mitigationPara": 116.666664
+      "mitigationPara": 138.0
     },
     {
       "ID": 13,
-      "mitigationPara": 115.384613
+      "mitigationPara": 137.0
     },
     {
       "ID": 14,
-      "mitigationPara": 114.285713
+      "mitigationPara": 136.0
     },
     {
       "ID": 15,
-      "mitigationPara": 113.333336
+      "mitigationPara": 135.0
     },
     {
       "ID": 16,
-      "mitigationPara": 112.5
+      "mitigationPara": 134.0
     },
     {
       "ID": 17,
-      "mitigationPara": 111.764709
+      "mitigationPara": 133.0
     },
     {
       "ID": 18,
-      "mitigationPara": 111.111115
+      "mitigationPara": 132.0
     },
     {
       "ID": 19,
-      "mitigationPara": 110.526314
+      "mitigationPara": 131.0
     },
     {
       "ID": 20,
-      "mitigationPara": 110.0
+      "mitigationPara": 130.0
     },
     {
       "ID": 21,
-      "mitigationPara": 109.523811
+      "mitigationPara": 129.0
     },
     {
       "ID": 22,
-      "mitigationPara": 109.090912
+      "mitigationPara": 128.0
     },
     {
       "ID": 23,
-      "mitigationPara": 108.695656
+      "mitigationPara": 127.0
     },
     {
       "ID": 24,
-      "mitigationPara": 108.333336
+      "mitigationPara": 126.0
     },
     {
       "ID": 25,
-      "mitigationPara": 108.0
+      "mitigationPara": 125.0
     },
     {
       "ID": 26,
-      "mitigationPara": 107.692307
+      "mitigationPara": 124.0
     },
     {
       "ID": 27,
-      "mitigationPara": 107.40741
+      "mitigationPara": 123.0
     },
     {
       "ID": 28,
-      "mitigationPara": 107.14286
+      "mitigationPara": 122.0
     },
     {
       "ID": 29,
-      "mitigationPara": 106.896553
+      "mitigationPara": 121.0
     },
     {
       "ID": 30,
-      "mitigationPara": 106.666664
+      "mitigationPara": 120.0
     },
     {
       "ID": 31,
-      "mitigationPara": 106.451614
+      "mitigationPara": 119.0
     },
     {
       "ID": 32,
-      "mitigationPara": 106.25
+      "mitigationPara": 118.0
     },
     {
       "ID": 33,
-      "mitigationPara": 106.060608
+      "mitigationPara": 117.0
     },
     {
       "ID": 34,
-      "mitigationPara": 105.882355
+      "mitigationPara": 116.0
     },
     {
       "ID": 35,
-      "mitigationPara": 105.714287
+      "mitigationPara": 115.0
     },
     {
       "ID": 36,
-      "mitigationPara": 105.555557
+      "mitigationPara": 114.0
     },
     {
       "ID": 37,
-      "mitigationPara": 105.4054
+      "mitigationPara": 113.0
     },
     {
       "ID": 38,
-      "mitigationPara": 105.263161
+      "mitigationPara": 112.0
     },
     {
       "ID": 39,
-      "mitigationPara": 105.128204
+      "mitigationPara": 111.0
     },
     {
       "ID": 40,
-      "mitigationPara": 105.0
+      "mitigationPara": 110.0
     },
     {
       "ID": 41,
-      "mitigationPara": 104.390244
+      "mitigationPara": 109.0
     },
     {
       "ID": 42,
-      "mitigationPara": 103.809525
+      "mitigationPara": 108.0
     },
     {
       "ID": 43,
-      "mitigationPara": 103.255814
+      "mitigationPara": 107.0
     },
     {
       "ID": 44,
-      "mitigationPara": 102.727272
+      "mitigationPara": 106.0
     },
     {
       "ID": 45,
-      "mitigationPara": 102.222221
+      "mitigationPara": 105.0
     },
     {
       "ID": 46,
-      "mitigationPara": 101.739128
+      "mitigationPara": 104.0
     },
     {
       "ID": 47,
-      "mitigationPara": 101.276596
+      "mitigationPara": 103.0
     },
     {
       "ID": 48,
-      "mitigationPara": 100.833336
+      "mitigationPara": 102.0
     },
     {
       "ID": 49,
-      "mitigationPara": 100.408165
+      "mitigationPara": 101.0
     },
     {
       "ID": 50,
-      "mitigationPara": 100.0
+      "mitigationPara": 100.02
     },
     {
       "ID": 51,
-      "mitigationPara": 99.21568
+      "mitigationPara": 99.05882
     },
     {
       "ID": 52,
-      "mitigationPara": 98.46154
+      "mitigationPara": 98.1075
     },
     {
       "ID": 53,
-      "mitigationPara": 97.73585
+      "mitigationPara": 97.18434
     },
     {
       "ID": 54,
-      "mitigationPara": 97.03704
+      "mitigationPara": 96.28778
     },
     {
       "ID": 55,
-      "mitigationPara": 96.36364
+      "mitigationPara": 95.41637
     },
     {
       "ID": 56,
-      "mitigationPara": 95.71429
+      "mitigationPara": 94.56875
     },
     {
       "ID": 57,
-      "mitigationPara": 95.08772
+      "mitigationPara": 93.74368
     },
     {
       "ID": 58,
-      "mitigationPara": 94.48276
+      "mitigationPara": 92.94
     },
     {
       "ID": 59,
-      "mitigationPara": 93.89831
+      "mitigationPara": 92.15661
     },
     {
       "ID": 60,
-      "mitigationPara": 93.3333359
+      "mitigationPara": 91.3925
     },
     {
       "ID": 61,
-      "mitigationPara": 92.4590149
+      "mitigationPara": 90.64672
     },
     {
       "ID": 62,
-      "mitigationPara": 91.6129
+      "mitigationPara": 89.91839
     },
     {
       "ID": 63,
-      "mitigationPara": 90.79365
+      "mitigationPara": 89.206665
     },
     {
       "ID": 64,
-      "mitigationPara": 90.0
+      "mitigationPara": 88.51078
     },
     {
       "ID": 65,
-      "mitigationPara": 89.23077
+      "mitigationPara": 87.83
     },
     {
       "ID": 66,
-      "mitigationPara": 88.48485
+      "mitigationPara": 87.1636353
     },
     {
       "ID": 67,
-      "mitigationPara": 87.76119
+      "mitigationPara": 86.51105
     },
     {
       "ID": 68,
-      "mitigationPara": 87.05882
+      "mitigationPara": 85.87162
     },
     {
       "ID": 69,
-      "mitigationPara": 86.37681
+      "mitigationPara": 85.24478
     },
     {
       "ID": 70,
-      "mitigationPara": 85.71429
+      "mitigationPara": 84.63
     },
     {
       "ID": 71,
-      "mitigationPara": 84.7887344
+      "mitigationPara": 84.0267639
     },
     {
       "ID": 72,
-      "mitigationPara": 83.8888855
+      "mitigationPara": 83.4345856
     },
     {
       "ID": 73,
-      "mitigationPara": 83.0137
+      "mitigationPara": 82.85301
     },
     {
       "ID": 74,
-      "mitigationPara": 82.16216
+      "mitigationPara": 82.2816238
     },
     {
       "ID": 75,
-      "mitigationPara": 81.3333359
+      "mitigationPara": 81.72
     },
     {
       "ID": 76,
-      "mitigationPara": 80.52631
+      "mitigationPara": 81.16776
     },
     {
       "ID": 77,
-      "mitigationPara": 79.74026
+      "mitigationPara": 80.62454
     },
     {
       "ID": 78,
-      "mitigationPara": 78.97436
+      "mitigationPara": 80.09
     },
     {
       "ID": 79,
-      "mitigationPara": 78.22785
+      "mitigationPara": 79.5638
     },
     {
       "ID": 80,
-      "mitigationPara": 77.5
+      "mitigationPara": 79.04562
     },
     {
       "ID": 81,
-      "mitigationPara": 76.79012
+      "mitigationPara": 78.53519
     },
     {
       "ID": 82,
-      "mitigationPara": 76.0975647
+      "mitigationPara": 78.032196
     },
     {
       "ID": 83,
-      "mitigationPara": 75.4216843
+      "mitigationPara": 77.5363846
     },
     {
       "ID": 84,
-      "mitigationPara": 74.7619
+      "mitigationPara": 77.0475
     },
     {
       "ID": 85,
-      "mitigationPara": 74.1176453
+      "mitigationPara": 76.56529
     },
     {
       "ID": 86,
-      "mitigationPara": 73.48837
+      "mitigationPara": 76.08954
     },
     {
       "ID": 87,
-      "mitigationPara": 72.8735657
+      "mitigationPara": 75.62
     },
     {
       "ID": 88,
-      "mitigationPara": 72.27273
+      "mitigationPara": 75.15648
     },
     {
       "ID": 89,
-      "mitigationPara": 71.6853943
+      "mitigationPara": 74.69876
     },
     {
       "ID": 90,
-      "mitigationPara": 71.1111145
+      "mitigationPara": 74.246666
     },
     {
       "ID": 91,
-      "mitigationPara": 70.54945
+      "mitigationPara": 73.8
     },
     {
       "ID": 92,
-      "mitigationPara": 70.0
+      "mitigationPara": 73.35859
     },
     {
       "ID": 93,
-      "mitigationPara": 69.4623642
+      "mitigationPara": 72.92226
     },
     {
       "ID": 94,
-      "mitigationPara": 68.93617
+      "mitigationPara": 72.49085
     },
     {
       "ID": 95,
-      "mitigationPara": 68.42105
+      "mitigationPara": 72.06421
     },
     {
       "ID": 96,
-      "mitigationPara": 67.9166641
+      "mitigationPara": 71.64219
     },
     {
       "ID": 97,
-      "mitigationPara": 67.42268
+      "mitigationPara": 71.22464
     },
     {
       "ID": 98,
-      "mitigationPara": 66.9387741
+      "mitigationPara": 70.81143
     },
     {
       "ID": 99,
-      "mitigationPara": 66.4646454
+      "mitigationPara": 70.40243
     },
     {
       "ID": 100,
-      "mitigationPara": 66.0
+      "mitigationPara": 69.9975
     }
   ]
 }

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -162,7 +162,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.13268968}
   m_AnchorMax: {x: 0.5, y: 0.13268968}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 95}
   m_SizeDelta: {x: 750, y: 63.02014}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1026066119927368560
@@ -352,7 +352,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -905,8 +905,8 @@ RectTransform:
   m_GameObject: {fileID: 1630334505711168803}
   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_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6570571664023300045}
   - {fileID: 6103133270796787680}
@@ -914,7 +914,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -64.66766, y: 107.07454}
+  m_AnchoredPosition: {x: -41.2, y: 102.7}
   m_SizeDelta: {x: 329.6647, y: 65.2255}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2981485876630666593
@@ -1511,7 +1511,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -20.7502}
+  m_AnchoredPosition: {x: 0, y: -20.750244}
   m_SizeDelta: {x: 750, y: 118.0951}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3167469181355813890
@@ -2075,7 +2075,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4894137871019489262
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2092,8 +2092,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 1.2, y: 242}
-  m_SizeDelta: {x: 267.9468, y: 48.6719}
+  m_AnchoredPosition: {x: 0, y: 187}
+  m_SizeDelta: {x: 609.1066, y: 79.3023}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5751402451290122237
 CanvasRenderer:
@@ -2116,7 +2116,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8470589, g: 0.89019614, b: 0.89019614, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3008,7 +3008,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 34
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 43

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

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

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -2375,6 +2375,7 @@ GameObject:
   - component: {fileID: 7566769296908980725}
   - component: {fileID: 3905264220941356025}
   - component: {fileID: 5637155694417808183}
+  - component: {fileID: 9166494655224894342}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Mapname
@@ -2398,11 +2399,11 @@ RectTransform:
   - {fileID: 1926551284965162357}
   m_Father: {fileID: 3764721290890148754}
   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: 252.6, y: 106.1}
-  m_SizeDelta: {x: 151.6817, y: 36.6236}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -79.424, y: -5.3}
+  m_SizeDelta: {x: 0, y: 36.623596}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &3905264220941356025
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2438,13 +2439,27 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E30\u90FD"
+--- !u!114 &9166494655224894342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &8848809442754795059
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/54ade351deed7a46ac648b209cc249f9.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DHJLsXikWnrr/XXX157O7Uo92gDWqcmnq1tGgbt34yk5H9JNiNYzns6O8xcF
-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: 
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/ItemWidgetType1.prefab

@@ -129,6 +129,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7091371511447556559}
+  - {fileID: 3375826015555380777}
   - {fileID: 8879216144060700877}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -208,7 +209,101 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_ItemIconSkill
+    gameObject: {fileID: 4478813827264039601}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &6687755613884693298
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3375826015555380777}
+  - component: {fileID: 3580106330819906449}
+  - component: {fileID: 4478813827264039601}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ItemIconSkill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3375826015555380777
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  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: 6132543138199057944}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 37.7841, y: -15.66925}
+  m_SizeDelta: {x: 19.4467, y: 19.4467}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3580106330819906449
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  m_CullTransparentMesh: 1
+--- !u!114 &4478813827264039601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6687755613884693298}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s9002
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: 6482952d0ee2ffcbb245b4e2233d024c
+  imageH: 26.404785
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8748313746680104858
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/fa8837a9a6079c0e39b38fced79940a6.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CSkevHyoUC9LEJyRwe7upNU+eqxTkYuJb/y0PFetOI9xSZl0N28xmcXFobAM
-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: fa8837a9a6079c0e39b38fced79940a6
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/主角.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DnkYtCL8WnOgV4kXz8xIa2XoZ33nwA2xz8i5gVImeQzVoZIG9pdztkRxq47J
-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: "\u4E3B\u89D2"
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/法宝界面-升级.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DSwXtS6oVH3UVgmgtxf2Iyv1cigciU5SGNt1quImPAtCRIJK6chk+Zwseals
-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: "\u6CD5\u5B9D\u754C\u9762-\u5347\u7EA7"
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/法宝界面.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: C3pJvHyuAC6XqNJsacsjz6udHIAYrG20lUUh9IGE9aB/nV4gS/8uSuvE78v2
-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: "\u6CD5\u5B9D\u754C\u9762"
-  assetBundleVariant: 

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -1496,7 +1496,7 @@ GameObject:
   - component: {fileID: 6332415411013533169}
   - component: {fileID: 7171448895155585201}
   - component: {fileID: 3683457587723248287}
-  - component: {fileID: 637341193158040451}
+  - component: {fileID: 4360891435948433655}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenCion
@@ -1555,7 +1555,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 43
@@ -1566,7 +1566,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39"
---- !u!114 &637341193158040451
+--- !u!114 &4360891435948433655
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1575,12 +1575,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1604847036802696322}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &1627423929816216099
 GameObject:
   m_ObjectHideFlags: 0
@@ -2762,7 +2763,7 @@ GameObject:
   - component: {fileID: 1802195678649483103}
   - component: {fileID: 4303440356813300985}
   - component: {fileID: 7005207063398492762}
-  - component: {fileID: 6747635218176705802}
+  - component: {fileID: 4692328669348406790}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: onCion
@@ -2821,7 +2822,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 43
@@ -2832,7 +2833,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39"
---- !u!114 &6747635218176705802
+--- !u!114 &4692328669348406790
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2841,12 +2842,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 4899914660764355177}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &5089696736954208135
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab

@@ -8252,7 +8252,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 146, y: -23}
-  m_SizeDelta: {x: 182, y: 50}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7048921669090791528
 CanvasRenderer:

Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -37,8 +37,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 196.9, y: -43.4515}
-  m_SizeDelta: {x: 108, y: 96.45}
+  m_AnchoredPosition: {x: 115.51595, y: -23.732}
+  m_SizeDelta: {x: 57, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:
@@ -69,8 +69,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
-    m_FontSize: 65
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
@@ -655,7 +655,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 101.24, y: 89.007}
+  m_SizeDelta: {x: 59.0219, y: 51.8902}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6889873714995245063
 CanvasRenderer:
@@ -1041,17 +1041,17 @@ RectTransform:
   m_GameObject: {fileID: 7520844935006336794}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6377767369545045157}
   - {fileID: 3238679409698069968}
   m_Father: {fileID: 666260999598083492}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -2.9, y: 0.000091552734}
-  m_SizeDelta: {x: 284.56, y: 86.903}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 47.464}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &4896940394472558642
 MonoBehaviour:
@@ -1071,7 +1071,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 8
+  m_Spacing: -9.99
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1208,6 +1208,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: RedDotComType01
+    gameObject: {fileID: 6274519881336305377}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -3320,6 +3329,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6934427383800001513}
+  - {fileID: 4404503928122068799}
   m_Father: {fileID: 1617875011636537765}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -5008,6 +5018,127 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
   m_PrefabInstance: {fileID: 1997473576992753959}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2049131876637579995
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4355802847687175809}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -15
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Name
+      value: RedDotComType01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: RedDotConfigId
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+--- !u!224 &4404503928122068799 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 2049131876637579995}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &6274519881336305377 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+  m_PrefabInstance: {fileID: 2049131876637579995}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8faa9321e9f040f42aa76599adb76143, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6876462808036315284
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/daoju.spriteatlasv2

@@ -31,10 +31,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d84b79a30f6baa04aad2377702a6fff8, type: 3}
     - {fileID: 2800000, guid: fc287bb1e8c1a9b42b766b953ccc4cc1, type: 3}
     - {fileID: 2800000, guid: c87f9af41546f5e488bae87199769f3d, type: 3}
+    - {fileID: 2800000, guid: 4be6e7eda5f7c49488213727a23cb3ac, type: 3}
     - {fileID: 2800000, guid: 3dbad1a5a76c126439669e6a3fd22f96, type: 3}
     - {fileID: 2800000, guid: 6d3ed58a661ac274c8e4563256a134ab, type: 3}
     - {fileID: 2800000, guid: 47489a5e6ac93b44caae37d1d2a81891, type: 3}
     - {fileID: 2800000, guid: f9235560a5af69942a289f4953d5dfe5, type: 3}
+    - {fileID: 2800000, guid: 5579b6e066a43ec4db944904f5f11176, type: 3}
     - {fileID: 2800000, guid: 5f64062b598715846ad43e6ce9b25868, type: 3}
     - {fileID: 2800000, guid: f70c1356c03bc044d993e8e82dd289d3, type: 3}
     - {fileID: 2800000, guid: 074ac8f3dc5c47642807ce2d8c4c5b98, type: 3}
@@ -56,6 +58,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 68aa6f00bec250343a09512d0708e782, type: 3}
     - {fileID: 2800000, guid: 93e16ce9520dc1f4da7449479a37d3b0, type: 3}
     - {fileID: 2800000, guid: bd52cd8b9975c264f975b0adb8c6255b, type: 3}
+    - {fileID: 2800000, guid: efc6cb2fd4e4efd4b9483d4afff6bc05, type: 3}
+    - {fileID: 2800000, guid: 09dc118ac2468fb4dba91b17668a65a5, type: 3}
+    - {fileID: 2800000, guid: 03690b8c18347df43b0185039b2aacc6, type: 3}
+    - {fileID: 2800000, guid: 46ce00e78da9d6244b4de33def54bba1, type: 3}
+    - {fileID: 2800000, guid: a2471ce0afd42414cab18de78436c5da, type: 3}
+    - {fileID: 2800000, guid: 93c879fdbe5139444af4a4b929b66b8a, type: 3}
     - {fileID: 2800000, guid: 30d1b75f214afd9468509004b1323cbc, type: 3}
     - {fileID: 2800000, guid: 54f2c3c9d402b9041aca03bba0508b19, type: 3}
     - {fileID: 2800000, guid: 88da5d7411d7b7c4db7008af4def7924, type: 3}

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -62,9 +62,10 @@ Material:
     - _QueueOffset: 0
     - _depthoff: 1.18
     - _qiangdu: 5
-    - _ran: 0.1
+    - _ran: 84.88
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
     - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _shengShiPos: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

Assets/Resources/Shader/ShengShiShader.shadergraph

@@ -1763,7 +1763,7 @@
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
     "m_ObjectId": "220af7af4d1d4182a26c500cfbd0c345",
     "m_Id": 0,
-    "m_DisplayName": "ran",
+    "m_DisplayName": "shengshiRan",
     "m_SlotType": 1,
     "m_Hidden": false,
     "m_ShaderOutputName": "Out",
@@ -4336,12 +4336,12 @@
     "m_Guid": {
         "m_GuidSerialized": "b5e36e16-5903-4b7d-9b8f-09e8dd3ea0c1"
     },
-    "m_Name": "pos",
+    "m_Name": "shengShiPos",
     "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "pos",
-    "m_DefaultReferenceName": "_pos",
+    "m_RefNameGeneratedByDisplayName": "shengShiPos",
+    "m_DefaultReferenceName": "_shengShiPos",
     "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
+    "m_GeneratePropertyBlock": false,
     "m_UseCustomSlotLabel": false,
     "m_CustomSlotLabel": "",
     "m_DismissedVersion": 0,
@@ -5448,12 +5448,12 @@
     "m_Guid": {
         "m_GuidSerialized": "e742a0b0-64ef-4bad-a451-ca43a9564c03"
     },
-    "m_Name": "ran",
+    "m_Name": "shengshiRan",
     "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "ran",
-    "m_DefaultReferenceName": "_ran",
+    "m_RefNameGeneratedByDisplayName": "shengshiRan",
+    "m_DefaultReferenceName": "_shengshiRan",
     "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
+    "m_GeneratePropertyBlock": false,
     "m_UseCustomSlotLabel": false,
     "m_CustomSlotLabel": "",
     "m_DismissedVersion": 0,
@@ -5490,7 +5490,7 @@
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
     "m_ObjectId": "b7c4826c43a84fddb3c1eecd2e1e5250",
     "m_Id": 0,
-    "m_DisplayName": "pos",
+    "m_DisplayName": "shengShiPos",
     "m_SlotType": 1,
     "m_Hidden": false,
     "m_ShaderOutputName": "Out",

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -35,7 +35,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 88.特定任务触发的事件 99.无标记 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 6.支线事件 98.特定任务触发的事件 99.无标记 
 		/// </summary>
 #if !COMBAT_SERVER
 		public int EventTriggerType;

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -190,7 +190,7 @@ namespace GameLogic.Bag
                         f.id == item.config.associateVlaue[1]);
                 if (faaData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * item.count.Value);
                 }
                 else
                 {
@@ -212,7 +212,7 @@ namespace GameLogic.Bag
                         s.id == item.config.associateVlaue[1]);
                 if (skillData != null)
                 {
-                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
+                    return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]* item.count.Value);
                 }
                 else
                 {

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -15,9 +15,9 @@ namespace GameLogic.Combat.CombatTool
 {
     public class CombatSenceController : IDisposable
     {
-        private static readonly int Ran = Shader.PropertyToID("_ran");
+        private static readonly int Ran = Shader.PropertyToID("_shengshiRan");
 
-        private static readonly int Pos = Shader.PropertyToID("_pos");
+        private static readonly int Pos = Shader.PropertyToID("_shengShiPos");
         // public CombatSencePath currBesselPath;
         //
         // public CombatSencePath NextBesselPath;
@@ -106,7 +106,8 @@ namespace GameLogic.Combat.CombatTool
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
                     SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
@@ -176,11 +177,13 @@ namespace GameLogic.Combat.CombatTool
         public void StartPayShengShi(Transform root)
         {
             shengShiRan = 1;
-            SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
+            Shader.SetGlobalFloat(Ran, shengShiRan);
+            // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
             Vector3 pos = CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
                 .CombatCameraControllder.Camera.transform.position;
             pos.z = -30;
-            SceneMonoConfig.shengShiMaterial.SetVector(Pos, pos);
+            Shader.SetGlobalVector(Pos, pos);
+            // SceneMonoConfig.shengShiMaterial.SetVector(Pos, pos);
 
             _isUpdateShengShi = true;
 
@@ -198,12 +201,14 @@ namespace GameLogic.Combat.CombatTool
             {
                 // _shengShiAddTime += t * 1f;
                 shengShiRan += t * 150;
-                SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
+                Shader.SetGlobalFloat(Ran, shengShiRan);
+                // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
                 // float v = Mathf.Lerp(shengShiStartSize, shengShiEndSize, _shengShiAddTime);
                 // ShengShiQiuTi.own.transform.localScale = Vector3.one * v;
                 if (shengShiRan >= 200)
                 {
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
 
                     _isUpdateShengShi = false;
                 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs

@@ -8,7 +8,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
     {
         public GameObject skyObejct;
 
-        public Material shengShiMaterial;
+       // public Material shengShiMaterial;
         protected Transform root;
         protected Transform moveRoot;
         public void Init(Transform root,Transform moveRoot)

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;
@@ -58,7 +59,7 @@ namespace GameLogic.Player
             AccountFileInfo.Instance.SavePlayerData();
         }
 
-        public List<ItemInfo> Summon(int id, int count)
+        public async CTask<List<ItemInfo>> Summon(int id, int count)
         {
             AccountFileInfo.SummonData summonData = summonDataMap[id];
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(summonData.id);
@@ -79,19 +80,42 @@ namespace GameLogic.Player
                 else
                 {
                     //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.oneConsume))
+                    if (openBoxConfig.CostItemID == 1007)
                     {
-                        PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
-                        allIitem = Summon(summonData, 1);
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                        if (TakuSDKManager.Instance.IsReady())
+                        {
+                            bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                            if (!isOK)
+                            {
+                                return null;
+                            }
+                        }
+                        else
+                        {
+                            return null;
+                        }
 
-                        summonData.onePayCount++;
-                        //summonData.nextOneFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
+#endif
                     }
                     else
                     {
-                        return null;
+                        //验证道具是否足够
+                        if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                                openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
+                        {
+                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
+                        }
+                        else
+                        {
+                            return null;
+                        }
                     }
+
+
+                    allIitem = Summon(summonData, 1);
+
+                    summonData.onePayCount++;
                 }
             }
             //十连抽
@@ -125,35 +149,56 @@ namespace GameLogic.Player
                 else
                 {
                     //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.tenConsume))
+                    if (openBoxConfig.CostItemID == 1007)
                     {
-                        PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
-                        allIitem = Summon(summonData, 10);
-                        if (summonData.isSummonSocre)
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                        if (TakuSDKManager.Instance.IsReady())
                         {
-                            //记录抽卡道具 用于成就检测
-                            List<int> drawHistory = new List<int>();
-                            foreach (var itemInfo in allIitem)
+                            bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                            if (!isOK)
                             {
-                                drawHistory.Add(itemInfo.itemID);
+                                return null;
                             }
-
-                            AccountFileInfo.IntList intList = new AccountFileInfo.IntList();
-                            intList.list = drawHistory;
-                            summonData.drawHistory.Add(intList);
-
-
-                            CheckAchievements(summonData);
+                        }
+                        else
+                        {
+                            return null;
                         }
 
-                        summonData.tenPayCount++;
-                        //summonData.nextTenFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
+#endif
                     }
                     else
                     {
-                        return null;
+                        if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                                openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
+                        {
+                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
+                        }
+                        else
+                        {
+                            return null;
+                        }
+                    }
+
+                    allIitem = Summon(summonData, 10);
+                    if (summonData.isSummonSocre)
+                    {
+                        //记录抽卡道具 用于成就检测
+                        List<int> drawHistory = new List<int>();
+                        foreach (var itemInfo in allIitem)
+                        {
+                            drawHistory.Add(itemInfo.itemID);
+                        }
+
+                        AccountFileInfo.IntList intList = new AccountFileInfo.IntList();
+                        intList.list = drawHistory;
+                        summonData.drawHistory.Add(intList);
+
+
+                        CheckAchievements(summonData);
                     }
+
+                    summonData.tenPayCount++;
                 }
             }
 

Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -248,6 +248,8 @@ public class RedDotManager : Singleton<RedDotManager>
 
     public bool isSkillUpgrade(SkillInfo _skillInfo)
     {
+        if (_skillInfo == null)
+            return false;
         var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
         if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Length)
         {

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -351,7 +351,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             //刷新支线任务
             List<EventConfig> zhiXianEvents = eventConfigs.Where(e =>
                 e.EventTriggerType == 6 && !BagIsEvent(e.ID) && !IsEventTrigger(e.ID) &&
-                e.SmallPlacesId == smallPlacesConfig.ID &&
+                ((e.SmallPlacesId == 0 && e.placeID == 0) ||
+                 (e.SmallPlacesId != 0 && e.SmallPlacesId == smallPlacesConfig.ID) ||
+                 (e.SmallPlacesId == 0 && e.placeID == smallPlacesConfig.PlacesId)) &&
                 eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
 
             if (zhiXianEvents.Count > 0)

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

@@ -22,41 +22,20 @@ namespace Fort23.Mono
             if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
-                return PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
             else
             {
-                if (openBoxConfig.CostItemID == 1007)
+                //验证道具是否足够
+                if (openBoxConfig.CostItemID != 1007 && !PlayerManager.Instance.BagController.IsEnough(
+                        openBoxConfig.CostItemID,
+                        openBoxConfig.oneConsume))
                 {
-#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                      if (TakuSDKManager.Instance.IsReady())
-                    {
-                        if (!await TakuSDKManager.Instance.ShowAutoAd())
-                        {
-                            return null;
-                        }
-                    }
-                    else
-                    {
-                        return null;
-                    }
-#endif
-                    return PlayerManager.Instance.SummonManager.Summon(configId, 10);
-                }
-                else
-                {
-                    //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.tenConsume))
-                    {
-                        return PlayerManager.Instance.SummonManager.Summon(configId, 10);
-                    }
-                    else
-                    {
-                        ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
-                        return null;
-                    }
+                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                    return null;
                 }
+
+                return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
         }
 
@@ -68,41 +47,20 @@ namespace Fort23.Mono
             if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
-                return PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
             else
             {
-                if (openBoxConfig.CostItemID == 1007)
+                //验证道具是否足够
+                if (openBoxConfig.CostItemID != 1007 && !PlayerManager.Instance.BagController.IsEnough(
+                        openBoxConfig.CostItemID,
+                        openBoxConfig.oneConsume))
                 {
-#if UNITY_ANDROID && !UNITY_EDITOR && Taptap
-                    if (TakuSDKManager.Instance.IsReady())
-                    {
-                        if (!await TakuSDKManager.Instance.ShowAutoAd())
-                        {
-                            return null;
-                        }
-                    }
-                    else
-                    {
-                        return null;
-                    }
-#endif
-                    return PlayerManager.Instance.SummonManager.Summon(configId, 1);
-                }
-                else
-                {
-                    //验证道具是否足够
-                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
-                            openBoxConfig.oneConsume))
-                    {
-                        return PlayerManager.Instance.SummonManager.Summon(configId, 1);
-                    }
-                    else
-                    {
-                        ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
-                        return null;
-                    }
+                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                    return null;
                 }
+
+                return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
         }
     }

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

@@ -57,20 +57,21 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            tenButton.onClick.AddListener(() =>
+            tenButton.onClick.AddListener(async() =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                     if (TakuSDKManager.Instance.IsReady())
-                    {
-                        if (!await TakuSDKManager.Instance.ShowAutoAd())
-                        {
-                            return null;
-                        }
-                    }
-                    else
+                      if (TakuSDKManager.Instance.IsReady())
+                {
+                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                    if (!isOK)
                     {
-                        return null;
+                        return;
                     }
+                }
+                else
+                {
+                    return;
+                }
 #endif
 
                 tenButton.gameObject.SetActive(false);

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

@@ -1,3 +1,4 @@
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -139,7 +140,16 @@ namespace Fort23.Mono
                     break;
             }
 
-            redDotComType01.CustomInit(2, skillConfigId);
+            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
+            {
+                redDotComType01.CustomInit(2, skillConfigId);
+            }
+            else
+            {
+                redDotComType01.CustomInit(2, null);
+            }
+
+         
         }
 
         public override void DormancyObj()

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

@@ -86,6 +86,7 @@ namespace Fort23.Mono
             this.goCallBack = goCallBack;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+            Btn_RemoveEvent.gameObject.SetActive(randomEventConfig.EventTriggerType != 4);
 
             AccountFileInfo.EventLinkData eventLinkData =
                 eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);

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

@@ -111,6 +111,7 @@ namespace Fort23.Mono
 
             _skillInfo.SkillData.star++;
             _skillInfo.CustomInt(_skillInfo.SkillData);
+            PlayerManager.Instance.myHero.ComputeHeroInfo();
             CustomInit(_skillInfo);
 
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
@@ -179,6 +180,7 @@ namespace Fort23.Mono
 
             _skillInfo.SkillData.level++;
             _skillInfo.CustomInt(_skillInfo.SkillData);
+            PlayerManager.Instance.myHero.ComputeHeroInfo();
             CustomInit(_skillInfo);
             AccountFileInfo.Instance.SavePlayerData();
         }
@@ -192,6 +194,7 @@ namespace Fort23.Mono
 
             _gongFaUpgradeInfoWidgets.Clear();
             _skillInfo = skillInfo;
+            RedDotComType01.CustomInit(2, _skillInfo);
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;

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

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

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

@@ -270,6 +270,7 @@ namespace Fort23.Mono
             {
                 heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
                 PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+                PlayerManager.Instance.myHero.Upgrade();
             }
             //圆满
             else if (type == 4)
@@ -279,7 +280,6 @@ namespace Fort23.Mono
 
             if (type != 4)
             {
-                PlayerManager.Instance.myHero.Upgrade();
                 HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
                     await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
                 await heroBreakthroughSuccessPanel.UIClosed();