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(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)]