Browse Source

增加cabinid

master
wserver/wangdisen 3 years ago
parent
commit
3df612d08d
  1. 3
      Proto/OuterMessage.proto
  2. 5
      Server/Model/Generate/Message/OuterMessage.cs
  3. 2
      Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs
  4. 6
      Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs
  5. 5
      Unity/Codes/Model/Generate/Message/OuterMessage.cs

3
Proto/OuterMessage.proto

@ -1200,13 +1200,14 @@ message M2C_ConstructFinish // IActorLocationResponse
message FarmlandProto
{
int64 id = 1;
int64 Id = 1;
int32 CropCfgId = 2;
int32 PlantCfgId = 3;
int32 Duration = 4;
int32 ExProduct = 5;
int32 FarmlandState = 6;
long PeopleId = 7;
long CabinId = 8;
}
//ResponseType M2C_FarmlandPlant

5
Server/Model/Generate/Message/OuterMessage.cs

@ -2501,7 +2501,7 @@ namespace ET
public partial class FarmlandProto: Object
{
[ProtoMember(1)]
public long id { get; set; }
public long Id { get; set; }
[ProtoMember(2)]
public int CropCfgId { get; set; }
@ -2521,6 +2521,9 @@ namespace ET
[ProtoMember(7)]
public long PeopleId { get; set; }
[ProtoMember(8)]
public long CabinId { get; set; }
}
[ResponseType(nameof(M2C_FarmlandPlant))]

2
Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs

@ -14,7 +14,7 @@ namespace ET
self.IsUpgrade = buildingProto.IsUpgrade;
if (buildingProto.Farmland != null)
{
var farmland = self.AddChildWithId<Farmland>(buildingProto.Farmland.id);
var farmland = self.AddChildWithId<Farmland>(buildingProto.Farmland.Id);
farmland.FromMessage(buildingProto.Farmland);
}

6
Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs

@ -30,25 +30,27 @@ namespace ET
{
public static void FromMessage(this Farmland self, FarmlandProto farmlandProto)
{
self.Id = farmlandProto.id;
self.Id = farmlandProto.Id;
self.CropCfgId = farmlandProto.CropCfgId;
self.Duration = farmlandProto.Duration;
self.ExProduct = farmlandProto.ExProduct;
self.PlanCropCfgId = farmlandProto.PlantCfgId;
self.FarmlandState = farmlandProto.FarmlandState;
self.PeopleId = farmlandProto.PeopleId;
self.CabinId = farmlandProto.CabinId;
}
public static FarmlandProto ToMessage(this Farmland self)
{
FarmlandProto proto = new FarmlandProto();
proto.id = self.Id;
proto.Id = self.Id;
proto.CropCfgId = self.CropCfgId;
proto.Duration = self.Duration;
proto.ExProduct = self.ExProduct;
proto.PlantCfgId = self.PlanCropCfgId;
proto.FarmlandState = self.FarmlandState;
proto.PeopleId = self.PeopleId;
proto.CabinId = self.CabinId;
return proto;
}

5
Unity/Codes/Model/Generate/Message/OuterMessage.cs

@ -2501,7 +2501,7 @@ namespace ET
public partial class FarmlandProto: Object
{
[ProtoMember(1)]
public long id { get; set; }
public long Id { get; set; }
[ProtoMember(2)]
public int CropCfgId { get; set; }
@ -2521,6 +2521,9 @@ namespace ET
[ProtoMember(7)]
public long PeopleId { get; set; }
[ProtoMember(8)]
public long CabinId { get; set; }
}
[ResponseType(nameof(M2C_FarmlandPlant))]

Loading…
Cancel
Save