From 8c56a6ae631d0d35e09da792040da268010e8b1d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Apr 2024 20:56:12 +0800 Subject: [PATCH] 1 --- server/gameserver/netdata.cc | 4 ++-- server/gameserver/pbutils.cc | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index ed5c4653..a9c65731 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -302,8 +302,8 @@ private: return source_name; }); owner_.Get()->GetAbility()->SetSource(attr_handle, cb); - } #endif + } } } } @@ -334,8 +334,8 @@ private: return source_name; }); owner_.Get()->GetAbility()->SetSource(attr_handle, cb); - } #endif + } } } } diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 22e65c96..e6f07538 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2200,11 +2200,7 @@ void Human::PushJoinRoomMsg() notifymsg.set_error_code(0); notifymsg.set_server_info(JsonDataMgr::Instance()->server_info); room->FillSMJoinedNotify(this, notifymsg); - #ifdef MYDEBUG - //notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); - #else - //notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); - #endif + notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg); } {