From de4bf109edcd0179dd181c4dff79e6cde3e577ff Mon Sep 17 00:00:00 2001 From: xeon Date: Wed, 12 Mar 2025 19:01:55 +0300 Subject: [PATCH] Adjust protocol structs naming --- crates/battle-server/src/logic/scene/fight.rs | 4 +- crates/battle-server/src/logic/scene/mod.rs | 6 +- crates/battle-server/src/logic/scene/rally.rs | 4 +- .../src/server_message_handler.rs | 4 +- crates/game-server/src/logic/player/mod.rs | 10 +- crates/game-server/src/logic/player/scene.rs | 4 - .../src/session/message/battle_event.rs | 7 - .../game-server/src/session/message/fairy.rs | 15 - crates/game-server/src/session/message/mod.rs | 9 +- .../game-server/src/session/message/player.rs | 12 +- .../game-server/src/session/message/quest.rs | 29 - .../game-server/src/session/message/scene.rs | 34 +- .../message/{client_systems.rs => system.rs} | 34 +- .../game-server/src/session/message/tips.rs | 32 + .../src/session/message/training.rs | 19 + .../message/{collections.rs => workbench.rs} | 25 +- crates/hall-server/src/logic/ecs/scene.rs | 4 +- crates/trigger-logic/src/scene.rs | 1 + crates/trigger-protobuf/out/_.rs | 300 ++++++-- crates/trigger-protobuf/out/protocol_map.rs | 679 +++++++++++++----- crates/trigger-protocol/src/lib.rs | 221 ++++-- 21 files changed, 1038 insertions(+), 415 deletions(-) delete mode 100644 crates/game-server/src/session/message/fairy.rs rename crates/game-server/src/session/message/{client_systems.rs => system.rs} (91%) create mode 100644 crates/game-server/src/session/message/tips.rs create mode 100644 crates/game-server/src/session/message/training.rs rename crates/game-server/src/session/message/{collections.rs => workbench.rs} (50%) diff --git a/crates/battle-server/src/logic/scene/fight.rs b/crates/battle-server/src/logic/scene/fight.rs index 44e8069..45e69b7 100644 --- a/crates/battle-server/src/logic/scene/fight.rs +++ b/crates/battle-server/src/logic/scene/fight.rs @@ -9,10 +9,10 @@ pub struct FightScene { } impl FightScene { - pub fn get_protocol_scene_info(&self) -> trigger_protocol::SceneInfo { + pub fn get_protocol_scene_data(&self) -> trigger_protocol::SceneData { use trigger_protocol::*; - SceneInfo { + SceneData { scene_type: 3, local_play_type: self.play_type.into(), event_id: self.event_id, // or maybe it's actually scene_id ? diff --git a/crates/battle-server/src/logic/scene/mod.rs b/crates/battle-server/src/logic/scene/mod.rs index a2a2486..6d8af24 100644 --- a/crates/battle-server/src/logic/scene/mod.rs +++ b/crates/battle-server/src/logic/scene/mod.rs @@ -15,10 +15,10 @@ pub enum Scene { } impl Scene { - pub fn get_protocol_scene_info(&self) -> trigger_protocol::SceneInfo { + pub fn get_protocol_scene_data(&self) -> trigger_protocol::SceneData { match self { - Self::Fight(scene) => scene.get_protocol_scene_info(), - Self::Rally(scene) => scene.get_protocol_scene_info(), + Self::Fight(scene) => scene.get_protocol_scene_data(), + Self::Rally(scene) => scene.get_protocol_scene_data(), } } diff --git a/crates/battle-server/src/logic/scene/rally.rs b/crates/battle-server/src/logic/scene/rally.rs index b674f2f..b53fdcd 100644 --- a/crates/battle-server/src/logic/scene/rally.rs +++ b/crates/battle-server/src/logic/scene/rally.rs @@ -10,10 +10,10 @@ pub struct RallyScene { } impl RallyScene { - pub fn get_protocol_scene_info(&self) -> trigger_protocol::SceneInfo { + pub fn get_protocol_scene_data(&self) -> trigger_protocol::SceneData { use trigger_protocol::*; - SceneInfo { + SceneData { scene_type: 7, local_play_type: ELocalPlayType::RallyLongFight.into(), event_id: self.event_id, // or maybe it's actually scene_id ? diff --git a/crates/battle-server/src/server_message_handler.rs b/crates/battle-server/src/server_message_handler.rs index 3db5f28..4c009b6 100644 --- a/crates/battle-server/src/server_message_handler.rs +++ b/crates/battle-server/src/server_message_handler.rs @@ -67,8 +67,8 @@ async fn on_change_game_state( ); let enter_scene_notify = EnterSceneScNotify { - scene_info: Some(game_state.scene.get_protocol_scene_info()), - dungeon_info: Some(game_state.dungeon.get_protocol_dungeon_info()), + scene: Some(game_state.scene.get_protocol_scene_data()), + dungeon: Some(game_state.dungeon.get_protocol_dungeon_info()), }; session.game_state = Some(game_state); diff --git a/crates/game-server/src/logic/player/mod.rs b/crates/game-server/src/logic/player/mod.rs index 43d6ee9..070145e 100644 --- a/crates/game-server/src/logic/player/mod.rs +++ b/crates/game-server/src/logic/player/mod.rs @@ -9,7 +9,7 @@ use scene::SceneModel; use trigger_database::{entity::*, prelude::*, DatabaseConnection}; use trigger_fileconfig::NapFileCfg; use trigger_logic::scene::ESceneType; -use trigger_protocol::PlayerBasicInfo; +use trigger_protocol::PlayerInfo; use trigger_sv::message::GameStateData; use yorozuya::YorozuyaModel; @@ -126,15 +126,17 @@ impl NapPlayer { .expect("player_basic_info::update failed"); } - pub fn get_protocol_player_basic_info(&self) -> PlayerBasicInfo { - PlayerBasicInfo { + pub fn get_protocol_player_info(&self) -> PlayerInfo { + PlayerInfo { nick_name: self.player_basic_info.nick_name.clone(), level: self.player_basic_info.level as u32, exp: self.player_basic_info.exp as u32, avatar_id: self.player_basic_info.avatar_id as u32, player_avatar_id: self.player_basic_info.player_avatar_id as u32, control_avatar_id: self.player_basic_info.control_avatar_id as u32, - last_enter_world_timestamp: self.scene_model.last_enter_world_timestamp(), + role_create_time: 0, + name_change_times: 1, + portrait_id: 0, } } diff --git a/crates/game-server/src/logic/player/scene.rs b/crates/game-server/src/logic/player/scene.rs index 49bfea5..af149d5 100644 --- a/crates/game-server/src/logic/player/scene.rs +++ b/crates/game-server/src/logic/player/scene.rs @@ -138,10 +138,6 @@ impl SceneModel { .expect("scene_basic_info::find_by_id failed") } - pub fn last_enter_world_timestamp(&self) -> i64 { - self.player_world_info.last_enter_world_timestamp - } - async fn load_or_create_player_world_info(context: &NapContext) -> player_world_info::Model { let player_uid = context.player_uid as i32; diff --git a/crates/game-server/src/session/message/battle_event.rs b/crates/game-server/src/session/message/battle_event.rs index 483dde5..29bac4a 100644 --- a/crates/game-server/src/session/message/battle_event.rs +++ b/crates/game-server/src/session/message/battle_event.rs @@ -12,11 +12,4 @@ mod battle_event_module { event_info: Some(BattleEventInfo::default()), } } - - pub async fn on_report_battle_team( - _context: &mut MessageContext<'_, '_>, - _request: ReportBattleTeamCsReq, - ) -> ReportBattleTeamScRsp { - ReportBattleTeamScRsp { retcode: 0 } - } } diff --git a/crates/game-server/src/session/message/fairy.rs b/crates/game-server/src/session/message/fairy.rs deleted file mode 100644 index faae65e..0000000 --- a/crates/game-server/src/session/message/fairy.rs +++ /dev/null @@ -1,15 +0,0 @@ -use super::MessageContext; -use trigger_codegen::handlers; - -#[handlers] -mod fairy_module { - pub async fn on_get_fairy_data( - _context: &mut MessageContext<'_, '_>, - _request: GetFairyDataCsReq, - ) -> GetFairyDataScRsp { - GetFairyDataScRsp { - retcode: 0, - data: Some(FairyData::default()), - } - } -} diff --git a/crates/game-server/src/session/message/mod.rs b/crates/game-server/src/session/message/mod.rs index 83024f8..83f5507 100644 --- a/crates/game-server/src/session/message/mod.rs +++ b/crates/game-server/src/session/message/mod.rs @@ -13,7 +13,7 @@ modules! { quest, abyss, bangboo, - client_systems, + system, gacha, mail, ramen, @@ -22,10 +22,10 @@ modules! { reward_buff, arcade, daily_challenge, - fairy, + tips, activity, land_revive, - collections, + workbench, perform, battle_event, vhs_store, @@ -39,8 +39,9 @@ modules! { camp_idle, miniscape_entrust, fishing_contest, + qa_game, ridus_got_boo, - qa_game + training } client_message_forwarding! { diff --git a/crates/game-server/src/session/message/player.rs b/crates/game-server/src/session/message/player.rs index 21e180e..95d07bd 100644 --- a/crates/game-server/src/session/message/player.rs +++ b/crates/game-server/src/session/message/player.rs @@ -8,13 +8,13 @@ mod player_module { use crate::logic::avatar_util; - pub async fn on_get_player_basic_info( + pub async fn on_get_player_info( context: &mut MessageContext<'_, '_>, - _request: GetPlayerBasicInfoCsReq, - ) -> GetPlayerBasicInfoScRsp { - GetPlayerBasicInfoScRsp { + _request: GetPlayerInfoCsReq, + ) -> GetPlayerInfoScRsp { + GetPlayerInfoScRsp { retcode: 0, - basic_info: Some(context.player.get_protocol_player_basic_info()), + player_info: Some(context.player.get_protocol_player_info()), } } @@ -89,7 +89,7 @@ mod player_module { .await; context.add_notify(PlayerSyncScNotify { - basic_info: Some(context.player.get_protocol_player_basic_info()), + player_info: Some(context.player.get_protocol_player_info()), ..Default::default() }); diff --git a/crates/game-server/src/session/message/quest.rs b/crates/game-server/src/session/message/quest.rs index 740a0eb..b2d281a 100644 --- a/crates/game-server/src/session/message/quest.rs +++ b/crates/game-server/src/session/message/quest.rs @@ -75,35 +75,6 @@ mod quest_module { } } - pub async fn on_begin_training_course_battle( - context: &mut MessageContext<'_, '_>, - request: BeginTrainingCourseBattleCsReq, - ) { - let scene_model = &mut context.player.scene_model; - let scene_info = scene_model.create_scene_info(ESceneType::Fight).await; - - let dungeon_equip = - dungeon_util::build_dungeon_equip_info(&context.player, &request.avatar_id_list); - - context - .session - .change_game_state( - context.request_id, - BeginTrainingCourseBattleScRsp { retcode: 0 }, - GameStateData::Fight { - play_type: ELocalPlayType::TrainingRoom.into(), - quest_id: request.quest_id, - buddy_id: request.buddy_id, - avatar_id_list: request.avatar_id_list, - dungeon_equip, - }, - &scene_info, - context.player, - true, - ) - .await; - } - pub async fn on_begin_archive_battle_quest( context: &mut MessageContext<'_, '_>, request: BeginArchiveBattleQuestCsReq, diff --git a/crates/game-server/src/session/message/scene.rs b/crates/game-server/src/session/message/scene.rs index d0f8fba..166f7d3 100644 --- a/crates/game-server/src/session/message/scene.rs +++ b/crates/game-server/src/session/message/scene.rs @@ -4,9 +4,10 @@ use trigger_codegen::handlers; #[handlers] mod scene_module { use tracing::debug; - use trigger_logic::scene::ESceneType; + use trigger_logic::scene::{ELocalPlayType, ESceneType}; + use trigger_sv::message::GameStateData; - use crate::logic::scene_util; + use crate::logic::{dungeon_util, scene_util}; pub async fn on_enter_world(context: &mut MessageContext<'_, '_>, _request: EnterWorldCsReq) { let scene_model = &mut context.player.scene_model; @@ -88,6 +89,35 @@ mod scene_module { } } + pub async fn on_enter_training_room( + context: &mut MessageContext<'_, '_>, + request: EnterTrainingRoomCsReq, + ) { + let scene_model = &mut context.player.scene_model; + let scene_info = scene_model.create_scene_info(ESceneType::Fight).await; + + let dungeon_equip = + dungeon_util::build_dungeon_equip_info(&context.player, &request.avatar_id_list); + + context + .session + .change_game_state( + context.request_id, + EnterTrainingRoomScRsp { retcode: 0 }, + GameStateData::Fight { + play_type: ELocalPlayType::TrainingRoom.into(), + quest_id: request.quest_id, + buddy_id: request.buddy_id, + avatar_id_list: request.avatar_id_list, + dungeon_equip, + }, + &scene_info, + context.player, + true, + ) + .await; + } + pub async fn on_leave_cur_scene( context: &mut MessageContext<'_, '_>, _request: LeaveCurSceneCsReq, diff --git a/crates/game-server/src/session/message/client_systems.rs b/crates/game-server/src/session/message/system.rs similarity index 91% rename from crates/game-server/src/session/message/client_systems.rs rename to crates/game-server/src/session/message/system.rs index 66c3993..4edd274 100644 --- a/crates/game-server/src/session/message/client_systems.rs +++ b/crates/game-server/src/session/message/system.rs @@ -93,24 +93,30 @@ mod client_systems_module { PlayerOperationScRsp { retcode: 0 } } - pub async fn on_get_tips_info( + pub async fn on_get_system_settings( _context: &mut MessageContext<'_, '_>, - _request: GetTipsInfoCsReq, - ) -> GetTipsInfoScRsp { - GetTipsInfoScRsp { + request: GetSystemSettingsCsReq, + ) -> GetSystemSettingsScRsp { + GetSystemSettingsScRsp { retcode: 0, - tips_info: Some(TipsInfo::default()), + r#type: request.r#type, + settings: Some(SystemSettings { + systems: Vec::new(), + switch_of_qte: false, + switch_of_story_mode: false, + }), + player_settings_map: HashMap::new(), } } - pub async fn on_get_client_systems_data( + pub async fn on_get_unlock_data( context: &mut MessageContext<'_, '_>, - _request: GetClientSystemsDataCsReq, - ) -> GetClientSystemsDataScRsp { - GetClientSystemsDataScRsp { + _request: GetUnlockDataCsReq, + ) -> GetUnlockDataScRsp { + GetUnlockDataScRsp { retcode: 0, - data: Some(ClientSystemsData { - unlock_data: Some(UnlockData { + data: Some(UnlockData { + unlock: Some(UnlockInfo { unlocked_list: context .state .filecfg @@ -122,7 +128,7 @@ mod client_systems_module { .collect(), ..Default::default() }), - post_girl_data: Some(PostGirlData { + post_girl: Some(PostGirlInfo { post_girl_item_list: context .state .filecfg @@ -138,7 +144,7 @@ mod client_systems_module { selected_post_girl_id_list: vec![3510028], show_random_selected: false, }), - music_player_data: Some(MusicPlayerData { + music_player: Some(MusicPlayerInfo { music_list: context .state .filecfg @@ -153,7 +159,7 @@ mod client_systems_module { }) .collect(), }), - teleport_data: Some(TeleportData { + teleport: Some(TeleportUnlockInfo { unlocked_list: context .state .filecfg diff --git a/crates/game-server/src/session/message/tips.rs b/crates/game-server/src/session/message/tips.rs new file mode 100644 index 0000000..8321404 --- /dev/null +++ b/crates/game-server/src/session/message/tips.rs @@ -0,0 +1,32 @@ +use super::MessageContext; +use trigger_codegen::handlers; + +#[handlers] +mod tips_module { + use std::collections::HashMap; + + pub async fn on_get_tips_data( + _context: &mut MessageContext<'_, '_>, + _request: GetTipsDataCsReq, + ) -> GetTipsDataScRsp { + GetTipsDataScRsp { + retcode: 0, + data: Some(TipsData { + tips: Some(TipsInfo { + tips_list: Vec::new(), + tips_group_list: Vec::new(), + }), + fairy: Some(FairyInfo { + fairy_groups: HashMap::new(), + fairy_record_list: Vec::new(), + }), + popup_window: Some(PopupWindowInfo { + popup_window_list: Vec::new(), + }), + loading_page_tips: Some(LoadingPageTipsInfo { + unlocked_list: Vec::new(), + }), + }), + } + } +} diff --git a/crates/game-server/src/session/message/training.rs b/crates/game-server/src/session/message/training.rs new file mode 100644 index 0000000..7c98409 --- /dev/null +++ b/crates/game-server/src/session/message/training.rs @@ -0,0 +1,19 @@ +use super::MessageContext; +use trigger_codegen::handlers; + +#[handlers] +mod training_module { + use tracing::info; + + pub async fn on_start_training( + _context: &mut MessageContext<'_, '_>, + request: StartTrainingCsReq, + ) -> StartTrainingScRsp { + info!("{request:?}"); + + StartTrainingScRsp { + retcode: 0, + training_uid: 1000000, + } + } +} diff --git a/crates/game-server/src/session/message/collections.rs b/crates/game-server/src/session/message/workbench.rs similarity index 50% rename from crates/game-server/src/session/message/collections.rs rename to crates/game-server/src/session/message/workbench.rs index 2b186d1..3fd8bf5 100644 --- a/crates/game-server/src/session/message/collections.rs +++ b/crates/game-server/src/session/message/workbench.rs @@ -2,24 +2,27 @@ use super::MessageContext; use trigger_codegen::handlers; #[handlers] -mod collections_module { - pub async fn on_get_collect_map( +mod workbench_module { + pub async fn on_get_workbench_data( _context: &mut MessageContext<'_, '_>, - _request: GetCollectMapCsReq, - ) -> GetCollectMapScRsp { - GetCollectMapScRsp { + _request: GetWorkbenchDataCsReq, + ) -> GetWorkbenchDataScRsp { + GetWorkbenchDataScRsp { retcode: 0, - collect_map: Some(CollectMap::default()), + workbench_data: Some(WorkbenchData { + workbench_app_list: vec![1, 2, 3, 4, 5], + clue_data: Some(ClueData::default()), + }), } } - pub async fn on_workbench_get_data( + pub async fn on_get_partner_data( _context: &mut MessageContext<'_, '_>, - _request: WorkbenchGetDataCsReq, - ) -> WorkbenchGetDataScRsp { - WorkbenchGetDataScRsp { + _request: GetPartnerDataCsReq, + ) -> GetPartnerDataScRsp { + GetPartnerDataScRsp { retcode: 0, - workbench_data: Some(WorkbenchData::default()), + partner_data: Some(PartnerData::default()), } } diff --git a/crates/hall-server/src/logic/ecs/scene.rs b/crates/hall-server/src/logic/ecs/scene.rs index bee47a7..075c312 100644 --- a/crates/hall-server/src/logic/ecs/scene.rs +++ b/crates/hall-server/src/logic/ecs/scene.rs @@ -137,12 +137,12 @@ pub fn notify_enter_scene( } listener.add(EnterSceneScNotify { - scene_info: Some(SceneInfo { + scene: Some(SceneData { scene_type: ESceneType::Hall as u32, hall_scene_info: Some(hall_scene_info), ..Default::default() }), - dungeon_info: None, + dungeon: None, }); } } diff --git a/crates/trigger-logic/src/scene.rs b/crates/trigger-logic/src/scene.rs index 0ca3ddf..51d7312 100644 --- a/crates/trigger-logic/src/scene.rs +++ b/crates/trigger-logic/src/scene.rs @@ -21,6 +21,7 @@ pub enum ESceneType { Fight = 3, Fresh = 4, MultiFight = 5, + TrainingRoom = 6, Rally = 7, } diff --git a/crates/trigger-protobuf/out/_.rs b/crates/trigger-protobuf/out/_.rs index ac66a26..1b57c68 100644 --- a/crates/trigger-protobuf/out/_.rs +++ b/crates/trigger-protobuf/out/_.rs @@ -12,13 +12,16 @@ pub struct GetRewardBuffDataScRsp { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct PlayerBasicInfo { +pub struct PlayerInfo { #[xor(15327)] #[prost(uint32, tag = "9")] pub level: u32, + #[xor(3181)] + #[prost(uint32, tag = "8")] + pub name_change_times: u32, #[xor(3247)] #[prost(int64, tag = "2")] - pub last_enter_world_timestamp: i64, + pub role_create_time: i64, #[xor(9120)] #[prost(uint32, tag = "12")] pub avatar_id: u32, @@ -28,6 +31,9 @@ pub struct PlayerBasicInfo { #[xor(8142)] #[prost(uint32, tag = "1658")] pub control_avatar_id: u32, + #[xor(13432)] + #[prost(uint32, tag = "7")] + pub portrait_id: u32, #[prost(string, tag = "11")] pub nick_name: ::prost::alloc::string::String, #[xor(9818)] @@ -112,6 +118,13 @@ pub struct DressedEquip { pub equip_uid: u32, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct LoadingPageTipsInfo { + #[prost(int32, repeated, tag = "12")] + pub unlocked_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(4672)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -137,7 +150,7 @@ pub struct AvatarSkillLevel { #[cmdid(2764)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct GetCollectMapCsReq {} +pub struct GetPartnerDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -165,7 +178,7 @@ pub struct EndBattleCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct PostGirlData { +pub struct PostGirlInfo { #[prost(uint32, repeated, tag = "7")] pub selected_post_girl_id_list: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "6")] @@ -225,9 +238,16 @@ pub struct HallSceneInfo { #[derive(Clone, PartialEq, ::prost::Message)] pub struct EnterSceneScNotify { #[prost(message, optional, tag = "10")] - pub scene_info: ::core::option::Option, + pub scene: ::core::option::Option, #[prost(message, optional, tag = "9")] - pub dungeon_info: ::core::option::Option, + pub dungeon: ::core::option::Option, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct PerformInfo { + #[prost(uint32, repeated, tag = "11")] + pub perform_id_list: ::prost::alloc::vec::Vec, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(499)] @@ -345,9 +365,9 @@ pub struct DressEquipmentCsReq { #[cmdid(6803)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetFairyDataScRsp { +pub struct GetTipsDataScRsp { #[prost(message, optional, tag = "7")] - pub data: ::core::option::Option, + pub data: ::core::option::Option, #[xor(3416)] #[prost(int32, tag = "6")] pub retcode: i32, @@ -478,6 +498,19 @@ pub struct GetBuddyDataScRsp { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct TipsSync { + #[prost(int32, repeated, tag = "13")] + pub tips_group_list: ::prost::alloc::vec::Vec, + #[prost(uint32, repeated, tag = "6")] + pub popup_window_list: ::prost::alloc::vec::Vec, + #[prost(int32, repeated, tag = "7")] + pub tips_list: ::prost::alloc::vec::Vec, + #[prost(map = "int32, enumeration(FairyState)", tag = "4")] + pub fairy_groups: ::std::collections::HashMap, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct Transform { #[prost(double, repeated, tag = "1")] pub position: ::prost::alloc::vec::Vec, @@ -530,7 +563,7 @@ pub struct RallySceneInfo { #[cmdid(4158)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct GetPlayerBasicInfoCsReq {} +pub struct GetPlayerInfoCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(4021)] #[derive(trigger_protobuf_derive::XorFields)] @@ -566,9 +599,12 @@ pub struct FinishArchivePerformScRsp { #[cmdid(6778)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct ReportBattleTeamCsReq { +pub struct StartTrainingCsReq { #[prost(int32, repeated, tag = "3")] pub avatar_list: ::prost::alloc::vec::Vec, + #[xor(6606)] + #[prost(int32, tag = "9")] + pub special_training_index: i32, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(744)] @@ -592,10 +628,22 @@ pub struct StartHollowQuestCsReq { #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetWebActivityDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] +#[cmdid(1149)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] +pub struct EndTrainingCsReq { + #[xor(15023)] + #[prost(int32, tag = "4")] + pub special_training_index: i32, + #[xor(4240)] + #[prost(int64, tag = "5")] + pub training_uid: i64, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(358)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct WorkbenchGetDataCsReq {} +pub struct GetWorkbenchDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(5494)] #[derive(trigger_protobuf_derive::XorFields)] @@ -612,6 +660,19 @@ pub struct AbyssGetDataScRsp { pub abyss_group_list: ::prost::alloc::vec::Vec, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] +pub struct VhsGuestInfo { + #[xor(2834)] + #[prost(int32, tag = "2")] + pub guest_id: i32, + #[xor(7940)] + #[prost(uint32, tag = "3")] + pub guest_type: u32, + #[prost(bool, tag = "7")] + pub has_guest: bool, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(7852)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] @@ -664,6 +725,15 @@ pub struct StartHollowQuestScRsp { pub retcode: i32, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct TipsInfo { + #[prost(int32, repeated, tag = "12")] + pub tips_group_list: ::prost::alloc::vec::Vec, + #[prost(int32, repeated, tag = "15")] + pub tips_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(2708)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -692,7 +762,7 @@ pub struct GetRewardBuffDataCsReq {} #[cmdid(8186)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct BeginTrainingCourseBattleCsReq { +pub struct EnterTrainingRoomCsReq { #[xor(8200)] #[prost(uint32, tag = "5")] pub quest_id: u32, @@ -717,6 +787,24 @@ pub struct QuestCollection { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct PopupWindowInfo { + #[prost(uint32, repeated, tag = "4")] + pub popup_window_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[cmdid(8963)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct GetVhsStoreDataScRsp { + #[xor(4520)] + #[prost(int32, tag = "12")] + pub retcode: i32, + #[prost(message, optional, tag = "11")] + pub data: ::core::option::Option, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct ItemSync { #[prost(message, repeated, tag = "6")] pub material_list: ::prost::alloc::vec::Vec, @@ -1015,7 +1103,7 @@ pub struct GetQuestDataCsReq { #[cmdid(2325)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct GetTipsInfoCsReq { +pub struct GetSystemSettingsCsReq { #[xor(12773)] #[prost(uint32, tag = "12")] pub r#type: u32, @@ -1128,24 +1216,28 @@ pub struct GetQuestionsAnswerGameDataCsReq {} #[cmdid(4174)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetClientSystemsDataScRsp { +pub struct GetUnlockDataScRsp { #[xor(2530)] #[prost(int32, tag = "3")] pub retcode: i32, #[prost(message, optional, tag = "6")] - pub data: ::core::option::Option, + pub data: ::core::option::Option, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(6645)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetTipsInfoScRsp { +pub struct GetSystemSettingsScRsp { #[xor(11676)] #[prost(uint32, tag = "10")] pub r#type: u32, #[xor(10864)] #[prost(int32, tag = "5")] pub retcode: i32, + #[prost(map = "uint32, uint32", tag = "15")] + pub player_settings_map: ::std::collections::HashMap, + #[prost(message, optional, tag = "12")] + pub settings: ::core::option::Option, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(1087)] @@ -1219,6 +1311,14 @@ pub struct PlayerGetTokenScRsp { pub sign: ::prost::alloc::string::String, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] +pub struct PromoterInfo { + #[xor(10809)] + #[prost(uint32, tag = "11")] + pub id: u32, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(3631)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] @@ -1299,6 +1399,13 @@ pub struct SyncEventInfoScNotify { pub owner_type: i32, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct VhsFlowInfo { + #[prost(message, repeated, tag = "9")] + pub buff_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(9161)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] @@ -1354,18 +1461,25 @@ pub struct GetFashionStoreDataCsReq {} #[cmdid(7302)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetPlayerBasicInfoScRsp { +pub struct GetPlayerInfoScRsp { #[xor(4333)] #[prost(int32, tag = "10")] pub retcode: i32, #[prost(message, optional, tag = "8")] - pub basic_info: ::core::option::Option, + pub player_info: ::core::option::Option, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] +pub struct VhsFlowBuffInfo { + #[prost(enumeration = "VhsFlowBuffSource", tag = "3")] + pub buff_source: i32, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(6289)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct GetClientSystemsDataCsReq {} +pub struct GetUnlockDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(2111)] #[derive(trigger_protobuf_derive::XorFields)] @@ -1378,15 +1492,19 @@ pub struct GetChatEmojiListScRsp { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct ClientSystemsData { +pub struct UnlockData { #[prost(message, optional, tag = "1")] - pub post_girl_data: ::core::option::Option, + pub post_girl: ::core::option::Option, #[prost(message, optional, tag = "14")] - pub unlock_data: ::core::option::Option, + pub unlock: ::core::option::Option, #[prost(message, optional, tag = "10")] - pub teleport_data: ::core::option::Option, + pub teleport: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub hollow_event: ::core::option::Option, #[prost(message, optional, tag = "8")] - pub music_player_data: ::core::option::Option, + pub music_player: ::core::option::Option, + #[prost(message, optional, tag = "4")] + pub perform: ::core::option::Option, } #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(2014)] @@ -1419,7 +1537,7 @@ pub struct GetActivityDataCsReq { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct UnlockData { +pub struct UnlockInfo { #[prost(int32, repeated, tag = "13")] pub unlocked_list: ::prost::alloc::vec::Vec, } @@ -1496,6 +1614,18 @@ pub struct GetCafeDataScRsp { #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PlayerLogoutCsReq {} #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct VhsStoreOpenInfo { + #[prost(message, optional, tag = "4")] + pub cur_promoter: ::core::option::Option, + #[prost(int32, repeated, tag = "13")] + pub vhs_collection_id_list: ::prost::alloc::vec::Vec, + #[xor(3569)] + #[prost(int64, tag = "3")] + pub setup_time: i64, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(6280)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -1556,7 +1686,7 @@ pub struct GetMonthCardRewardListCsReq {} #[cmdid(4783)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct GetFairyDataCsReq {} +pub struct GetTipsDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[cmdid(3591)] #[derive(trigger_protobuf_derive::XorFields)] @@ -1623,6 +1753,13 @@ pub struct PlayerGetTokenCsReq { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct HollowEventUnlockInfo { + #[prost(int32, repeated, tag = "3")] + pub unlocked_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct DungeonEquipInfo { #[prost(message, repeated, tag = "15")] pub equip_list: ::prost::alloc::vec::Vec, @@ -1657,7 +1794,9 @@ pub struct PlayerSyncScNotify { #[prost(message, optional, tag = "2")] pub avatar_sync: ::core::option::Option, #[prost(message, optional, tag = "5")] - pub basic_info: ::core::option::Option, + pub player_info: ::core::option::Option, + #[prost(message, optional, tag = "13")] + pub tips: ::core::option::Option, #[prost(message, optional, tag = "1")] pub item_sync: ::core::option::Option, } @@ -1748,6 +1887,18 @@ pub struct UpdateEventGraphScNotify { pub event_graph_uid: u32, } #[derive(trigger_protobuf_derive::CmdID)] +#[cmdid(2753)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] +pub struct StartTrainingScRsp { + #[xor(9872)] + #[prost(int64, tag = "15")] + pub training_uid: i64, + #[xor(1222)] + #[prost(int32, tag = "13")] + pub retcode: i32, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(7975)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] @@ -1777,11 +1928,20 @@ pub struct GetDisplayCaseDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct TeleportData { +pub struct TeleportUnlockInfo { #[prost(int32, repeated, tag = "8")] pub unlocked_list: ::prost::alloc::vec::Vec, } #[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct FairyInfo { + #[prost(map = "int32, enumeration(FairyState)", tag = "10")] + pub fairy_groups: ::std::collections::HashMap, + #[prost(int32, repeated, tag = "14")] + pub fairy_record_list: ::prost::alloc::vec::Vec, +} +#[derive(trigger_protobuf_derive::CmdID)] #[cmdid(5659)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -1805,6 +1965,37 @@ pub struct ClickHollowSystemCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct VhsStoreData { + #[xor(2629)] + #[prost(uint32, tag = "4")] + pub store_level: u32, + #[prost(int32, repeated, tag = "3")] + pub unlock_collection_id_list: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag = "13")] + pub vhs_store_open_info: ::core::option::Option, + #[prost(map = "uint32, message", tag = "10")] + pub promoter_info_map: ::std::collections::HashMap, + #[prost(message, optional, tag = "2")] + pub vhs_guest_info: ::core::option::Option, + #[prost(message, optional, tag = "1")] + pub vhs_flow_info: ::core::option::Option, + #[prost(bool, tag = "8")] + pub is_need_refresh: bool, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct SystemSettings { + #[prost(uint32, repeated, tag = "1")] + pub systems: ::prost::alloc::vec::Vec, + #[prost(bool, tag = "7")] + pub switch_of_story_mode: bool, + #[prost(bool, tag = "6")] + pub switch_of_qte: bool, +} +#[derive(trigger_protobuf_derive::CmdID)] +#[derive(trigger_protobuf_derive::XorFields)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct QuestInfo { #[xor(5460)] #[prost(uint32, tag = "14")] @@ -1861,7 +2052,7 @@ pub struct MusicPlayerItem { #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct SceneInfo { +pub struct SceneData { #[prost(message, optional, tag = "11")] pub hall_scene_info: ::core::option::Option, #[xor(10113)] @@ -1896,11 +2087,20 @@ pub struct GetWeaponDataCsReq {} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct FairyData {} +pub struct TipsData { + #[prost(message, optional, tag = "5")] + pub tips: ::core::option::Option, + #[prost(message, optional, tag = "7")] + pub fairy: ::core::option::Option, + #[prost(message, optional, tag = "10")] + pub loading_page_tips: ::core::option::Option, + #[prost(message, optional, tag = "9")] + pub popup_window: ::core::option::Option, +} #[derive(trigger_protobuf_derive::CmdID)] #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct MusicPlayerData { +pub struct MusicPlayerInfo { #[prost(message, repeated, tag = "3")] pub music_list: ::prost::alloc::vec::Vec, } @@ -5925,26 +6125,26 @@ impl Ilojlciaack { #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Eifoghmicik { - Cldigdhookf = 0, - Fjookhinkdm = 1, +pub enum FairyState { + EifoghmicikCldigdhookf = 0, + EifoghmicikFjookhinkdm = 1, } -impl Eifoghmicik { +impl FairyState { /// String value of the enum field names used in the ProtoBuf definition. /// /// The values are not transformed in any way and thus are considered stable /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - Self::Cldigdhookf => "EIFOGHMICIK_CLDIGDHOOKF", - Self::Fjookhinkdm => "EIFOGHMICIK_FJOOKHINKDM", + Self::EifoghmicikCldigdhookf => "EIFOGHMICIK_CLDIGDHOOKF", + Self::EifoghmicikFjookhinkdm => "EIFOGHMICIK_FJOOKHINKDM", } } /// Creates an enum from field names used in the ProtoBuf definition. pub fn from_str_name(value: &str) -> ::core::option::Option { match value { - "EIFOGHMICIK_CLDIGDHOOKF" => Some(Self::Cldigdhookf), - "EIFOGHMICIK_FJOOKHINKDM" => Some(Self::Fjookhinkdm), + "EIFOGHMICIK_CLDIGDHOOKF" => Some(Self::EifoghmicikCldigdhookf), + "EIFOGHMICIK_FJOOKHINKDM" => Some(Self::EifoghmicikFjookhinkdm), _ => None, } } @@ -17299,27 +17499,33 @@ impl Fgchgkjflpl { #[derive(trigger_protobuf_derive::XorFields)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Amnemeaehhp { - VhsFlowBuffSourceNone = 0, - VhsFlowBuffSourceQuest = 1, +pub enum VhsFlowBuffSource { + AmnemeaehhpVhsFlowBuffSourceNone = 0, + AmnemeaehhpVhsFlowBuffSourceQuest = 1, } -impl Amnemeaehhp { +impl VhsFlowBuffSource { /// String value of the enum field names used in the ProtoBuf definition. /// /// The values are not transformed in any way and thus are considered stable /// (if the ProtoBuf definition does not change) and safe for programmatic use. pub fn as_str_name(&self) -> &'static str { match self { - Self::VhsFlowBuffSourceNone => "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_NONE", - Self::VhsFlowBuffSourceQuest => "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_QUEST", + Self::AmnemeaehhpVhsFlowBuffSourceNone => { + "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_NONE" + } + Self::AmnemeaehhpVhsFlowBuffSourceQuest => { + "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_QUEST" + } } } /// Creates an enum from field names used in the ProtoBuf definition. pub fn from_str_name(value: &str) -> ::core::option::Option { match value { - "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_NONE" => Some(Self::VhsFlowBuffSourceNone), + "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_NONE" => { + Some(Self::AmnemeaehhpVhsFlowBuffSourceNone) + } "AMNEMEAEHHP_VHS_FLOW_BUFF_SOURCE_QUEST" => { - Some(Self::VhsFlowBuffSourceQuest) + Some(Self::AmnemeaehhpVhsFlowBuffSourceQuest) } _ => None, } diff --git a/crates/trigger-protobuf/out/protocol_map.rs b/crates/trigger-protobuf/out/protocol_map.rs index eed71bd..cd40281 100644 --- a/crates/trigger-protobuf/out/protocol_map.rs +++ b/crates/trigger-protobuf/out/protocol_map.rs @@ -43,10 +43,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetCollectMapCsReq::CMD_ID => { - let mut pb_message = GetCollectMapCsReq::decode(pb)?; + GetPartnerDataCsReq::CMD_ID => { + let mut pb_message = GetPartnerDataCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetCollectMapCsReq::from( + let common_protocol_message = ::trigger_protocol::GetPartnerDataCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -163,10 +163,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetFairyDataScRsp::CMD_ID => { - let mut pb_message = GetFairyDataScRsp::decode(pb)?; + GetTipsDataScRsp::CMD_ID => { + let mut pb_message = GetTipsDataScRsp::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetFairyDataScRsp::from( + let common_protocol_message = ::trigger_protocol::GetTipsDataScRsp::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -259,10 +259,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetPlayerBasicInfoCsReq::CMD_ID => { - let mut pb_message = GetPlayerBasicInfoCsReq::decode(pb)?; + GetPlayerInfoCsReq::CMD_ID => { + let mut pb_message = GetPlayerInfoCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetPlayerBasicInfoCsReq::from( + let common_protocol_message = ::trigger_protocol::GetPlayerInfoCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -291,10 +291,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - ReportBattleTeamCsReq::CMD_ID => { - let mut pb_message = ReportBattleTeamCsReq::decode(pb)?; + StartTrainingCsReq::CMD_ID => { + let mut pb_message = StartTrainingCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::ReportBattleTeamCsReq::from( + let common_protocol_message = ::trigger_protocol::StartTrainingCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -315,10 +315,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - WorkbenchGetDataCsReq::CMD_ID => { - let mut pb_message = WorkbenchGetDataCsReq::decode(pb)?; + GetWorkbenchDataCsReq::CMD_ID => { + let mut pb_message = GetWorkbenchDataCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::WorkbenchGetDataCsReq::from( + let common_protocol_message = ::trigger_protocol::GetWorkbenchDataCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -403,10 +403,18 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - BeginTrainingCourseBattleCsReq::CMD_ID => { - let mut pb_message = BeginTrainingCourseBattleCsReq::decode(pb)?; + EnterTrainingRoomCsReq::CMD_ID => { + let mut pb_message = EnterTrainingRoomCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::BeginTrainingCourseBattleCsReq::from( + let common_protocol_message = ::trigger_protocol::EnterTrainingRoomCsReq::from( + pb_message, + ); + Ok(Some(common_protocol_message.into())) + } + GetVhsStoreDataScRsp::CMD_ID => { + let mut pb_message = GetVhsStoreDataScRsp::decode(pb)?; + pb_message.xor_fields(); + let common_protocol_message = ::trigger_protocol::GetVhsStoreDataScRsp::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -587,10 +595,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetTipsInfoCsReq::CMD_ID => { - let mut pb_message = GetTipsInfoCsReq::decode(pb)?; + GetSystemSettingsCsReq::CMD_ID => { + let mut pb_message = GetSystemSettingsCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetTipsInfoCsReq::from( + let common_protocol_message = ::trigger_protocol::GetSystemSettingsCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -651,18 +659,18 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetClientSystemsDataScRsp::CMD_ID => { - let mut pb_message = GetClientSystemsDataScRsp::decode(pb)?; + GetUnlockDataScRsp::CMD_ID => { + let mut pb_message = GetUnlockDataScRsp::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetClientSystemsDataScRsp::from( + let common_protocol_message = ::trigger_protocol::GetUnlockDataScRsp::from( pb_message, ); Ok(Some(common_protocol_message.into())) } - GetTipsInfoScRsp::CMD_ID => { - let mut pb_message = GetTipsInfoScRsp::decode(pb)?; + GetSystemSettingsScRsp::CMD_ID => { + let mut pb_message = GetSystemSettingsScRsp::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetTipsInfoScRsp::from( + let common_protocol_message = ::trigger_protocol::GetSystemSettingsScRsp::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -755,18 +763,18 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetPlayerBasicInfoScRsp::CMD_ID => { - let mut pb_message = GetPlayerBasicInfoScRsp::decode(pb)?; + GetPlayerInfoScRsp::CMD_ID => { + let mut pb_message = GetPlayerInfoScRsp::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetPlayerBasicInfoScRsp::from( + let common_protocol_message = ::trigger_protocol::GetPlayerInfoScRsp::from( pb_message, ); Ok(Some(common_protocol_message.into())) } - GetClientSystemsDataCsReq::CMD_ID => { - let mut pb_message = GetClientSystemsDataCsReq::decode(pb)?; + GetUnlockDataCsReq::CMD_ID => { + let mut pb_message = GetUnlockDataCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetClientSystemsDataCsReq::from( + let common_protocol_message = ::trigger_protocol::GetUnlockDataCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -891,10 +899,10 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } - GetFairyDataCsReq::CMD_ID => { - let mut pb_message = GetFairyDataCsReq::decode(pb)?; + GetTipsDataCsReq::CMD_ID => { + let mut pb_message = GetTipsDataCsReq::decode(pb)?; pb_message.xor_fields(); - let common_protocol_message = ::trigger_protocol::GetFairyDataCsReq::from( + let common_protocol_message = ::trigger_protocol::GetTipsDataCsReq::from( pb_message, ); Ok(Some(common_protocol_message.into())) @@ -979,6 +987,14 @@ pub fn pb_to_common_protocol_unit( ); Ok(Some(common_protocol_message.into())) } + StartTrainingScRsp::CMD_ID => { + let mut pb_message = StartTrainingScRsp::decode(pb)?; + pb_message.xor_fields(); + let common_protocol_message = ::trigger_protocol::StartTrainingScRsp::from( + pb_message, + ); + Ok(Some(common_protocol_message.into())) + } RefreshSectionScRsp::CMD_ID => { let mut pb_message = RefreshSectionScRsp::decode(pb)?; pb_message.xor_fields(); @@ -1140,13 +1156,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((SavePosInMainCityCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetCollectMapCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetCollectMapCsReq::decode( + ::trigger_protocol::GetPartnerDataCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetPartnerDataCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetCollectMapCsReq::from(common_protocol_message); + let mut pb_message = GetPartnerDataCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetCollectMapCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetPartnerDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::EndBattleCsReq::CMD_ID => { let common_protocol_message = ::trigger_protocol::EndBattleCsReq::decode( @@ -1266,13 +1282,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((DressEquipmentCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetFairyDataScRsp::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetFairyDataScRsp::decode( + ::trigger_protocol::GetTipsDataScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetTipsDataScRsp::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetFairyDataScRsp::from(common_protocol_message); + let mut pb_message = GetTipsDataScRsp::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetFairyDataScRsp::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetTipsDataScRsp::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::RefreshSectionCsReq::CMD_ID => { let common_protocol_message = ::trigger_protocol::RefreshSectionCsReq::decode( @@ -1364,13 +1380,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((EnterSectionCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetPlayerBasicInfoCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetPlayerBasicInfoCsReq::decode( + ::trigger_protocol::GetPlayerInfoCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetPlayerInfoCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetPlayerBasicInfoCsReq::from(common_protocol_message); + let mut pb_message = GetPlayerInfoCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetPlayerBasicInfoCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetPlayerInfoCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::GetAvatarDataScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::GetAvatarDataScRsp::decode( @@ -1398,13 +1414,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((FinishArchivePerformScRsp::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::ReportBattleTeamCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::ReportBattleTeamCsReq::decode( + ::trigger_protocol::StartTrainingCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::StartTrainingCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = ReportBattleTeamCsReq::from(common_protocol_message); + let mut pb_message = StartTrainingCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((ReportBattleTeamCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((StartTrainingCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::StartHollowQuestCsReq::CMD_ID => { let common_protocol_message = ::trigger_protocol::StartHollowQuestCsReq::decode( @@ -1422,13 +1438,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((GetWebActivityDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::WorkbenchGetDataCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::WorkbenchGetDataCsReq::decode( + ::trigger_protocol::GetWorkbenchDataCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetWorkbenchDataCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = WorkbenchGetDataCsReq::from(common_protocol_message); + let mut pb_message = GetWorkbenchDataCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((WorkbenchGetDataCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetWorkbenchDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::AbyssGetDataScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::AbyssGetDataScRsp::decode( @@ -1514,20 +1530,21 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((GetRewardBuffDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::BeginTrainingCourseBattleCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::BeginTrainingCourseBattleCsReq::decode( + ::trigger_protocol::EnterTrainingRoomCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::EnterTrainingRoomCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = BeginTrainingCourseBattleCsReq::from( - common_protocol_message, - ); + let mut pb_message = EnterTrainingRoomCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok( - Some(( - BeginTrainingCourseBattleCsReq::CMD_ID, - pb_message.encode_to_vec(), - )), - ) + Ok(Some((EnterTrainingRoomCsReq::CMD_ID, pb_message.encode_to_vec()))) + } + ::trigger_protocol::GetVhsStoreDataScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetVhsStoreDataScRsp::decode( + &mut ::std::io::Cursor::new(&unit.blob), + )?; + let mut pb_message = GetVhsStoreDataScRsp::from(common_protocol_message); + pb_message.xor_fields(); + Ok(Some((GetVhsStoreDataScRsp::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::BeginArchiveBattleQuestScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::BeginArchiveBattleQuestScRsp::decode( @@ -1721,13 +1738,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((GetQuestDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetTipsInfoCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetTipsInfoCsReq::decode( + ::trigger_protocol::GetSystemSettingsCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetSystemSettingsCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetTipsInfoCsReq::from(common_protocol_message); + let mut pb_message = GetSystemSettingsCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetTipsInfoCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetSystemSettingsCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::GetCampIdleDataCsReq::CMD_ID => { let common_protocol_message = ::trigger_protocol::GetCampIdleDataCsReq::decode( @@ -1794,23 +1811,21 @@ pub fn common_protocol_unit_to_pb( )), ) } - ::trigger_protocol::GetClientSystemsDataScRsp::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetClientSystemsDataScRsp::decode( + ::trigger_protocol::GetUnlockDataScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetUnlockDataScRsp::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetClientSystemsDataScRsp::from( - common_protocol_message, - ); + let mut pb_message = GetUnlockDataScRsp::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetClientSystemsDataScRsp::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetUnlockDataScRsp::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetTipsInfoScRsp::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetTipsInfoScRsp::decode( + ::trigger_protocol::GetSystemSettingsScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetSystemSettingsScRsp::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetTipsInfoScRsp::from(common_protocol_message); + let mut pb_message = GetSystemSettingsScRsp::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetTipsInfoScRsp::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetSystemSettingsScRsp::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::SwitchRoleCsReq::CMD_ID => { let common_protocol_message = ::trigger_protocol::SwitchRoleCsReq::decode( @@ -1904,23 +1919,21 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((GetFashionStoreDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetPlayerBasicInfoScRsp::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetPlayerBasicInfoScRsp::decode( + ::trigger_protocol::GetPlayerInfoScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetPlayerInfoScRsp::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetPlayerBasicInfoScRsp::from(common_protocol_message); + let mut pb_message = GetPlayerInfoScRsp::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetPlayerBasicInfoScRsp::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetPlayerInfoScRsp::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetClientSystemsDataCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetClientSystemsDataCsReq::decode( + ::trigger_protocol::GetUnlockDataCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetUnlockDataCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetClientSystemsDataCsReq::from( - common_protocol_message, - ); + let mut pb_message = GetUnlockDataCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetClientSystemsDataCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetUnlockDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::GetChatEmojiListScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::GetChatEmojiListScRsp::decode( @@ -2044,13 +2057,13 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((GetMonthCardRewardListCsReq::CMD_ID, pb_message.encode_to_vec()))) } - ::trigger_protocol::GetFairyDataCsReq::CMD_ID => { - let common_protocol_message = ::trigger_protocol::GetFairyDataCsReq::decode( + ::trigger_protocol::GetTipsDataCsReq::CMD_ID => { + let common_protocol_message = ::trigger_protocol::GetTipsDataCsReq::decode( &mut ::std::io::Cursor::new(&unit.blob), )?; - let mut pb_message = GetFairyDataCsReq::from(common_protocol_message); + let mut pb_message = GetTipsDataCsReq::from(common_protocol_message); pb_message.xor_fields(); - Ok(Some((GetFairyDataCsReq::CMD_ID, pb_message.encode_to_vec()))) + Ok(Some((GetTipsDataCsReq::CMD_ID, pb_message.encode_to_vec()))) } ::trigger_protocol::PerformTriggerScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::PerformTriggerScRsp::decode( @@ -2134,6 +2147,14 @@ pub fn common_protocol_unit_to_pb( pb_message.xor_fields(); Ok(Some((UpdateEventGraphScNotify::CMD_ID, pb_message.encode_to_vec()))) } + ::trigger_protocol::StartTrainingScRsp::CMD_ID => { + let common_protocol_message = ::trigger_protocol::StartTrainingScRsp::decode( + &mut ::std::io::Cursor::new(&unit.blob), + )?; + let mut pb_message = StartTrainingScRsp::from(common_protocol_message); + pb_message.xor_fields(); + Ok(Some((StartTrainingScRsp::CMD_ID, pb_message.encode_to_vec()))) + } ::trigger_protocol::RefreshSectionScRsp::CMD_ID => { let common_protocol_message = ::trigger_protocol::RefreshSectionScRsp::decode( &mut ::std::io::Cursor::new(&unit.blob), @@ -2274,14 +2295,16 @@ impl From<::trigger_protocol::GetRewardBuffDataScRsp> for GetRewardBuffDataScRsp } } #[allow(unused)] -impl From for ::trigger_protocol::PlayerBasicInfo { - fn from(value: PlayerBasicInfo) -> Self { +impl From for ::trigger_protocol::PlayerInfo { + fn from(value: PlayerInfo) -> Self { Self { level: value.level.into(), - last_enter_world_timestamp: value.last_enter_world_timestamp.into(), + name_change_times: value.name_change_times.into(), + role_create_time: value.role_create_time.into(), avatar_id: value.avatar_id.into(), player_avatar_id: value.player_avatar_id.into(), control_avatar_id: value.control_avatar_id.into(), + portrait_id: value.portrait_id.into(), nick_name: value.nick_name.into(), exp: value.exp.into(), ..Default::default() @@ -2289,14 +2312,16 @@ impl From for ::trigger_protocol::PlayerBasicInfo { } } #[allow(unused)] -impl From<::trigger_protocol::PlayerBasicInfo> for PlayerBasicInfo { - fn from(value: ::trigger_protocol::PlayerBasicInfo) -> Self { +impl From<::trigger_protocol::PlayerInfo> for PlayerInfo { + fn from(value: ::trigger_protocol::PlayerInfo) -> Self { Self { level: value.level.into(), - last_enter_world_timestamp: value.last_enter_world_timestamp.into(), + name_change_times: value.name_change_times.into(), + role_create_time: value.role_create_time.into(), avatar_id: value.avatar_id.into(), player_avatar_id: value.player_avatar_id.into(), control_avatar_id: value.control_avatar_id.into(), + portrait_id: value.portrait_id.into(), nick_name: value.nick_name.into(), exp: value.exp.into(), ..Default::default() @@ -2436,6 +2461,24 @@ impl From<::trigger_protocol::DressedEquip> for DressedEquip { } } #[allow(unused)] +impl From for ::trigger_protocol::LoadingPageTipsInfo { + fn from(value: LoadingPageTipsInfo) -> Self { + Self { + unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::LoadingPageTipsInfo> for LoadingPageTipsInfo { + fn from(value: ::trigger_protocol::LoadingPageTipsInfo) -> Self { + Self { + unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::SavePosInMainCityCsReq { fn from(value: SavePosInMainCityCsReq) -> Self { Self { @@ -2476,14 +2519,14 @@ impl From<::trigger_protocol::AvatarSkillLevel> for AvatarSkillLevel { } } #[allow(unused)] -impl From for ::trigger_protocol::GetCollectMapCsReq { - fn from(value: GetCollectMapCsReq) -> Self { +impl From for ::trigger_protocol::GetPartnerDataCsReq { + fn from(value: GetPartnerDataCsReq) -> Self { Self { ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetCollectMapCsReq> for GetCollectMapCsReq { - fn from(value: ::trigger_protocol::GetCollectMapCsReq) -> Self { +impl From<::trigger_protocol::GetPartnerDataCsReq> for GetPartnerDataCsReq { + fn from(value: ::trigger_protocol::GetPartnerDataCsReq) -> Self { Self { ..Default::default() } } } @@ -2526,8 +2569,8 @@ impl From<::trigger_protocol::EndBattleCsReq> for EndBattleCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::PostGirlData { - fn from(value: PostGirlData) -> Self { +impl From for ::trigger_protocol::PostGirlInfo { + fn from(value: PostGirlInfo) -> Self { Self { selected_post_girl_id_list: value .selected_post_girl_id_list @@ -2544,8 +2587,8 @@ impl From for ::trigger_protocol::PostGirlData { } } #[allow(unused)] -impl From<::trigger_protocol::PostGirlData> for PostGirlData { - fn from(value: ::trigger_protocol::PostGirlData) -> Self { +impl From<::trigger_protocol::PostGirlInfo> for PostGirlInfo { + fn from(value: ::trigger_protocol::PostGirlInfo) -> Self { Self { selected_post_girl_id_list: value .selected_post_girl_id_list @@ -2641,8 +2684,8 @@ impl From<::trigger_protocol::HallSceneInfo> for HallSceneInfo { impl From for ::trigger_protocol::EnterSceneScNotify { fn from(value: EnterSceneScNotify) -> Self { Self { - scene_info: value.scene_info.map(|v| v.into()), - dungeon_info: value.dungeon_info.map(|v| v.into()), + scene: value.scene.map(|v| v.into()), + dungeon: value.dungeon.map(|v| v.into()), ..Default::default() } } @@ -2651,8 +2694,34 @@ impl From for ::trigger_protocol::EnterSceneScNotify { impl From<::trigger_protocol::EnterSceneScNotify> for EnterSceneScNotify { fn from(value: ::trigger_protocol::EnterSceneScNotify) -> Self { Self { - scene_info: value.scene_info.map(|v| v.into()), - dungeon_info: value.dungeon_info.map(|v| v.into()), + scene: value.scene.map(|v| v.into()), + dungeon: value.dungeon.map(|v| v.into()), + ..Default::default() + } + } +} +#[allow(unused)] +impl From for ::trigger_protocol::PerformInfo { + fn from(value: PerformInfo) -> Self { + Self { + perform_id_list: value + .perform_id_list + .into_iter() + .map(|v| v.into()) + .collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::PerformInfo> for PerformInfo { + fn from(value: ::trigger_protocol::PerformInfo) -> Self { + Self { + perform_id_list: value + .perform_id_list + .into_iter() + .map(|v| v.into()) + .collect(), ..Default::default() } } @@ -2892,8 +2961,8 @@ impl From<::trigger_protocol::DressEquipmentCsReq> for DressEquipmentCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::GetFairyDataScRsp { - fn from(value: GetFairyDataScRsp) -> Self { +impl From for ::trigger_protocol::GetTipsDataScRsp { + fn from(value: GetTipsDataScRsp) -> Self { Self { data: value.data.map(|v| v.into()), retcode: value.retcode.into(), @@ -2902,8 +2971,8 @@ impl From for ::trigger_protocol::GetFairyDataScRsp { } } #[allow(unused)] -impl From<::trigger_protocol::GetFairyDataScRsp> for GetFairyDataScRsp { - fn from(value: ::trigger_protocol::GetFairyDataScRsp) -> Self { +impl From<::trigger_protocol::GetTipsDataScRsp> for GetTipsDataScRsp { + fn from(value: ::trigger_protocol::GetTipsDataScRsp) -> Self { Self { data: value.data.map(|v| v.into()), retcode: value.retcode.into(), @@ -3226,14 +3295,14 @@ impl From<::trigger_protocol::RallySceneInfo> for RallySceneInfo { } } #[allow(unused)] -impl From for ::trigger_protocol::GetPlayerBasicInfoCsReq { - fn from(value: GetPlayerBasicInfoCsReq) -> Self { +impl From for ::trigger_protocol::GetPlayerInfoCsReq { + fn from(value: GetPlayerInfoCsReq) -> Self { Self { ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetPlayerBasicInfoCsReq> for GetPlayerBasicInfoCsReq { - fn from(value: ::trigger_protocol::GetPlayerBasicInfoCsReq) -> Self { +impl From<::trigger_protocol::GetPlayerInfoCsReq> for GetPlayerInfoCsReq { + fn from(value: ::trigger_protocol::GetPlayerInfoCsReq) -> Self { Self { ..Default::default() } } } @@ -3292,19 +3361,21 @@ impl From<::trigger_protocol::FinishArchivePerformScRsp> for FinishArchivePerfor } } #[allow(unused)] -impl From for ::trigger_protocol::ReportBattleTeamCsReq { - fn from(value: ReportBattleTeamCsReq) -> Self { +impl From for ::trigger_protocol::StartTrainingCsReq { + fn from(value: StartTrainingCsReq) -> Self { Self { avatar_list: value.avatar_list.into_iter().map(|v| v.into()).collect(), + special_training_index: value.special_training_index.into(), ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::ReportBattleTeamCsReq> for ReportBattleTeamCsReq { - fn from(value: ::trigger_protocol::ReportBattleTeamCsReq) -> Self { +impl From<::trigger_protocol::StartTrainingCsReq> for StartTrainingCsReq { + fn from(value: ::trigger_protocol::StartTrainingCsReq) -> Self { Self { avatar_list: value.avatar_list.into_iter().map(|v| v.into()).collect(), + special_training_index: value.special_training_index.into(), ..Default::default() } } @@ -3344,14 +3415,14 @@ impl From<::trigger_protocol::GetWebActivityDataCsReq> for GetWebActivityDataCsR } } #[allow(unused)] -impl From for ::trigger_protocol::WorkbenchGetDataCsReq { - fn from(value: WorkbenchGetDataCsReq) -> Self { +impl From for ::trigger_protocol::GetWorkbenchDataCsReq { + fn from(value: GetWorkbenchDataCsReq) -> Self { Self { ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::WorkbenchGetDataCsReq> for WorkbenchGetDataCsReq { - fn from(value: ::trigger_protocol::WorkbenchGetDataCsReq) -> Self { +impl From<::trigger_protocol::GetWorkbenchDataCsReq> for GetWorkbenchDataCsReq { + fn from(value: ::trigger_protocol::GetWorkbenchDataCsReq) -> Self { Self { ..Default::default() } } } @@ -3490,6 +3561,34 @@ impl From<::trigger_protocol::StartHollowQuestScRsp> for StartHollowQuestScRsp { } } #[allow(unused)] +impl From for ::trigger_protocol::TipsInfo { + fn from(value: TipsInfo) -> Self { + Self { + tips_group_list: value + .tips_group_list + .into_iter() + .map(|v| v.into()) + .collect(), + tips_list: value.tips_list.into_iter().map(|v| v.into()).collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::TipsInfo> for TipsInfo { + fn from(value: ::trigger_protocol::TipsInfo) -> Self { + Self { + tips_group_list: value + .tips_group_list + .into_iter() + .map(|v| v.into()) + .collect(), + tips_list: value.tips_list.into_iter().map(|v| v.into()).collect(), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::GetRoleCardDataScRsp { fn from(value: GetRoleCardDataScRsp) -> Self { Self { @@ -3542,9 +3641,8 @@ impl From<::trigger_protocol::GetRewardBuffDataCsReq> for GetRewardBuffDataCsReq } } #[allow(unused)] -impl From -for ::trigger_protocol::BeginTrainingCourseBattleCsReq { - fn from(value: BeginTrainingCourseBattleCsReq) -> Self { +impl From for ::trigger_protocol::EnterTrainingRoomCsReq { + fn from(value: EnterTrainingRoomCsReq) -> Self { Self { quest_id: value.quest_id.into(), avatar_id_list: value.avatar_id_list.into_iter().map(|v| v.into()).collect(), @@ -3554,9 +3652,8 @@ for ::trigger_protocol::BeginTrainingCourseBattleCsReq { } } #[allow(unused)] -impl From<::trigger_protocol::BeginTrainingCourseBattleCsReq> -for BeginTrainingCourseBattleCsReq { - fn from(value: ::trigger_protocol::BeginTrainingCourseBattleCsReq) -> Self { +impl From<::trigger_protocol::EnterTrainingRoomCsReq> for EnterTrainingRoomCsReq { + fn from(value: ::trigger_protocol::EnterTrainingRoomCsReq) -> Self { Self { quest_id: value.quest_id.into(), avatar_id_list: value.avatar_id_list.into_iter().map(|v| v.into()).collect(), @@ -3596,6 +3693,52 @@ impl From<::trigger_protocol::QuestCollection> for QuestCollection { } } #[allow(unused)] +impl From for ::trigger_protocol::PopupWindowInfo { + fn from(value: PopupWindowInfo) -> Self { + Self { + popup_window_list: value + .popup_window_list + .into_iter() + .map(|v| v.into()) + .collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::PopupWindowInfo> for PopupWindowInfo { + fn from(value: ::trigger_protocol::PopupWindowInfo) -> Self { + Self { + popup_window_list: value + .popup_window_list + .into_iter() + .map(|v| v.into()) + .collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From for ::trigger_protocol::GetVhsStoreDataScRsp { + fn from(value: GetVhsStoreDataScRsp) -> Self { + Self { + retcode: value.retcode.into(), + data: value.data.map(|v| v.into()), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::GetVhsStoreDataScRsp> for GetVhsStoreDataScRsp { + fn from(value: ::trigger_protocol::GetVhsStoreDataScRsp) -> Self { + Self { + retcode: value.retcode.into(), + data: value.data.map(|v| v.into()), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::ItemSync { fn from(value: ItemSync) -> Self { Self { @@ -4220,15 +4363,21 @@ impl From<::trigger_protocol::GetQuestDataCsReq> for GetQuestDataCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::GetTipsInfoCsReq { - fn from(value: GetTipsInfoCsReq) -> Self { - Self { ..Default::default() } +impl From for ::trigger_protocol::GetSystemSettingsCsReq { + fn from(value: GetSystemSettingsCsReq) -> Self { + Self { + r#type: value.r#type.into(), + ..Default::default() + } } } #[allow(unused)] -impl From<::trigger_protocol::GetTipsInfoCsReq> for GetTipsInfoCsReq { - fn from(value: ::trigger_protocol::GetTipsInfoCsReq) -> Self { - Self { ..Default::default() } +impl From<::trigger_protocol::GetSystemSettingsCsReq> for GetSystemSettingsCsReq { + fn from(value: ::trigger_protocol::GetSystemSettingsCsReq) -> Self { + Self { + r#type: value.r#type.into(), + ..Default::default() + } } } #[allow(unused)] @@ -4392,8 +4541,8 @@ for GetQuestionsAnswerGameDataCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::GetClientSystemsDataScRsp { - fn from(value: GetClientSystemsDataScRsp) -> Self { +impl From for ::trigger_protocol::GetUnlockDataScRsp { + fn from(value: GetUnlockDataScRsp) -> Self { Self { retcode: value.retcode.into(), data: value.data.map(|v| v.into()), @@ -4402,8 +4551,8 @@ impl From for ::trigger_protocol::GetClientSystemsDat } } #[allow(unused)] -impl From<::trigger_protocol::GetClientSystemsDataScRsp> for GetClientSystemsDataScRsp { - fn from(value: ::trigger_protocol::GetClientSystemsDataScRsp) -> Self { +impl From<::trigger_protocol::GetUnlockDataScRsp> for GetUnlockDataScRsp { + fn from(value: ::trigger_protocol::GetUnlockDataScRsp) -> Self { Self { retcode: value.retcode.into(), data: value.data.map(|v| v.into()), @@ -4412,19 +4561,33 @@ impl From<::trigger_protocol::GetClientSystemsDataScRsp> for GetClientSystemsDat } } #[allow(unused)] -impl From for ::trigger_protocol::GetTipsInfoScRsp { - fn from(value: GetTipsInfoScRsp) -> Self { +impl From for ::trigger_protocol::GetSystemSettingsScRsp { + fn from(value: GetSystemSettingsScRsp) -> Self { Self { + r#type: value.r#type.into(), retcode: value.retcode.into(), + player_settings_map: value + .player_settings_map + .into_iter() + .map(|(k, v)| (k.into(), v.into())) + .collect(), + settings: value.settings.map(|v| v.into()), ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetTipsInfoScRsp> for GetTipsInfoScRsp { - fn from(value: ::trigger_protocol::GetTipsInfoScRsp) -> Self { +impl From<::trigger_protocol::GetSystemSettingsScRsp> for GetSystemSettingsScRsp { + fn from(value: ::trigger_protocol::GetSystemSettingsScRsp) -> Self { Self { + r#type: value.r#type.into(), retcode: value.retcode.into(), + player_settings_map: value + .player_settings_map + .into_iter() + .map(|(k, v)| (k.into(), v.into())) + .collect(), + settings: value.settings.map(|v| v.into()), ..Default::default() } } @@ -4712,34 +4875,34 @@ impl From<::trigger_protocol::GetFashionStoreDataCsReq> for GetFashionStoreDataC } } #[allow(unused)] -impl From for ::trigger_protocol::GetPlayerBasicInfoScRsp { - fn from(value: GetPlayerBasicInfoScRsp) -> Self { +impl From for ::trigger_protocol::GetPlayerInfoScRsp { + fn from(value: GetPlayerInfoScRsp) -> Self { Self { retcode: value.retcode.into(), - basic_info: value.basic_info.map(|v| v.into()), + player_info: value.player_info.map(|v| v.into()), ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetPlayerBasicInfoScRsp> for GetPlayerBasicInfoScRsp { - fn from(value: ::trigger_protocol::GetPlayerBasicInfoScRsp) -> Self { +impl From<::trigger_protocol::GetPlayerInfoScRsp> for GetPlayerInfoScRsp { + fn from(value: ::trigger_protocol::GetPlayerInfoScRsp) -> Self { Self { retcode: value.retcode.into(), - basic_info: value.basic_info.map(|v| v.into()), + player_info: value.player_info.map(|v| v.into()), ..Default::default() } } } #[allow(unused)] -impl From for ::trigger_protocol::GetClientSystemsDataCsReq { - fn from(value: GetClientSystemsDataCsReq) -> Self { +impl From for ::trigger_protocol::GetUnlockDataCsReq { + fn from(value: GetUnlockDataCsReq) -> Self { Self { ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetClientSystemsDataCsReq> for GetClientSystemsDataCsReq { - fn from(value: ::trigger_protocol::GetClientSystemsDataCsReq) -> Self { +impl From<::trigger_protocol::GetUnlockDataCsReq> for GetUnlockDataCsReq { + fn from(value: ::trigger_protocol::GetUnlockDataCsReq) -> Self { Self { ..Default::default() } } } @@ -4762,25 +4925,29 @@ impl From<::trigger_protocol::GetChatEmojiListScRsp> for GetChatEmojiListScRsp { } } #[allow(unused)] -impl From for ::trigger_protocol::ClientSystemsData { - fn from(value: ClientSystemsData) -> Self { +impl From for ::trigger_protocol::UnlockData { + fn from(value: UnlockData) -> Self { Self { - post_girl_data: value.post_girl_data.map(|v| v.into()), - unlock_data: value.unlock_data.map(|v| v.into()), - teleport_data: value.teleport_data.map(|v| v.into()), - music_player_data: value.music_player_data.map(|v| v.into()), + post_girl: value.post_girl.map(|v| v.into()), + unlock: value.unlock.map(|v| v.into()), + teleport: value.teleport.map(|v| v.into()), + hollow_event: value.hollow_event.map(|v| v.into()), + music_player: value.music_player.map(|v| v.into()), + perform: value.perform.map(|v| v.into()), ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::ClientSystemsData> for ClientSystemsData { - fn from(value: ::trigger_protocol::ClientSystemsData) -> Self { +impl From<::trigger_protocol::UnlockData> for UnlockData { + fn from(value: ::trigger_protocol::UnlockData) -> Self { Self { - post_girl_data: value.post_girl_data.map(|v| v.into()), - unlock_data: value.unlock_data.map(|v| v.into()), - teleport_data: value.teleport_data.map(|v| v.into()), - music_player_data: value.music_player_data.map(|v| v.into()), + post_girl: value.post_girl.map(|v| v.into()), + unlock: value.unlock.map(|v| v.into()), + teleport: value.teleport.map(|v| v.into()), + hollow_event: value.hollow_event.map(|v| v.into()), + music_player: value.music_player.map(|v| v.into()), + perform: value.perform.map(|v| v.into()), ..Default::default() } } @@ -4842,8 +5009,8 @@ impl From<::trigger_protocol::GetActivityDataCsReq> for GetActivityDataCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::UnlockData { - fn from(value: UnlockData) -> Self { +impl From for ::trigger_protocol::UnlockInfo { + fn from(value: UnlockInfo) -> Self { Self { unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), ..Default::default() @@ -4851,8 +5018,8 @@ impl From for ::trigger_protocol::UnlockData { } } #[allow(unused)] -impl From<::trigger_protocol::UnlockData> for UnlockData { - fn from(value: ::trigger_protocol::UnlockData) -> Self { +impl From<::trigger_protocol::UnlockInfo> for UnlockInfo { + fn from(value: ::trigger_protocol::UnlockInfo) -> Self { Self { unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), ..Default::default() @@ -5132,14 +5299,14 @@ for GetMonthCardRewardListCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::GetFairyDataCsReq { - fn from(value: GetFairyDataCsReq) -> Self { +impl From for ::trigger_protocol::GetTipsDataCsReq { + fn from(value: GetTipsDataCsReq) -> Self { Self { ..Default::default() } } } #[allow(unused)] -impl From<::trigger_protocol::GetFairyDataCsReq> for GetFairyDataCsReq { - fn from(value: ::trigger_protocol::GetFairyDataCsReq) -> Self { +impl From<::trigger_protocol::GetTipsDataCsReq> for GetTipsDataCsReq { + fn from(value: ::trigger_protocol::GetTipsDataCsReq) -> Self { Self { ..Default::default() } } } @@ -5224,6 +5391,18 @@ impl From<::trigger_protocol::GetNewsStandDataCsReq> for GetNewsStandDataCsReq { } } #[allow(unused)] +impl From for ::trigger_protocol::HollowEventUnlockInfo { + fn from(value: HollowEventUnlockInfo) -> Self { + Self { ..Default::default() } + } +} +#[allow(unused)] +impl From<::trigger_protocol::HollowEventUnlockInfo> for HollowEventUnlockInfo { + fn from(value: ::trigger_protocol::HollowEventUnlockInfo) -> Self { + Self { ..Default::default() } + } +} +#[allow(unused)] impl From for ::trigger_protocol::DungeonEquipInfo { fn from(value: DungeonEquipInfo) -> Self { Self { @@ -5282,7 +5461,7 @@ impl From for ::trigger_protocol::PlayerSyncScNotify { fn from(value: PlayerSyncScNotify) -> Self { Self { avatar_sync: value.avatar_sync.map(|v| v.into()), - basic_info: value.basic_info.map(|v| v.into()), + player_info: value.player_info.map(|v| v.into()), item_sync: value.item_sync.map(|v| v.into()), ..Default::default() } @@ -5293,7 +5472,7 @@ impl From<::trigger_protocol::PlayerSyncScNotify> for PlayerSyncScNotify { fn from(value: ::trigger_protocol::PlayerSyncScNotify) -> Self { Self { avatar_sync: value.avatar_sync.map(|v| v.into()), - basic_info: value.basic_info.map(|v| v.into()), + player_info: value.player_info.map(|v| v.into()), item_sync: value.item_sync.map(|v| v.into()), ..Default::default() } @@ -5454,6 +5633,26 @@ impl From<::trigger_protocol::UpdateEventGraphScNotify> for UpdateEventGraphScNo } } #[allow(unused)] +impl From for ::trigger_protocol::StartTrainingScRsp { + fn from(value: StartTrainingScRsp) -> Self { + Self { + training_uid: value.training_uid.into(), + retcode: value.retcode.into(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::StartTrainingScRsp> for StartTrainingScRsp { + fn from(value: ::trigger_protocol::StartTrainingScRsp) -> Self { + Self { + training_uid: value.training_uid.into(), + retcode: value.retcode.into(), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::RefreshSectionScRsp { fn from(value: RefreshSectionScRsp) -> Self { Self { @@ -5512,8 +5711,8 @@ impl From<::trigger_protocol::GetDisplayCaseDataCsReq> for GetDisplayCaseDataCsR } } #[allow(unused)] -impl From for ::trigger_protocol::TeleportData { - fn from(value: TeleportData) -> Self { +impl From for ::trigger_protocol::TeleportUnlockInfo { + fn from(value: TeleportUnlockInfo) -> Self { Self { unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), ..Default::default() @@ -5521,8 +5720,8 @@ impl From for ::trigger_protocol::TeleportData { } } #[allow(unused)] -impl From<::trigger_protocol::TeleportData> for TeleportData { - fn from(value: ::trigger_protocol::TeleportData) -> Self { +impl From<::trigger_protocol::TeleportUnlockInfo> for TeleportUnlockInfo { + fn from(value: ::trigger_protocol::TeleportUnlockInfo) -> Self { Self { unlocked_list: value.unlocked_list.into_iter().map(|v| v.into()).collect(), ..Default::default() @@ -5530,6 +5729,42 @@ impl From<::trigger_protocol::TeleportData> for TeleportData { } } #[allow(unused)] +impl From for ::trigger_protocol::FairyInfo { + fn from(value: FairyInfo) -> Self { + Self { + fairy_groups: value + .fairy_groups + .into_iter() + .map(|(k, v)| (k.into(), v.into())) + .collect(), + fairy_record_list: value + .fairy_record_list + .into_iter() + .map(|v| v.into()) + .collect(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::FairyInfo> for FairyInfo { + fn from(value: ::trigger_protocol::FairyInfo) -> Self { + Self { + fairy_groups: value + .fairy_groups + .into_iter() + .map(|(k, v)| (k.into(), v.into())) + .collect(), + fairy_record_list: value + .fairy_record_list + .into_iter() + .map(|v| v.into()) + .collect(), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::GetRamenDataScRsp { fn from(value: GetRamenDataScRsp) -> Self { Self { @@ -5574,6 +5809,40 @@ impl From<::trigger_protocol::ClickHollowSystemCsReq> for ClickHollowSystemCsReq } } #[allow(unused)] +impl From for ::trigger_protocol::VhsStoreData { + fn from(value: VhsStoreData) -> Self { + Self { ..Default::default() } + } +} +#[allow(unused)] +impl From<::trigger_protocol::VhsStoreData> for VhsStoreData { + fn from(value: ::trigger_protocol::VhsStoreData) -> Self { + Self { ..Default::default() } + } +} +#[allow(unused)] +impl From for ::trigger_protocol::SystemSettings { + fn from(value: SystemSettings) -> Self { + Self { + systems: value.systems.into_iter().map(|v| v.into()).collect(), + switch_of_story_mode: value.switch_of_story_mode.into(), + switch_of_qte: value.switch_of_qte.into(), + ..Default::default() + } + } +} +#[allow(unused)] +impl From<::trigger_protocol::SystemSettings> for SystemSettings { + fn from(value: ::trigger_protocol::SystemSettings) -> Self { + Self { + systems: value.systems.into_iter().map(|v| v.into()).collect(), + switch_of_story_mode: value.switch_of_story_mode.into(), + switch_of_qte: value.switch_of_qte.into(), + ..Default::default() + } + } +} +#[allow(unused)] impl From for ::trigger_protocol::QuestInfo { fn from(value: QuestInfo) -> Self { Self { @@ -5696,8 +5965,8 @@ impl From<::trigger_protocol::MusicPlayerItem> for MusicPlayerItem { } } #[allow(unused)] -impl From for ::trigger_protocol::SceneInfo { - fn from(value: SceneInfo) -> Self { +impl From for ::trigger_protocol::SceneData { + fn from(value: SceneData) -> Self { Self { hall_scene_info: value.hall_scene_info.map(|v| v.into()), local_play_type: value.local_play_type.into(), @@ -5710,8 +5979,8 @@ impl From for ::trigger_protocol::SceneInfo { } } #[allow(unused)] -impl From<::trigger_protocol::SceneInfo> for SceneInfo { - fn from(value: ::trigger_protocol::SceneInfo) -> Self { +impl From<::trigger_protocol::SceneData> for SceneData { + fn from(value: ::trigger_protocol::SceneData) -> Self { Self { hall_scene_info: value.hall_scene_info.map(|v| v.into()), local_play_type: value.local_play_type.into(), @@ -5760,20 +6029,32 @@ impl From<::trigger_protocol::GetWeaponDataCsReq> for GetWeaponDataCsReq { } } #[allow(unused)] -impl From for ::trigger_protocol::FairyData { - fn from(value: FairyData) -> Self { - Self { ..Default::default() } +impl From for ::trigger_protocol::TipsData { + fn from(value: TipsData) -> Self { + Self { + tips: value.tips.map(|v| v.into()), + fairy: value.fairy.map(|v| v.into()), + loading_page_tips: value.loading_page_tips.map(|v| v.into()), + popup_window: value.popup_window.map(|v| v.into()), + ..Default::default() + } } } #[allow(unused)] -impl From<::trigger_protocol::FairyData> for FairyData { - fn from(value: ::trigger_protocol::FairyData) -> Self { - Self { ..Default::default() } +impl From<::trigger_protocol::TipsData> for TipsData { + fn from(value: ::trigger_protocol::TipsData) -> Self { + Self { + tips: value.tips.map(|v| v.into()), + fairy: value.fairy.map(|v| v.into()), + loading_page_tips: value.loading_page_tips.map(|v| v.into()), + popup_window: value.popup_window.map(|v| v.into()), + ..Default::default() + } } } #[allow(unused)] -impl From for ::trigger_protocol::MusicPlayerData { - fn from(value: MusicPlayerData) -> Self { +impl From for ::trigger_protocol::MusicPlayerInfo { + fn from(value: MusicPlayerInfo) -> Self { Self { music_list: value.music_list.into_iter().map(|v| v.into()).collect(), ..Default::default() @@ -5781,8 +6062,8 @@ impl From for ::trigger_protocol::MusicPlayerData { } } #[allow(unused)] -impl From<::trigger_protocol::MusicPlayerData> for MusicPlayerData { - fn from(value: ::trigger_protocol::MusicPlayerData) -> Self { +impl From<::trigger_protocol::MusicPlayerInfo> for MusicPlayerInfo { + fn from(value: ::trigger_protocol::MusicPlayerInfo) -> Self { Self { music_list: value.music_list.into_iter().map(|v| v.into()).collect(), ..Default::default() diff --git a/crates/trigger-protocol/src/lib.rs b/crates/trigger-protocol/src/lib.rs index f821600..428c7bb 100644 --- a/crates/trigger-protocol/src/lib.rs +++ b/crates/trigger-protocol/src/lib.rs @@ -30,24 +30,26 @@ where #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1)] -pub struct GetPlayerBasicInfoCsReq {} +pub struct GetPlayerInfoCsReq {} #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct PlayerBasicInfo { +pub struct PlayerInfo { pub nick_name: String, pub level: u32, pub exp: u32, pub avatar_id: u32, pub player_avatar_id: u32, + pub role_create_time: i64, + pub name_change_times: u32, + pub portrait_id: u32, pub control_avatar_id: u32, - pub last_enter_world_timestamp: i64, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(2)] -pub struct GetPlayerBasicInfoScRsp { +pub struct GetPlayerInfoScRsp { pub retcode: i32, - pub basic_info: Option, + pub player_info: Option, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] @@ -145,7 +147,7 @@ pub struct CafeSync { #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(100)] pub struct PlayerSyncScNotify { - pub basic_info: Option, + pub player_info: Option, pub avatar_sync: Option, pub item_sync: Option, pub ramen_sync: Option, @@ -261,7 +263,7 @@ pub struct Transform { } #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct SceneInfo { +pub struct SceneData { pub scene_type: u32, pub event_id: u32, pub local_play_type: u32, @@ -392,8 +394,8 @@ pub struct EnterWorldScRsp { #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(452)] pub struct EnterSceneScNotify { - pub scene_info: Option, - pub dungeon_info: Option, + pub scene: Option, + pub dungeon: Option, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] @@ -695,7 +697,7 @@ pub struct GetPrivateMessageDataScRsp { #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(640)] -pub struct BeginTrainingCourseBattleCsReq { +pub struct EnterTrainingRoomCsReq { pub quest_id: u32, pub buddy_id: u32, pub avatar_id_list: Vec, @@ -703,7 +705,7 @@ pub struct BeginTrainingCourseBattleCsReq { #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(641)] -pub struct BeginTrainingCourseBattleScRsp { +pub struct EnterTrainingRoomScRsp { pub retcode: i32, } @@ -1052,7 +1054,7 @@ pub struct EatRamenScRsp { // Client systems #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct UnlockData { +pub struct UnlockInfo { pub unlocked_list: Vec, } @@ -1063,7 +1065,7 @@ pub struct PostGirlItem { } #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct PostGirlData { +pub struct PostGirlInfo { pub post_girl_item_list: Vec, pub selected_post_girl_id_list: Vec, pub show_random_selected: bool, @@ -1077,21 +1079,61 @@ pub struct MusicPlayerItem { } #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct MusicPlayerData { +pub struct MusicPlayerInfo { pub music_list: Vec, } #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct TeleportData { +pub struct TeleportUnlockInfo { pub unlocked_list: Vec, } #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct ClientSystemsData { - pub unlock_data: Option, - pub post_girl_data: Option, - pub teleport_data: Option, - pub music_player_data: Option, +pub struct NewbieInfo { + pub unlocked_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct PerformInfo { + pub perform_id_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct HollowEventUnlockInfo { + pub unlock_map: Vec, + pub new_unlock_map: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct HollowCardUnlockInfo { + pub unlock_map: Vec, + pub new_unlock_map: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct HollowItemUnlockInfo { + pub unlock_map: Vec, + pub new_unlock_map: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct CurseUnlockInfo { + pub unlock_map: Vec, + pub new_unlock_map: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct UnlockData { + pub unlock: Option, + pub newbie: Option, + pub perform: Option, + pub hollow_event: Option, + pub hollow_card: Option, + pub hollow_item: Option, + pub curse: Option, + pub teleport: Option, + pub post_girl: Option, + pub music_player: Option, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] @@ -1120,27 +1162,35 @@ pub struct SavePlayerSystemSettingScRsp { #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1305)] -pub struct GetTipsInfoCsReq {} +pub struct GetSystemSettingsCsReq { + pub r#type: u32, +} #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct TipsInfo {} +pub struct SystemSettings { + pub systems: Vec, + pub switch_of_story_mode: bool, + pub switch_of_qte: bool, +} #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1306)] -pub struct GetTipsInfoScRsp { +pub struct GetSystemSettingsScRsp { pub retcode: i32, - pub tips_info: Option, + pub r#type: u32, + pub settings: Option, + pub player_settings_map: HashMap, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1307)] -pub struct GetClientSystemsDataCsReq {} +pub struct GetUnlockDataCsReq {} #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1308)] -pub struct GetClientSystemsDataScRsp { +pub struct GetUnlockDataScRsp { pub retcode: i32, - pub data: Option, + pub data: Option, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] @@ -1300,20 +1350,47 @@ pub struct GetDailyChallengeDataScRsp { pub data: Option, } -// Fairy +// Tips #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1601)] -pub struct GetFairyDataCsReq {} +pub struct GetTipsDataCsReq {} #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct FairyData {} +pub struct TipsInfo { + pub tips_group_list: Vec, + pub tips_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct FairyInfo { + pub fairy_record_list: Vec, + pub fairy_groups: HashMap, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct PopupWindowInfo { + pub popup_window_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct LoadingPageTipsInfo { + pub unlocked_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct TipsData { + pub tips: Option, + pub fairy: Option, + pub popup_window: Option, + pub loading_page_tips: Option, +} #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(1602)] -pub struct GetFairyDataScRsp { +pub struct GetTipsDataScRsp { pub retcode: i32, - pub data: Option, + pub data: Option, } // Activity @@ -1386,36 +1463,54 @@ pub struct GetMainCityRevivalDataScRsp { pub main_city_revival_data: Option, } -// Collections +// Workbench #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2001)] -pub struct GetCollectMapCsReq {} +#[id(2000)] +pub struct GetWorkbenchDataCsReq {} #[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct CollectMap {} +pub struct ClueData { + pub unlocked_clue_area_list: Vec, + pub unlocked_clue_id_list: Vec, + pub awarded_clue_id_list: Vec, +} -#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2002)] -pub struct GetCollectMapScRsp { - pub retcode: i32, - pub collect_map: Option, +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct WorkbenchData { + pub workbench_app_list: Vec, + pub clue_data: Option, } #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2021)] -pub struct WorkbenchGetDataCsReq {} - -#[derive(Default, Debug, Clone, Encodeable, Decodeable)] -pub struct WorkbenchData {} - -#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2022)] -pub struct WorkbenchGetDataScRsp { +#[id(2001)] +pub struct GetWorkbenchDataScRsp { pub retcode: i32, pub workbench_data: Option, } +#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] +#[id(2010)] +pub struct GetPartnerDataCsReq {} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct PartnerTrustInfo { + pub level: u32, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable)] +pub struct PartnerData { + pub partner_memory_id_list: Vec, + pub partner_trust_list: Vec, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] +#[id(2011)] +pub struct GetPartnerDataScRsp { + pub retcode: i32, + pub partner_data: Option, +} + #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] #[id(2041)] pub struct GetAbyssRewardDataCsReq {} @@ -1504,6 +1599,20 @@ pub struct PerformEndScRsp { pub retcode: i32, } +#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] +#[id(2406)] +pub struct StartTrainingCsReq { + pub avatar_list: Vec, + pub special_training_index: i32, +} + +#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] +#[id(2407)] +pub struct StartTrainingScRsp { + pub retcode: i32, + pub training_uid: i64, +} + // BattleEvent #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] @@ -1520,18 +1629,6 @@ pub struct GetBattleEventInfoScRsp { pub event_info: Option, } -#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2452)] -pub struct ReportBattleTeamCsReq { - pub avatar_list: Vec, -} - -#[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)] -#[id(2453)] -pub struct ReportBattleTeamScRsp { - pub retcode: i32, -} - // VhsStore #[derive(Default, Debug, Clone, Encodeable, Decodeable, ClientCmdID)]