From 250c19a1b1edd2ad67a4e81a8bd587923c9630ed Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 4 Jan 2023 11:28:15 +0800
Subject: [PATCH] 1

---
 server/gameserver/framemaker.cc        | 3 +++
 server/gameserver/room.h               | 1 +
 server/tools/protobuild/cs_proto.proto | 1 +
 3 files changed, 5 insertions(+)

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 6439a45e..c6d49f07 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -12,6 +12,8 @@
 #include "incubator.h"
 #include "frameeventdata.h"
 
+#include "mt/AirLine.h"
+
 void FrameMaker::Debug_FullObject(Human* hum)
 {
     #if 0
@@ -130,6 +132,7 @@ void FrameMaker::PreProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData
             TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
             TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
             TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
+            p->set_plane_speed(room->GetAirLine()->plane_speed());
         }
     }
     {
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index aa82b09b..fcf8e83f 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -210,6 +210,7 @@ public:
     bool CanAddObstacle(const glm::vec3& pos, int obstacle_id);
     void AddTask(int task_uniid, ITask* task);
     void RemoveTask(int task_uniid);
+    const mt::AirLine* GetAirLine() { return airline_; };
 
 private:
     void ShuaAndroid();
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 34251aed..4879fa4d 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -798,6 +798,7 @@ message MFPlane
     optional MFVec3 start_point = 1; //飞机起点
     optional MFVec3 end_point = 2; //飞机终点
     optional MFVec3 pos = 3; //飞机当前位置
+    optional float plane_speed = 4; //飞机速度(像素/秒)
 }
 
 //载具信息（用于小地图显示）