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

1

Browse Source
This commit is contained in:
aozhiwei 2021-06-23 03:56:07 +00:00
commit 4f4dd25783
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/framemaker.cc
View File

@ -18,6 +18,7 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
cs::MFPlane* p = msg->mutable_plane(); cs::MFPlane* p = msg->mutable_plane();
TypeConvert::ToPb(room->plane.start_point, p->mutable_start_point()); TypeConvert::ToPb(room->plane.start_point, p->mutable_start_point());
TypeConvert::ToPb(room->plane.end_point, p->mutable_end_point()); TypeConvert::ToPb(room->plane.end_point, p->mutable_end_point());
TypeConvert::ToPb(room->plane.curr_pos, p->mutable_pos());
} }
for (auto& itr : hum->new_objects) { for (auto& itr : hum->new_objects) {
#ifdef DEBUG #ifdef DEBUG

6
server/gameserver/obstacle.cc
View File

@ -184,9 +184,9 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
} }
if (GetInteractionData(hum)) { if (GetInteractionData(hum)) {
#if 1 #if 1
p->set_button_name("脱离"); p->set_button_name("3");
#else #else
p->set_button_name("1"); p->set_button_name("脱离");
#endif #endif
} else { } else {
#if 1 #if 1
@ -201,7 +201,7 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
p->set_button_name(""); p->set_button_name("");
} else { } else {
#if 1 #if 1
p->set_button_name("3"); p->set_button_name("1");
#else #else
p->set_button_name("开启"); p->set_button_name("开启");
#endif #endif

1
server/tools/protobuild/cs_proto.proto
View File

@ -760,6 +760,7 @@ message MFPlane
{ {
optional MFVec2 start_point = 1; //飞机起点 optional MFVec2 start_point = 1; //飞机起点
optional MFVec2 end_point = 2; //飞机终点 optional MFVec2 end_point = 2; //飞机终点
optional MFVec2 pos = 3; //飞机当前位置
} }
//载具信息（用于小地图显示） //载具信息（用于小地图显示）