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

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.009973586
+    - _Alpha: 0.20340419
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.55235326
+    - _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/LanguageChineseConfig.json

@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10688,
@@ -39846,7 +39846,7 @@
     },
     {
       "ID": 10702,
-      "txt": "占位"
+      "txt": "赠送给道友，提升{0}点心情值。"
     },
     {
       "ID": 10703,

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/HeroTuPoSuccessPanel.prefab.meta

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

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

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

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;

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs

@@ -14,6 +14,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
     {
         private AudioSourcePool audioSourcePool;
 
+        private bool _Finish;
+
         protected override void ProSetCombatInfo()
         {
         }
@@ -21,7 +23,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         protected override async void ProEnter()
         {
 #if !COMBAT_SERVER
-
+            _Finish = false;
             TimeLineAudioSeralization timeLineAudioSeralization =
                 mTimeLineAssetSerialization as TimeLineAudioSeralization;
             if (!string.IsNullOrEmpty(timeLineAudioSeralization.audioName))
@@ -42,6 +44,12 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                     {
                         audioSourcePool.TimeLineAudioEventLogic = this;
                     }
+
+                    if (_Finish && audioSourcePool != null)
+                    {
+                        audioSourcePool.Finish();
+                        this.audioSourcePool = null;
+                    }
                 }
             }
 #endif
@@ -72,6 +80,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
 
@@ -82,6 +91,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
 
@@ -92,6 +102,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 this.audioSourcePool.Finish();
             }
 
+            _Finish = true;
             audioSourcePool = null;
         }
     }

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

@@ -64,7 +64,7 @@ namespace Fort23.Mono
             ItemAssociateConfig itemAssociateConfig =
                 ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
 
-            if (itemAssociateConfig.LanID != -1 || itemAssociateConfig.LanID != 0)
+            if (itemAssociateConfig.LanID != -1 && itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);

Assets/Scripts/ThirdParty/Crasheye/Crasheye.cs

@@ -61,7 +61,7 @@ public class Crasheye : MonoBehaviour
 #endif
     }
 
-    void Start()
+    void Awake()
     {
         DontDestroyOnLoad(gameObject);
 

Assets/Settings/rpAsset.asset

@@ -23,7 +23,7 @@ MonoBehaviour:
   m_RequireOpaqueTexture: 1
   m_OpaqueDownsampling: 1
   m_SupportsTerrainHoles: 1
-  m_SupportsHDR: 0
+  m_SupportsHDR: 1
   m_HDRColorBufferPrecision: 0
   m_MSAA: 1
   m_RenderScale: 1

Assets/Settings/rpAsset_Renderer.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e03bbffa856b4d149b49c5ff90f72fb6, type: 3}
-  m_Name: Blit
+  m_Name: FlatKitPixelation
   m_EditorClassIdentifier: 
   m_Active: 1
   settings:
@@ -19,20 +19,6 @@ MonoBehaviour:
     blitMaterialPassIndex: 0
     destination: 0
     textureId: _BlitPassTexture
---- !u!114 &-1306005803540324591
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  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: edb250ac097f481fa89c38a1e224b773, type: 3}
-  m_Name: FlatKitPixelation
-  m_EditorClassIdentifier: 
-  m_Active: 1
-  settings: {fileID: 0}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -50,10 +36,9 @@ MonoBehaviour:
     hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
   m_RendererFeatures:
   - {fileID: 8096991511476621891}
-  - {fileID: -1306005803540324591}
   - {fileID: -3260757889090043925}
   - {fileID: 5558826321195499833}
-  m_RendererFeatureMap: 43d2ea46e14a5e70115f6125a422e0edeb3f3ce2f975bfd23901f35216eb244d
+  m_RendererFeatureMap: 43d2ea46e14a5e70eb3f3ce2f975bfd23901f35216eb244d
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}

Assets/StreamingAssets/Dll/DllMD5.txt

@@ -1 +1 @@
-{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"252ef60ca26130adf058c8f59f3e97ce","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"99793525c7b3e05b76917f3f3d89c767","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"66a2681b05176860a4a045883dbb4cec","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"607caf6ec97b30f4276bfe64c8b80fd5","size":329728},{"fileName":"Fort23.Mono.dll.bytes","md5":"f581cc9b3e991e90142b96ba3b0775d6","size":920576},{"fileName":"GameTimeLine.dll.bytes","md5":"76e9f9a384f3b24118ff154fc917d9f5","size":52224},{"fileName":"mscorlib.dll.bytes","md5":"6720ca3ecc69bac6e6f4d95c765891bd","size":2668544},{"fileName":"NetCoreBasic.dll.bytes","md5":"510da4f4ef70ba018d49685158eb4b1c","size":10752},{"fileName":"Protocol.dll.bytes","md5":"ba94799fcb1a3542fe1c52204a9c9b62","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"b2b3d4e7bbd8f4a28cd5c3e783835d5d","size":899584},{"fileName":"ThirdParty.dll.bytes","md5":"68a609e080e77e5125f4d9f32bfa3be5","size":281600},{"fileName":"Unity.Timeline.dll.bytes","md5":"90da2499f74467c0879feea95656d0ab","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"fc51f09b192b0e3b7780ebeb716a5c6d","size":991232}]}
+{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"77c00b63a080880f4c87872e0b50472f","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"14117e2592ea782b6f00985a44c3eab9","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"66a2681b05176860a4a045883dbb4cec","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"8ded8ed98d4fc452b9556a4af41099d9","size":330240},{"fileName":"Fort23.Mono.dll.bytes","md5":"0bffd5d98d6d132ba3ba39cae033e72d","size":922624},{"fileName":"GameTimeLine.dll.bytes","md5":"5d8fba394019188d3593b525d865cf51","size":52736},{"fileName":"mscorlib.dll.bytes","md5":"9515ad7f53bd8dd5846ee76817b34054","size":2668544},{"fileName":"NetCoreBasic.dll.bytes","md5":"510da4f4ef70ba018d49685158eb4b1c","size":10752},{"fileName":"Protocol.dll.bytes","md5":"ba94799fcb1a3542fe1c52204a9c9b62","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"b2b3d4e7bbd8f4a28cd5c3e783835d5d","size":899584},{"fileName":"ThirdParty.dll.bytes","md5":"68a609e080e77e5125f4d9f32bfa3be5","size":281600},{"fileName":"Unity.Timeline.dll.bytes","md5":"90da2499f74467c0879feea95656d0ab","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"165505d96b9f6e5df0b181888f8fc9c3","size":985600}]}