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

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat   resolved by origin/master(远端) version

Assets/Art/Character/zhiyangzhenren/xiaojian.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: xiaojian_t40
+  assetBundleName: xiaojian_t42
   assetBundleVariant: 

Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: tiankonglevelbattle02
   assetBundleVariant: 

Assets/Art/UIAssets/bg/bg_lh_quelinger.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_lh_quelinger
   assetBundleVariant: 

Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_lh_queyinger
   assetBundleVariant: 

Assets/Art/UIAssets/bg/bg_lh_wanxi.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_lh_wanxi
   assetBundleVariant: 

Assets/Art/VFX/Epic Toon FX/Textures/glow1.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: glow1_t26
+  assetBundleName: glow1_t27
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui_sf.prefab.meta

@@ -3,5 +3,5 @@ guid: D3hKtH+uByn/BWn5Lscm0opSbD+yt0HPkM/jQonMGR+cMLo+XzprMRX4CzfD
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gf_bingzhui_sf
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gf_duzhen_sf.prefab.meta

@@ -3,5 +3,5 @@ guid: WS5MsymqBXPEyNg50HLujNrr3cNyU/61x29AQLEMFHtZnjIjqmMWNBxwrwUI
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gf_duzhen_sf
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui sd add.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_sd_add
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_dian1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_dian1
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_fzgf_wl1
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_fzgf_xian_wl 1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_fzgf_xian_wl_1
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_fzgf_xian_wl.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_fzgf_xian_wl
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_huan_add.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_huan_add
   assetBundleVariant: 

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.7652023
+    - _Alpha: 0.005366751
     - _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.57886076
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_pojing_wl1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_pojing_wl1
   assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_quan add.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_quan_add
   assetBundleVariant: 

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.10382682
+    - _Alpha: 0.20340419
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.34226894
+    - _MainTexOffsetU: 0.20804214
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Art/VFX/Materials/UIMat/ui_xuanzhuan glow.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: ui_xuanzhuan_glow
   assetBundleVariant: 

Assets/Art/VFX/Tex/Noise/Noise363.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise363_t18
+  assetBundleName: noise363_t20
   assetBundleVariant: 

Assets/Art/VFX/Tex/Noise/Noise83.tga.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise83_t41
+  assetBundleName: noise83_t43
   assetBundleVariant: 

Assets/Art/VFX/Tex/Trails/trail03.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: trail03_t35
+  assetBundleName: trail03_t37
   assetBundleVariant: 

Assets/Art/VFX/Tex/maobi2.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: maobi2_t46
+  assetBundleName: maobi2_t48
   assetBundleVariant: 

Assets/Art/VFX/Textures/01np_dg4.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 01np_dg4_t48
+  assetBundleName: 01np_dg4_t50
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/RadialMask_05.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: radialmask_05_t15
+  assetBundleName: radialmask_05_t16
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/VertMask_13.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: vertmask_13_t16
+  assetBundleName: vertmask_13_t32
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/VertMask_18 1.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: vertmask_18_1_t38
+  assetBundleName: vertmask_18_1_t40
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask05.png.meta

@@ -210,6 +210,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 8192
+    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: []
@@ -227,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: mask05_t15
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask_hen03.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_hen03_t33
+  assetBundleName: mask_hen03_t35
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask_u.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_u_t28
+  assetBundleName: mask_u_t29
   assetBundleVariant: 

Assets/Art/VFX/Textures/Mask/mask_v02.png.meta

@@ -227,5 +227,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_v02_t43
+  assetBundleName: mask_v02_t45
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise218.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise218_t31
+  assetBundleName: noise218_t33
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise221.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise221_t32
+  assetBundleName: noise221_t34
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise339.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise339_t47
+  assetBundleName: noise339_t49
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise382_1.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise382_1_t25
+  assetBundleName: noise382_1_t18
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise482.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise482_t36
+  assetBundleName: noise482_t38
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/Noise94.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise94_t30
+  assetBundleName: noise94_t31
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/NoiseCell01_inverted.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noisecell01_inverted_t20
+  assetBundleName: noisecell01_inverted_t22
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/fx_noise_shu1.png.meta

@@ -227,5 +227,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_noise_shu1_t44
+  assetBundleName: fx_noise_shu1_t46
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/noise_kt1_hen.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise_kt1_hen_t34
+  assetBundleName: noise_kt1_hen_t36
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/tumo1.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: tumo1_t29
+  assetBundleName: tumo1_t30
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/wb_wenli6.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: wb_wenli6_t19
+  assetBundleName: wb_wenli6_t21
   assetBundleVariant: 

Assets/Art/VFX/Textures/Noise/wl_shu1.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: wl_shu1_t21
+  assetBundleName: wl_shu1_t23
   assetBundleVariant: 

Assets/Art/VFX/Textures/Sheet/xl_xiaoshandian.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: xl_xiaoshandian_t27
+  assetBundleName: xl_xiaoshandian_t28
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/Trail13_al.png.meta

@@ -227,5 +227,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: trail13_al_t22
+  assetBundleName: trail13_al_t24
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/fx_Trail22_al.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_trail22_al_t23
+  assetBundleName: fx_trail22_al_t25
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/trail_smoke2.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: trail_smoke2_t24
+  assetBundleName: trail_smoke2_t26
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx hen3101.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_hen3101_t37
+  assetBundleName: fx_hen3101_t39
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_base_tw1.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_base_tw1_t39
+  assetBundleName: fx_base_tw1_t41
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_hen_wl3.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_hen_wl3_t17
+  assetBundleName: fx_hen_wl3_t19
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_lz01_al.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_lz01_al_t45
+  assetBundleName: fx_lz01_al_t47
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_ring2.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ring2_t17
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_tw_ad2.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_tw_ad2_t49
+  assetBundleName: fx_tw_ad2_t51
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_wl_sd2.png.meta

@@ -185,5 +185,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_wl_sd2_t42
+  assetBundleName: fx_wl_sd2_t44
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_dujie_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: CH4esnykVy1P8XU3xgtqwakrq8gArsoABN/eNmnY+8AjeUm/nj46uCYH+kzF
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_dujie_loop
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_gf_fangzhi_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: XnoetSikVHtPbcVklCOJrD+QZvq+xat7rkaHA/dwoFlmeDtoTSQReRbSxiqW
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_gf_fangzhi_loop
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_gf_fz_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: CC8dsi+sUi5J5AkivRDTJqVaVFQTYgIVk1R/B6OQfYaEJdbuhnq4Abo5F+rt
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_gf_fz_loop
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_gf_fz_xian_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: XXoe4yr+U3lnsF3e43d6qsBrRqfJCU/uFbRaOrtigfyHQ56jtSk8GN9dFZWa
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_gf_fz_xian_loop
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_jingjie_dujie.prefab.meta

@@ -3,5 +3,5 @@ guid: Xi8XsHurAXy3cyycyop4UmaEt2DXdjVg1pG/rLc0DA7pjDzPDPx8Zo/i5XGv
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_jingjie_dujie
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_jingjie_yuanman.prefab.meta

@@ -3,5 +3,5 @@ guid: B3JN4Sv+VX3tIAPUKZfqGZnjyDAa37CAIB2ablQWPPu8BIvHzxe+qW40xxH+
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_jingjie_yuanman
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_pojing_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: XHwX5iurUi6AZLqgEG6k/Cq6k8zrP/aNPc67p4+hNniOF9mO1F7xLoTzISRY
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_pojing_loop
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_pojing_loop2.prefab.meta

@@ -3,5 +3,5 @@ guid: DS8b5in/Ui1QTnlswX07r2oZYhLHGsNPS+F6K3P9Si8fy3Y0GCl+MoCjss5r
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_pojing_loop2
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_tupo2.prefab.meta

@@ -3,5 +3,5 @@ guid: D39J5iyrAS0ExiuZld27J5iBV5za2eB0TJ/0Js3qXMbydk5/bIZIeV9e5Vvj
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_tupo2
   assetBundleVariant: 

Assets/Res/Config/ItemAssociateConfig.json.meta

@@ -3,5 +3,5 @@ guid: XSsa4CmpAHPCjhO7r4e7Y/eAbuusOH0/RoghHh3aZ0UOnYysnKJMs80slHTS
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: itemassociateconfig
   assetBundleVariant: 

Assets/Res/Config/ShopItemConfig.json

@@ -1942,7 +1942,7 @@
         1
       ],
       "costItemId": 1004,
-      "price": 200,
+      "price": 100,
       "oldPrice": 1,
       "buyCount": 5,
       "maxBuyCount": -1,
@@ -2103,7 +2103,7 @@
         1
       ],
       "costItemId": 1004,
-      "price": 98,
+      "price": 68,
       "oldPrice": 1,
       "buyCount": 10,
       "maxBuyCount": -1,
@@ -2126,7 +2126,7 @@
         1
       ],
       "costItemId": 1004,
-      "price": 168,
+      "price": 98,
       "oldPrice": 1,
       "buyCount": 1,
       "maxBuyCount": -1,
@@ -2149,7 +2149,7 @@
         1
       ],
       "costItemId": 1004,
-      "price": 328,
+      "price": 168,
       "oldPrice": 1,
       "buyCount": 1,
       "maxBuyCount": -1,
@@ -2172,7 +2172,7 @@
         1
       ],
       "costItemId": 1004,
-      "price": 648,
+      "price": 328,
       "oldPrice": 1,
       "buyCount": 1,
       "maxBuyCount": -1,

Assets/Res/UI/Canvas/Canvas.prefab

@@ -403,7 +403,7 @@ Camera:
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
   m_TargetEye: 3
-  m_HDR: 1
+  m_HDR: 0
   m_AllowMSAA: 1
   m_enableGDRP: 1
   m_backfaceCulling: 0

Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab.meta

@@ -3,5 +3,5 @@ guid: BilMvSKvUnwNOXa5pJer2i9eLGAC6jRM038Ebe4ewDkBkLujGb02Vxn5IK8k
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: divinesencehuoquwidget
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanel.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: heryuanmansuccesspanel
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanelopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: heryuanmansuccesspanelopen
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobreakthroughsuccesspanel
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobreakthroughsuccesspanelopen
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanel.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: herotuposuccesspanel
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanelopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: herotuposuccesspanelopen
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller

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

Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller.meta

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

Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim

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

Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim.meta

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

Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: XXMc5nikVHMYC4UBQxdgsvnc3Wf8pFGUooVP3jPJ6EsSaj4azqoZzUFoEPRo
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: herobreakthroughsuccesspanel
+  assetBundleName: herotuposuccesspanel
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

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

Assets/Res/UI/ShopPanel/DaiJinJuanWidgetopen.anim

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

Assets/Res/UI/TipMessagePanel/HelpTipPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: CHIfsXmpWy7BpGbxXTfEqH2RCwQcJp3YUqDlNkZkFvK5qEK5BuUWsSq5ppw8
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: tipmessagepaneltype2
+  assetBundleName: helptippanel
   assetBundleVariant: 

Assets/Res/UI/TipMessagePanel/showTips.anim

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

Assets/Res/UI/UIanima/UIanimaKzOpen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: uianimakzopen
   assetBundleVariant: 

Assets/Res/UI/UIanima/UIanimaScale1.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: uianimascale1
   assetBundleVariant: 

Assets/Res/UIAnimRes/KzScale.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: kzscale
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetBtn1_map.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetbtn1_map
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetBtn_Event.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetbtn_event
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoctrl.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfoctrl
   assetBundleVariant: 

Assets/Res/UIAtlas/battle.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: battle
   assetBundleVariant: 

Assets/Res/UIAtlas/touxiang.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: touxiang
   assetBundleVariant: 

Assets/Resources/Shader/CTC.shadergraph

@@ -0,0 +1,717 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "1ce74adbad9944a1a27a3fa1e941c89f",
+    "m_Properties": [
+        {
+            "m_Id": "8ab34c65429b4b9cbbfc71e8ac756e22"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "bffa9177c400499286f7b7bd9796c84a"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "81d3e177d9764dd682ec254618f834bd"
+        },
+        {
+            "m_Id": "f066513eba274262b9fbd88522796629"
+        },
+        {
+            "m_Id": "b22667717a4d41959a7c2cc058f3f372"
+        },
+        {
+            "m_Id": "3003a890f32242a5a9b6c2f60cc61f94"
+        },
+        {
+            "m_Id": "b17948bc49e74d8f99a040f52c747d64"
+        },
+        {
+            "m_Id": "5c4c3267b8d448058df18cd1b3213ccd"
+        }
+    ],
+    "m_LocalVariables": [],
+    "m_RegisterIDs": [],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "5c4c3267b8d448058df18cd1b3213ccd"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3003a890f32242a5a9b6c2f60cc61f94"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b17948bc49e74d8f99a040f52c747d64"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "5c4c3267b8d448058df18cd1b3213ccd"
+                },
+                "m_SlotId": 1
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "81d3e177d9764dd682ec254618f834bd"
+            },
+            {
+                "m_Id": "f066513eba274262b9fbd88522796629"
+            },
+            {
+                "m_Id": "b22667717a4d41959a7c2cc058f3f372"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 200.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "3003a890f32242a5a9b6c2f60cc61f94"
+            }
+        ]
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Shader Graphs",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": ""
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": [
+        {
+            "m_Id": "7560a87ba5624a4f9fdff3b92294f638"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "10d31e397eb84fd29b5f4a14d7ea12ec",
+    "m_Id": 7,
+    "m_DisplayName": "A",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "3003a890f32242a5a9b6c2f60cc61f94",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.BaseColor",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9e41793d19ff4dafad4b4cf47b807e73"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "42f6dd18655f4ff293a27e266627bd2a",
+    "m_Id": 5,
+    "m_DisplayName": "G",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "44f54053518f4d7e92f1cbc4f97696ff",
+    "m_Id": 0,
+    "m_DisplayName": "Position",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Position",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
+    "m_ObjectId": "5c4c3267b8d448058df18cd1b3213ccd",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -293.0,
+            "y": 209.0,
+            "width": 208.0,
+            "height": 435.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9d7710fb5e894e0aa742dd7d8f760dc7"
+        },
+        {
+            "m_Id": "8a4bfc4c178b460c9665b7e29bd09e2f"
+        },
+        {
+            "m_Id": "42f6dd18655f4ff293a27e266627bd2a"
+        },
+        {
+            "m_Id": "e8bcb9420e2f472c90d2eec5b7c0b64d"
+        },
+        {
+            "m_Id": "10d31e397eb84fd29b5f4a14d7ea12ec"
+        },
+        {
+            "m_Id": "77d96a39a2394826a6fd30ef333b4307"
+        },
+        {
+            "m_Id": "b123008ec0564c2d895dd4cfa38258db"
+        },
+        {
+            "m_Id": "f78eaf58988a4f8fae26814f28ecdefd"
+        }
+    ],
+    "synonyms": [
+        "tex2d"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_TextureType": 0,
+    "m_NormalMapSpace": 0,
+    "m_EnableGlobalMipBias": true,
+    "m_MipSamplingMode": 0
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "7560a87ba5624a4f9fdff3b92294f638",
+    "m_Datas": [],
+    "m_ActiveSubTarget": {
+        "m_Id": "bf2f43b540f04a17b43db23c87c76cc4"
+    },
+    "m_AllowMaterialOverride": false,
+    "m_SurfaceType": 0,
+    "m_ZTestMode": 4,
+    "m_ZWriteControl": 0,
+    "m_AlphaMode": 0,
+    "m_RenderFace": 2,
+    "m_AlphaClip": false,
+    "m_CastShadows": true,
+    "m_ReceiveShadows": true,
+    "m_SupportsLODCrossFade": false,
+    "m_CustomEditorGUI": "",
+    "m_SupportVFX": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+    "m_ObjectId": "77d96a39a2394826a6fd30ef333b4307",
+    "m_Id": 1,
+    "m_DisplayName": "Texture",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Texture",
+    "m_StageCapability": 3,
+    "m_BareResource": false,
+    "m_Texture": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "81d3e177d9764dd682ec254618f834bd",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "44f54053518f4d7e92f1cbc4f97696ff"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8a4bfc4c178b460c9665b7e29bd09e2f",
+    "m_Id": 4,
+    "m_DisplayName": "R",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+    "m_ObjectId": "8ab34c65429b4b9cbbfc71e8ac756e22",
+    "m_Guid": {
+        "m_GuidSerialized": "617ac6bf-a713-4522-af2e-c16c89bf5b70"
+    },
+    "m_Name": "MainTex",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "MainTex",
+    "m_DefaultReferenceName": "_MainTex",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Priority": 10,
+    "m_Value": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "isMainTexture": false,
+    "useTilingAndOffset": false,
+    "m_Modifiable": true,
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "8e51617cc6064beda777e785c0059096",
+    "m_Id": 0,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "9d7710fb5e894e0aa742dd7d8f760dc7",
+    "m_Id": 0,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "9e41793d19ff4dafad4b4cf47b807e73",
+    "m_Id": 0,
+    "m_DisplayName": "Base Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "BaseColor",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 0.5,
+        "g": 0.5,
+        "b": 0.5,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "b123008ec0564c2d895dd4cfa38258db",
+    "m_Id": 2,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "b17948bc49e74d8f99a040f52c747d64",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -541.0,
+            "y": 289.0,
+            "width": 129.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "eacd03b22b764a80995b3c1216e3389b"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "8ab34c65429b4b9cbbfc71e8ac756e22"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "b22667717a4d41959a7c2cc058f3f372",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Tangent",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "e270c8b1094c4263be1e6b3baf3aef6f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 2,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
+    "m_ObjectId": "bf2f43b540f04a17b43db23c87c76cc4",
+    "m_RemovedVariants": [],
+    "m_RemovedPasses": [],
+    "keywordsStatus": [
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true
+    ],
+    "passStatus": [
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true
+    ],
+    "surfaceOptionsFoldout": false,
+    "passesFoldout": false,
+    "variantsFoldout": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "bffa9177c400499286f7b7bd9796c84a",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "8ab34c65429b4b9cbbfc71e8ac756e22"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "e270c8b1094c4263be1e6b3baf3aef6f",
+    "m_Id": 0,
+    "m_DisplayName": "Tangent",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Tangent",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "e8bcb9420e2f472c90d2eec5b7c0b64d",
+    "m_Id": 6,
+    "m_DisplayName": "B",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+    "m_ObjectId": "eacd03b22b764a80995b3c1216e3389b",
+    "m_Id": 0,
+    "m_DisplayName": "MainTex",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "f066513eba274262b9fbd88522796629",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Normal",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8e51617cc6064beda777e785c0059096"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
+    "m_ObjectId": "f78eaf58988a4f8fae26814f28ecdefd",
+    "m_Id": 3,
+    "m_DisplayName": "Sampler",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Sampler",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+

Assets/Resources/Shader/CTC.shadergraph.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: Bn1MvC+oVHMKa1+QgOrjejmEw+DAU6tcz3Vb3v9oqGXDR8eqNNS02QwrTAph
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Resources/Shader/Shader Graphs_CTC.mat

@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8825604905674675511
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shader Graphs_CTC
+  m_Shader: {fileID: -6465566751694194690, guid: 97c95578b284fcf4fad806d83dc0f050, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/Resources/Shader/Shader Graphs_CTC.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CyhKti+vByrpWV7LAMwNNlRJaG+lKEwq8DDAhEIOnI5HYWACs+qwqTOWWfQB
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -61,8 +61,10 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _depthoff: 1.18
+    - _fanwei: -0.07
     - _qiangdu: 5
     - _ran: 84.88
+    - _shengshiRan: 100
     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}

Assets/Scenes/testCombat.scene

@@ -135,7 +135,6 @@ GameObject:
   - component: {fileID: 123020045}
   - component: {fileID: 123020044}
   - component: {fileID: 123020046}
-  - component: {fileID: 123020047}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: GameStart
@@ -193,24 +192,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   massgeText: {fileID: 773560731}
   loadSlider: {fileID: 1324294698}
---- !u!114 &123020047
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 123020043}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0e351b4322d564b589ca735763c1da14, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  YourAppKeyForAndroid: sm0zzhed
-  YourChannelIdForAndroid: ysj
-  YourAppKeyForIOS: wi9su6vc
-  YourChannelIdForIOS: YourChannelIdForIOS
-  YourAppKeyForPC: ve5x7wfy
-  YourChannelIdForPC: ysj_pc
 --- !u!1 &164319092
 GameObject:
   m_ObjectHideFlags: 0
@@ -504,221 +485,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!213 &333746269
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 389
-      y: 1229
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 389, y: 1229}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &376281604
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,7 +1295,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 333746269}
+  m_Sprite: {fileID: 2080538702}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1560,6 +1326,221 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1831378551}
   m_CullTransparentMesh: 1
+--- !u!213 &2080538702
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -106,7 +106,7 @@ namespace GameLogic.Combat.CombatTool
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
                     SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
-                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran,100f);
                     // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
                 });
             cTaskAwaitBuffer.AddTask(task_a);
@@ -176,7 +176,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void StartPayShengShi(Transform root)
         {
-            shengShiRan = 1;
+            shengShiRan = 0;
             Shader.SetGlobalFloat(Ran, shengShiRan);
             // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
             Vector3 pos = CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
@@ -200,14 +200,14 @@ namespace GameLogic.Combat.CombatTool
             if (_isUpdateShengShi)
             {
                 // _shengShiAddTime += t * 1f;
-                shengShiRan += t * 150;
+                shengShiRan += t*0.5f ;
                 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)
+                if (shengShiRan >= 0.4)
                 {
-                    Shader.SetGlobalFloat(Ran, 0.1f);
+                    Shader.SetGlobalFloat(Ran, 100);
                     // SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
 
                     _isUpdateShengShi = false;