1
This commit is contained in:
commit
4f4dd25783
@ -18,6 +18,7 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
|
||||
cs::MFPlane* p = msg->mutable_plane();
|
||||
TypeConvert::ToPb(room->plane.start_point, p->mutable_start_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) {
|
||||
#ifdef DEBUG
|
||||
|
@ -184,9 +184,9 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
|
||||
}
|
||||
if (GetInteractionData(hum)) {
|
||||
#if 1
|
||||
p->set_button_name("脱离");
|
||||
p->set_button_name("3");
|
||||
#else
|
||||
p->set_button_name("1");
|
||||
p->set_button_name("脱离");
|
||||
#endif
|
||||
} else {
|
||||
#if 1
|
||||
@ -201,7 +201,7 @@ void Obstacle::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_d
|
||||
p->set_button_name("");
|
||||
} else {
|
||||
#if 1
|
||||
p->set_button_name("3");
|
||||
p->set_button_name("1");
|
||||
#else
|
||||
p->set_button_name("开启");
|
||||
#endif
|
||||
|
@ -760,6 +760,7 @@ message MFPlane
|
||||
{
|
||||
optional MFVec2 start_point = 1; //飞机起点
|
||||
optional MFVec2 end_point = 2; //飞机终点
|
||||
optional MFVec2 pos = 3; //飞机当前位置
|
||||
}
|
||||
|
||||
//载具信息(用于小地图显示)
|
||||
|
Loading…
x
Reference in New Issue
Block a user