From d3a823c3456b6b5c22e83e6e6060c2f225c1edfe Mon Sep 17 00:00:00 2001
From: wserver/wangdisen <1065498738@qq.com>
Date: Fri, 12 Aug 2022 10:29:01 +0800
Subject: [PATCH] =?UTF-8?q?building=E5=A2=9E=E5=8A=A0=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Proto/OuterMessage.proto                           | 1 +
 Server/Model/Generate/Message/OuterMessage.cs      | 3 +++
 Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs | 5 ++++-
 Unity/Codes/Model/Generate/Message/OuterMessage.cs | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Proto/OuterMessage.proto b/Proto/OuterMessage.proto
index a1b169d..c1e1a85 100644
--- a/Proto/OuterMessage.proto
+++ b/Proto/OuterMessage.proto
@@ -66,6 +66,7 @@ message BuildingProto
 	float Y = 4;
 	int32 Durable = 5;
 	FarmlandProto Farmland = 6;
+	int32 IsUpgrade = 7;
 
 }
 
diff --git a/Server/Model/Generate/Message/OuterMessage.cs b/Server/Model/Generate/Message/OuterMessage.cs
index 4d918db..7143b05 100644
--- a/Server/Model/Generate/Message/OuterMessage.cs
+++ b/Server/Model/Generate/Message/OuterMessage.cs
@@ -143,6 +143,9 @@ namespace ET
 		[ProtoMember(6)]
 		public FarmlandProto Farmland { get; set; }
 
+		[ProtoMember(7)]
+		public int IsUpgrade { get; set; }
+
 	}
 
 	[Message(OuterOpcode.PeopleProto)]
diff --git a/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs b/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs
index 1eab3ae..a47df3d 100644
--- a/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs
+++ b/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs
@@ -11,6 +11,7 @@ namespace ET
             self.Position = new Vector2(buildingProto.X, buildingProto.Y);
             self.ConfigId = buildingProto.ConfigId;
             self.Durable = buildingProto.Durable;
+            self.IsUpgrade = buildingProto.IsUpgrade;
             if (buildingProto.Farmland != null)
             {
                 var farmland = self.AddChildWithId<Farmland>(buildingProto.Farmland.id);
@@ -24,7 +25,9 @@ namespace ET
                 ConfigId = self.ConfigId, 
                 X = self.Position.x, 
                 Y = self.Position.y,
-                Durable = self.Durable};
+                Durable = self.Durable,
+                IsUpgrade = self.IsUpgrade
+            };
             if (self.Config.Special == (int) StructureSpecialEnum.FARMLAND)
             {
                 foreach (var v in self.Children.Values)
diff --git a/Unity/Codes/Model/Generate/Message/OuterMessage.cs b/Unity/Codes/Model/Generate/Message/OuterMessage.cs
index 4d918db..7143b05 100644
--- a/Unity/Codes/Model/Generate/Message/OuterMessage.cs
+++ b/Unity/Codes/Model/Generate/Message/OuterMessage.cs
@@ -143,6 +143,9 @@ namespace ET
 		[ProtoMember(6)]
 		public FarmlandProto Farmland { get; set; }
 
+		[ProtoMember(7)]
+		public int IsUpgrade { get; set; }
+
 	}
 
 	[Message(OuterOpcode.PeopleProto)]