diff --git a/ConfigData/AllConfigs.bytes b/ConfigData/AllConfigs.bytes index 85e3901..69787e6 100644 Binary files a/ConfigData/AllConfigs.bytes and b/ConfigData/AllConfigs.bytes differ diff --git a/Scripts/DR_Generated/DRDialogData.cs b/Scripts/DR_Generated/DRDialogData.cs index 55f3ec4..5a45ace 100644 --- a/Scripts/DR_Generated/DRDialogData.cs +++ b/Scripts/DR_Generated/DRDialogData.cs @@ -28,35 +28,35 @@ namespace CrazyMaple } /// - /// PlotNode + /// Area /// - public string PlotNode + public int Area { get { - return _configData?.PlotNode ?? ""; + return _configData?.Area ?? 0; } } /// - /// SceneId + /// Building /// - public int SceneId + public int Building { get { - return _configData?.SceneId ?? 0; + return _configData?.Building ?? 0; } } /// - /// Group + /// BuildLv /// - public string Group + public int BuildLv { get { - return _configData?.Group ?? ""; + return _configData?.BuildLv ?? 0; } } @@ -71,6 +71,17 @@ namespace CrazyMaple } } + /// + /// Group + /// + public string Group + { + get + { + return _configData?.Group ?? ""; + } + } + /// /// Direct /// diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs index d4ea3be..b0fbabf 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs @@ -41,10 +41,11 @@ namespace Byway.Thrift.Data public partial class DialogDataItem : TBase { private int _Id; - private string _PlotNode; - private int _SceneId; - private string _Group; + private int _Area; + private int _Building; + private int _BuildLv; private int _SortId; + private string _Group; private string _Direct; private string _Icon; private string _Title; @@ -68,44 +69,44 @@ namespace Byway.Thrift.Data } [DataMember(Order = 0)] - public string PlotNode + public int Area { get { - return _PlotNode; + return _Area; } set { - __isset.PlotNode = true; - this._PlotNode = value; + __isset.Area = true; + this._Area = value; } } [DataMember(Order = 0)] - public int SceneId + public int Building { get { - return _SceneId; + return _Building; } set { - __isset.SceneId = true; - this._SceneId = value; + __isset.Building = true; + this._Building = value; } } [DataMember(Order = 0)] - public string Group + public int BuildLv { get { - return _Group; + return _BuildLv; } set { - __isset.@Group = true; - this._Group = value; + __isset.BuildLv = true; + this._BuildLv = value; } } @@ -123,6 +124,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public string Group + { + get + { + return _Group; + } + set + { + __isset.@Group = true; + this._Group = value; + } + } + [DataMember(Order = 0)] public string Direct { @@ -230,14 +245,16 @@ namespace Byway.Thrift.Data [DataMember] public bool Id; [DataMember] - public bool PlotNode; + public bool Area; [DataMember] - public bool SceneId; + public bool Building; [DataMember] - public bool @Group; + public bool BuildLv; [DataMember] public bool SortId; [DataMember] + public bool @Group; + [DataMember] public bool Direct; [DataMember] public bool Icon; @@ -260,19 +277,19 @@ namespace Byway.Thrift.Data return __isset.Id; } - public bool ShouldSerializePlotNode() + public bool ShouldSerializeArea() { - return __isset.PlotNode; + return __isset.Area; } - public bool ShouldSerializeSceneId() + public bool ShouldSerializeBuilding() { - return __isset.SceneId; + return __isset.Building; } - public bool ShouldSerializeGroup() + public bool ShouldSerializeBuildLv() { - return __isset.@Group; + return __isset.BuildLv; } public bool ShouldSerializeSortId() @@ -280,6 +297,11 @@ namespace Byway.Thrift.Data return __isset.SortId; } + public bool ShouldSerializeGroup() + { + return __isset.@Group; + } + public bool ShouldSerializeDirect() { return __isset.Direct; @@ -329,26 +351,31 @@ namespace Byway.Thrift.Data tmp0.Id = this.Id; } tmp0.__isset.Id = this.__isset.Id; - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - tmp0.PlotNode = this.PlotNode; + tmp0.Area = this.Area; } - tmp0.__isset.PlotNode = this.__isset.PlotNode; - if(__isset.SceneId) + tmp0.__isset.Area = this.__isset.Area; + if(__isset.Building) { - tmp0.SceneId = this.SceneId; + tmp0.Building = this.Building; } - tmp0.__isset.SceneId = this.__isset.SceneId; - if((Group != null) && __isset.@Group) + tmp0.__isset.Building = this.__isset.Building; + if(__isset.BuildLv) { - tmp0.Group = this.Group; + tmp0.BuildLv = this.BuildLv; } - tmp0.__isset.@Group = this.__isset.@Group; + tmp0.__isset.BuildLv = this.__isset.BuildLv; if(__isset.SortId) { tmp0.SortId = this.SortId; } tmp0.__isset.SortId = this.__isset.SortId; + if((Group != null) && __isset.@Group) + { + tmp0.Group = this.Group; + } + tmp0.__isset.@Group = this.__isset.@Group; if((Direct != null) && __isset.Direct) { tmp0.Direct = this.Direct; @@ -415,9 +442,9 @@ namespace Byway.Thrift.Data } break; case 2: - if (field.Type == TType.String) + if (field.Type == TType.I32) { - PlotNode = await iprot.ReadStringAsync(cancellationToken); + Area = await iprot.ReadI32Async(cancellationToken); } else { @@ -427,7 +454,7 @@ namespace Byway.Thrift.Data case 3: if (field.Type == TType.I32) { - SceneId = await iprot.ReadI32Async(cancellationToken); + Building = await iprot.ReadI32Async(cancellationToken); } else { @@ -435,9 +462,9 @@ namespace Byway.Thrift.Data } break; case 4: - if (field.Type == TType.String) + if (field.Type == TType.I32) { - Group = await iprot.ReadStringAsync(cancellationToken); + BuildLv = await iprot.ReadI32Async(cancellationToken); } else { @@ -457,7 +484,7 @@ namespace Byway.Thrift.Data case 6: if (field.Type == TType.String) { - Direct = await iprot.ReadStringAsync(cancellationToken); + Group = await iprot.ReadStringAsync(cancellationToken); } else { @@ -467,7 +494,7 @@ namespace Byway.Thrift.Data case 7: if (field.Type == TType.String) { - Icon = await iprot.ReadStringAsync(cancellationToken); + Direct = await iprot.ReadStringAsync(cancellationToken); } else { @@ -477,7 +504,7 @@ namespace Byway.Thrift.Data case 8: if (field.Type == TType.String) { - Title = await iprot.ReadStringAsync(cancellationToken); + Icon = await iprot.ReadStringAsync(cancellationToken); } else { @@ -487,7 +514,7 @@ namespace Byway.Thrift.Data case 9: if (field.Type == TType.String) { - Content = await iprot.ReadStringAsync(cancellationToken); + Title = await iprot.ReadStringAsync(cancellationToken); } else { @@ -497,7 +524,7 @@ namespace Byway.Thrift.Data case 10: if (field.Type == TType.String) { - BubbleType = await iprot.ReadStringAsync(cancellationToken); + Content = await iprot.ReadStringAsync(cancellationToken); } else { @@ -507,7 +534,7 @@ namespace Byway.Thrift.Data case 11: if (field.Type == TType.String) { - Phone = await iprot.ReadStringAsync(cancellationToken); + BubbleType = await iprot.ReadStringAsync(cancellationToken); } else { @@ -515,6 +542,16 @@ namespace Byway.Thrift.Data } break; case 12: + if (field.Type == TType.String) + { + Phone = await iprot.ReadStringAsync(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; + case 13: if (field.Type == TType.String) { Status = await iprot.ReadStringAsync(cancellationToken); @@ -557,31 +594,31 @@ namespace Byway.Thrift.Data await oprot.WriteI32Async(Id, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - tmp2.Name = "PlotNode"; - tmp2.Type = TType.String; + tmp2.Name = "Area"; + tmp2.Type = TType.I32; tmp2.ID = 2; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteStringAsync(PlotNode, cancellationToken); + await oprot.WriteI32Async(Area, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if(__isset.SceneId) + if(__isset.Building) { - tmp2.Name = "SceneId"; + tmp2.Name = "Building"; tmp2.Type = TType.I32; tmp2.ID = 3; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteI32Async(SceneId, cancellationToken); + await oprot.WriteI32Async(Building, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { - tmp2.Name = "Group"; - tmp2.Type = TType.String; + tmp2.Name = "BuildLv"; + tmp2.Type = TType.I32; tmp2.ID = 4; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteStringAsync(Group, cancellationToken); + await oprot.WriteI32Async(BuildLv, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } if(__isset.SortId) @@ -593,11 +630,20 @@ namespace Byway.Thrift.Data await oprot.WriteI32Async(SortId, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if((Group != null) && __isset.@Group) + { + tmp2.Name = "Group"; + tmp2.Type = TType.String; + tmp2.ID = 6; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteStringAsync(Group, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } if((Direct != null) && __isset.Direct) { tmp2.Name = "Direct"; tmp2.Type = TType.String; - tmp2.ID = 6; + tmp2.ID = 7; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Direct, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -606,7 +652,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Icon"; tmp2.Type = TType.String; - tmp2.ID = 7; + tmp2.ID = 8; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Icon, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -615,7 +661,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Title"; tmp2.Type = TType.String; - tmp2.ID = 8; + tmp2.ID = 9; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Title, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -624,7 +670,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Content"; tmp2.Type = TType.String; - tmp2.ID = 9; + tmp2.ID = 10; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Content, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -633,7 +679,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "BubbleType"; tmp2.Type = TType.String; - tmp2.ID = 10; + tmp2.ID = 11; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(BubbleType, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -642,7 +688,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Phone"; tmp2.Type = TType.String; - tmp2.ID = 11; + tmp2.ID = 12; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Phone, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -651,7 +697,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Status"; tmp2.Type = TType.String; - tmp2.ID = 12; + tmp2.ID = 13; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Status, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -670,10 +716,11 @@ namespace Byway.Thrift.Data if (!(that is DialogDataItem other)) return false; if (ReferenceEquals(this, other)) return true; return ((__isset.Id == other.__isset.Id) && ((!__isset.Id) || (global::System.Object.Equals(Id, other.Id)))) - && ((__isset.PlotNode == other.__isset.PlotNode) && ((!__isset.PlotNode) || (global::System.Object.Equals(PlotNode, other.PlotNode)))) - && ((__isset.SceneId == other.__isset.SceneId) && ((!__isset.SceneId) || (global::System.Object.Equals(SceneId, other.SceneId)))) - && ((__isset.@Group == other.__isset.@Group) && ((!__isset.@Group) || (global::System.Object.Equals(Group, other.Group)))) + && ((__isset.Area == other.__isset.Area) && ((!__isset.Area) || (global::System.Object.Equals(Area, other.Area)))) + && ((__isset.Building == other.__isset.Building) && ((!__isset.Building) || (global::System.Object.Equals(Building, other.Building)))) + && ((__isset.BuildLv == other.__isset.BuildLv) && ((!__isset.BuildLv) || (global::System.Object.Equals(BuildLv, other.BuildLv)))) && ((__isset.SortId == other.__isset.SortId) && ((!__isset.SortId) || (global::System.Object.Equals(SortId, other.SortId)))) + && ((__isset.@Group == other.__isset.@Group) && ((!__isset.@Group) || (global::System.Object.Equals(Group, other.Group)))) && ((__isset.Direct == other.__isset.Direct) && ((!__isset.Direct) || (global::System.Object.Equals(Direct, other.Direct)))) && ((__isset.Icon == other.__isset.Icon) && ((!__isset.Icon) || (global::System.Object.Equals(Icon, other.Icon)))) && ((__isset.Title == other.__isset.Title) && ((!__isset.Title) || (global::System.Object.Equals(Title, other.Title)))) @@ -690,22 +737,26 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Id.GetHashCode(); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - hashcode = (hashcode * 397) + PlotNode.GetHashCode(); + hashcode = (hashcode * 397) + Area.GetHashCode(); } - if(__isset.SceneId) + if(__isset.Building) { - hashcode = (hashcode * 397) + SceneId.GetHashCode(); + hashcode = (hashcode * 397) + Building.GetHashCode(); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { - hashcode = (hashcode * 397) + Group.GetHashCode(); + hashcode = (hashcode * 397) + BuildLv.GetHashCode(); } if(__isset.SortId) { hashcode = (hashcode * 397) + SortId.GetHashCode(); } + if((Group != null) && __isset.@Group) + { + hashcode = (hashcode * 397) + Group.GetHashCode(); + } if((Direct != null) && __isset.Direct) { hashcode = (hashcode * 397) + Direct.GetHashCode(); @@ -748,23 +799,23 @@ namespace Byway.Thrift.Data tmp3.Append("Id: "); Id.ToString(tmp3); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("PlotNode: "); - PlotNode.ToString(tmp3); + tmp3.Append("Area: "); + Area.ToString(tmp3); } - if(__isset.SceneId) + if(__isset.Building) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("SceneId: "); - SceneId.ToString(tmp3); + tmp3.Append("Building: "); + Building.ToString(tmp3); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("Group: "); - Group.ToString(tmp3); + tmp3.Append("BuildLv: "); + BuildLv.ToString(tmp3); } if(__isset.SortId) { @@ -772,6 +823,12 @@ namespace Byway.Thrift.Data tmp3.Append("SortId: "); SortId.ToString(tmp3); } + if((Group != null) && __isset.@Group) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("Group: "); + Group.ToString(tmp3); + } if((Direct != null) && __isset.Direct) { if(0 < tmp4++) { tmp3.Append(", "); }