From b2d3125b989654bcf03bd569d286020b21e3c621 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 22 Jun 2021 11:32:18 +0800
Subject: [PATCH 1/3] 1

---
 third_party/a8engine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/a8engine b/third_party/a8engine
index b16f9a6..8932713 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit b16f9a6176bfac30c0e7d29ec6df37e750fd1c60
+Subproject commit 8932713766a5c0289966f08a5a0153a1ae493a9d

From df0b8571b067bed3c8b04a7f3b0862d3653ef603 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 22 Jun 2021 11:41:02 +0800
Subject: [PATCH 2/3] 1

---
 server/gameserver/obstacle.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index 78dc622..7219e89 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -183,9 +183,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
@@ -200,7 +200,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

From 226a5735bff4945c4aa4ffe182c69e277cbefad8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 22 Jun 2021 13:57:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A3=9E=E6=9C=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 78153af..f4c6289 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -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
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 54487b5..a6622fd 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -760,6 +760,7 @@ message MFPlane
 {
     optional MFVec2 start_point = 1; //飞机起点
     optional MFVec2 end_point = 2; //飞机终点
+    optional MFVec2 pos = 3; //飞机当前位置
 }
 
 //载具信息（用于小地图显示）