From 6d2981e4cf4dabf035872b1ac54a4717ca58f137 Mon Sep 17 00:00:00 2001 From: amizing25 <85472093+amizing25@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:28:07 +0700 Subject: [PATCH] chore: Some changes --- gameserver/src/net/handlers/chat.rs | 2 +- gameserver/src/net/handlers/mod.rs | 2 +- gameserver/src/net/handlers/player.rs | 2 +- gameserver/src/net/packet.rs | 14 ++++++++------ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gameserver/src/net/handlers/chat.rs b/gameserver/src/net/handlers/chat.rs index 8ed7af3..786e878 100644 --- a/gameserver/src/net/handlers/chat.rs +++ b/gameserver/src/net/handlers/chat.rs @@ -14,7 +14,7 @@ const SERVER_CHAT_BUBBLE_ID: u32 = 220005; const SERVER_CHAT_HISTORY: [&str; 5] = [ "'dvd' render a dvd bouncing effect. you need to put the image into your game folder, with name \"image.png\"", "'sync'", - "'mc {mc_id}' mc_id can be set from 8001 to 8006", + "'mc {mc_id}' mc_id can be set from 8001 to 8008", "'march {march_id}' march_id can be set 1001 or 1224", "available command:", ]; diff --git a/gameserver/src/net/handlers/mod.rs b/gameserver/src/net/handlers/mod.rs index b10b904..378795e 100644 --- a/gameserver/src/net/handlers/mod.rs +++ b/gameserver/src/net/handlers/mod.rs @@ -135,5 +135,5 @@ dummy! { // PlayerLoginFinish, InteractProp, FinishTalkMission, - RelicRecommend + // RelicRecommend } diff --git a/gameserver/src/net/handlers/player.rs b/gameserver/src/net/handlers/player.rs index 2457fe5..2fb1972 100644 --- a/gameserver/src/net/handlers/player.rs +++ b/gameserver/src/net/handlers/player.rs @@ -23,7 +23,7 @@ pub async fn on_player_heart_beat_cs_req( res: &mut PlayerHeartBeatScRsp, ) { res.client_time_ms = body.client_time_ms; - res.server_time_ms = cur_timestamp_ms(); + res.server_time_ms = body.client_time_ms; res.download_data = Some(ClientDownloadData { version: 51, time: res.server_time_ms as i64, diff --git a/gameserver/src/net/packet.rs b/gameserver/src/net/packet.rs index c043d1b..b4160f3 100644 --- a/gameserver/src/net/packet.rs +++ b/gameserver/src/net/packet.rs @@ -18,12 +18,13 @@ use proto::{ CmdMuseumType::*, CmdOfferingType::*, CmdPamMissionType::*, CmdPhoneType::*, CmdPlayerBoardType::*, CmdPlayerReturnType::*, CmdPlayerSync::*, CmdPlayerType::*, CmdPlotType::*, CmdPunkLordType::*, CmdQuestType::*, CmdRaidCollectionType::*, CmdRaidType::*, - CmdRedDotType::*, CmdReplayType::*, CmdRndOptionType::*, CmdRogueCommonType::*, - CmdRogueEndless::*, CmdRogueModifierType::*, CmdRogueTournType::*, CmdRogueType::*, - CmdRollShopType::*, CmdSceneType::*, CmdServerPrefsType::*, CmdShopType::*, CmdSpaceZooType::*, - CmdStarFightType::*, CmdStoryLineType::*, CmdStrongChallengeActivityType::*, - CmdTalkRewardType::*, CmdTelevisionActivityType::*, CmdTextJoinType::*, CmdTrainVisitorType::*, - CmdTreasureDungeonType::*, CmdTutorialType::*, CmdWaypointType::*, CmdWolfBroType::*, + CmdRecommendType::*, CmdRedDotType::*, CmdReplayType::*, CmdRndOptionType::*, + CmdRogueCommonType::*, CmdRogueEndless::*, CmdRogueModifierType::*, CmdRogueTournType::*, + CmdRogueType::*, CmdRollShopType::*, CmdSceneType::*, CmdServerPrefsType::*, CmdShopType::*, + CmdSpaceZooType::*, CmdStarFightType::*, CmdStoryLineType::*, + CmdStrongChallengeActivityType::*, CmdTalkRewardType::*, CmdTelevisionActivityType::*, + CmdTextJoinType::*, CmdTrainVisitorType::*, CmdTreasureDungeonType::*, CmdTutorialType::*, + CmdWaypointType::*, CmdWolfBroType::*, }; use super::handlers::*; @@ -217,4 +218,5 @@ trait_handler! { GetGachaInfo; DoGacha; PlayerLoginFinish; + RelicRecommend; }