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

2023-04-26 18:28:07 +08:00 · 2023-04-26 18:28:07 +08:00 · 553141fce8
commit 553141fce8
parent 83486450f0 8ebcad8898
23 changed files with 4 additions and 0 deletions
--- a/Assets/lua/app/common/bi_report.lua.bytes
+++ b/Assets/lua/app/common/bi_report.lua.bytes
--- a/Assets/lua/app/common/local_data.lua.bytes
+++ b/Assets/lua/app/common/local_data.lua.bytes
--- a/Assets/lua/app/common/pay_manager.lua.bytes
+++ b/Assets/lua/app/common/pay_manager.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/strings/cn/global.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/global.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/battle_manager.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_manager.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/module/battle/controller/battle_controller_stage.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes
--- a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes
+++ b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes
--- a/Assets/lua/app/module/login/login_manager.lua.bytes
+++ b/Assets/lua/app/module/login/login_manager.lua.bytes
--- a/Assets/lua/app/module/login/login_ui.lua.bytes
+++ b/Assets/lua/app/module/login/login_ui.lua.bytes
--- a/Assets/lua/app/module/maincity/maincity_manager.lua.bytes
+++ b/Assets/lua/app/module/maincity/maincity_manager.lua.bytes
--- a/Assets/lua/app/server/data/server_chapter_data.lua.bytes
+++ b/Assets/lua/app/server/data/server_chapter_data.lua.bytes
--- a/Assets/lua/app/server/data/server_player_data.lua.bytes
+++ b/Assets/lua/app/server/data/server_player_data.lua.bytes
--- a/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes
+++ b/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes
--- a/Assets/lua/app/server/server_data_manager.lua.bytes
+++ b/Assets/lua/app/server/server_data_manager.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_pause_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/userdata/bag/item_data.lua.bytes
+++ b/Assets/lua/app/userdata/bag/item_data.lua.bytes
--- a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
+++ b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes
--- a/Assets/lua/app/userdata/player/player_data.lua.bytes
+++ b/Assets/lua/app/userdata/player/player_data.lua.bytes
--- a/Assets/prefabs/ui/main_city/main_comp.prefab
+++ b/Assets/prefabs/ui/main_city/main_comp.prefab
@ -2635,6 +2635,10 @@ MonoBehaviour:
    hashName: 1514198253
    objectType: 0
    gameObject: {fileID: 3357628491710705900}
  - name: main_comp.chapter.record_tx
    hashName: 3376984312
    objectType: 0
    gameObject: {fileID: 7978622507837727525}
 --- !u!114 &6214590949040345325
 MonoBehaviour:
  m_ObjectHideFlags: 0