diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 17e619e9f..0e5918d6b 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/common/scheduler_manager.lua.bytes b/Assets/lua/app/common/scheduler_manager.lua.bytes index f92f126e2..245171383 100644 Binary files a/Assets/lua/app/common/scheduler_manager.lua.bytes and b/Assets/lua/app/common/scheduler_manager.lua.bytes differ diff --git a/Assets/lua/app/game.lua.bytes b/Assets/lua/app/game.lua.bytes index d21aecd38..50cc37b97 100644 Binary files a/Assets/lua/app/game.lua.bytes and b/Assets/lua/app/game.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index aaeafeb2e..0904a76dd 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index abf71823d..71f40ea03 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes index b5ba0e21d..2a302dbca 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes differ diff --git a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes index 70c156b4b..23ef8cebc 100644 Binary files a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes and b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes differ diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index a137426b9..4f70a0254 100644 Binary files a/Assets/lua/app/module/formation/formation_manager.lua.bytes and b/Assets/lua/app/module/formation/formation_manager.lua.bytes differ diff --git a/Assets/lua/app/module/gm/gm_const.lua.bytes b/Assets/lua/app/module/gm/gm_const.lua.bytes index 17b3e754c..fa7b1d07c 100644 Binary files a/Assets/lua/app/module/gm/gm_const.lua.bytes and b/Assets/lua/app/module/gm/gm_const.lua.bytes differ diff --git a/Assets/lua/app/module/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index cc39640e7..9facc9491 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.lua.bytes differ diff --git a/Assets/lua/app/module/login/login_manager.lua.bytes b/Assets/lua/app/module/login/login_manager.lua.bytes index 446ca2ebd..37bd7c9bf 100644 Binary files a/Assets/lua/app/module/login/login_manager.lua.bytes and b/Assets/lua/app/module/login/login_manager.lua.bytes differ diff --git a/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes b/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes index 9e4591653..96999d69a 100644 Binary files a/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes and b/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes b/Assets/lua/app/net/net_manager.lua.bytes index 1b8f591b2..6d849f87f 100644 Binary files a/Assets/lua/app/net/net_manager.lua.bytes and b/Assets/lua/app/net/net_manager.lua.bytes differ diff --git a/Assets/lua/app/proto/proto_msg_type.lua.bytes b/Assets/lua/app/proto/proto_msg_type.lua.bytes index 0fb2de2ea..2127d19e4 100644 Binary files a/Assets/lua/app/proto/proto_msg_type.lua.bytes and b/Assets/lua/app/proto/proto_msg_type.lua.bytes differ diff --git a/Assets/lua/app/server/data/server_bag_data.lua.bytes b/Assets/lua/app/server/data/server_bag_data.lua.bytes deleted file mode 100644 index a8084dbd4..000000000 Binary files a/Assets/lua/app/server/data/server_bag_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_bag_data.lua.bytes.meta b/Assets/lua/app/server/data/server_bag_data.lua.bytes.meta deleted file mode 100644 index 2fb8e2d48..000000000 --- a/Assets/lua/app/server/data/server_bag_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 485d93d345cfb5745aee09b4ece3c0b2 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_bag_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_base_data.lua.bytes b/Assets/lua/app/server/data/server_base_data.lua.bytes deleted file mode 100644 index 07506ab3f..000000000 Binary files a/Assets/lua/app/server/data/server_base_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_base_data.lua.bytes.meta b/Assets/lua/app/server/data/server_base_data.lua.bytes.meta deleted file mode 100644 index 92bddc874..000000000 --- a/Assets/lua/app/server/data/server_base_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9135da9d96df6c84eb87e42de1861982 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_base_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_chapter_data.lua.bytes b/Assets/lua/app/server/data/server_chapter_data.lua.bytes deleted file mode 100644 index b7e2994f7..000000000 Binary files a/Assets/lua/app/server/data/server_chapter_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_chapter_data.lua.bytes.meta b/Assets/lua/app/server/data/server_chapter_data.lua.bytes.meta deleted file mode 100644 index f0adda6cd..000000000 --- a/Assets/lua/app/server/data/server_chapter_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c8c31019e41ac3442ba68cd4d42da11e -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_chapter_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_formation_data.lua.bytes b/Assets/lua/app/server/data/server_formation_data.lua.bytes deleted file mode 100644 index 2a53d63f6..000000000 Binary files a/Assets/lua/app/server/data/server_formation_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_formation_data.lua.bytes.meta b/Assets/lua/app/server/data/server_formation_data.lua.bytes.meta deleted file mode 100644 index dc9622fec..000000000 --- a/Assets/lua/app/server/data/server_formation_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a11737af93dd2194290e079d7ff735d0 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_formation_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_hero_data.lua.bytes b/Assets/lua/app/server/data/server_hero_data.lua.bytes deleted file mode 100644 index 0a360b23e..000000000 Binary files a/Assets/lua/app/server/data/server_hero_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_hero_data.lua.bytes.meta b/Assets/lua/app/server/data/server_hero_data.lua.bytes.meta deleted file mode 100644 index fac9d21fd..000000000 --- a/Assets/lua/app/server/data/server_hero_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1b653dbe158c74546ae9a3d47c1b9efb -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_hero_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_item_data.lua.bytes b/Assets/lua/app/server/data/server_item_data.lua.bytes deleted file mode 100644 index 89d0348ac..000000000 Binary files a/Assets/lua/app/server/data/server_item_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_item_data.lua.bytes.meta b/Assets/lua/app/server/data/server_item_data.lua.bytes.meta deleted file mode 100644 index 203d81d5a..000000000 --- a/Assets/lua/app/server/data/server_item_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1873d486d0ecec44f9d35f0aff877993 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_item_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_player_data.lua.bytes b/Assets/lua/app/server/data/server_player_data.lua.bytes deleted file mode 100644 index b7e52454c..000000000 Binary files a/Assets/lua/app/server/data/server_player_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_player_data.lua.bytes.meta b/Assets/lua/app/server/data/server_player_data.lua.bytes.meta deleted file mode 100644 index 798e3fe79..000000000 --- a/Assets/lua/app/server/data/server_player_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 130f97d7e056d214c8595e1cd1262bfb -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_player_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes b/Assets/lua/app/server/data/server_tutorial_data.lua.bytes deleted file mode 100644 index 17a706e83..000000000 Binary files a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta b/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta deleted file mode 100644 index 6e414765d..000000000 --- a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a8f882241e504c041ae086b7de6bb54d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/data/server_tutorial_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes b/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes deleted file mode 100644 index 16c7cb088..000000000 Binary files a/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes.meta b/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes.meta deleted file mode 100644 index fa98bb747..000000000 --- a/Assets/lua/app/server/manager/server_chapter_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 343e348dfe57f2c4f95db95a4fb84444 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/manager/server_chapter_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/manager/server_formation_manager.lua.bytes b/Assets/lua/app/server/manager/server_formation_manager.lua.bytes deleted file mode 100644 index 6767373fb..000000000 Binary files a/Assets/lua/app/server/manager/server_formation_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/manager/server_formation_manager.lua.bytes.meta b/Assets/lua/app/server/manager/server_formation_manager.lua.bytes.meta deleted file mode 100644 index 3707f2f27..000000000 --- a/Assets/lua/app/server/manager/server_formation_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 561ca0625eb6aa741b12c8ac8e9e15dc -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/manager/server_formation_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/manager/server_hero_manager.lua.bytes b/Assets/lua/app/server/manager/server_hero_manager.lua.bytes deleted file mode 100644 index 75d6acc57..000000000 Binary files a/Assets/lua/app/server/manager/server_hero_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/manager/server_hero_manager.lua.bytes.meta b/Assets/lua/app/server/manager/server_hero_manager.lua.bytes.meta deleted file mode 100644 index 765f35e53..000000000 --- a/Assets/lua/app/server/manager/server_hero_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4fc6b0dfd227f2c46a23ef3e5ac59215 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/manager/server_hero_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes b/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes deleted file mode 100644 index 53f686f1e..000000000 Binary files a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta b/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta deleted file mode 100644 index 83c3526af..000000000 --- a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 63a1838dbfe97e74f925979737eec95e -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/manager/server_tutorial_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/server_data_const.lua.bytes b/Assets/lua/app/server/server_data_const.lua.bytes deleted file mode 100644 index c385ae643..000000000 Binary files a/Assets/lua/app/server/server_data_const.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/server_data_const.lua.bytes.meta b/Assets/lua/app/server/server_data_const.lua.bytes.meta deleted file mode 100644 index 5987ae0a5..000000000 --- a/Assets/lua/app/server/server_data_const.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3af3c6198d026654fb26065b3a74571d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/server_data_const.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/server_data_manager.lua.bytes b/Assets/lua/app/server/server_data_manager.lua.bytes deleted file mode 100644 index 3ea94edbb..000000000 Binary files a/Assets/lua/app/server/server_data_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/server_data_manager.lua.bytes.meta b/Assets/lua/app/server/server_data_manager.lua.bytes.meta deleted file mode 100644 index 689365cdb..000000000 --- a/Assets/lua/app/server/server_data_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b3f8ed29b70c2f4489309c2650d2978a -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/server_data_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/server_game_data.lua.bytes b/Assets/lua/app/server/server_game_data.lua.bytes deleted file mode 100644 index a1cf4404f..000000000 Binary files a/Assets/lua/app/server/server_game_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/server/server_game_data.lua.bytes.meta b/Assets/lua/app/server/server_game_data.lua.bytes.meta deleted file mode 100644 index e5108a534..000000000 --- a/Assets/lua/app/server/server_game_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 49f175feec4b3384ca1a4c2a84d971d9 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/server/server_game_data.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 9f0366bf5..dee73cead 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cheat_message_box.lua.bytes b/Assets/lua/app/ui/common/cheat_message_box.lua.bytes index 5aaf6c973..0a0737182 100644 Binary files a/Assets/lua/app/ui/common/cheat_message_box.lua.bytes and b/Assets/lua/app/ui/common/cheat_message_box.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes index 98007acfa..900a61253 100644 Binary files a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes index 21029f2af..0850f9ac7 100644 Binary files a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes and b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 9b81d79a9..8f5254516 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/reward_box.lua.bytes b/Assets/lua/app/ui/tips/reward_box.lua.bytes index d312ba02b..3f93c8177 100644 Binary files a/Assets/lua/app/ui/tips/reward_box.lua.bytes and b/Assets/lua/app/ui/tips/reward_box.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/bag_data.lua.bytes b/Assets/lua/app/userdata/bag/bag_data.lua.bytes index 2c171bb87..9676c2339 100644 Binary files a/Assets/lua/app/userdata/bag/bag_data.lua.bytes and b/Assets/lua/app/userdata/bag/bag_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_data.lua.bytes b/Assets/lua/app/userdata/bag/item_data.lua.bytes index 646433cca..2a3eac56d 100644 Binary files a/Assets/lua/app/userdata/bag/item_data.lua.bytes and b/Assets/lua/app/userdata/bag/item_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_data.lua.bytes index 891f88e8e..1a038bdd1 100644 Binary files a/Assets/lua/app/userdata/battle/battle_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index 93b546670..689d8738f 100644 Binary files a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes and b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/formation/formation_data.lua.bytes b/Assets/lua/app/userdata/formation/formation_data.lua.bytes index 6b7f88b80..b7006fdf8 100644 Binary files a/Assets/lua/app/userdata/formation/formation_data.lua.bytes and b/Assets/lua/app/userdata/formation/formation_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 901bb6cb4..d5dd9064a 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/tutorial/tutorial_data.lua.bytes b/Assets/lua/app/userdata/tutorial/tutorial_data.lua.bytes index 513b398f4..84fa2527b 100644 Binary files a/Assets/lua/app/userdata/tutorial/tutorial_data.lua.bytes and b/Assets/lua/app/userdata/tutorial/tutorial_data.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index ec16218f8..487f78815 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -464,8 +464,8 @@ RectTransform: m_Children: - {fileID: 7402852988677530968} - {fileID: 8335102383607932721} - - {fileID: 8396702131301176704} - {fileID: 6710246215471342977} + - {fileID: 8396702131301176704} m_Father: {fileID: 3121552964615492639} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4705,7 +4705,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -4820,7 +4820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index cfa631f06..d3db25648 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,6 +1,6 @@ -c -pb/proto/protocol.protocspb" +�c +pb/proto/protocol.protocspb"� BattlePass1 tasks ( 2.cspb.BattlePass.TasksEntryRtasks @@ -16,16 +16,18 @@ TasksEntry key (Rkey& value ( 2.cspb.TaskSingleRvalue:8") BattlePassTaskRewardReq -id (Rid" +id (Rid"� BattlePassTaskRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode$ +err_code (2 +.cspb.ErrCodeRerrCode$ task ( 2.cspb.TaskSingleRtask level (Rlevel exp (Rexp& rewards ( 2 .cspb.RewardRrewards" -BattlePassRewardReq" +BattlePassRewardReq"� BattlePassRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode claimed (Rclaimed pro_claimed (R proClaimed& @@ -35,7 +37,7 @@ proClaimed& ChapterInfo total_count (R totalCount -index (Rindex" +index (Rindex"� Chapter$ max_chapter_id (R maxChapterId max_wave (RmaxWaveA @@ -47,7 +49,8 @@ totalCount chapter_id (R chapterId"~ ChapterStartRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode chapter_id (R chapterId" costs ( 2 .cspb.RewardRcosts"d @@ -55,9 +58,10 @@ chapter_id (R chapterId" win (Rwin chapter_id (R chapterId - pass_wave (RpassWave" + pass_wave (RpassWave"� ChapterSettlementRsp( -err_code (2 .cspb.ErrCodeRerrCode& +err_code (2 +.cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards$ max_chapter_id (R maxChapterId max_wave (RmaxWave"H @@ -66,8 +70,9 @@ chapter_id (R chapterId chapter_id (R chapterId wave (Rwave"g ChapterBoxRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode& -rewards ( 2 .cspb.RewardRrewards" +err_code (2 +.cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards"� Reward type (Rtype item ( 2 @@ -89,22 +94,28 @@ chapter_id (R chapterId id (Rid ts (Rts"M EnergyLimit# - diamond_count (R diamondCount + +diamond_count (R diamondCount ad_count (RadCount" -EnergyByDiamondReq" +EnergyByDiamondReq"� EnergyByDiamondRsp( -err_code (2 .cspb.ErrCodeRerrCode4 +err_code (2 +.cspb.ErrCodeRerrCode4 energy_limit ( 2.cspb.EnergyLimitR energyLimit& rewards ( 2 .cspb.RewardRrewards" costs ( 2 .cspb.RewardRcosts" - EnergyByADReq" - EnergyByADRsp( -err_code (2 .cspb.ErrCodeRerrCode4 + +EnergyByADReq"� + +EnergyByADRsp( +err_code (2 +.cspb.ErrCodeRerrCode4 energy_limit ( 2.cspb.EnergyLimitR energyLimit& rewards ( 2 .cspb.RewardRrewards" FundData! free_awarded (R freeAwarded& -pay_low_awarded (R payLowAwarded( +pay_low_awarded (R +payLowAwarded( pay_high_awarded (RpayHighAwarded"} Fund+ funds ( 2.cspb.Fund.FundsEntryRfundsH @@ -117,9 +128,10 @@ FundsEntry level (Rlevel"< FundAwardReq, -id_with_lv ( 2.cspb.IdWithLvRidWithLv" +id_with_lv ( 2.cspb.IdWithLvRidWithLv"� FundAwardRsp( -err_code (2 .cspb.ErrCodeRerrCode, +err_code (2 +.cspb.ErrCodeRerrCode, id_with_lv ( 2.cspb.IdWithLvRidWithLv& rewards ( 2 .cspb.RewardRrewards"k @@ -131,22 +143,25 @@ id_with_lv ( 2.cspb.IdWithLvRidWithLv& GuideFundMarkReq id (Rid"< GuideFundMarkRsp( -err_code (2 .cspb.ErrCodeRerrCode" +err_code (2 +.cspb.ErrCodeRerrCode" HeroUpgradeReq id (Rid"~ HeroUpgradeRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode hero ( 2 .cspb.HeroRhero" costs ( 2 .cspb.RewardRcosts" HeroPutOnReq -id (Rid" +id (Rid"� HeroPutOnRsp( -err_code (2 .cspb.ErrCodeRerrCode6 +err_code (2 +.cspb.ErrCodeRerrCode6 heroes ( 2.cspb.HeroPutOnRsp.HeroesEntryRheroes9 HeroesEntry key (Rkey -value (Rvalue:8" +value (Rvalue:8"� Mail id (Rid title ( Rtitle @@ -157,43 +172,52 @@ id_with_lv ( 2.cspb.IdWithLvRidWithLv& expire (Rexpire", MailInfo mails ( 2 -.cspb.MailRmails" +.cspb.MailRmails" MailListReq"Y MailListRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode mails ( 2 .cspb.MailRmails" MailReadReq ids (Rids"I MailReadRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode ids (Rids"" MailExtractReq ids (Rids"t MailExtractRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode ids (Rids& rewards ( 2 .cspb.RewardRrewards"! - MailDeleteReq + +MailDeleteReq ids (Rids"K - MailDeleteRsp( -err_code (2 .cspb.ErrCodeRerrCode + +MailDeleteRsp( +err_code (2 +.cspb.ErrCodeRerrCode ids (Rids" NewMailNtf" MailCycleReq"8 MailCycleRsp( -err_code (2 .cspb.ErrCodeRerrCode" +err_code (2 +.cspb.ErrCodeRerrCode"� Gift mall_type (RmallType id (Rid buy_count (RbuyCount" - latest_buy_at (R latestBuyAt* -latest_order_uuid ( RlatestOrderUuid" + +latest_buy_at (R latestBuyAt* +latest_order_uuid ( RlatestOrderUuid"� Mall gifts ( 2 .cspb.GiftRgiftsA - trigger_gifts ( 2.cspb.Mall.TriggerGiftsEntryR triggerGifts6 + +trigger_gifts ( 2.cspb.Mall.TriggerGiftsEntryR triggerGifts6 latest_mon_card_award_at (RlatestMonCardAwardAt? TriggerGiftsEntry key (Rkey @@ -201,10 +225,11 @@ NewMailNtf" MallPayReq mall_type (RmallType -id (Rid" +id (Rid"� MallPayRsp( -err_code (2 .cspb.ErrCodeRerrCode& +err_code (2 +.cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards uuid ( Ruuid recharge_id (R @@ -214,13 +239,15 @@ rechargeId MallPaidResultReq uuid ( Ruuid channel (Rchannel - pay_token ( RpayToken" + pay_token ( RpayToken"� MallPaidResultRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode gift ( 2 .cspb.GiftRgift& rewards ( 2 .cspb.RewardRrewards% -duplicate_uuid ( R duplicateUuid"_ +duplicate_uuid ( R +duplicateUuid"_ MallActTriggerGiftNtf mall_type (RmallType id (Rid @@ -230,14 +257,16 @@ MallPayNtf& rewards ( 2 .cspb.RewardRrewards mall_type (RmallType id (Rid" -MonCardRewardReq" +MonCardRewardReq"� MonCardRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode& +err_code (2 +.cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards6 latest_mon_card_award_at (RlatestMonCardAwardAt" AdFreeDailyGiftReq"f AdFreeDailyGiftRsp( -err_code (2 .cspb.ErrCodeRerrCode& +err_code (2 +.cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards"u Pig @@ -250,10 +279,11 @@ addDiamond PigLevelDownRsp". PigLevelDownNtf pig ( 2 .cspb.PigRpig", - PigLevelUpNtf + +PigLevelUpNtf pig ( 2 .cspb.PigRpig"/ PigPlayUpdateNtf -pig ( 2 .cspb.PigRpig" +pig ( 2 .cspb.PigRpig"� BasicInfo name ( Rname level (Rlevel @@ -261,7 +291,7 @@ addDiamond avatar (Ravatar pay_amount (R payAmount! - name_changed (R nameChanged" + name_changed (R nameChanged"� ClientInfo bundle_id ( RbundleId @@ -275,7 +305,7 @@ ClientInfo network_type ( R networkType language ( Rlanguage -timezone ( Rtimezone" +timezone ( Rtimezone"� Bag* items ( 2.cspb.Bag.ItemsEntryRitems- heroes ( 2.cspb.Bag.HeroesEntryRheroes9 @@ -305,16 +335,17 @@ onlineTime"{ key (Rkey value (Rvalue:8" Request -id (Rid" +id (Rid"� AuthReq type ( Rtype id ( Rid token ( Rtoken1 client_info ( 2.cspb.ClientInfoR clientInfo" -sync ( 2.cspb.SyncDataRsync" +sync ( 2.cspb.SyncDataRsync"� AuthRsp( -err_code (2 .cspb.ErrCodeRerrCode +err_code (2 +.cspb.ErrCodeRerrCode id ( Rid token ( Rtoken email ( Remail @@ -328,35 +359,44 @@ facebookId"C id ( Rid token ( Rtoken"3 BindRsp( -err_code (2 .cspb.ErrCodeRerrCode"D +err_code (2 +.cspb.ErrCodeRerrCode"D ExistReq type ( Rtype id ( Rid token ( Rtoken"4 ExistRsp( -err_code (2 .cspb.ErrCodeRerrCode" +err_code (2 +.cspb.ErrCodeRerrCode" DeleteReq"5 DeleteRsp( -err_code (2 .cspb.ErrCodeRerrCode"' +err_code (2 +.cspb.ErrCodeRerrCode"' ReconnectReq -recv_id ( RrecvId"Q +recv_id ( +RrecvId"Q ReconnectRsp( -err_code (2 .cspb.ErrCodeRerrCode -send_id ( RsendId" +err_code (2 +.cspb.ErrCodeRerrCode +send_id ( +RsendId" HeartbeatReq"8 HeartbeatRsp( -err_code (2 .cspb.ErrCodeRerrCode" +err_code (2 +.cspb.ErrCodeRerrCode" GMReq args ( Rargs"1 GMRsp( -err_code (2 .cspb.ErrCodeRerrCode"\ +err_code (2 +.cspb.ErrCodeRerrCode"\ LoginReq1 client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide" +skip_guide (R skipGuide"� LoginRsp( -err_code (2 .cspb.ErrCodeRerrCode* +err_code (2 +.cspb.ErrCodeRerrCode* today_first_login (RtodayFirstLogin today_ts (RtodayTs now_ts (RnowTs. @@ -374,42 +414,51 @@ fight_info ( 2.cspb.FightInfoR fightInfo task_daily ( 2.cspb.TaskDailyR taskDaily+ seven_day ( 2.cspb.SevenDayRsevenDay1 - battle_pass ( 2.cspb.BattlePassR + battle_pass + ( 2.cspb.BattlePassR battlePass+ mail_info ( 2.cspb.MailInfoRmailInfo fund ( 2 .cspb.FundRfund' -chapter ( 2 .cspb.ChapterRchapter +chapter ( 2 +.cspb.ChapterRchapter pig ( 2 .cspb.PigRpig3 energyLimit ( 2.cspb.EnergyLimitR energyLimit"U PipedReq -id ( Rid +id ( +Rid ts (Rts -msg_id ( RmsgId +msg_id ( +RmsgId data ( Rdata", SyncData pip ( 2.cspb.PipedReqRpip"9 KickOutNtf+ reason (2.cspb.KickOutReasonRreason"# - ChangeNameReq + +ChangeNameReq name ( Rname"q - ChangeNameRsp( -err_code (2 .cspb.ErrCodeRerrCode + +ChangeNameRsp( +err_code (2 +.cspb.ErrCodeRerrCode name ( Rname" costs ( 2 .cspb.RewardRcosts" WatchADReq"6 WatchADRsp( -err_code (2 .cspb.ErrCodeRerrCode"S +err_code (2 +.cspb.ErrCodeRerrCode"S TaskTutor id (Rid progress (Rprogress finished (Rfinished" -TaskTutorRewardReq" +TaskTutorRewardReq"� TaskTutorRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode# +err_code (2 +.cspb.ErrCodeRerrCode# task ( 2.cspb.TaskTutorRtask& rewards ( 2 .cspb.RewardRrewards"R @@ -420,7 +469,7 @@ TaskSingle TaskMulti id (Rid progress (Rprogress -stage (Rstage" +stage (Rstage"� TaskDaily0 tasks ( 2.cspb.TaskDaily.TasksEntryRtasksJ @@ -428,11 +477,12 @@ TasksEntry key (Rkey& value ( 2.cspb.TaskSingleRvalue:8"$ TaskDailyRewardReq -id (Rid" +id (Rid"� TaskDailyRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode$ +err_code (2 +.cspb.ErrCodeRerrCode$ task ( 2.cspb.TaskSingleRtask& -rewards ( 2 .cspb.RewardRrewards" +rewards ( 2 .cspb.RewardRrewards"� SevenDay open_day_ts (R openDayTs login_day (RloginDay/ @@ -446,9 +496,10 @@ TasksEntry key (Rkey value (Rvalue:8") SevenDayTaskRewardReq -ids (Rids" +ids (Rids"� SevenDayTaskRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode< +err_code (2 +.cspb.ErrCodeRerrCode< tasks ( 2&.cspb.SevenDayTaskRewardRsp.TasksEntryRtasks& rewards ( 2 .cspb.RewardRrewardsJ @@ -456,14 +507,15 @@ TasksEntry key (Rkey& value ( 2.cspb.TaskSingleRvalue:8"# SevenDayRewardReq -id (Rid" +id (Rid"� SevenDayRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode> +err_code (2 +.cspb.ErrCodeRerrCode> Claimed ( 2$.cspb.SevenDayRewardRsp.ClaimedEntryRClaimed& rewards ( 2 .cspb.RewardRrewards: ClaimedEntry key (Rkey -value (Rvalue:8* +value (Rvalue:8*� ErrCode SUCCESS @@ -483,57 +535,60 @@ TasksEntry PLAYER_LEVEL_NOT_ENOUGHl REWARD_CLAIMEDm TIME_OUTn - FUNC_NOT_OPENo -SIGN_IS_FINISHED -ACCELERATION_TIME_ERROR -DUNGEON_COUNT_NOT_ENOUGH -DUNGEON_TYPE_INVALID -DUNGEON_DIFF_INVALID -DUNGEON_AD_ADD_LIMIT" -MASTERY_PREV_LEVEL_NOT_ENOUGH -RUNE_LEVEL_MAX - RUNE_NO_NEXT -CHAPTER_BEYOND_MAX_STAGE! -CHAPTER_STAGE_ALREADY_REWARD -CHAPTER_WAVE_NOT_ENOUGH! -MALL_PAY_ORDER_CREATE_FAILED -MALL_PAY_ORDER_NOT_FOUND -MALL_PAY_ORDER_ID_NOT_MATCH -MALL_PAY_ORDER_STATE_ERROR -MALL_PAY_COUNT_LIMITED -MALL_PAY_OUT_OF_TIME -MALL_PAY_GIFT_NOT_TRIGGER# -MALL_PAY_FIRST_PAY_NOT_SATISFY -MALL_PAY_MON_CARD_NOT_FOUND -MALL_PAY_AD_FREE_DAILY_GIFT -MALL_PAY_DUPLICATE - IDLE_EXTRA_CD -FUND_HAS_AWARDED  -FUND_NOT_SATISFIED  -TASK_TUTOR_NOT_REACHED + +FUNC_NOT_OPENo +SIGN_IS_FINISHED� +ACCELERATION_TIME_ERROR� +DUNGEON_COUNT_NOT_ENOUGH� +DUNGEON_TYPE_INVALID� +DUNGEON_DIFF_INVALID� +DUNGEON_AD_ADD_LIMIT�" +MASTERY_PREV_LEVEL_NOT_ENOUGH� +RUNE_LEVEL_MAX� + RUNE_NO_NEXT� +CHAPTER_BEYOND_MAX_STAGE�! +CHAPTER_STAGE_ALREADY_REWARD� +CHAPTER_WAVE_NOT_ENOUGH�! +MALL_PAY_ORDER_CREATE_FAILED� +MALL_PAY_ORDER_NOT_FOUND� +MALL_PAY_ORDER_ID_NOT_MATCH� +MALL_PAY_ORDER_STATE_ERROR� +MALL_PAY_COUNT_LIMITED� +MALL_PAY_OUT_OF_TIME� +MALL_PAY_GIFT_NOT_TRIGGER�# +MALL_PAY_FIRST_PAY_NOT_SATISFY� +MALL_PAY_MON_CARD_NOT_FOUND� +MALL_PAY_AD_FREE_DAILY_GIFT� +MALL_PAY_DUPLICATE� + +IDLE_EXTRA_CD� +FUND_HAS_AWARDED�  +FUND_NOT_SATISFIED�  +TASK_TUTOR_NOT_REACHED�  -TASK_DAILY_NOT_REACHED +TASK_DAILY_NOT_REACHED�  -TASK_DAILY_CLAIMED +TASK_DAILY_CLAIMED�  -TASK_SEVEN_DAY_NOT_REACHED +TASK_SEVEN_DAY_NOT_REACHED�  -TASK_SEVEN_DAY_CLAIMED +TASK_SEVEN_DAY_CLAIMED� " -TASK_SEVEN_DAY_REWARD_CLAIMED +TASK_SEVEN_DAY_REWARD_CLAIMED� $ -TASK_SEVEN_DAY_DATE_NOT_REACHED +TASK_SEVEN_DAY_DATE_NOT_REACHED� ' -"TASK_SEVEN_DAY_FINISHED_NOT_ENOUGH +"TASK_SEVEN_DAY_FINISHED_NOT_ENOUGH� & -!COLLECTION_EQUIP_LEVEL_NOT_ENOUGH +!COLLECTION_EQUIP_LEVEL_NOT_ENOUGH� ! -BATTLE_PASS_TASK_NOT_REACHED  -BATTLE_PASS_TASK_CLAIMED  -ENERGY_BY_DIAMOND_LIMIT  -ENERGY_BY_AD_LIMIT *L - KickOutReason -MAINTAIN - FLOW_CTRL +BATTLE_PASS_TASK_NOT_REACHED�  +BATTLE_PASS_TASK_CLAIMED�  +ENERGY_BY_DIAMOND_LIMIT�  +ENERGY_BY_AD_LIMIT� *L + +KickOutReason +MAINTAIN + FLOW_CTRL FORBIDDEN OTHER_LOGINbproto3 \ No newline at end of file