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

2023-05-30 09:48:00 +08:00 · 2023-05-30 09:48:00 +08:00 · 5b99d61887
commit 5b99d61887
parent 12b3e4507e ee2e0152f8
36 changed files with 208 additions and 213 deletions
--- a/Assets/arts/spines/characters/m20011/m20011.skel.bytes
+++ b/Assets/arts/spines/characters/m20011/m20011.skel.bytes
--- a/Assets/lua/app/config/buff.lua.bytes
+++ b/Assets/lua/app/config/buff.lua.bytes
--- a/Assets/lua/app/config/buff_daily_challenge.lua.bytes
+++ b/Assets/lua/app/config/buff_daily_challenge.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/func_open.lua.bytes
+++ b/Assets/lua/app/config/func_open.lua.bytes
--- a/Assets/lua/app/config/grid_type.lua.bytes
+++ b/Assets/lua/app/config/grid_type.lua.bytes
--- a/Assets/lua/app/config/hero.lua.bytes
+++ b/Assets/lua/app/config/hero.lua.bytes
--- a/Assets/lua/app/config/localization/localization_global_const.lua.bytes
+++ b/Assets/lua/app/config/localization/localization_global_const.lua.bytes
--- a/Assets/lua/app/config/monster_chapter.lua.bytes
+++ b/Assets/lua/app/config/monster_chapter.lua.bytes
--- a/Assets/lua/app/config/monster_daily_challenge.lua.bytes
+++ b/Assets/lua/app/config/monster_daily_challenge.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/global.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/global.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/cn/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/tutorial.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/de/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/de/tutorial.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/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/en/tutorial.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/fr/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/fr/tutorial.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/ja/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/ja/tutorial.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/ko/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/ko/tutorial.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/tutorial.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/tutorial.lua.bytes
--- a/Assets/lua/app/config/tutorial.lua.bytes
+++ b/Assets/lua/app/config/tutorial.lua.bytes
--- a/Assets/lua/app/userdata/shop/shop_data.lua.bytes
+++ b/Assets/lua/app/userdata/shop/shop_data.lua.bytes