diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 8a9cfad83..ba78506a5 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/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 25011fb12..9615ebc3c 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/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index ebb24d2c9..91e824ad0 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.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 eed760888..9ae2dd4d6 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/ui/arena/arena_formation_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_formation_ui.lua.bytes index 19aef2421..167d16218 100644 Binary files a/Assets/lua/app/ui/arena/arena_formation_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_formation_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_comp.lua.bytes index c7f16f90d..ffc7729fc 100644 Binary files a/Assets/lua/app/ui/hero/hero_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_comp.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 7ab50e3f8..dd5a76993 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/userdata/formation/formation_data.lua.bytes b/Assets/lua/app/userdata/formation/formation_data.lua.bytes index 216667db1..0d2adbf74 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_other.lua.bytes b/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes new file mode 100644 index 000000000..78077d5ea Binary files /dev/null and b/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes.meta b/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes.meta new file mode 100644 index 000000000..7533105ca --- /dev/null +++ b/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b7c37c8b42004ac89fa3a6ceb70b769 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes new file mode 100644 index 000000000..8b2e6e027 Binary files /dev/null and b/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes.meta b/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes.meta new file mode 100644 index 000000000..47cd741b1 --- /dev/null +++ b/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7cd7514fbdb644f7ebc9212d2cdd5477 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index 0a60aa0b1..5aeb3266a 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -Ÿ‚ +¥„ pb/proto/protocol.protocspb"' Act gifts ( 2 @@ -754,7 +754,7 @@ PartsEntry name ( Rname level (Rlevel avatar (Ravatar! - avatar_frame (R avatarFrame"ø + avatar_frame (R avatarFrame"î MatchPlayerInfo robot (Rrobot id ( Rid @@ -766,10 +766,14 @@ PartsEntry heroes ( 2.cspb.HeroInfoRheroes9 equips ( 2!.cspb.MatchPlayerInfo.EquipsEntryRequips skins - (RskinsK + (Rskins9 +talent ( 2!.cspb.MatchPlayerInfo.TalentEntryRtalentK EquipsEntry key (Rkey& -value ( 2.cspb.EquipInfosRvalue:8"' +value ( 2.cspb.EquipInfosRvalue:89 + TalentEntry +key (Rkey +value (Rvalue:8"' BaseBountyGrade grade (Rgrade"À @@ -1295,7 +1299,7 @@ player_ids ( 2.cspb.AuthRsp.PlayerIdsEntryR playerIds client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide"† +skip_guide (R skipGuide"– LoginRsp( err_code (2 .cspb.ErrCodeRerrCode! game_version ( R gameVersion @@ -1331,7 +1335,10 @@ summonData mall_gold ( 2.cspb.MallGoldRmallGold> mall_daily_store ( 2.cspb.MallDailyStoreRmallDailyStoreS chapter_daily_challenge ( 2.cspb.ChapterDailyChallengeRchapterDailyChallenge+ -dungeon ( 2.cspb.DungeonDataRdungeon4 +dungeon ( 2.cspb.DungeonDataRdungeon> + +formations ( 2.cspb.LoginRsp.FormationsEntryR +formations4 arena_bounty ( 2.cspb.ArenaBountyR arenaBounty8 act_arena_gift ( 2.cspb.ActArenaGiftR actArenaGift% equip ( 2.cspb.EquipDataRequip. @@ -1341,7 +1348,10 @@ summonData activities# ( 2.cspb.ActivityR activities@ task_achievement$ ( 2.cspb.TaskAchievementRtaskAchievement -actc ( 2 .cspb.ActRact"U +actc ( 2 .cspb.ActRactN +FormationsEntry +key (Rkey% +value ( 2.cspb.FormationRvalue:8"U PipedReq id ( Rid ts (Rts