浏览代码

修改bug

DESKTOP-BGJIU14\ck 1 天之前
父节点
当前提交
dbaa85b133
共有 86 个文件被更改,包括 784 次插入609 次删除
  1. 1 1
      Assets/Art/Character/zhiyangzhenren/xiaojian.png.meta
  2. 1 1
      Assets/Art/UIAssets/bg/bg_lh_quelinger.png.meta
  3. 1 1
      Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta
  4. 1 1
      Assets/Art/VFX/Epic Toon FX/Textures/glow1.png.meta
  5. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui_sf.prefab.meta
  6. 1 1
      Assets/Art/VFX/FXPrefabs/fx_gf_duzhen_sf.prefab.meta
  7. 1 1
      Assets/Art/VFX/Materials/UIMat/ui sd add.mat.meta
  8. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_dian1.mat.meta
  9. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat.meta
  10. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_fzgf_xian_wl 1.mat.meta
  11. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_fzgf_xian_wl.mat.meta
  12. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_huan_add.mat.meta
  13. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_pojing_wl1.mat.meta
  14. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_quan add.mat.meta
  15. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_xuanzhuan glow.mat.meta
  16. 1 1
      Assets/Art/VFX/Tex/Noise/Noise363.png.meta
  17. 1 1
      Assets/Art/VFX/Tex/Noise/Noise83.tga.meta
  18. 1 1
      Assets/Art/VFX/Tex/Trails/trail03.png.meta
  19. 1 1
      Assets/Art/VFX/Tex/maobi2.png.meta
  20. 1 1
      Assets/Art/VFX/Textures/01np_dg4.png.meta
  21. 1 1
      Assets/Art/VFX/Textures/Dots/fx_glow_fangshe.png.meta
  22. 1 1
      Assets/Art/VFX/Textures/Mask/RadialMask_05.png.meta
  23. 1 1
      Assets/Art/VFX/Textures/Mask/VertMask_13.png.meta
  24. 1 1
      Assets/Art/VFX/Textures/Mask/VertMask_18 1.png.meta
  25. 15 1
      Assets/Art/VFX/Textures/Mask/mask05.png.meta
  26. 1 1
      Assets/Art/VFX/Textures/Mask/mask_hen03.png.meta
  27. 1 1
      Assets/Art/VFX/Textures/Mask/mask_shu.png.meta
  28. 1 1
      Assets/Art/VFX/Textures/Mask/mask_u.png.meta
  29. 1 1
      Assets/Art/VFX/Textures/Mask/mask_v02.png.meta
  30. 1 1
      Assets/Art/VFX/Textures/Noise/Noise218.png.meta
  31. 1 1
      Assets/Art/VFX/Textures/Noise/Noise221.png.meta
  32. 1 1
      Assets/Art/VFX/Textures/Noise/Noise339.png.meta
  33. 1 1
      Assets/Art/VFX/Textures/Noise/Noise382_1.png.meta
  34. 1 1
      Assets/Art/VFX/Textures/Noise/Noise482.png.meta
  35. 1 1
      Assets/Art/VFX/Textures/Noise/Noise94.png.meta
  36. 1 1
      Assets/Art/VFX/Textures/Noise/NoiseCell01_inverted.png.meta
  37. 1 1
      Assets/Art/VFX/Textures/Noise/fx_noise_shu1.png.meta
  38. 1 1
      Assets/Art/VFX/Textures/Noise/noise_kt1_hen.png.meta
  39. 1 1
      Assets/Art/VFX/Textures/Noise/tumo1.png.meta
  40. 1 1
      Assets/Art/VFX/Textures/Noise/wb_wenli6.png.meta
  41. 1 1
      Assets/Art/VFX/Textures/Noise/wl_shu1.png.meta
  42. 1 1
      Assets/Art/VFX/Textures/Sheet/xl_xiaoshandian.png.meta
  43. 1 1
      Assets/Art/VFX/Textures/Trails/Trail13_al.png.meta
  44. 1 1
      Assets/Art/VFX/Textures/Trails/fx_Trail22_al.png.meta
  45. 1 1
      Assets/Art/VFX/Textures/Trails/trail_smoke2.png.meta
  46. 1 1
      Assets/Art/VFX/Textures/fx hen3101.png.meta
  47. 1 1
      Assets/Art/VFX/Textures/fx_base_tw1.png.meta
  48. 1 1
      Assets/Art/VFX/Textures/fx_hen_wl3.png.meta
  49. 1 1
      Assets/Art/VFX/Textures/fx_lz01_al.png.meta
  50. 1 1
      Assets/Art/VFX/Textures/fx_ring2.png.meta
  51. 1 1
      Assets/Art/VFX/Textures/fx_tw_ad2.png.meta
  52. 1 1
      Assets/Art/VFX/Textures/fx_wl_sd2.png.meta
  53. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_dujie_loop.prefab.meta
  54. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_gf_fangzhi_loop.prefab.meta
  55. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_gf_fz_loop.prefab.meta
  56. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_gf_fz_xian_loop.prefab.meta
  57. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_jingjie_dujie.prefab.meta
  58. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_jingjie_yuanman.prefab.meta
  59. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_pojing_loop.prefab.meta
  60. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_pojing_loop2.prefab.meta
  61. 1 1
      Assets/Art/VFX/UIFXprefab/fx_ui_tupo2.prefab.meta
  62. 1 1
      Assets/Res/Config/ItemAssociateConfig.json.meta
  63. 1 1
      Assets/Res/UI/Canvas/Canvas.prefab
  64. 1 1
      Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanel.controller.meta
  65. 1 1
      Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanelopen.anim.meta
  66. 1 1
      Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanel.controller.meta
  67. 1 1
      Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanelopen.anim.meta
  68. 1 1
      Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta
  69. 1 1
      Assets/Res/UI/TipMessagePanel/HelpTipPanel.prefab.meta
  70. 1 1
      Assets/Res/UIAnimRes/KzScale.asset.meta
  71. 1 1
      Assets/Res/UIAnimRes/TweenAssetBtn1_map.asset.meta
  72. 1 1
      Assets/Res/UIAnimRes/TweenAssetBtn_Event.asset.meta
  73. 1 1
      Assets/Res/UIAnimRes/TweenAssetInfoctrl.asset.meta
  74. 1 1
      Assets/Res/UIAtlas/battle.spriteatlasv2.meta
  75. 1 1
      Assets/Res/UIAtlas/touxiang.spriteatlasv2.meta
  76. 216 235
      Assets/Scenes/testCombat.scene
  77. 1 1
      Assets/Scripts/ThirdParty/Crasheye/Crasheye.cs
  78. 1 1
      Assets/Settings/rpAsset.asset
  79. 3 18
      Assets/Settings/rpAsset_Renderer.asset
  80. 1 1
      Assets/StreamingAssets/Dll/DllMD5.txt
  81. 二进制
      Assets/StreamingAssets/Dll/UnityEngine.CoreModule.dll.bytes
  82. 二进制
      Assets/StreamingAssets/Dll/mscorlib.dll.bytes
  83. 0 0
      Assets/StreamingAssets/assetConfig.txt
  84. 1 1
      Assets/StreamingAssets/assetMD5.txt
  85. 471 277
      UserSettings/Layouts/default-2022.dwlt
  86. 1 0
      XiuXianGame.sln.DotSettings.user

+ 1 - 1
Assets/Art/Character/zhiyangzhenren/xiaojian.png.meta

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

+ 1 - 1
Assets/Art/UIAssets/bg/bg_lh_quelinger.png.meta

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

+ 1 - 1
Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta

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

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

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

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

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

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

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_dian1.mat.meta

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

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

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

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

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

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

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

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

+ 1 - 1
Assets/Art/VFX/Tex/Noise/Noise363.png.meta

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

+ 1 - 1
Assets/Art/VFX/Tex/Noise/Noise83.tga.meta

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

+ 1 - 1
Assets/Art/VFX/Tex/Trails/trail03.png.meta

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

+ 1 - 1
Assets/Art/VFX/Tex/maobi2.png.meta

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

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

+ 1 - 1
Assets/Art/VFX/Textures/Dots/fx_glow_fangshe.png.meta

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

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

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

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

+ 15 - 1
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_t13
   assetBundleVariant: 

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

+ 1 - 1
Assets/Art/VFX/Textures/Mask/mask_shu.png.meta

@@ -241,5 +241,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: mask_shu_t14
+  assetBundleName: mask_shu_t15
   assetBundleVariant: 

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

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/Noise218.png.meta

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/Noise221.png.meta

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/Noise339.png.meta

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

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/Noise482.png.meta

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/Noise94.png.meta

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

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

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

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

+ 1 - 1
Assets/Art/VFX/Textures/Noise/tumo1.png.meta

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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
Assets/Art/VFX/Textures/fx_ring2.png.meta

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

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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
Assets/Res/Config/ItemAssociateConfig.json.meta

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

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

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanel.controller.meta

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

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/Animator/HerYuanManSuccessPanelopen.anim.meta

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

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanel.controller.meta

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

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/Animator/HeroTuPoSuccessPanelopen.anim.meta

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

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta

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

+ 1 - 1
Assets/Res/UI/TipMessagePanel/HelpTipPanel.prefab.meta

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

+ 1 - 1
Assets/Res/UIAnimRes/KzScale.asset.meta

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

+ 1 - 1
Assets/Res/UIAnimRes/TweenAssetBtn1_map.asset.meta

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

+ 1 - 1
Assets/Res/UIAnimRes/TweenAssetBtn_Event.asset.meta

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

+ 1 - 1
Assets/Res/UIAnimRes/TweenAssetInfoctrl.asset.meta

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

+ 1 - 1
Assets/Res/UIAtlas/battle.spriteatlasv2.meta

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

+ 1 - 1
Assets/Res/UIAtlas/touxiang.spriteatlasv2.meta

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

+ 216 - 235
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
@@ -715,6 +696,221 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!213 &671799665
+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 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -1256,221 +1452,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!213 &1787246934
-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 &1831378551
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,7 +1510,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1787246934}
+  m_Sprite: {fileID: 671799665}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 1 - 1
Assets/Scripts/ThirdParty/Crasheye/Crasheye.cs

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

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

+ 3 - 18
Assets/Settings/rpAsset_Renderer.asset

@@ -10,29 +10,15 @@ 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
+  m_Active: 0
   settings:
     Event: 500
     blitMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
     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}

+ 1 - 1
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":"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":"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}]}

二进制
Assets/StreamingAssets/Dll/UnityEngine.CoreModule.dll.bytes


二进制
Assets/StreamingAssets/Dll/mscorlib.dll.bytes


文件差异内容过多而无法显示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 1 - 1
Assets/StreamingAssets/assetMD5.txt

@@ -1 +1 @@
-638966434934940897
+638977950189740177

文件差异内容过多而无法显示
+ 471 - 277
UserSettings/Layouts/default-2022.dwlt


+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -11,6 +11,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncMethodBuilderCore_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F82_003F86e88926_003FAsyncMethodBuilderCore_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABatchFilterSettings_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F2b_003F6302754e_003FBatchFilterSettings_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABoolean_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fb7_003F8b615c21_003FBoolean_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACameraClearFlags_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Ff2_003F4429afe9_003FCameraClearFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACameraType_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F07_003F2a422d04_003FCameraType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACamera_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fb4_003Fff6cb607_003FCamera_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollectionExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fde80aed0bd3646409e8bfb15c101f005e2000_003Fb3_003F5c77f01e_003FCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

部分文件因为文件数量过多而无法显示