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

2023-06-06 15:10:38 +08:00 · 2023-06-06 15:10:38 +08:00 · 8cc37aba08
commit 8cc37aba08
parent 19ebceb54b 77cd8d33ac
19 changed files with 17 additions and 17 deletions
--- a/Assets/arts/sounds/sfx/battle/130022201.wav
+++ b/Assets/arts/sounds/sfx/battle/130022201.wav
--- a/Assets/arts/sounds/sfx/battle/130022201.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/130022201.wav.meta
--- a/Assets/arts/sounds/sfx/battle/130022202.wav
+++ b/Assets/arts/sounds/sfx/battle/130022202.wav
--- a/Assets/arts/sounds/sfx/battle/130022202.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/130022202.wav.meta
--- a/Assets/arts/sounds/sfx/battle/130022203.wav
+++ b/Assets/arts/sounds/sfx/battle/130022203.wav
--- a/Assets/arts/sounds/sfx/battle/130022203.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/130022203.wav.meta
--- a/Assets/lua/app/config/act_gift.lua.bytes
+++ b/Assets/lua/app/config/act_gift.lua.bytes
--- a/Assets/lua/app/config/bounty_level.lua.bytes
+++ b/Assets/lua/app/config/bounty_level.lua.bytes
--- a/Assets/lua/app/config/bounty_time.lua.bytes
+++ b/Assets/lua/app/config/bounty_time.lua.bytes
--- a/Assets/lua/app/config/mall_gold.lua.bytes
+++ b/Assets/lua/app/config/mall_gold.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/lua/app/config/strings/en/global.lua.bytes
+++ b/Assets/lua/app/config/strings/en/global.lua.bytes
--- a/Assets/lua/app/config/strings/zh/global.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/global.lua.bytes
--- a/Assets/lua/app/config/tutorial.lua.bytes
+++ b/Assets/lua/app/config/tutorial.lua.bytes
--- a/Assets/lua/app/global/global_func.lua.bytes
+++ b/Assets/lua/app/global/global_func.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_daily_challenge_buff_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_daily_challenge_buff_ui.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/gm/gm_tool_ui.lua.bytes
+++ b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes