From 285fc0b6fa521cb7ad064ab4f27ee4784387f054 Mon Sep 17 00:00:00 2001 From: xeon Date: Sun, 4 Aug 2024 15:40:06 +0300 Subject: [PATCH] NewsStand interaction --- assets/EventConfig/Interacts.json | 11 +++++++++++ nap_gameserver/src/handlers/client_systems.rs | 10 ++++++++++ nap_gameserver/src/handlers/mod.rs | 1 + nap_proto/out/_.rs | 6 +++--- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/assets/EventConfig/Interacts.json b/assets/EventConfig/Interacts.json index 3ee0104..e284969 100644 --- a/assets/EventConfig/Interacts.json +++ b/assets/EventConfig/Interacts.json @@ -200,5 +200,16 @@ "store_template_id": 1191 } ] + }, + { + "event_id": 15000301, + "actions": [ + { + "$type": "OpenUi", + "ui": "UINewsStandPageController", + "args": 0, + "store_template_id": 1061 + } + ] } ] diff --git a/nap_gameserver/src/handlers/client_systems.rs b/nap_gameserver/src/handlers/client_systems.rs index 8a35629..7ca94ca 100644 --- a/nap_gameserver/src/handlers/client_systems.rs +++ b/nap_gameserver/src/handlers/client_systems.rs @@ -54,6 +54,16 @@ pub async fn on_get_news_stand_data( }) } +pub async fn on_news_stand_seen( + _session: &NetSession, + _player: &mut Player, + _req: NewsStandSeenCsReq, +) -> NetResult { + Ok(NewsStandSeenScRsp { + retcode: Retcode::RetSucc.into(), + }) +} + pub async fn on_get_trashbin_hermit_data( _session: &NetSession, _player: &mut Player, diff --git a/nap_gameserver/src/handlers/mod.rs b/nap_gameserver/src/handlers/mod.rs index c869ef7..bce8e4c 100644 --- a/nap_gameserver/src/handlers/mod.rs +++ b/nap_gameserver/src/handlers/mod.rs @@ -107,6 +107,7 @@ req_handlers! { client_systems::ReportSystemSettingsChange; client_systems::InteractWithSceneObject; client_systems::PlayerSystemParameterChange; + client_systems::NewsStandSeen; perform::PerformTrigger; perform::PerformEnd; perform::PerformJump; diff --git a/nap_proto/out/_.rs b/nap_proto/out/_.rs index 7bc0341..09e505f 100644 --- a/nap_proto/out/_.rs +++ b/nap_proto/out/_.rs @@ -14738,9 +14738,9 @@ pub struct UpdateEventGraphScNotify { #[derive(proto_gen::XorFields)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Kckdjohckaf { +pub struct NewsStandSeenCsReq { #[prost(int32, repeated, tag = "9")] - pub kijpafaibda: ::prost::alloc::vec::Vec, + pub seen_news_id_list: ::prost::alloc::vec::Vec, } #[derive(proto_gen::CmdID)] #[derive(proto_gen::XorFields)] @@ -21580,7 +21580,7 @@ pub struct Jiebkihfhpb { #[derive(proto_gen::XorFields)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct Ffnabokpijm { +pub struct NewsStandSeenScRsp { #[xor(12369)] #[prost(int32, tag = "7")] pub retcode: i32,