From f81da6db9020e91fc410568b7cd0ec4a4beb2f44 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 2 Jan 2024 16:13:41 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 15 ++++++++++-----
 server/gameserver/roommgr.cc |  9 ++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 5f479888..68ab51c5 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -1132,11 +1132,6 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
         }
         *msg.mutable_settlement() = *p->settlement;
     }
-#ifdef MYDEBUG
-    if (IsPlayer()) {
-        a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
-    }
-#endif
 }
 
 void Human::SendNewBieEnd()
@@ -1565,6 +1560,11 @@ void Human::SendGameOver()
             cs::SMGameOver msg;
             FillSMGameOver(msg);
             SendNotifyMsg(msg);
+#ifdef MYDEBUG
+            if (IsPlayer()) {
+                a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
+            }
+#endif
         } else {
             CalcStats();
             if (IsPlayer() && !sent_personal_report_) {
@@ -1580,6 +1580,11 @@ void Human::SendGameOver()
                 cs::SMGameOver msg;
                 FillSMGameOver(msg);
                 SendNotifyMsg(msg);
+#ifdef MYDEBUG
+                if (IsPlayer()) {
+                    a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
+                }
+#endif
             }
         }
     }
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index e5bedbff..1c2cd8de 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -121,11 +121,10 @@ void RoomMgr::_CMJoin(f8::MsgHdr* hdr, const cs::CMJoin& msg)
         cs::CMJoin* mutable_msg = (cs::CMJoin*)&msg;
         AdjustCMJoin(mutable_msg);
 #ifdef MYDEBUG
-        a8::XPrintf("AdjustCMJoinAfter room_mode:%d pve_instance_id:%d\n",
+        a8::XPrintf("AdjustCMJoinAfter %s\n",
                     {
-                        msg.room_mode(),
-                            msg.pve_instance_id()
-                            });
+                     f8::PbToJson(&msg)
+                    });
 #endif
     }
     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());
     if (map_meta && map_meta->is_moba()) {
         msg->set_room_mode(kMobaMode);
-#if 1
+#if 0
         {
             auto data = a8::MutableXObject::CreateObject();
             data->SetVal("zone_id", 1);