server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-01-02 16:13:41 +08:00
parent 87a368201f
commit f81da6db90
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/gameserver/pbutils.cc
View File

@ -1132,11 +1132,6 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
} }
*msg.mutable_settlement() = *p->settlement; *msg.mutable_settlement() = *p->settlement;
} }
#ifdef MYDEBUG
if (IsPlayer()) {
a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
}
#endif
} }
void Human::SendNewBieEnd() void Human::SendNewBieEnd()
@ -1565,6 +1560,11 @@ void Human::SendGameOver()
cs::SMGameOver msg; cs::SMGameOver msg;
FillSMGameOver(msg); FillSMGameOver(msg);
SendNotifyMsg(msg); SendNotifyMsg(msg);
#ifdef MYDEBUG
if (IsPlayer()) {
a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
}
#endif
} else { } else {
CalcStats(); CalcStats();
if (IsPlayer() && !sent_personal_report_) { if (IsPlayer() && !sent_personal_report_) {
@ -1580,6 +1580,11 @@ void Human::SendGameOver()
cs::SMGameOver msg; cs::SMGameOver msg;
FillSMGameOver(msg); FillSMGameOver(msg);
SendNotifyMsg(msg); SendNotifyMsg(msg);
#ifdef MYDEBUG
if (IsPlayer()) {
a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
}
#endif
} }
} }
} }

9
server/gameserver/roommgr.cc
View File

@ -121,11 +121,10 @@ void RoomMgr::_CMJoin(f8::MsgHdr* hdr, const cs::CMJoin& msg)
cs::CMJoin* mutable_msg = (cs::CMJoin*)&msg; cs::CMJoin* mutable_msg = (cs::CMJoin*)&msg;
AdjustCMJoin(mutable_msg); AdjustCMJoin(mutable_msg);
#ifdef MYDEBUG #ifdef MYDEBUG
a8::XPrintf("AdjustCMJoinAfter room_mode:%d pve_instance_id:%d\n", a8::XPrintf("AdjustCMJoinAfter %s\n",
{ {
msg.room_mode(), f8::PbToJson(&msg)
msg.pve_instance_id() });
});
#endif #endif
} }
if (msg.force_enter_newbie_room()) { if (msg.force_enter_newbie_room()) {
@ -838,7 +837,7 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
const mt::Map* map_meta = mt::Map::GetById(msg->mapid()); const mt::Map* map_meta = mt::Map::GetById(msg->mapid());
if (map_meta && map_meta->is_moba()) { if (map_meta && map_meta->is_moba()) {
msg->set_room_mode(kMobaMode); msg->set_room_mode(kMobaMode);
#if 1 #if 0
{ {
auto data = a8::MutableXObject::CreateObject(); auto data = a8::MutableXObject::CreateObject();
data->SetVal("zone_id", 1); data->SetVal("zone_id", 1);