reversedrooms/JadeSR
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Adjust player spawn pos, fix some proto names

Browse source
This commit is contained in:
xeon 2024-05-09 19:02:17 +03:00
parent 7648e6c014
commit b63ee14fa8
2 changed files with 53 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
gameserver/src/net/handlers/scene.rs
View file

@ -22,10 +22,6 @@ pub async fn on_enter_scene_cs_req(session: &PlayerSession, body: &EnterSceneCsR
floor_id: entrance_config.floor_id, floor_id: entrance_config.floor_id,
entry_id: entrance_config.id, entry_id: entrance_config.id,
game_mode_type: 1, // TODO: EntranceType -> enum repr(u32) game_mode_type: 1, // TODO: EntranceType -> enum repr(u32)
// TODO: thing above is probably not gm type
nnfgkelcban: 1,
lgflfajffjl: 1,
pjbjelcgkof: 1,
..Default::default() ..Default::default()
}), }),
}; };
@ -49,32 +45,56 @@ pub async fn on_get_cur_scene_info_cs_req(
floor_id: 20101001, floor_id: 20101001,
entry_id: 2010101, entry_id: 2010101,
game_mode_type: 1, game_mode_type: 1,
nnfgkelcban: 1, leader_entity_id: 1,
lgflfajffjl: 1, scene_group_list: vec![
pjbjelcgkof: 1, SceneGroupInfo {
scene_group_list: vec![SceneGroupInfo { state: 1,
state: 1, group_id: 0,
group_id: 19, entity_list: vec![SceneEntityInfo {
entity_list: vec![SceneEntityInfo { group_id: 0,
group_id: 19, inst_id: 0,
inst_id: 300001, entity_id: 1,
entity_id: 228, actor: Some(SceneActorInfo {
prop: Some(ScenePropInfo { avatar_type: 3,
prop_id: 808, base_avatar_id: 1314,
prop_state: 1, map_layer: 2,
..Default::default() uid: session.player_uid(),
}),
motion: Some(MotionInfo {
pos: Some(Vector {
z: 4480,
y: 19364,
x: -570,
}), }),
rot: Some(Vector::default()), motion: Some(MotionInfo {
}), pos: Some(Vector {
..Default::default() x: -550,
}], y: 19364,
}], z: 4480,
}),
rot: Some(Vector::default()),
}),
..Default::default()
}],
},
SceneGroupInfo {
state: 1,
group_id: 19,
entity_list: vec![SceneEntityInfo {
group_id: 19,
inst_id: 300001,
entity_id: 228,
prop: Some(ScenePropInfo {
prop_id: 808,
prop_state: 1,
..Default::default()
}),
motion: Some(MotionInfo {
pos: Some(Vector {
x: -570,
y: 19364,
z: 4480,
}),
rot: Some(Vector::default()),
}),
..Default::default()
}],
},
],
..Default::default() ..Default::default()
}), }),
}, },

8
proto/out/_.rs
View file

@ -15996,7 +15996,7 @@ pub struct Mbdeomilmed {
#[prost(uint32, repeated, tag = "12")] #[prost(uint32, repeated, tag = "12")]
pub pgcmnafcahe: ::prost::alloc::vec::Vec<u32>, pub pgcmnafcahe: ::prost::alloc::vec::Vec<u32>,
#[prost(uint32, tag = "11")] #[prost(uint32, tag = "11")]
pub pjbjelcgkof: u32, pub game_mode_type: u32,
#[prost(uint32, tag = "1")] #[prost(uint32, tag = "1")]
pub ojljokcgaad: u32, pub ojljokcgaad: u32,
} }
@ -20097,11 +20097,11 @@ pub struct Icjemgcigbp {
#[derive(Clone, PartialEq, ::prost::Message)] #[derive(Clone, PartialEq, ::prost::Message)]
pub struct SceneInfo { pub struct SceneInfo {
#[prost(uint32, tag = "5")] #[prost(uint32, tag = "5")]
pub nnfgkelcban: u32, pub leader_entity_id: u32,
#[prost(uint32, tag = "15")] #[prost(uint32, tag = "15")]
pub lgflfajffjl: u32, pub lgflfajffjl: u32,
#[prost(uint32, tag = "13")] #[prost(uint32, tag = "13")]
pub pjbjelcgkof: u32, pub game_mode_type: u32,
#[prost(message, repeated, tag = "3")] #[prost(message, repeated, tag = "3")]
pub ijmddokpdff: ::prost::alloc::vec::Vec<BuffInfo>, pub ijmddokpdff: ::prost::alloc::vec::Vec<BuffInfo>,
#[prost(message, optional, tag = "1472")] #[prost(message, optional, tag = "1472")]
@ -20111,7 +20111,7 @@ pub struct SceneInfo {
#[prost(map = "string, int32", tag = "211")] #[prost(map = "string, int32", tag = "211")]
pub dynamic_values: ::std::collections::HashMap<::prost::alloc::string::String, i32>, pub dynamic_values: ::std::collections::HashMap<::prost::alloc::string::String, i32>,
#[prost(uint32, tag = "1")] #[prost(uint32, tag = "1")]
pub game_mode_type: u32, pub ipigefggbok: u32,
#[prost(message, repeated, tag = "9")] #[prost(message, repeated, tag = "9")]
pub padggdamiam: ::prost::alloc::vec::Vec<EntityBuffInfo>, pub padggdamiam: ::prost::alloc::vec::Vec<EntityBuffInfo>,
#[prost(message, repeated, tag = "11")] #[prost(message, repeated, tag = "11")]