Parcourir la source

Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta   resolved by origin/master(远端) version
#	Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta   resolved by origin/master(远端) version
#	Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta   resolved by origin/master(远端) version
#	Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta   resolved by origin/master(远端) version
liao il y a 4 mois
Parent
commit
54ea18e7b2
100 fichiers modifiés avec 385 ajouts et 184 suppressions
  1. 1 1
      Assets/Art/Chapter/Chapter03.prefab.meta
  2. 15 1
      Assets/Art/UIAssets/bg/bg_Archer.png.meta
  3. 15 1
      Assets/Art/UIAssets/bg/bg_Mage.png.meta
  4. 15 1
      Assets/Art/UIAssets/bg/bg_herobagtop.png.meta
  5. 15 1
      Assets/Art/UIAssets/bg/bg_herozbtop.png.meta
  6. 15 1
      Assets/Art/UIAssets/bg/bg_priest.png.meta
  7. 15 1
      Assets/Art/UIAssets/bg/bg_warrior.png.meta
  8. 15 1
      Assets/Art/UIAssets/bg/bg_zairu.png.meta
  9. 2 2
      Assets/Art/VFX/FXPrefabs/fx_fuhuo1.prefab.meta
  10. 2 2
      Assets/Art/VFX/FXPrefabs/fx_fuhuo2.prefab.meta
  11. 2 2
      Assets/Art/VFX/Materials/fx_fuhuo_wl1.mat.meta
  12. 16 2
      Assets/Art/VFX/Textures/Mask/fx_mask01.png.meta
  13. 16 2
      Assets/Art/VFX/Textures/fx_hen01_1_c.png.meta
  14. 1 1
      Assets/Epic Toon FX/Textures/splat02_flat_3x3.png.meta
  15. 1 1
      Assets/Res/Aduio/Skill/boss_lang_att.wav.meta
  16. 1 1
      Assets/Res/Aduio/Skill/boss_lang_die.wav.meta
  17. 1 1
      Assets/Res/Aduio/Skill/boss_lang_jiao.wav.meta
  18. 1 1
      Assets/Res/Aduio/Skill/boss_lang_sk1.wav.meta
  19. 1 1
      Assets/Res/Aduio/Skill/boss_lang_sk3.wav.meta
  20. 1 1
      Assets/Res/Aduio/Skill/boss_she_att.wav.meta
  21. 1 1
      Assets/Res/Aduio/Skill/boss_she_die.wav.meta
  22. 1 1
      Assets/Res/Aduio/Skill/boss_she_sk1.wav.meta
  23. 1 1
      Assets/Res/Aduio/Skill/boss_she_sk3.wav.meta
  24. 1 1
      Assets/Res/Aduio/Skill/hero01_att.wav.meta
  25. 1 1
      Assets/Res/Aduio/Skill/hero01_sk1.wav.meta
  26. 1 1
      Assets/Res/Aduio/Skill/hero02_sk1.wav.meta
  27. 1 1
      Assets/Res/Aduio/Skill/hero03_att.wav.meta
  28. 1 1
      Assets/Res/Aduio/Skill/hero03_sk1.wav.meta
  29. 1 1
      Assets/Res/Aduio/Skill/hero04_att.wav.meta
  30. 1 1
      Assets/Res/Aduio/Skill/hero04_sk1.wav.meta
  31. 1 1
      Assets/Res/Aduio/Skill/xiaoshe_die.wav.meta
  32. 1 1
      Assets/Res/Aduio/combatBattle.wav.meta
  33. 1 1
      Assets/Res/Aduio/combatBattle2.wav.meta
  34. 89 8
      Assets/Res/UI/DialoguePanel.prefab
  35. 1 1
      Assets/Res/UI/DialoguePanel.prefab.meta
  36. 1 1
      Assets/Res/UI/WidgetItem_空.prefab.meta
  37. 1 1
      Assets/Res/UI/WidgetItem_紫装.prefab.meta
  38. 1 1
      Assets/Res/UI/WidgetItem_红装.prefab.meta
  39. 1 1
      Assets/Res/UI/WidgetItem_绿装.prefab.meta
  40. 1 1
      Assets/Res/UI/WidgetItem_黄装.prefab.meta
  41. 1 1
      Assets/Res/UIAnimRes/DialogueButtonAnim.asset.meta
  42. 1 1
      Assets/Res/UIAnimRes/TweenAssetInfoBox (1).asset.meta
  43. 1 1
      Assets/Res/UIAnimRes/TweenAssetInfoButton_battleBoss.asset.meta
  44. 1 1
      Assets/Res/UIAnimRes/TweenAssetInfoHeroDetailPanel.asset.meta
  45. 1 1
      Assets/Res/UIAnimRes/TweenAssetInfoHeroUpTxtEft.asset.meta
  46. 14 20
      Assets/Resources/MyShader.shadervariants
  47. 8 8
      Assets/Scenes/testCombat.scene
  48. 1 1
      Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs
  49. 0 0
      Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5
  50. 7 0
      Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta
  51. 0 7
      Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta
  52. BIN
      Assets/StreamingAssets/Bundle/01np_dg2_07f82c2f7c07c897fbd58c8840b001a2
  53. 0 7
      Assets/StreamingAssets/Bundle/01np_dg2_07f82c2f7c07c897fbd58c8840b001a2.meta
  54. BIN
      Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04
  55. 7 0
      Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta
  56. BIN
      Assets/StreamingAssets/Bundle/01np_dg3_4487cf8758e755d68d5274b37bc10e6b
  57. 0 7
      Assets/StreamingAssets/Bundle/01np_dg3_4487cf8758e755d68d5274b37bc10e6b.meta
  58. BIN
      Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76
  59. 7 0
      Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta
  60. 0 0
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2
  61. 7 0
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta
  62. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta
  63. BIN
      Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19
  64. 7 0
      Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta
  65. BIN
      Assets/StreamingAssets/Bundle/403_banyuan_glow_bf249f8ecebd11c4c5fe3c0e32429f2b
  66. 0 7
      Assets/StreamingAssets/Bundle/403_banyuan_glow_bf249f8ecebd11c4c5fe3c0e32429f2b.meta
  67. BIN
      Assets/StreamingAssets/Bundle/603_ice_zd_07d0aa580b428603944eac977be7c95a
  68. 0 7
      Assets/StreamingAssets/Bundle/603_ice_zd_07d0aa580b428603944eac977be7c95a.meta
  69. BIN
      Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2
  70. 7 0
      Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta
  71. 0 0
      Assets/StreamingAssets/Bundle/MD5.txt
  72. BIN
      Assets/StreamingAssets/Bundle/UnityBundle.unity3d
  73. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b
  74. 7 0
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta
  75. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_68f58129b762863d089286affa93e5f1
  76. 0 7
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_68f58129b762863d089286affa93e5f1.meta
  77. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6
  78. 7 0
      Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6.meta
  79. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hong_b1b3c41a17e72889a2bf8dc0a3e7c239
  80. 0 7
      Assets/StreamingAssets/Bundle/afx_ramp_hong_b1b3c41a17e72889a2bf8dc0a3e7c239.meta
  81. 0 7
      Assets/StreamingAssets/Bundle/albedo_t1_c22888ebdb1be817e4f98b01f4ef2678.meta
  82. 0 0
      Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb
  83. 7 0
      Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb.meta
  84. BIN
      Assets/StreamingAssets/Bundle/all_5876ebc735d0cfd52d89cff34120a9b5
  85. 0 7
      Assets/StreamingAssets/Bundle/all_5876ebc735d0cfd52d89cff34120a9b5.meta
  86. BIN
      Assets/StreamingAssets/Bundle/all_a0c270db4d90fb62215ba1ce9438fabc
  87. 7 0
      Assets/StreamingAssets/Bundle/all_a0c270db4d90fb62215ba1ce9438fabc.meta
  88. 0 0
      Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36
  89. 7 0
      Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36.meta
  90. 0 7
      Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta
  91. 0 0
      Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e
  92. 7 0
      Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e.meta
  93. 0 7
      Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta
  94. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta
  95. 0 0
      Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba
  96. 7 0
      Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba.meta
  97. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta
  98. 0 0
      Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f
  99. 7 0
      Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f.meta
  100. 0 0
      Assets/StreamingAssets/Bundle/arch_gate_debris_01_2cada77b5ae5a45acd37ac48306e3180

+ 1 - 1
Assets/Art/Chapter/Chapter03.prefab.meta

@@ -3,5 +3,5 @@ guid: WilN4H78AX6BQdwg0H1tWnQ0uMTvbxAQWfodNKyI8bxmYVYDsBcM53k=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: chapter02
+  assetBundleName: chapter03
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_Archer.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_archer
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_Mage.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_mage
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_herobagtop.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_herobagtop
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_herozbtop.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_herozbtop
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_priest.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_priest
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_warrior.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_warrior
   assetBundleVariant: 
   assetBundleVariant: 

+ 15 - 1
Assets/Art/UIAssets/bg/bg_zairu.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_zairu
   assetBundleVariant: 
   assetBundleVariant: 

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx_fuhuo1.prefab.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 0a1df25006141f1468b3a1dcc598c701
+guid: Dyse4XyvVnvLh7CdwZ0TYZTMXGXWVbNJtKPxrw40+cw8RD0NhepVnrE=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_fuhuo1
   assetBundleVariant: 
   assetBundleVariant: 

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx_fuhuo2.prefab.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 5ce82b176da930e4c95fff1b40ad2722
+guid: CilKvSj/UnydLjqwYlWurWFrzEsFHrdHkh0bkoc0n7QBvNM6ryk9Rn0=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_fuhuo2
   assetBundleVariant: 
   assetBundleVariant: 

+ 2 - 2
Assets/Art/VFX/Materials/fx_fuhuo_wl1.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 6fa0422a3b8586d4585c3e719a0246f4
+guid: CSxOtS6vUSpS/d6Kabz5hWkbHGWkS4Bs2d5V0f2MB1a1KO0eMJNITbo=
 NativeFormatImporter:
 NativeFormatImporter:
   externalObjects: {}
   externalObjects: {}
   mainObjectFileID: 2100000
   mainObjectFileID: 2100000
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_fuhuo_wl1
   assetBundleVariant: 
   assetBundleVariant: 

+ 16 - 2
Assets/Art/VFX/Textures/Mask/fx_mask01.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 40c4a03f52afed241bb1eecbff2631d0
+guid: C3pMsXutUC1WelWOnTiHMaguP1e3BG+uJPXGFHDC6gEDc64cpm7nd6A=
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_mask01
   assetBundleVariant: 
   assetBundleVariant: 

+ 16 - 2
Assets/Art/VFX/Textures/fx_hen01_1_c.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 09b4069934bb2734e9bd2e225d5cc31e
+guid: D3NNsSqrWnKsUUS7LLx6Hz6xBma1uoq/H6PFHkQMx9Fcu6rMuYc1LiA=
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
     serializedVersion: 2
     serializedVersion: 2
     sprites: []
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hen01_1_c
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Epic Toon FX/Textures/splat02_flat_3x3.png.meta

@@ -157,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
   userData: 
   userData: 
-  assetBundleName: splat02_flat_3x3_t6
+  assetBundleName: splat02_flat_3x3_t7
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_lang_att.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_lang_att
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_lang_die.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_lang_die
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_lang_jiao.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_lang_jiao
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_lang_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_lang_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_lang_sk3.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_lang_sk3
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_she_att.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_she_att
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_she_die.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_she_die
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_she_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_she_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/boss_she_sk3.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: boss_she_sk3
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero01_att.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero01_att
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero01_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero01_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero02_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero02_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero03_att.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero03_att
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero03_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero03_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero04_att.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero04_att
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/hero04_sk1.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: hero04_sk1
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/Skill/xiaoshe_die.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: xiaoshe_die
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/combatBattle.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: combatbattle
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/Aduio/combatBattle2.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   ambisonic: 0
   3D: 1
   3D: 1
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: combatbattle2
   assetBundleVariant: 
   assetBundleVariant: 

+ 89 - 8
Assets/Res/UI/DialoguePanel.prefab

@@ -1,5 +1,85 @@
 %YAML 1.1
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2244152698652825230
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8967359963982628057}
+  - component: {fileID: 8323833396097417543}
+  - component: {fileID: 2901794445896937265}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8967359963982628057
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2244152698652825230}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3275273584098972649}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -81.37363, y: -73.29993}
+  m_SizeDelta: {x: 470.4527, y: 53.319}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8323833396097417543
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2244152698652825230}
+  m_CullTransparentMesh: 1
+--- !u!114 &2901794445896937265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2244152698652825230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BF9\u8BDD\u6846"
 --- !u!1 &4284872839404994711
 --- !u!1 &4284872839404994711
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -26,7 +106,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4284872839404994711}
   m_GameObject: {fileID: 4284872839404994711}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
@@ -35,7 +115,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -5.6, y: 33}
+  m_AnchoredPosition: {x: 11.699987, y: 36.390015}
   m_SizeDelta: {x: 635.8, y: 145.6}
   m_SizeDelta: {x: 635.8, y: 145.6}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5302561503091161802
 --- !u!222 &5302561503091161802
@@ -67,7 +147,7 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
     m_FontSize: 24
     m_FontSize: 24
     m_FontStyle: 0
     m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
@@ -79,7 +159,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: 
+  m_Text: "\u4F60"
 --- !u!1 &5477700202101321355
 --- !u!1 &5477700202101321355
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -183,7 +263,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2.1, y: 11.8}
+  m_AnchoredPosition: {x: 15.199987, y: 15.190063}
   m_SizeDelta: {x: 685, y: 230.3}
   m_SizeDelta: {x: 685, y: 230.3}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6945069562181101411
 --- !u!222 &6945069562181101411
@@ -268,7 +348,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 283, y: -52.163643}
+  m_AnchoredPosition: {x: 300.3, y: -48.77356}
   m_SizeDelta: {x: 38, y: 28}
   m_SizeDelta: {x: 38, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2729643428166531704
 --- !u!222 &2729643428166531704
@@ -568,11 +648,12 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 3450449309247689875}
   - {fileID: 3450449309247689875}
   - {fileID: 2401587046251870679}
   - {fileID: 2401587046251870679}
+  - {fileID: 8967359963982628057}
   - {fileID: 6614233195307115645}
   - {fileID: 6614233195307115645}
   m_Father: {fileID: 1803833552231621266}
   m_Father: {fileID: 1803833552231621266}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -633}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: -17.299988, y: -636.39}
+  m_SizeDelta: {x: 715.4, y: 351.23}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}

+ 1 - 1
Assets/Res/UI/DialoguePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: CH1N5iupAS2N4Mob15Jexmgcpx6RhT02nMbcudYk7TYS6sv89Wxcwjc=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: dialoguepanel
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem_空.prefab.meta

@@ -3,5 +3,5 @@ guid: DSxKvSv8BSpd+EpZUc/h2++m9HklJaROJJ1ZTS7hMExkA9l7i4D2lK8=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: "widgetitem_\u7A7A"
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem_紫装.prefab.meta

@@ -3,5 +3,5 @@ guid: B3hM5yiqVXMeXRo8YSL0FvFrweIMapcI8vVh12TrbtHF5CWOMn1fUew=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: "widgetitem_\u7D2B\u88C5"
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem_红装.prefab.meta

@@ -3,5 +3,5 @@ guid: DykY4X6lBXy4A+jsJUpU0cCEJklp6yJaPEFdu9CjaFbVhGqH2ZikWV0=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: "widgetitem_\u7EA2\u88C5"
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem_绿装.prefab.meta

@@ -3,5 +3,5 @@ guid: DCsctCuvAHhgBbO01UlOsgy4yxo5WHMHzWL0MCr/W8LsKy6/uoyHfvA=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: "widgetitem_\u7EFF\u88C5"
   assetBundleVariant: 
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem_黄装.prefab.meta

@@ -3,5 +3,5 @@ guid: CilO5i3/AXu8iWUkL6ZI+SByp1HgaKQ7E1RIXyKNMTa+yk+G0PE07G0=
 PrefabImporter:
 PrefabImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: "widgetitem_\u9EC4\u88C5"
   assetBundleVariant: 
   assetBundleVariant: 

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

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

+ 1 - 1
Assets/Res/UIAnimRes/TweenAssetInfoBox (1).asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   externalObjects: {}
   mainObjectFileID: 11400000
   mainObjectFileID: 11400000
   userData: 
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfobox_(1)
   assetBundleVariant: 
   assetBundleVariant: 

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

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

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

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

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

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

+ 14 - 20
Assets/Resources/MyShader.shadervariants

@@ -14,52 +14,46 @@ ShaderVariantCollection:
   - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants: []
-  - first: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
-    second:
-      variants: []
-  - first: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  - first: {fileID: -6465566751694194690, guid: dfab9f92705bc3448be937135a3cb41d, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
+  - first: {fileID: -6465566751694194690, guid: de8b10515e8c7b6419b7a2e25ccbf055, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 10723, guid: 0000000000000000f000000000000000, type: 0}
+  - first: {fileID: -6465566751694194690, guid: f7c09a0ce9e591942bd0e4e102bbc409, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
+  - first: {fileID: -6465566751694194690, guid: 24ce5c251bc875b4ba39dde2e7209665, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  - first: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: 91bd8b6735bb531488bbcaaf06ea18ba, type: 3}
+  - first: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: 2933b413a51fc4ff3a83c7ef4177ae84, type: 3}
+  - first: {fileID: 10723, guid: 0000000000000000f000000000000000, type: 0}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: -6465566751694194690, guid: de8b10515e8c7b6419b7a2e25ccbf055, type: 3}
+  - first: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: -6465566751694194690, guid: f7c09a0ce9e591942bd0e4e102bbc409, type: 3}
+  - first: {fileID: 4800000, guid: c6a0e78efe21c54448ab2869b09e8a2d, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: c6a0e78efe21c54448ab2869b09e8a2d, type: 3}
+  - first: {fileID: 4800000, guid: caadcbe202b44584cb8021b3e5e89999, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: -6465566751694194690, guid: dfab9f92705bc3448be937135a3cb41d, type: 3}
+  - first: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: -6465566751694194690, guid: 24ce5c251bc875b4ba39dde2e7209665, type: 3}
+  - first: {fileID: 4800000, guid: 276e77afd9b929d498b6fbdcdce398d0, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: caadcbe202b44584cb8021b3e5e89999, type: 3}
+  - first: {fileID: 4800000, guid: 91bd8b6735bb531488bbcaaf06ea18ba, type: 3}
     second:
     second:
       variants: []
       variants: []
-  - first: {fileID: 4800000, guid: 276e77afd9b929d498b6fbdcdce398d0, type: 3}
+  - first: {fileID: 4800000, guid: 2933b413a51fc4ff3a83c7ef4177ae84, type: 3}
     second:
     second:
       variants: []
       variants: []
   - first: {fileID: 4800000, guid: 8bee0edf03bdded419ae76dcde0de9a8, type: 3}
   - first: {fileID: 4800000, guid: 8bee0edf03bdded419ae76dcde0de9a8, type: 3}

+ 8 - 8
Assets/Scenes/testCombat.scene

@@ -816,9 +816,9 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 753442136}
   m_Father: {fileID: 753442136}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -627}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 185}
   m_SizeDelta: {x: 660.2, y: 33}
   m_SizeDelta: {x: 660.2, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &773560730
 --- !u!114 &773560730
@@ -1025,10 +1025,10 @@ RectTransform:
   - {fileID: 1080868192}
   - {fileID: 1080868192}
   m_Father: {fileID: 753442136}
   m_Father: {fileID: 753442136}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -685}
-  m_SizeDelta: {x: -89.79999, y: -1501.7}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 127}
+  m_SizeDelta: {x: 660.2, y: 122.30005}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1324294698
 --- !u!114 &1324294698
 MonoBehaviour:
 MonoBehaviour:
@@ -1049,7 +1049,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   m_Colors:
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}

+ 1 - 1
Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -1,4 +1,4 @@
-using Codice.CM.Common;
+
 using Core.Utility;
 using Core.Utility;
 using Excel2Json;
 using Excel2Json;
 using Fort23.UTool;
 using Fort23.UTool;

+ 0 - 0
Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64 → Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5


+ 7 - 0
Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CytL5iKqVnn9yxTqFu2UMxn5Hd47z2grAEnonCg6itTx7Ps91Aa48Qs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXgY4X7+VCiR/9TATXwm3yYw7C8vCubCVxrl7HLwXG62wUinWqxu09w=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg2_07f82c2f7c07c897fbd58c8840b001a2


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg2_07f82c2f7c07c897fbd58c8840b001a2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: BykZ4XmsBykTeD7DbuVSFPIV2XDCI/5XUsMhRk8Iy4/qkknjuMGslDM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04


+ 7 - 0
Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XStOsSysB3letrCMNjjs38UhxqB62xVpP4fanqiqA50SZ54qCbkcxFA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg3_4487cf8758e755d68d5274b37bc10e6b


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg3_4487cf8758e755d68d5274b37bc10e6b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DXwXtXipAHi1Lc7KcXLWiJGCeKSKKOFw2n6DaP0NSRFu2GjhOBvLxpo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76


+ 7 - 0
Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DS5MvC+vUXqqu5+euZQgSVEypQpx4fDE9KzCU3+lUZepaIXJKPfNLM8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d → Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2


+ 7 - 0
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXMa5H6rVHiX7EmBQxjSR8mpljYpcjz+kv/11NEVhlR3CwbmYbcj1EA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CChN5imtUHow3TmTouXlbbviY9I3BgnDHq9daTLMaHIcBPR6FndAY44=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19


+ 7 - 0
Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnJJsyqpViiLC+ZWtEGASwVXhqudhPdC7udSLhAKQk0O/GWltQXB2Dk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/403_banyuan_glow_bf249f8ecebd11c4c5fe3c0e32429f2b


+ 0 - 7
Assets/StreamingAssets/Bundle/403_banyuan_glow_bf249f8ecebd11c4c5fe3c0e32429f2b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXsdsi+sBi7d6LiTILfnuOKgrU02DG6O556RwgN6ZqCVXToFLOFT78c=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/603_ice_zd_07d0aa580b428603944eac977be7c95a


+ 0 - 7
Assets/StreamingAssets/Bundle/603_ice_zd_07d0aa580b428603944eac977be7c95a.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WylNsi6oWnuu8bAOirPsaHq7lo68s9ClY4ceFDXM5LMtk633jLbVi7s=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2


+ 7 - 0
Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3wfsCmrVn9B3nODhpvI9figRuVVKJ7xdi78y5igcUcxDy546TbqZKE=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Assets/StreamingAssets/Bundle/MD5.txt


BIN
Assets/StreamingAssets/Bundle/UnityBundle.unity3d


BIN
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b


+ 7 - 0
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXtNsyL8UCns9En/w+14X2HU9n3S6PRaETORR6La2k8ZEdWtw//MeN8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_68f58129b762863d089286affa93e5f1


+ 0 - 7
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_68f58129b762863d089286affa93e5f1.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: B3MXtyz4Uyh2sCwNqCFsHKE9IsdZi/K0033MsMCz0i6DRKsTn1+C0ng=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6


+ 7 - 0
Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XHgdti2qVHLmi2fXZrAQrzxAmkifoQuOdva8usn43rmHYo7MIXen2Uk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/afx_ramp_hong_b1b3c41a17e72889a2bf8dc0a3e7c239


+ 0 - 7
Assets/StreamingAssets/Bundle/afx_ramp_hong_b1b3c41a17e72889a2bf8dc0a3e7c239.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CCsf4Hv+By+g+0F1uUHVghEB2WfP3XlW3W5f2fBf1HyCqu5WkhNbLJQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/albedo_t1_c22888ebdb1be817e4f98b01f4ef2678.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XSwWvXivBX0AIXx4ct9UeDpapyzB57A0t7VPcWu4ag7CvMs47WhQ46U=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/albedo_t1_c22888ebdb1be817e4f98b01f4ef2678 → Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb


+ 7 - 0
Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XngW5imkBXLvOGFqju2LbsHeq+1uxmNrGgjh/8s7sxtG61ns5xBguZg=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/all_5876ebc735d0cfd52d89cff34120a9b5


+ 0 - 7
Assets/StreamingAssets/Bundle/all_5876ebc735d0cfd52d89cff34120a9b5.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DygZsCz+U379AZ68ib5cDrW8nkq8btQhbKyccgbHQoOxghAJbyjyyLY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/all_a0c270db4d90fb62215ba1ce9438fabc


+ 7 - 0
Assets/StreamingAssets/Bundle/all_a0c270db4d90fb62215ba1ce9438fabc.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XS8fsyOlVHMMvAPwV+qV54LfKwgH3l1JPVrfIKebwX8Sl4X2JOVjnBA=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a → Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36


+ 7 - 0
Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wy8ctCqvVnxx9N6r+JYx5HYb9hV0Hj3u4bETOInZVXGR4trhuhxUUNI=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnIb5nmrW32tXVMje1iP4bOtPZqO6gn2Ha+GJD82jG8scNGATceZcLc=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb → Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e


+ 7 - 0
Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WStM5nz4UnKZilfayXfs3pA1wPjNBCRh5C71kwZmszVdM0BC5FCq/3o=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXwYtSyvVHP9NP01fNUO4hxS3EkIQ4MUjaV4qIOrTbDp2V6pN0ed/Ls=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CigW5iP+V3yXQSNRWw1RUh4RDoDOtX+ARVoQtkrkjNOVbB4kIn7B8Fo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e → Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba


+ 7 - 0
Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHIatiKoUHPYM+WcRDzdK3aPztflKxNbsJdHQvGgkM5smT//c9Vpmys=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXge5n75UipX0b9khLlY4LmynnSGwRF/ULaWm95h6ALb6RygH7JAGSk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278 → Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f


+ 7 - 0
Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cy5Lty+qAS/wewwAudXX0veq7CjdmmRA8LvNJDqdyqY05jaUkucm/Nk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc → Assets/StreamingAssets/Bundle/arch_gate_debris_01_2cada77b5ae5a45acd37ac48306e3180


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff