From b9df7db87cae75aec8b49e92b269e5c6c2d700e5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Apr 2024 10:30:09 +0800 Subject: [PATCH] 1 --- server/gameserver/framemaker.cc | 2 ++ server/gameserver/room.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc index 6df1adea..2663897a 100644 --- a/server/gameserver/framemaker.cc +++ b/server/gameserver/framemaker.cc @@ -639,7 +639,9 @@ void FrameMaker::SerializeVoices(cs::SMUpdate* msg, Room* room, Human* hum, Fram { v->voice_id })); + #if 0 a8::XPrintf("InGameVoice %d:%s\n", {room->GetRoomIdx(), f8::PbToJson(msg)}); + #endif } #endif } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index e9c0ea58..6276672d 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3792,7 +3792,8 @@ void Room::MobaBatterysUpdate() glm::vec3 bullet_dir = target.Get()->GetPos().ToGlmVec3() - center; GlmHelper::Normalize(bullet_dir); - const mt::Equip* weapon_meta = mt::Equip::GetById(std::get<2>(tuple)); + //const mt::Equip* weapon_meta = mt::Equip::GetById(std::get<2>(tuple)); + const mt::Equip* weapon_meta = mt::Equip::GetById(21111); if (!weapon_meta) { #ifdef MYDEBUG abort();