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

2023-06-06 10:48:06 +08:00 · 2023-06-06 10:48:06 +08:00 · 99880f6a32
commit 99880f6a32
parent 6a54f6a01b a85373b5fb
6 changed files with 22 additions and 0 deletions
--- a/Assets/arts/sounds/sfx/battle/warning_boss.wav
+++ b/Assets/arts/sounds/sfx/battle/warning_boss.wav
--- a/Assets/arts/sounds/sfx/battle/warning_boss.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/warning_boss.wav.meta
@ -0,0 +1,22 @@
 fileFormatVersion: 2
 guid: 755df453a20b136428afe975d1d26e21
 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/common/audio_manager.lua.bytes
+++ b/Assets/lua/app/common/audio_manager.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_ui.lua.bytes
--- a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
+++ b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
--- a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
+++ b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes