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

2023-04-27 18:06:37 +08:00 · 2023-04-27 18:06:37 +08:00 · 9d47c04bc0
commit 9d47c04bc0
parent 1a8fcdd45b 1327f70567
27 changed files with 23 additions and 1 deletions
--- a/Assets/arts/sounds/sfx/battle/2300120.wav
+++ b/Assets/arts/sounds/sfx/battle/2300120.wav
--- a/Assets/arts/sounds/sfx/battle/2300120.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/2300120.wav.meta
@ -0,0 +1,22 @@
 fileFormatVersion: 2
 guid: c81744416e61ee24e865d6fa4a0c1eb9
 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/3200120.wav
+++ b/Assets/arts/sounds/sfx/battle/3200120.wav
--- a/Assets/lua/app/config/buff.lua.bytes
+++ b/Assets/lua/app/config/buff.lua.bytes
--- a/Assets/lua/app/config/chapter.lua.bytes
+++ b/Assets/lua/app/config/chapter.lua.bytes
--- a/Assets/lua/app/config/chapter_board.lua.bytes
+++ b/Assets/lua/app/config/chapter_board.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/lua/app/config/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/skill_rogue.lua.bytes
--- a/Assets/lua/app/config/strings/cn/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/buff.lua.bytes
--- a/Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
--- a/Assets/lua/app/config/strings/de/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/de/buff.lua.bytes
--- a/Assets/lua/app/config/strings/en/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/en/buff.lua.bytes
--- a/Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
--- a/Assets/lua/app/config/strings/fr/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/fr/buff.lua.bytes
--- a/Assets/lua/app/config/strings/id/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/id/buff.lua.bytes
--- a/Assets/lua/app/config/strings/ja/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/ja/buff.lua.bytes
--- a/Assets/lua/app/config/strings/ko/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/ko/buff.lua.bytes
--- a/Assets/lua/app/config/strings/pt/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/pt/buff.lua.bytes
--- a/Assets/lua/app/config/strings/ru/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/ru/buff.lua.bytes
--- a/Assets/lua/app/config/strings/th/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/th/buff.lua.bytes
--- a/Assets/lua/app/config/strings/vi/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/vi/buff.lua.bytes
--- a/Assets/lua/app/config/strings/zh/buff.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/buff.lua.bytes
--- a/Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
--- a/Assets/lua/app/config/tutorial.lua.bytes
+++ b/Assets/lua/app/config/tutorial.lua.bytes
--- a/Assets/lua/app/module/battle/battle_const.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_const.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/userdata/battle/battle_data.lua.bytes
+++ b/Assets/lua/app/userdata/battle/battle_data.lua.bytes