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 2022-12-20 11:34:49 +08:00
parent 6452f850e1
commit ca90cab7b8
4 changed files with 11 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/framemaker.cc
View File

@ -159,7 +159,8 @@ void FrameMaker::PostProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameDat
} }
if (room->GetGasData().GetGasMode() == GasMoving) { if (room->GetGasData().GetGasMode() == GasMoving) {
msg->set_gas_progress(room->GetGasData().gas_progress); msg->set_gas_progress(room->GetGasData().gas_progress);
TypeConvert::ToPb(room->GetGasData().pos_old, msg->mutable_gas_pos_old()); glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);
TypeConvert::ToPb(v3, msg->mutable_gas_pos_old());
} }
if (room->GetFrameNo() - room->AliveCountChgFrameNo() <= 4 || if (room->GetFrameNo() - room->AliveCountChgFrameNo() <= 4 ||
room->GetFrameNo() - hum->join_frameno <= 2) { room->GetFrameNo() - hum->join_frameno <= 2) {

11
server/gameserver/human.cc
View File

@ -1711,8 +1711,15 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
gas_data->set_duration(0); gas_data->set_duration(0);
} }
} }
TypeConvert::ToPb(room->GetGasData().pos_old, gas_data->mutable_pos_old()); // 333
TypeConvert::ToPb(room->GetGasData().pos_new, gas_data->mutable_pos_new()); {
glm::vec3 v3(room->GetGasData().pos_old.x, 0.0f, room->GetGasData().pos_old.y);
TypeConvert::ToPb(v3, gas_data->mutable_pos_old());
}
{
glm::vec3 v3(room->GetGasData().pos_new.x, 0.0f, room->GetGasData().pos_new.y);
TypeConvert::ToPb(v3, gas_data->mutable_pos_new());
}
gas_data->set_rad_old(room->GetGasData().rad_old); gas_data->set_rad_old(room->GetGasData().rad_old);
gas_data->set_rad_new(room->GetGasData().rad_new); gas_data->set_rad_new(room->GetGasData().rad_new);
} }

35
server/gameserver/typeconvert.cc
View File

@ -6,22 +6,6 @@
namespace TypeConvert namespace TypeConvert
{ {
void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj)
{
pb_obj->set_x(v.x);
pb_obj->set_y(v.y);
}
void ToPb(const Position& v, cs::MFVec2* pb_obj)
{
#ifdef SXY
pb_obj->set_x(v.x);
pb_obj->set_y(v.z);
#else
pb_obj->set_x(v.x);
pb_obj->set_y(v.y);
#endif
}
void ToPb(const Position v, cs::MFVec3* pb_obj) void ToPb(const Position v, cs::MFVec3* pb_obj)
{ {
@ -49,25 +33,6 @@ namespace TypeConvert
#endif #endif
} }
void ToPb(const a8::Vec2& v, cs::MFVec3* pb_obj)
{
pb_obj->set_x(v.x);
pb_obj->set_y(v.y);
pb_obj->set_z(0.0f);
}
void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj)
{
v.x = pb_obj->x();
v.y = pb_obj->y();
}
void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj)
{
v.x = pb_obj->x();
v.y = pb_obj->y();
}
void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj) void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj)
{ {
pb_obj->set_x(v.x); pb_obj->set_x(v.x);

6
server/gameserver/typeconvert.h
View File

@ -2,7 +2,6 @@
namespace cs namespace cs
{ {
class MFVec2;
class MFVec3; class MFVec3;
class MFOverReward; class MFOverReward;
} }
@ -11,13 +10,8 @@ struct OverReward;
namespace TypeConvert namespace TypeConvert
{ {
void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj);
void ToPb(const Position v, cs::MFVec2* pb_obj);
void ToPb(const Position v, cs::MFVec3* pb_obj); void ToPb(const Position v, cs::MFVec3* pb_obj);
void ToPb(const a8::Vec2& v, cs::MFVec3* pb_obj);
void ToPb(const glm::vec3& v, cs::MFVec3* pb_obj); void ToPb(const glm::vec3& v, cs::MFVec3* pb_obj);
void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj);
void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj);
void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj); void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj);
void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj); void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj);