Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

2023-06-20 17:10:32 +08:00 · 2023-06-20 17:10:32 +08:00 · b49c8b61cf
commit b49c8b61cf
parent 02cef5907d 3fc9c15755
6 changed files with 44 additions and 0 deletions
--- a/Assets/arts/sounds/sfx/battle/44002200.wav
+++ b/Assets/arts/sounds/sfx/battle/44002200.wav
--- a/Assets/arts/sounds/sfx/battle/44002200.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/44002200.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 79d0efe2451bd584f9ba5311c0702315
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/54002200.wav
+++ b/Assets/arts/sounds/sfx/battle/54002200.wav
--- a/Assets/arts/sounds/sfx/battle/54002200.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/54002200.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6037a311cd7b9894d8c78b8fd8b0e92d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
+++ b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_skill_condition_handle.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_skill_condition_handle.lua.bytes