From 19d39c7a26ba22f9b4d50ebc8de720ada7638366 Mon Sep 17 00:00:00 2001 From: amizing25 Date: Thu, 27 Jun 2024 19:41:36 +0700 Subject: [PATCH] fix multi path avatar --- gameserver/src/net/handlers/avatar.rs | 4 +- gameserver/src/net/handlers/battle.rs | 5 +- gameserver/src/net/handlers/chat.rs | 122 ++++-- gameserver/src/net/handlers/inventory.rs | 4 +- gameserver/src/net/handlers/lineup.rs | 24 +- gameserver/src/net/handlers/player.rs | 99 ++--- gameserver/src/net/handlers/scene.rs | 10 +- gameserver/src/net/tools.rs | 62 ++- proto/out/_.rs | 495 ++++++++++++----------- sdkserver/src/config/version_config.rs | 2 +- 10 files changed, 443 insertions(+), 384 deletions(-) diff --git a/gameserver/src/net/handlers/avatar.rs b/gameserver/src/net/handlers/avatar.rs index 97e4a8c..29ef563 100644 --- a/gameserver/src/net/handlers/avatar.rs +++ b/gameserver/src/net/handlers/avatar.rs @@ -1,4 +1,4 @@ -use crate::net::tools::JsonData; +use crate::net::tools::FreesrData; use super::*; @@ -13,7 +13,7 @@ pub async fn on_get_avatar_data_cs_req( session: &mut PlayerSession, body: &GetAvatarDataCsReq, ) -> Result<()> { - let json = JsonData::load().await; + let json = FreesrData::load().await; session .send( CMD_GET_AVATAR_DATA_SC_RSP, diff --git a/gameserver/src/net/handlers/battle.rs b/gameserver/src/net/handlers/battle.rs index e2b5236..ae038da 100644 --- a/gameserver/src/net/handlers/battle.rs +++ b/gameserver/src/net/handlers/battle.rs @@ -67,14 +67,13 @@ pub async fn on_scene_cast_skill_cs_req( } async fn create_battle_info() -> SceneBattleInfo { - let player = tools::JsonData::load().await; + let player = tools::FreesrData::load().await; let mut battle_info = SceneBattleInfo { stage_id: player.battle_config.stage_id, logic_random_seed: rand::thread_rng().gen::(), battle_id: 1, - // cleheggdkal: player.battle_config.cycle_count, // wave - rounds_limit: player.battle_config.cycle_count, // wave + rounds_limit: player.battle_config.cycle_count, ..Default::default() }; diff --git a/gameserver/src/net/handlers/chat.rs b/gameserver/src/net/handlers/chat.rs index 4dddb12..8da1797 100644 --- a/gameserver/src/net/handlers/chat.rs +++ b/gameserver/src/net/handlers/chat.rs @@ -1,5 +1,8 @@ use crate::{ - net::{tools::JsonData, PlayerSession}, + net::{ + tools::{FreesrData, MultiPathAvatar}, + PlayerSession, + }, util::cur_timestamp_ms, }; @@ -63,6 +66,13 @@ pub async fn on_get_private_chat_history_cs_req( sender_uid: 727, ..Default::default() }, + Chat { + msg_type: MsgType::CustomText.into(), + sent_time: cur_timestamp_ms(), + text: "'march {march_id}' march_id can be set 1001 or 1224".to_string(), + sender_uid: 727, + ..Default::default() + }, Chat { msg_type: MsgType::CustomText.into(), sent_time: cur_timestamp_ms(), @@ -80,9 +90,9 @@ pub async fn on_get_private_chat_history_cs_req( } pub async fn on_send_msg_cs_req(session: &mut PlayerSession, body: &SendMsgCsReq) -> Result<()> { - let json = JsonData::load().await; + let mut json = FreesrData::load().await; - if let Some((cmd, _args)) = parse_command(&body.text) { + if let Some((cmd, args)) = parse_command(&body.text) { match cmd { "sync" => { sync_player(session, json).await?; @@ -102,48 +112,76 @@ pub async fn on_send_msg_cs_req(session: &mut PlayerSession, body: &SendMsgCsReq .await?; } "mc" => { - // let mc = MainCharacter::from( - // args.first() - // .unwrap_or(&"") - // .parse::() - // .unwrap_or(json.main_character as u32), - // ); + let mc = MultiPathAvatar::from( + args.first() + .unwrap_or(&"") + .parse::() + .unwrap_or(json.main_character as u32), + ); - // json.main_character = mc; - // json.save().await; + json.main_character = mc; + json.save().await; - // session - // .send( - // CMD_GET_HERO_BASIC_TYPE_INFO_SC_RSP, - // GetHeroBasicTypeInfoScRsp { - // retcode: 0, - // gender: mc.get_gender().into(), - // cur_basic_type: mc.get_type().into(), - // basic_type_info_list: vec![HeroBasicTypeInfo { - // basic_type: mc.get_type().into(), - // ..Default::default() - // }], - // ..Default::default() - // }, - // ) - // .await?; + session + .send( + CMD_AVATAR_PATH_CHANGED_NOTIFY, + AvatarPathChangedNotify { + base_avatar_id: 8001, + cur_multi_path_avatar_type: mc as i32, + }, + ) + .await?; - // sync_player(session, json).await?; + session + .send( + CMD_REVC_MSG_SC_NOTIFY, + RevcMsgScNotify { + enlmbccjfbg: body.enlmbccjfbg.clone(), + msg_type: body.msg_type, + text: format!("Success change mc to {:#?}", mc), + emote: body.emote, + from_uid: 727, // from + to_uid: 1337, // to + chat_type: body.chat_type, + }, + ) + .await?; + } + "march" => { + let march_type = MultiPathAvatar::from( + args.first() + .unwrap_or(&"") + .parse::() + .unwrap_or(json.march_type as u32), + ); - // session - // .send( - // CMD_REVC_MSG_SC_NOTIFY, - // Klonpheafip { - // ggadmjhlomj: body.ggadmjhlomj.clone(), - // kokadficdfb: body.kokadficdfb, - // ajlhdpcjand: format!("Set MC to: {mc:#?}"), - // mgmicgabebd: body.mgmicgabebd, - // ghojifhngmc: 727, - // cmmildghfnl: 1337, - // nmfepfoojic: body.nmfepfoojic, - // }, - // ) - // .await?; + json.march_type = march_type; + json.save().await; + + session + .send( + CMD_AVATAR_PATH_CHANGED_NOTIFY, + AvatarPathChangedNotify { + base_avatar_id: 1001, + cur_multi_path_avatar_type: march_type as i32, + }, + ) + .await?; + + session + .send( + CMD_REVC_MSG_SC_NOTIFY, + RevcMsgScNotify { + enlmbccjfbg: body.enlmbccjfbg.clone(), + msg_type: body.msg_type, + text: format!("Success change march to {:#?}", march_type), + emote: body.emote, + from_uid: 727, // from + to_uid: 1337, // to + chat_type: body.chat_type, + }, + ) + .await?; } _ => {} } @@ -170,7 +208,7 @@ fn parse_command(command: &str) -> Option<(&str, Vec<&str>)> { Some((parts[0], parts[1..].to_vec())) } -async fn sync_player(session: &mut PlayerSession, json: JsonData) -> Result<()> { +async fn sync_player(session: &mut PlayerSession, json: FreesrData) -> Result<()> { session .send( CMD_PLAYER_SYNC_SC_NOTIFY, diff --git a/gameserver/src/net/handlers/inventory.rs b/gameserver/src/net/handlers/inventory.rs index 95a0c8d..b1f8049 100644 --- a/gameserver/src/net/handlers/inventory.rs +++ b/gameserver/src/net/handlers/inventory.rs @@ -1,10 +1,10 @@ use anyhow::Result; use proto::*; -use crate::net::{tools::JsonData, PlayerSession}; +use crate::net::{tools::FreesrData, PlayerSession}; pub async fn on_get_bag_cs_req(session: &mut PlayerSession, _: &GetBagCsReq) -> Result<()> { - let player = JsonData::load().await; + let player = FreesrData::load().await; session .send( diff --git a/gameserver/src/net/handlers/lineup.rs b/gameserver/src/net/handlers/lineup.rs index 8b80bae..83be2f7 100644 --- a/gameserver/src/net/handlers/lineup.rs +++ b/gameserver/src/net/handlers/lineup.rs @@ -1,7 +1,7 @@ use scene_entity_info::Entity; use scene_entity_refresh_info::RefreshType; -use crate::net::tools::{self, AvatarJson, JsonData}; +use crate::net::tools::{self, AvatarJson, FreesrData}; use super::*; @@ -9,7 +9,7 @@ pub async fn on_get_all_lineup_data_cs_req( session: &mut PlayerSession, _body: &GetAllLineupDataCsReq, ) -> Result<()> { - let player = tools::JsonData::load().await; + let player = tools::FreesrData::load().await; let lineup = LineupInfo { extra_lineup_type: ExtraLineupType::LineupNone.into(), name: "Squad 1".to_string(), @@ -34,7 +34,7 @@ pub async fn on_get_cur_lineup_data_cs_req( session: &mut PlayerSession, _body: &GetCurLineupDataCsReq, ) -> Result<()> { - let player = tools::JsonData::load().await; + let player = tools::FreesrData::load().await; let mut lineup = LineupInfo { extra_lineup_type: ExtraLineupType::LineupNone.into(), name: "Squad 1".to_string(), @@ -91,12 +91,14 @@ pub async fn on_join_lineup_cs_req( // update lineups // TODO: FIX THESE SHIT { - let mut player = tools::JsonData::load().await; + let mut player = tools::FreesrData::load().await; let lineups = &mut player.lineups; lineups.insert( body.slot, - if body.base_avatar_id > 8000 { + if body.base_avatar_id == 8001 { player.main_character as u32 + } else if body.base_avatar_id == 1001 { + player.march_type as u32 } else { body.base_avatar_id }, @@ -105,7 +107,7 @@ pub async fn on_join_lineup_cs_req( } { - let player = tools::JsonData::load().await; + let player = tools::FreesrData::load().await; refresh_lineup(session, &player).await?; } @@ -120,13 +122,15 @@ pub async fn on_replace_lineup_cs_req( req: &ReplaceLineupCsReq, ) -> Result<()> { { - let mut player = tools::JsonData::load().await; + let mut player = tools::FreesrData::load().await; let lineups = &mut player.lineups; for (slot, avatar_id) in &mut *lineups { if let Some(lineup) = req.slots.get(*slot as usize) { - *avatar_id = if lineup.id > 8000 { + *avatar_id = if lineup.id == 8001 { player.main_character as u32 + } else if lineup.id == 1001 { + player.march_type as u32 } else { lineup.id }; @@ -138,7 +142,7 @@ pub async fn on_replace_lineup_cs_req( } { - let player = tools::JsonData::load().await; + let player = tools::FreesrData::load().await; refresh_lineup(_session, &player).await?; } @@ -157,7 +161,7 @@ pub async fn on_quit_lineup_cs_req( .await } -async fn refresh_lineup(sess: &mut PlayerSession, player: &JsonData) -> Result<()> { +async fn refresh_lineup(sess: &mut PlayerSession, player: &FreesrData) -> Result<()> { let lineup = LineupInfo { extra_lineup_type: ExtraLineupType::LineupNone.into(), name: "Squad 1".to_string(), diff --git a/gameserver/src/net/handlers/player.rs b/gameserver/src/net/handlers/player.rs index eb17571..ff889fd 100644 --- a/gameserver/src/net/handlers/player.rs +++ b/gameserver/src/net/handlers/player.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use crate::util::{self}; +use crate::{net::tools::FreesrData, util}; use super::*; @@ -50,12 +50,7 @@ pub async fn on_player_login_finish_cs_req( session .send(CMD_PLAYER_LOGIN_FINISH_SC_RSP, Dummy {}) .await?; - session - .send(CMD_CONTENT_PACKAGE_UNLOCK_SC_RSP, Dummy {}) - .await?; - session - .send(CMD_CONTENT_PACKAGE_GET_DATA_SC_RSP, Dummy {}) - .await?; + session .send( CMD_CONTENT_PACKAGE_SYNC_DATA_SC_NOTIFY, @@ -96,6 +91,8 @@ pub async fn on_get_multi_path_avatar_info_cs_req( session: &mut PlayerSession, _: &GetMultiPathAvatarInfoCsReq, ) -> Result<()> { + let json = FreesrData::load().await; + session .send( CMD_GET_MULTI_PATH_AVATAR_INFO_SC_RSP, @@ -103,70 +100,58 @@ pub async fn on_get_multi_path_avatar_info_cs_req( retcode: 0, multi_path_avatar_type_info_list: vec![ MultiPathAvatarTypeInfo { - multi_path_avatar_type: MultiPathAvatarType::GirlShamanType.into(), + multi_path_avatar_type: json.main_character as i32, rank: 6, - equip_relic_list: vec![], - skilltree_list: vec![ - AvatarSkillTree { + equip_relic_list: json + .relics + .iter() + .filter(|v| v.equip_avatar == json.main_character as u32) + .map(|v| v.to_equipment_relic_proto()) + .collect(), + skilltree_list: (1..=4) + .map(|v| AvatarSkillTree { level: 1, - point_id: 8006001, - }, - AvatarSkillTree { - level: 1, - point_id: 8006002, - }, - AvatarSkillTree { - level: 1, - point_id: 8006003, - }, - AvatarSkillTree { - level: 1, - point_id: 8006004, - }, - AvatarSkillTree { - level: 1, - point_id: 8006001, - }, - ], + point_id: (json.main_character as u32) * 1000 + v, + }) + .collect(), all_path_special_skilltree_list: vec![], - path_equipment_id: 0, + path_equipment_id: json + .lightcones + .iter() + .find(|v| v.equip_avatar == json.main_character as u32) + .map(|v| v.internal_uid) + .unwrap_or_default(), all_path_unlocked_special_point_id_list: vec![], }, MultiPathAvatarTypeInfo { - multi_path_avatar_type: MultiPathAvatarType::Mar7thKnightType.into(), + multi_path_avatar_type: json.march_type as i32, rank: 6, - equip_relic_list: vec![], - skilltree_list: vec![ - AvatarSkillTree { + equip_relic_list: json + .relics + .iter() + .filter(|v| v.equip_avatar == json.march_type as u32) + .map(|v| v.to_equipment_relic_proto()) + .collect(), + skilltree_list: (1..=4) + .map(|v| AvatarSkillTree { level: 1, - point_id: 1224001, - }, - AvatarSkillTree { - level: 1, - point_id: 1224002, - }, - AvatarSkillTree { - level: 1, - point_id: 1224003, - }, - AvatarSkillTree { - level: 1, - point_id: 1224004, - }, - AvatarSkillTree { - level: 1, - point_id: 1224005, - }, - ], + point_id: (json.march_type as u32) * 1000 + v, + }) + .collect(), all_path_special_skilltree_list: vec![], - path_equipment_id: 1224, + path_equipment_id: json + .lightcones + .iter() + .find(|v| v.equip_avatar == json.march_type as u32) + .map(|v| v.internal_uid) + .unwrap_or_default(), all_path_unlocked_special_point_id_list: vec![], }, ], gmhdhimdkfi: vec![], current_multi_path_avatar_id: HashMap::from([ - (8001, MultiPathAvatarType::GirlShamanType.into()), - (1001, MultiPathAvatarType::Mar7thRogueType.into()), + (8001, json.main_character.get_type().into()), + (1001, json.march_type.get_type().into()), ]), }, ) diff --git a/gameserver/src/net/handlers/scene.rs b/gameserver/src/net/handlers/scene.rs index eddb5c3..0b3377d 100644 --- a/gameserver/src/net/handlers/scene.rs +++ b/gameserver/src/net/handlers/scene.rs @@ -5,7 +5,7 @@ use tokio::sync::Mutex; use crate::{ net::{ - tools::{AvatarJson, JsonData, Position}, + tools::{AvatarJson, FreesrData, Position}, tools_res::{PropState, GAME_RESOURCES}, }, util::{self}, @@ -20,7 +20,7 @@ pub async fn on_get_cur_scene_info_cs_req( session: &mut PlayerSession, _body: &GetCurSceneInfoCsReq, ) -> Result<()> { - let mut player = JsonData::load().await; + let mut player = FreesrData::load().await; let entry = player.scene.entry_id; let scene = load_scene(session, &mut player, entry, false, Option::::None).await; @@ -63,7 +63,7 @@ pub async fn on_enter_scene_cs_req( session: &mut PlayerSession, request: &EnterSceneCsReq, ) -> Result<()> { - let mut player = JsonData::load().await; + let mut player = FreesrData::load().await; // send packet first session @@ -169,7 +169,7 @@ pub async fn on_scene_entity_move_cs_req( session: &mut PlayerSession, request: &SceneEntityMoveCsReq, ) -> Result<()> { - let mut player = JsonData::load().await; + let mut player = FreesrData::load().await; let mut timestamp = NEXT_SCENE_SAVE.lock().await; if util::cur_timestamp_ms() <= *timestamp { @@ -236,7 +236,7 @@ pub async fn on_get_entered_scene_cs_req( async fn load_scene( session: &mut PlayerSession, - json: &mut JsonData, + json: &mut FreesrData, entry_id: u32, _save: bool, teleport_id: Option, diff --git a/gameserver/src/net/tools.rs b/gameserver/src/net/tools.rs index 750fab4..df5faea 100644 --- a/gameserver/src/net/tools.rs +++ b/gameserver/src/net/tools.rs @@ -129,7 +129,7 @@ impl AvatarJson { } } - pub fn to_lineup_avatars(player: &JsonData) -> Vec { + pub fn to_lineup_avatars(player: &FreesrData) -> Vec { let avatar_ids = player .avatars .values() @@ -479,7 +479,7 @@ impl Position { // FREESR-DATA.json #[derive(Debug, Serialize, Deserialize)] -pub struct JsonData { +pub struct FreesrData { pub lightcones: Vec, pub relics: Vec, pub avatars: BTreeMap, @@ -493,11 +493,13 @@ pub struct JsonData { #[serde(default)] pub scene: Scene, #[serde(default)] - pub main_character: MainCharacter, + pub main_character: MultiPathAvatar, + #[serde(default)] + pub march_type: MultiPathAvatar, } #[derive(Debug, Serialize, Deserialize)] -pub struct JsonData2 { +pub struct Persistent { #[serde(default)] pub lineups: BTreeMap, #[serde(default)] @@ -505,10 +507,12 @@ pub struct JsonData2 { #[serde(default)] pub scene: Scene, #[serde(default)] - pub main_character: MainCharacter, + pub main_character: MultiPathAvatar, + #[serde(default)] + pub march_type: MultiPathAvatar, } -impl Default for JsonData2 { +impl Default for Persistent { fn default() -> Self { let mut lineups = BTreeMap::::new(); lineups.insert(0, 8006); @@ -521,21 +525,24 @@ impl Default for JsonData2 { position: Default::default(), main_character: Default::default(), scene: Default::default(), + march_type: MultiPathAvatar::MarchHunt, } } } #[derive(Serialize, Deserialize, Clone, Debug, Copy)] -pub enum MainCharacter { +pub enum MultiPathAvatar { MalePyhsical = 8001, FemalePhysical = 8002, MalePreservation = 8003, FemalePreservation = 8004, MaleHarmony = 8005, FemaleHarmony = 8006, + MarchHunt = 1224, + MarchPreservation = 1001, } -impl From for MainCharacter { +impl From for MultiPathAvatar { fn from(value: u32) -> Self { match value { 8001 => Self::MalePyhsical, @@ -544,14 +551,18 @@ impl From for MainCharacter { 8004 => Self::FemalePreservation, 8005 => Self::MaleHarmony, 8006 => Self::FemaleHarmony, + 1224 => Self::MarchHunt, + 1001 => Self::MarchPreservation, _ => Self::FemaleHarmony, } } } -impl MainCharacter { +impl MultiPathAvatar { pub fn get_gender(&self) -> Gender { - if *self as u32 % 2 == 1 { + if (*self as u32) < 8000 { + Gender::None + } else if *self as u32 % 2 == 1 { Gender::Man } else { Gender::Woman @@ -560,33 +571,35 @@ impl MainCharacter { pub fn get_type(&self) -> MultiPathAvatarType { match *self { - Self::MalePyhsical => MultiPathAvatarType::BoyWarriorType, - Self::FemalePhysical => MultiPathAvatarType::GirlWarriorType, - Self::MalePreservation => MultiPathAvatarType::BoyKnightType, - Self::FemalePreservation => MultiPathAvatarType::GirlKnightType, - Self::MaleHarmony => MultiPathAvatarType::BoyShamanType, - Self::FemaleHarmony => MultiPathAvatarType::GirlShamanType, + MultiPathAvatar::MalePyhsical => MultiPathAvatarType::BoyWarriorType, + MultiPathAvatar::FemalePhysical => MultiPathAvatarType::GirlWarriorType, + MultiPathAvatar::MalePreservation => MultiPathAvatarType::BoyKnightType, + MultiPathAvatar::FemalePreservation => MultiPathAvatarType::GirlKnightType, + MultiPathAvatar::MaleHarmony => MultiPathAvatarType::BoyShamanType, + MultiPathAvatar::FemaleHarmony => MultiPathAvatarType::GirlShamanType, + MultiPathAvatar::MarchHunt => MultiPathAvatarType::Mar7thRogueType, + MultiPathAvatar::MarchPreservation => MultiPathAvatarType::Mar7thKnightType, } } } -impl Default for MainCharacter { +impl Default for MultiPathAvatar { fn default() -> Self { Self::FemaleHarmony } } -impl JsonData { +impl FreesrData { pub async fn load() -> Self { - let mut json: JsonData = tokio::fs::read_to_string("freesr-data.json") + let mut json: FreesrData = tokio::fs::read_to_string("freesr-data.json") .await .map(|v| { - serde_json::from_str::(&v) + serde_json::from_str::(&v) .expect("freesr-data.json is broken, pls redownload") }) .expect("failed to read freesr-data.json"); - let json2: JsonData2 = serde_json::from_str( + let json2: Persistent = serde_json::from_str( &tokio::fs::read_to_string("persistent") .await .unwrap_or_default(), @@ -600,6 +613,10 @@ impl JsonData { json.verify_lineup().await; + if json.march_type as u32 > 8000 { + json.march_type = MultiPathAvatar::MarchHunt; + } + json } @@ -623,11 +640,12 @@ impl JsonData { let _ = tokio::fs::write("freesr-data.json", json.as_bytes()).await; let _ = tokio::fs::write( "persistent", - serde_json::to_string_pretty(&JsonData2 { + serde_json::to_string_pretty(&Persistent { lineups: self.lineups.clone(), main_character: self.main_character, position: self.position.clone(), scene: self.scene.clone(), + march_type: self.march_type, }) .unwrap() .as_bytes(), diff --git a/proto/out/_.rs b/proto/out/_.rs index 631920e..90cb352 100644 --- a/proto/out/_.rs +++ b/proto/out/_.rs @@ -197,7 +197,7 @@ pub struct Ocnjnnjamcg { #[prost(int64, tag = "5")] pub sent_time: i64, #[prost(uint32, tag = "6")] - pub dlmcjgclnkh: u32, + pub left_hp: u32, #[prost(uint32, tag = "7")] pub mcplhccohah: u32, #[prost(enumeration = "Mphbgocphig", tag = "8")] @@ -733,7 +733,7 @@ pub struct Niipmdddppl { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Afmklgdiodb { +pub struct AttackDamageProperty { #[prost(string, tag = "1")] pub nlkfegnklho: ::prost::alloc::string::String, #[prost(double, tag = "2")] @@ -741,7 +741,7 @@ pub struct Afmklgdiodb { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Cjlacichgnh { +pub struct SkillUseProperty { #[prost(uint32, tag = "1")] pub cclgmcimglh: u32, #[prost(string, tag = "2")] @@ -777,7 +777,7 @@ pub struct Lgjajmehhid { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Dindonjldji { #[prost(string, tag = "1")] - pub lgekdbjjlni: ::prost::alloc::string::String, + pub source: ::prost::alloc::string::String, #[prost(uint32, tag = "2")] pub dlljmhngbhl: u32, } @@ -789,7 +789,7 @@ pub struct Lgfhldhbdfm { #[prost(uint32, tag = "2")] pub count: u32, #[prost(double, tag = "3")] - pub kfeognngcoh: f64, + pub total_damage: f64, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -811,33 +811,33 @@ pub struct AvatarBattleInfo { #[prost(message, repeated, tag = "8")] pub ljpkhmoehch: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "9")] - pub pnmiagabaml: u32, + pub total_turns: u32, #[prost(double, tag = "10")] - pub kfeognngcoh: f64, + pub total_damage: f64, #[prost(double, tag = "11")] - pub dljkjjecalf: f64, + pub total_heal: f64, #[prost(double, tag = "12")] - pub hoefnffieha: f64, + pub total_damage_taken: f64, #[prost(double, tag = "13")] - pub hpdncjckhpk: f64, + pub total_hp_recover: f64, #[prost(double, tag = "14")] pub nbcepkhhgon: f64, #[prost(uint32, tag = "15")] pub stage_id: u32, #[prost(uint32, tag = "16")] - pub cnpkcdgciif: u32, + pub stage_type: u32, #[prost(double, tag = "17")] pub neepdjbcipo: f64, #[prost(message, repeated, tag = "18")] - pub manlkacjjpk: ::prost::alloc::vec::Vec, + pub attack_damage_type: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "19")] - pub hadbdhichjo: ::prost::alloc::vec::Vec, + pub hadbdhichjo: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "20")] - pub kgmbiidmeka: ::prost::alloc::vec::Vec, + pub kgmbiidmeka: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "21")] - pub cnmipancllf: ::prost::alloc::vec::Vec, + pub skill_times: ::prost::alloc::vec::Vec, #[prost(double, tag = "22")] - pub ofafohdfaml: f64, + pub delay_cumulate: f64, #[prost(uint32, tag = "23")] pub bfjkjclneok: u32, #[prost(message, repeated, tag = "24")] @@ -865,7 +865,7 @@ pub struct AvatarBattleInfo { #[prost(uint32, tag = "35")] pub ijehmbpehcm: u32, #[prost(message, repeated, tag = "36")] - pub neimbiephjm: ::prost::alloc::vec::Vec, + pub neimbiephjm: ::prost::alloc::vec::Vec, #[prost(double, tag = "37")] pub dhiaimnoahj: f64, #[prost(double, tag = "38")] @@ -883,21 +883,21 @@ pub struct AvatarBattleInfo { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Cojkgenckaj { +pub struct MonsterProperty { #[prost(double, tag = "1")] pub max_hp: f64, #[prost(double, tag = "2")] - pub iiifdchhang: f64, + pub attack: f64, #[prost(double, tag = "3")] - pub ngkplhcfiga: f64, + pub defence: f64, #[prost(double, tag = "4")] - pub demjdanpfnb: f64, + pub shield: f64, #[prost(double, tag = "5")] - pub ajkaljlngof: f64, + pub speed: f64, #[prost(double, tag = "6")] - pub dlmcjgclnkh: f64, + pub left_hp: f64, #[prost(double, tag = "7")] - pub hjhnjbbpjnc: f64, + pub enter_battle_hp: f64, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -913,57 +913,58 @@ pub struct Cmdkkbmjpgp { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Glgfejdadhh { +pub struct MonsterBattleInfo { #[prost(uint32, tag = "1")] pub entity_id: u32, #[prost(uint32, tag = "2")] pub monster_id: u32, #[prost(uint32, tag = "3")] - pub eilapnmbhpe: u32, + pub monster_template_id: u32, #[prost(uint32, tag = "4")] - pub jfppajdfpeo: u32, + pub monster_level: u32, #[prost(message, optional, tag = "5")] - pub giohdjgffkj: ::core::option::Option, + pub monster_property: ::core::option::Option, #[prost(uint32, tag = "6")] - pub pnmiagabaml: u32, + pub total_turns: u32, #[prost(double, tag = "7")] - pub kfeognngcoh: f64, + pub total_damage: f64, #[prost(double, tag = "8")] - pub dljkjjecalf: f64, + pub total_heal: f64, #[prost(double, tag = "9")] - pub hoefnffieha: f64, + pub total_damage_taken: f64, #[prost(double, tag = "10")] - pub dkoikbpaafh: f64, + pub total_stance_damage_taken: f64, #[prost(double, tag = "11")] - pub hpdncjckhpk: f64, + pub total_hp_recover: f64, #[prost(uint32, tag = "12")] pub stage_id: u32, #[prost(uint32, tag = "13")] pub battle_id: u32, #[prost(uint32, tag = "14")] - pub fndkjkhpbke: u32, + pub monster_type: u32, #[prost(message, repeated, tag = "15")] - pub manlkacjjpk: ::prost::alloc::vec::Vec, + pub attack_damage_type: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "16")] - pub cnmipancllf: ::prost::alloc::vec::Vec, + pub skill_times: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "17")] - pub cnpkcdgciif: u32, + pub stage_type: u32, #[prost(double, tag = "18")] - pub ljkbbpfbdlj: f64, + pub total_break_damage_taken: f64, #[prost(double, tag = "19")] - pub ofafohdfaml: f64, - #[prost(enumeration = "Bhhbceikadc", tag = "20")] - pub lfcealdhedk: i32, + pub delay_cumulate: f64, + #[prost(enumeration = "DeathSource", tag = "20")] + pub death_source: i32, #[prost(uint32, tag = "21")] pub wave: u32, #[prost(int32, tag = "22")] - pub nckjijogdfp: i32, + pub index_in_wave: i32, + /// TODO: this is phase, rename all manually #[prost(uint32, tag = "23")] pub stars: u32, #[prost(uint32, tag = "24")] - pub pgpepiapeib: u32, + pub max_phase: u32, #[prost(enumeration = "Gkdmdmboaod", tag = "25")] - pub ompmhbnmefe: i32, + pub battle_tag: i32, #[prost(message, repeated, tag = "26")] pub skill_info: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "27")] @@ -1009,7 +1010,7 @@ pub struct Lgfelglkhjb { #[prost(uint32, repeated, tag = "2")] pub fdjlgfoiglc: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "3")] - pub lgekdbjjlni: u32, + pub source: u32, #[prost(double, tag = "4")] pub kiblligkckm: f64, #[prost(uint32, repeated, tag = "5")] @@ -1245,7 +1246,7 @@ pub struct BattleStatistics { #[prost(message, repeated, tag = "7")] pub battle_avatar_list: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag = "8")] - pub monster_list: ::prost::alloc::vec::Vec, + pub monster_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "9")] pub round_cnt: u32, #[prost(uint32, tag = "10")] @@ -1576,9 +1577,9 @@ pub struct GetTrialActivityDataScRsp { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Nfhmdjgalen { +pub struct TrialActivityDataChangeScNotify { #[prost(message, optional, tag = "3")] - pub eigenmmggdk: ::core::option::Option, + pub trial_activity_info: ::core::option::Option, } /// 13(CmdActivityType) /// CsReq @@ -1640,7 +1641,7 @@ pub struct StartTrialActivityScRsp { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Cggjmbamecn { +pub struct LeaveTrialActivityCsReq { #[prost(uint32, tag = "6")] pub stage_id: u32, } @@ -1648,7 +1649,7 @@ pub struct Cggjmbamecn { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Omnplfkjdli { +pub struct LeaveTrialActivityScRsp { #[prost(uint32, tag = "11")] pub stage_id: u32, #[prost(uint32, tag = "4")] @@ -1658,10 +1659,11 @@ pub struct Omnplfkjdli { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ilhekadiljo { +pub struct CurTrialActivityScNotify { + /// TODO: Obf: PODJNCHJCIK #[prost(uint32, tag = "10")] - pub podjnchjcik: u32, - #[prost(enumeration = "Pcegpgngkhn", tag = "4")] + pub cur_stage_id: u32, + #[prost(enumeration = "TrialActivityStatus", tag = "4")] pub status: i32, } /// 22(CmdActivityType) @@ -3298,7 +3300,7 @@ pub struct Annidkmlelb { #[derive(Clone, PartialEq, ::prost::Message)] pub struct BattlePassInfoNotify { #[prost(enumeration = "BpTierType", tag = "5")] - pub bdaoalgknbk: i32, + pub bp_tier_type: i32, #[prost(uint64, tag = "15")] pub giomiajhilj: u64, #[prost(uint32, tag = "12")] @@ -3597,7 +3599,7 @@ pub struct Ndgfdepfmhh { pub struct Challenge { /// TODO: Original Obf: FODNLHANPGH, #[prost(uint32, tag = "4")] - pub phase: u32, + pub attempts: u32, #[prost(message, optional, tag = "3")] pub story_info: ::core::option::Option, /// TODO (maybe stars): Original Obf: score_two, @@ -3798,6 +3800,7 @@ pub struct ChallengeSettleNotify { pub reward: ::core::option::Option, } /// 17(CmdChallengeType) +/// monster's wave (how many defeated monsters (for pf only)) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct KillMonsterInfo { @@ -3935,14 +3938,14 @@ pub struct ChallengeMemoryStats { #[prost(message, optional, tag = "10")] pub clear_info: ::core::option::Option, #[prost(uint32, tag = "15")] - pub stars: u32, + pub attempts: u32, } /// 30(CmdChallengeType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ChallengeStoryStats { #[prost(uint32, tag = "13")] - pub stars: u32, + pub attempts: u32, #[prost(message, optional, tag = "10")] pub clear_info: ::core::option::Option, } @@ -3951,7 +3954,7 @@ pub struct ChallengeStoryStats { #[derive(Clone, PartialEq, ::prost::Message)] pub struct ChallengeBossStats { #[prost(uint32, tag = "15")] - pub stars: u32, + pub attempts: u32, #[prost(message, optional, tag = "11")] pub clear_info: ::core::option::Option, } @@ -3959,9 +3962,8 @@ pub struct ChallengeBossStats { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ChallengeMemoryClearInfo { - /// TODO: Maybe wrong idk #[prost(uint32, tag = "10")] - pub fight_count: u32, + pub highest_difficulty: u32, #[prost(uint32, tag = "4")] pub round_count: u32, #[prost(uint32, tag = "9")] @@ -3975,9 +3977,8 @@ pub struct ChallengeMemoryClearInfo { pub struct ChallengeStoryClearInfo { #[prost(message, repeated, tag = "14")] pub lineup_list: ::prost::alloc::vec::Vec, - /// TODO: Maybe wrong idk #[prost(uint32, tag = "15")] - pub fight_count: u32, + pub highest_difficulty: u32, #[prost(uint32, tag = "5")] pub buff_one: u32, #[prost(uint32, tag = "8")] @@ -3993,9 +3994,8 @@ pub struct ChallengeStoryClearInfo { pub struct ChallengeBossClearInfo { #[prost(message, repeated, tag = "10")] pub lineup_list: ::prost::alloc::vec::Vec, - /// TODO: Maybe wrong idk #[prost(uint32, tag = "3")] - pub fight_count: u32, + pub highest_difficulty: u32, #[prost(uint32, tag = "15")] pub score: u32, #[prost(uint32, tag = "8")] @@ -4084,10 +4084,11 @@ pub struct ChallengeBossStageInfo { pub buff_id: u32, #[prost(bool, tag = "7")] pub is_win: bool, + /// maybe is done? #[prost(bool, tag = "1")] pub ehlamhmjlfp: bool, #[prost(uint32, tag = "2")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 41(CmdChallengeType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -4123,8 +4124,9 @@ pub struct ChallengeBossRelic { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct ChallengeBossRelicList { + /// key is slot #[prost(map = "uint32, message", tag = "10")] - pub ikgimlhnipi: ::std::collections::HashMap, + pub equipped_relic_map: ::std::collections::HashMap, } /// 44(CmdChallengeType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -4136,10 +4138,14 @@ pub struct ChallengeBossInfo { pub second_node: ::core::option::Option, #[prost(uint32, repeated, tag = "11")] pub second_lineup_ids: ::prost::alloc::vec::Vec, - /// map MPHILJEPBDD = 3; + /// key is avatarid + #[prost(map = "uint32, message", tag = "3")] + pub used_relic_map: ::std::collections::HashMap, #[prost(bool, tag = "14")] pub acghcdlbcgd: bool, - /// map GJPKHDHDCDN = 12; + /// key is avatarid + #[prost(map = "uint32, message", tag = "12")] + pub used_equipment_map: ::std::collections::HashMap, #[prost(uint32, repeated, tag = "2")] pub first_lineup_ids: ::prost::alloc::vec::Vec, } @@ -4296,9 +4302,9 @@ pub struct Dpokgkepmid { #[derive(Clone, PartialEq, ::prost::Message)] pub struct GetPrivateChatHistoryCsReq { #[prost(uint32, tag = "5")] - pub sender_id: u32, - #[prost(uint32, tag = "7")] pub to_uid: u32, + #[prost(uint32, tag = "7")] + pub sender_id: u32, } /// 6(CmdChatType) /// ScRsp @@ -4308,9 +4314,9 @@ pub struct GetPrivateChatHistoryScRsp { #[prost(uint32, tag = "5")] pub retcode: u32, #[prost(uint32, tag = "11")] - pub sender_id: u32, - #[prost(uint32, tag = "2")] pub to_uid: u32, + #[prost(uint32, tag = "2")] + pub sender_id: u32, #[prost(message, repeated, tag = "8")] pub chat_list: ::prost::alloc::vec::Vec, } @@ -6993,7 +6999,7 @@ pub struct Cheinnkfdjn { #[prost(uint32, tag = "14")] pub kfgnaklpgdn: u32, #[prost(uint32, tag = "11")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 5(CmdEvolveBuild) #[allow(clippy::derive_partial_eq_without_eq)] @@ -7772,12 +7778,12 @@ pub struct FightActivityGroup { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Chggalkbnag {} +pub struct GetFightActivityDataCsReq {} /// 2(CmdFightActivityType) /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Gnflbilmmlc { +pub struct GetFightActivityDataScRsp { #[prost(uint32, tag = "11")] pub world_level: u32, #[prost(message, repeated, tag = "7")] @@ -7793,7 +7799,7 @@ pub struct Gnflbilmmlc { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Jppimimkmgc { +pub struct FightActivityDataChangeScNotify { #[prost(message, repeated, tag = "6")] pub pblpdemppak: ::prost::alloc::vec::Vec, #[prost(map = "uint32, uint32", tag = "15")] @@ -7802,7 +7808,7 @@ pub struct Jppimimkmgc { /// 4(CmdFightActivityType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Kiechaaodij { +pub struct FightActivityAvatar { #[prost(enumeration = "AvatarType", tag = "8")] pub avatar_type: i32, #[prost(uint32, tag = "13")] @@ -7812,13 +7818,13 @@ pub struct Kiechaaodij { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Jdggjaknbaa { +pub struct EnterFightActivityStageCsReq { #[prost(uint32, repeated, tag = "12")] pub avatar_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "4")] pub group_id: u32, #[prost(message, repeated, tag = "3")] - pub bbaghoekifn: ::prost::alloc::vec::Vec, + pub bbaghoekifn: ::prost::alloc::vec::Vec, #[prost(uint32, repeated, tag = "11")] pub item_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "6")] @@ -7828,7 +7834,7 @@ pub struct Jdggjaknbaa { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Libkkfphape { +pub struct EnterFightActivityStageScRsp { #[prost(uint32, tag = "9")] pub group_id: u32, #[prost(message, optional, tag = "13")] @@ -7842,7 +7848,7 @@ pub struct Libkkfphape { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ihpiecgoeei { +pub struct TakeFightActivityRewardCsReq { #[prost(uint32, tag = "8")] pub difficulty: u32, #[prost(uint32, tag = "7")] @@ -7852,7 +7858,7 @@ pub struct Ihpiecgoeei { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Megfbegdecd { +pub struct TakeFightActivityRewardScRsp { #[prost(uint32, tag = "9")] pub difficulty: u32, #[prost(message, optional, tag = "7")] @@ -8387,7 +8393,7 @@ pub struct FriendApplyInfo { /// 21(CmdFriendType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Maojknnonoj { +pub struct FriendRecommendInfo { #[prost(bool, tag = "8")] pub opgfdiklagl: bool, #[prost(message, optional, tag = "10")] @@ -8433,9 +8439,8 @@ pub struct Cdpnemeebkk { pub kkmacpkifkp: ::prost::alloc::string::String, #[prost(uint32, tag = "15")] pub buff_one: u32, - /// TODO: Maybe wrong idk #[prost(uint32, tag = "4")] - pub fight_count: u32, + pub highest_difficulty: u32, #[prost(uint32, tag = "7")] pub buff_two: u32, #[prost(message, repeated, tag = "3")] @@ -8611,26 +8616,26 @@ pub struct GetPlayerDetailInfoScRsp { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetFriendLoginInfoCsReq {} +pub struct GetFriendApplyListInfoCsReq {} /// 41(CmdFriendType) /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetFriendLoginInfoScRsp { +pub struct GetFriendApplyListInfoScRsp { #[prost(uint32, tag = "8")] pub retcode: u32, #[prost(message, repeated, tag = "11")] - pub fmjlbpedghm: ::prost::alloc::vec::Vec, + pub friend_apply_list: ::prost::alloc::vec::Vec, #[prost(uint32, repeated, tag = "6")] - pub friend_uid_list: ::prost::alloc::vec::Vec, + pub send_apply_list: ::prost::alloc::vec::Vec, } /// 42(CmdFriendType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Aedffihpnpf { - #[prost(enumeration = "Kammnbkbeol", tag = "12")] - pub lgekdbjjlni: i32, +pub struct ApplyFriendCsReq { + #[prost(enumeration = "FriendApplySource", tag = "12")] + pub source: i32, #[prost(uint32, tag = "5")] pub uid: u32, } @@ -8638,7 +8643,7 @@ pub struct Aedffihpnpf { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Oliodegkiil { +pub struct ApplyFriendScRsp { #[prost(uint32, tag = "6")] pub uid: u32, #[prost(uint32, tag = "12")] @@ -8648,9 +8653,9 @@ pub struct Oliodegkiil { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Alilngbfpjp { +pub struct SyncApplyFriendScNotify { #[prost(message, optional, tag = "15")] - pub hboadipognk: ::core::option::Option, + pub friend_apply_info: ::core::option::Option, } /// 45(CmdFriendType) /// CsReq @@ -8689,10 +8694,10 @@ pub struct SyncHandleFriendScNotify { pub handle_result: bool, } /// 48(CmdFriendType) -/// CsReq +/// CsReq (TODO) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Kdaleemphkm { +pub struct DeleteFriendCsReq { #[prost(uint32, tag = "11")] pub uid: u32, #[prost(uint32, tag = "6")] @@ -8702,7 +8707,7 @@ pub struct Kdaleemphkm { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Pdnjalfndmf { +pub struct DeleteFriendScRsp { #[prost(uint32, tag = "2")] pub retcode: u32, #[prost(uint32, tag = "7")] @@ -8712,7 +8717,7 @@ pub struct Pdnjalfndmf { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Emgeclkgbhp { +pub struct SyncDeleteFriendScNotify { #[prost(uint32, tag = "12")] pub uid: u32, } @@ -8746,7 +8751,7 @@ pub struct Fblkalmkfjc { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Jljndgoeide { +pub struct GetFriendRecommendListInfoCsReq { #[prost(bool, tag = "6")] pub clbgeiomcoj: bool, } @@ -8754,9 +8759,9 @@ pub struct Jljndgoeide { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ninoafagmgl { +pub struct GetFriendRecommendListInfoScRsp { #[prost(message, repeated, tag = "13")] - pub lnkhmomindf: ::prost::alloc::vec::Vec, + pub friend_recommend_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "5")] pub retcode: u32, } @@ -8957,7 +8962,7 @@ pub struct Ebmlnjabllm { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Aejbpedecge { +pub struct GetPlatformPlayerInfoCsReq { #[prost(enumeration = "PlatformType", tag = "4")] pub platform_type: i32, #[prost(string, repeated, tag = "7")] @@ -8967,22 +8972,22 @@ pub struct Aejbpedecge { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Hfbbefchfkh { +pub struct GetPlatformPlayerInfoScRsp { #[prost(uint32, tag = "9")] pub retcode: u32, #[prost(message, repeated, tag = "5")] - pub lnkhmomindf: ::prost::alloc::vec::Vec, + pub friend_recommend_list: ::prost::alloc::vec::Vec, } /// 78(CmdFriendType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ckolbohoeoj {} +pub struct GetFriendLoginInfoCsReq {} /// 79(CmdFriendType) /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Mnbhpjalole { +pub struct GetFriendLoginInfoScRsp { #[prost(uint32, repeated, tag = "12")] pub gecaoaamepe: ::prost::alloc::vec::Vec, #[prost(bool, tag = "15")] @@ -10117,14 +10122,14 @@ pub struct LockRelicScRsp { pub retcode: u32, } /// 26(CmdItemType) -/// CsReq +/// CsReq (TODO) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Hhbegolfelk { +pub struct DiscardRelicCsReq { #[prost(uint32, tag = "7")] pub relic_unique_id: u32, #[prost(bool, tag = "9")] - pub ecdolccngai: bool, + pub is_discard: bool, #[prost(uint32, repeated, tag = "15")] pub ppeilldocbe: ::prost::alloc::vec::Vec, #[prost(bool, tag = "6")] @@ -10134,9 +10139,9 @@ pub struct Hhbegolfelk { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Lninlomnjkc { +pub struct DiscardRelicScRsp { #[prost(bool, tag = "15")] - pub ecdolccngai: bool, + pub is_discard: bool, #[prost(uint32, tag = "13")] pub retcode: u32, } @@ -10699,7 +10704,7 @@ pub struct GetStageLineupCsReq {} #[derive(Clone, PartialEq, ::prost::Message)] pub struct StageLineup { #[prost(uint32, tag = "12")] - pub cnpkcdgciif: u32, + pub stage_type: u32, #[prost(uint32, tag = "11")] pub aeefpickblc: u32, } @@ -16779,7 +16784,7 @@ pub struct Igjbeeiiica { #[prost(uint32, tag = "5")] pub ggfpcdonofj: u32, #[prost(uint32, tag = "7")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 10(CmdRaidType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -17844,7 +17849,7 @@ pub struct Mcbabgaiknd { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Djpafgmmhie { +pub struct PickRogueAvatarCsReq { #[prost(uint32, repeated, tag = "3")] pub avatar_id_list: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "5")] @@ -17856,7 +17861,7 @@ pub struct Djpafgmmhie { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Hecmobpinig { +pub struct PickRogueAvatarScRsp { #[prost(uint32, tag = "7")] pub retcode: u32, #[prost(uint32, repeated, tag = "4")] @@ -19071,7 +19076,7 @@ pub struct Elcmbgeaomn { #[prost(message, optional, tag = "4")] pub rogue_action: ::core::option::Option, #[prost(enumeration = "Khkfcclabmd", tag = "11")] - pub lgekdbjjlni: i32, + pub source: i32, } /// 107(CmdRogueCommonType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -21925,15 +21930,15 @@ pub struct Dfdimkmfkic { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Khlodljfaej { +pub struct GetRollShopInfoCsReq { #[prost(uint32, tag = "3")] - pub inkadmicllh: u32, + pub roll_shop_id: u32, } /// 1(CmdRollShopType) -/// ScRsp +/// GetRollShopInfoScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Bkfbdolgcdj { +pub struct GetRollShopInfoScRsp { #[prost(uint32, repeated, tag = "15")] pub pbmhfionkea: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "14")] @@ -21941,17 +21946,17 @@ pub struct Bkfbdolgcdj { #[prost(uint32, tag = "9")] pub gacha_random: u32, #[prost(uint32, tag = "7")] - pub inkadmicllh: u32, + pub roll_shop_id: u32, } /// 2(CmdRollShopType) -/// CsReq +/// DoGachaInRollShopCsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Nmealgfonhn { +pub struct DoGachaInRollShopCsReq { #[prost(uint32, tag = "13")] pub cfljillnelc: u32, #[prost(uint32, tag = "11")] - pub inkadmicllh: u32, + pub roll_shop_id: u32, #[prost(uint32, tag = "3")] pub gacha_random: u32, } @@ -21959,11 +21964,11 @@ pub struct Nmealgfonhn { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Acknmgmhpel { +pub struct DoGachaInRollShopScRsp { #[prost(uint32, tag = "5")] pub retcode: u32, #[prost(uint32, tag = "11")] - pub inkadmicllh: u32, + pub roll_shop_id: u32, #[prost(uint32, tag = "15")] pub ejapjpidpoa: u32, #[prost(message, optional, tag = "3")] @@ -21977,7 +21982,7 @@ pub struct Acknmgmhpel { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Djgpejnihkm { #[prost(uint32, tag = "14")] - pub inkadmicllh: u32, + pub roll_shop_id: u32, } /// 5(CmdRollShopType) /// ScRsp @@ -22058,7 +22063,7 @@ pub struct Kgoanecdehk { /// 13(CmdSceneType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Hiacmghppmi { +pub struct NpcRogueInfo { #[prost(bool, tag = "9")] pub jofmikfbghp: bool, #[prost(uint32, tag = "11")] @@ -22097,12 +22102,21 @@ pub struct Echlhjalckl { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct NpcExtraInfo { - #[prost(message, optional, tag = "7")] - pub rogue_info: ::core::option::Option, - #[prost(message, optional, tag = "6")] - pub keilalkhcca: ::core::option::Option, - #[prost(message, optional, tag = "14")] - pub olgaobhackd: ::core::option::Option, + #[prost(oneof = "npc_extra_info::Info", tags = "7, 6, 14")] + pub info: ::core::option::Option, +} +/// Nested message and enum types in `NpcExtraInfo`. +pub mod npc_extra_info { + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Oneof)] + pub enum Info { + #[prost(message, tag = "7")] + RogueInfo(super::NpcRogueInfo), + #[prost(message, tag = "6")] + Keilalkhcca(super::Echlhjalckl), + #[prost(message, tag = "14")] + Olgaobhackd(super::Aalahndepba), + } } /// OneOf Type From: NpcExtraInfo.LHMPMDOPDDC /// 17(CmdSceneType) @@ -22129,7 +22143,7 @@ pub struct SceneNpcInfo { /// 19(CmdSceneType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Bhbnmcgbcfb { +pub struct PropRogueInfo { #[prost(uint32, tag = "12")] pub dlnbflgdkhp: u32, #[prost(uint32, tag = "4")] @@ -22208,20 +22222,29 @@ pub struct Naakapmfelc { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct PropExtraInfo { - #[prost(message, optional, tag = "11")] - pub rogue_info: ::core::option::Option, - #[prost(message, optional, tag = "9")] - pub aeon_info: ::core::option::Option, - #[prost(message, optional, tag = "8")] - pub chess_rogue_info: ::core::option::Option, - #[prost(message, optional, tag = "13")] - pub rogue_tourn_door_info: ::core::option::Option, - #[prost(message, optional, tag = "1")] - pub rogue_tourn_workbench_info: ::core::option::Option, - #[prost(message, optional, tag = "10")] - pub rogue_gamble_machine_info: ::core::option::Option, - #[prost(message, optional, tag = "6")] - pub rogue_curse_chest_info: ::core::option::Option, + #[prost(oneof = "prop_extra_info::Info", tags = "11, 9, 8, 13, 1, 10, 6")] + pub info: ::core::option::Option, +} +/// Nested message and enum types in `PropExtraInfo`. +pub mod prop_extra_info { + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Oneof)] + pub enum Info { + #[prost(message, tag = "11")] + RogueInfo(super::PropRogueInfo), + #[prost(message, tag = "9")] + AeonInfo(super::PropAeonInfo), + #[prost(message, tag = "8")] + ChessRogueInfo(super::Hogofofoohd), + #[prost(message, tag = "13")] + RogueTournDoorInfo(super::Bilbobbfaop), + #[prost(message, tag = "1")] + RogueTournWorkbenchInfo(super::Mfbmfhokeme), + #[prost(message, tag = "10")] + RogueGambleMachineInfo(super::Bejpocfijen), + #[prost(message, tag = "6")] + RogueCurseChestInfo(super::Naakapmfelc), + } } /// OneOf Type From: PropExtraInfo.InfoOneofCase /// 28(CmdSceneType) @@ -24027,7 +24050,7 @@ pub struct Aaahmbhklpo { /// 0(CmdStarFightType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Gmfilgicffc { +pub struct StarFightData { #[prost(uint32, tag = "9")] pub olcpifjcbfp: u32, #[prost(bool, tag = "2")] @@ -24043,21 +24066,21 @@ pub struct Gmfilgicffc { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Njikcbaeibn {} +pub struct GetStarFightDataCsReq {} /// 2(CmdStarFightType) /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ipjfihmhmjb { +pub struct GetStarFightDataScRsp { #[prost(uint32, tag = "6")] pub retcode: u32, #[prost(message, repeated, tag = "12")] - pub dhjidddcppb: ::prost::alloc::vec::Vec, + pub star_fight_data_list: ::prost::alloc::vec::Vec, } /// 3(CmdStarFightType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ohdgmdlcnll { +pub struct StarFightAvatar { #[prost(uint32, tag = "5")] pub avatar_id: u32, #[prost(enumeration = "AvatarType", tag = "7")] @@ -24067,19 +24090,19 @@ pub struct Ohdgmdlcnll { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ljnlhmbampj { +pub struct StartStarFightLevelCsReq { #[prost(uint32, tag = "11")] pub difficulty: u32, #[prost(uint32, tag = "7")] pub group_id: u32, #[prost(message, repeated, tag = "5")] - pub avatar_list: ::prost::alloc::vec::Vec, + pub avatar_list: ::prost::alloc::vec::Vec, } /// 5(CmdStarFightType) /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Jlpldbohnok { +pub struct StartStarFightLevelScRsp { #[prost(uint32, tag = "15")] pub retcode: u32, #[prost(uint32, tag = "7")] @@ -24093,11 +24116,11 @@ pub struct Jlpldbohnok { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Bhgmhdjclcg { +pub struct StarFightDataChangeNotify { #[prost(uint32, tag = "15")] pub group_id: u32, #[prost(message, optional, tag = "11")] - pub nbchigbiadl: ::core::option::Option, + pub star_fight_data: ::core::option::Option, } /// 1(CmdStoryLineType) /// CsReq @@ -24183,7 +24206,7 @@ pub struct Ajmllgklnmf { #[prost(uint32, tag = "2")] pub ednobgjcmbk: u32, #[prost(uint32, tag = "9")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 3(CmdStrongChallengeActivityType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -24237,7 +24260,7 @@ pub struct Lohffeganbp { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Clooadflaio { #[prost(uint32, tag = "5")] - pub fogbecbdfdm: u32, + pub stage_score: u32, #[prost(uint32, tag = "14")] pub stage_id: u32, #[prost(uint32, tag = "7")] @@ -24249,7 +24272,7 @@ pub struct Clooadflaio { #[prost(enumeration = "BattleEndStatus", tag = "8")] pub end_status: i32, #[prost(uint32, tag = "11")] - pub kfeognngcoh: u32, + pub total_damage: u32, #[prost(uint32, tag = "3")] pub koieibkkmjf: u32, } @@ -24642,7 +24665,7 @@ pub struct Bfdcfckhilp { #[prost(message, optional, tag = "1")] pub rogue_action: ::core::option::Option, #[prost(enumeration = "Impnhhhpmba", tag = "14")] - pub lgekdbjjlni: i32, + pub source: i32, } /// 33(CmdSwordTrainingType) #[allow(clippy::derive_partial_eq_without_eq)] @@ -25461,7 +25484,7 @@ pub struct Mbeifnacmnc { #[prost(uint32, tag = "4")] pub cfnfmeemckk: u32, #[prost(uint32, tag = "1")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 1(CmdTelevisionActivityType) /// CsReq @@ -25619,7 +25642,7 @@ pub struct Oikbjjgikim { #[prost(uint32, tag = "14")] pub stage_id: u32, #[prost(uint32, tag = "4")] - pub fogbecbdfdm: u32, + pub stage_score: u32, } /// 1(CmdTrackPhotoActivityType) /// CsReq @@ -26699,7 +26722,7 @@ pub struct Bcibpajimin { /// 1(CmdWolfBroType) #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Pgpkocpbnef { +pub struct WolfBroGameData { #[prost(message, repeated, tag = "11")] pub ofkibkelokh: ::prost::alloc::vec::Vec, #[prost(uint32, tag = "10")] @@ -26717,7 +26740,7 @@ pub struct Pgpkocpbnef { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Gkbnidegepl { +pub struct StartWolfBroGameCsReq { #[prost(message, optional, tag = "14")] pub motion: ::core::option::Option, #[prost(uint32, tag = "13")] @@ -26731,9 +26754,9 @@ pub struct Gkbnidegepl { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Iljlklfgebn { +pub struct StartWolfBroGameScRsp { #[prost(message, optional, tag = "12")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, #[prost(uint32, tag = "1")] pub retcode: u32, } @@ -26741,7 +26764,7 @@ pub struct Iljlklfgebn { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Dnjjcdijjob { +pub struct ArchiveWolfBroGameCsReq { #[prost(message, optional, tag = "8")] pub motion: ::core::option::Option, #[prost(uint32, tag = "6")] @@ -26751,17 +26774,17 @@ pub struct Dnjjcdijjob { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Phkhpfeegje { +pub struct ArchiveWolfBroGameScRsp { #[prost(uint32, tag = "6")] pub retcode: u32, #[prost(message, optional, tag = "11")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, } /// 6(CmdWolfBroType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Afllioenioc { +pub struct RestoreWolfBroGameArchiveCsReq { #[prost(uint32, tag = "5")] pub id: u32, } @@ -26769,17 +26792,17 @@ pub struct Afllioenioc { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Lailcdkjlie { +pub struct RestoreWolfBroGameArchiveScRsp { #[prost(uint32, tag = "12")] pub retcode: u32, #[prost(message, optional, tag = "9")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, } /// 8(CmdWolfBroType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Pbohagggndh { +pub struct QuitWolfBroGameCsReq { #[prost(uint32, tag = "2")] pub id: u32, } @@ -26787,17 +26810,17 @@ pub struct Pbohagggndh { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Fedglbkicak { +pub struct QuitWolfBroGameScRsp { #[prost(uint32, tag = "8")] pub retcode: u32, #[prost(message, optional, tag = "11")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, } /// 10(CmdWolfBroType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Lpahfbmbofm { +pub struct GetWolfBroGameDataCsReq { #[prost(uint32, tag = "9")] pub id: u32, } @@ -26805,9 +26828,9 @@ pub struct Lpahfbmbofm { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Noeimeghabj { +pub struct GetWolfBroGameDataScRsp { #[prost(message, optional, tag = "7")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, #[prost(uint32, tag = "4")] pub retcode: u32, } @@ -26815,15 +26838,15 @@ pub struct Noeimeghabj { /// ScNotify #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Eljokcmkhlm { +pub struct WolfBroGameDataChangeScNotify { #[prost(message, optional, tag = "3")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, } /// 13(CmdWolfBroType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Kfnjajdjdlg { +pub struct WolfBroGameUseBulletCsReq { #[prost(message, optional, tag = "3")] pub dkjhohcaknd: ::core::option::Option, #[prost(uint32, repeated, tag = "14")] @@ -26833,17 +26856,17 @@ pub struct Kfnjajdjdlg { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Aogkiepicpj { +pub struct WolfBroGameUseBulletScRsp { #[prost(uint32, tag = "13")] pub retcode: u32, #[prost(message, optional, tag = "11")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, } /// 15(CmdWolfBroType) /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Lndnafgmjci { +pub struct WolfBroGamePickupBulletCsReq { #[prost(message, optional, tag = "8")] pub dkjhohcaknd: ::core::option::Option, } @@ -26851,9 +26874,9 @@ pub struct Lndnafgmjci { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Fihbnpdejgl { +pub struct WolfBroGamePickupBulletScRsp { #[prost(message, optional, tag = "1")] - pub fknofjnafad: ::core::option::Option, + pub wolf_bro_game_data: ::core::option::Option, #[prost(uint32, tag = "13")] pub retcode: u32, } @@ -26861,7 +26884,7 @@ pub struct Fihbnpdejgl { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Hnpigilomip { +pub struct WolfBroGameActivateBulletCsReq { #[prost(uint32, tag = "1")] pub group_id: u32, #[prost(uint32, tag = "6")] @@ -26871,7 +26894,7 @@ pub struct Hnpigilomip { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Fkoojnhgmgb { +pub struct WolfBroGameActivateBulletScRsp { #[prost(uint32, tag = "7")] pub retcode: u32, } @@ -26879,7 +26902,7 @@ pub struct Fkoojnhgmgb { /// CsReq #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Neodieeplhf { +pub struct WolfBroGameExplodeMonsterCsReq { #[prost(uint32, repeated, tag = "3")] pub assist_monster_entity_id_list: ::prost::alloc::vec::Vec, } @@ -26887,7 +26910,7 @@ pub struct Neodieeplhf { /// ScRsp #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Dipjojjghjl { +pub struct WolfBroGameExplodeMonsterScRsp { #[prost(uint32, tag = "5")] pub retcode: u32, } @@ -28693,23 +28716,23 @@ impl Dniinpiemig { } #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Bhhbceikadc { +pub enum DeathSource { Unknown = 0, KilledByOthers = 1, KilledBySelf = 2, Escape = 3, } -impl Bhhbceikadc { +impl DeathSource { /// 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 { - Bhhbceikadc::Unknown => "UNKNOWN", - Bhhbceikadc::KilledByOthers => "KILLED_BY_OTHERS", - Bhhbceikadc::KilledBySelf => "KILLED_BY_SELF", - Bhhbceikadc::Escape => "ESCAPE", + DeathSource::Unknown => "UNKNOWN", + DeathSource::KilledByOthers => "KILLED_BY_OTHERS", + DeathSource::KilledBySelf => "KILLED_BY_SELF", + DeathSource::Escape => "ESCAPE", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -33179,26 +33202,26 @@ impl CmdActivityType { /// 0(CmdActivityType) #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Pcegpgngkhn { - TrialActivityStatusNone = 0, - TrialActivityStatusFinish = 1, +pub enum TrialActivityStatus { + None = 0, + Finish = 1, } -impl Pcegpgngkhn { +impl TrialActivityStatus { /// 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 { - Pcegpgngkhn::TrialActivityStatusNone => "TRIAL_ACTIVITY_STATUS_NONE", - Pcegpgngkhn::TrialActivityStatusFinish => "TRIAL_ACTIVITY_STATUS_FINISH", + TrialActivityStatus::None => "TRIAL_ACTIVITY_STATUS_NONE", + TrialActivityStatus::Finish => "TRIAL_ACTIVITY_STATUS_FINISH", } } /// Creates an enum from field names used in the ProtoBuf definition. pub fn from_str_name(value: &str) -> ::core::option::Option { match value { - "TRIAL_ACTIVITY_STATUS_NONE" => Some(Self::TrialActivityStatusNone), - "TRIAL_ACTIVITY_STATUS_FINISH" => Some(Self::TrialActivityStatusFinish), + "TRIAL_ACTIVITY_STATUS_NONE" => Some(Self::None), + "TRIAL_ACTIVITY_STATUS_FINISH" => Some(Self::Finish), _ => None, } } @@ -37346,49 +37369,41 @@ impl FriendOnlineStatus { /// 1(CmdFriendType) #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] -pub enum Kammnbkbeol { - FriendApplySourceNone = 0, - FriendApplySourceSearch = 1, - FriendApplySourceRecommend = 2, - FriendApplySourceAssist = 3, - FriendApplySourceRecommendAssist = 4, - FriendApplySourcePsnFriend = 5, - FriendApplySourceAssistReward = 6, +pub enum FriendApplySource { + None = 0, + Search = 1, + Recommend = 2, + Assist = 3, + RecommendAssist = 4, + PsnFriend = 5, + AssistReward = 6, } -impl Kammnbkbeol { +impl FriendApplySource { /// 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 { - Kammnbkbeol::FriendApplySourceNone => "FRIEND_APPLY_SOURCE_NONE", - Kammnbkbeol::FriendApplySourceSearch => "FRIEND_APPLY_SOURCE_SEARCH", - Kammnbkbeol::FriendApplySourceRecommend => "FRIEND_APPLY_SOURCE_RECOMMEND", - Kammnbkbeol::FriendApplySourceAssist => "FRIEND_APPLY_SOURCE_ASSIST", - Kammnbkbeol::FriendApplySourceRecommendAssist => { - "FRIEND_APPLY_SOURCE_RECOMMEND_ASSIST" - } - Kammnbkbeol::FriendApplySourcePsnFriend => "FRIEND_APPLY_SOURCE_PSN_FRIEND", - Kammnbkbeol::FriendApplySourceAssistReward => { - "FRIEND_APPLY_SOURCE_ASSIST_REWARD" - } + FriendApplySource::None => "FRIEND_APPLY_SOURCE_NONE", + FriendApplySource::Search => "FRIEND_APPLY_SOURCE_SEARCH", + FriendApplySource::Recommend => "FRIEND_APPLY_SOURCE_RECOMMEND", + FriendApplySource::Assist => "FRIEND_APPLY_SOURCE_ASSIST", + FriendApplySource::RecommendAssist => "FRIEND_APPLY_SOURCE_RECOMMEND_ASSIST", + FriendApplySource::PsnFriend => "FRIEND_APPLY_SOURCE_PSN_FRIEND", + FriendApplySource::AssistReward => "FRIEND_APPLY_SOURCE_ASSIST_REWARD", } } /// Creates an enum from field names used in the ProtoBuf definition. pub fn from_str_name(value: &str) -> ::core::option::Option { match value { - "FRIEND_APPLY_SOURCE_NONE" => Some(Self::FriendApplySourceNone), - "FRIEND_APPLY_SOURCE_SEARCH" => Some(Self::FriendApplySourceSearch), - "FRIEND_APPLY_SOURCE_RECOMMEND" => Some(Self::FriendApplySourceRecommend), - "FRIEND_APPLY_SOURCE_ASSIST" => Some(Self::FriendApplySourceAssist), - "FRIEND_APPLY_SOURCE_RECOMMEND_ASSIST" => { - Some(Self::FriendApplySourceRecommendAssist) - } - "FRIEND_APPLY_SOURCE_PSN_FRIEND" => Some(Self::FriendApplySourcePsnFriend), - "FRIEND_APPLY_SOURCE_ASSIST_REWARD" => { - Some(Self::FriendApplySourceAssistReward) - } + "FRIEND_APPLY_SOURCE_NONE" => Some(Self::None), + "FRIEND_APPLY_SOURCE_SEARCH" => Some(Self::Search), + "FRIEND_APPLY_SOURCE_RECOMMEND" => Some(Self::Recommend), + "FRIEND_APPLY_SOURCE_ASSIST" => Some(Self::Assist), + "FRIEND_APPLY_SOURCE_RECOMMEND_ASSIST" => Some(Self::RecommendAssist), + "FRIEND_APPLY_SOURCE_PSN_FRIEND" => Some(Self::PsnFriend), + "FRIEND_APPLY_SOURCE_ASSIST_REWARD" => Some(Self::AssistReward), _ => None, } } diff --git a/sdkserver/src/config/version_config.rs b/sdkserver/src/config/version_config.rs index 72afc71..9289d4f 100644 --- a/sdkserver/src/config/version_config.rs +++ b/sdkserver/src/config/version_config.rs @@ -11,7 +11,7 @@ pub struct VersionConfig { pub asset_bundle_url: String, pub ex_resource_url: String, pub lua_url: String, - pub lua_version: String, + // pub lua_version: String, } lazy_static! {