diff --git a/ConfigData/AllConfigs.bytes b/ConfigData/AllConfigs.bytes index 5e5a668..85e3901 100644 Binary files a/ConfigData/AllConfigs.bytes and b/ConfigData/AllConfigs.bytes differ diff --git a/Scripts/DR_Generated/DROrderScene.cs b/Scripts/DR_Generated/DROrderScene.cs index cc368a8..00e059c 100644 --- a/Scripts/DR_Generated/DROrderScene.cs +++ b/Scripts/DR_Generated/DROrderScene.cs @@ -28,13 +28,13 @@ namespace CrazyMaple } /// - /// Sence + /// Level /// - public int Sence + public int Level { get { - return _configData?.Sence ?? 0; + return _configData?.Level ?? 0; } } diff --git a/Scripts/DR_Generated/DRPetCareItem.cs b/Scripts/DR_Generated/DRPetCareItem.cs index 18e3d81..972b029 100644 --- a/Scripts/DR_Generated/DRPetCareItem.cs +++ b/Scripts/DR_Generated/DRPetCareItem.cs @@ -181,6 +181,17 @@ namespace CrazyMaple } } + /// + /// Unlock + /// + public int Unlock + { + get + { + return _configData?.Unlock ?? 0; + } + } + /// /// 从配置加载数据（优先使用传入的配置实例） /// diff --git a/Scripts/DR_Generated/DRPetPlayJoyItem.cs b/Scripts/DR_Generated/DRPetPlayJoyItem.cs index 0f14040..659f49e 100644 --- a/Scripts/DR_Generated/DRPetPlayJoyItem.cs +++ b/Scripts/DR_Generated/DRPetPlayJoyItem.cs @@ -170,6 +170,17 @@ namespace CrazyMaple } } + /// + /// Unlock + /// + public int Unlock + { + get + { + return _configData?.Unlock ?? 0; + } + } + /// /// 从配置加载数据（优先使用传入的配置实例） /// diff --git a/Scripts/DR_Generated/DRPetShopItem.cs b/Scripts/DR_Generated/DRPetShopItem.cs index 333b428..e9a80c5 100644 --- a/Scripts/DR_Generated/DRPetShopItem.cs +++ b/Scripts/DR_Generated/DRPetShopItem.cs @@ -214,6 +214,17 @@ namespace CrazyMaple } } + /// + /// Unlock + /// + public int Unlock + { + get + { + return _configData?.Unlock ?? 0; + } + } + /// /// 从配置加载数据（优先使用传入的配置实例） /// diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/OrderSceneItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/OrderSceneItem.cs index 17d4547..2101dbc 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/OrderSceneItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/OrderSceneItem.cs @@ -41,7 +41,7 @@ namespace Byway.Thrift.Data public partial class OrderSceneItem : TBase { private int _Id; - private int _Sence; + private int _Level; private int _Factor; [DataMember(Order = 0)] @@ -59,16 +59,16 @@ namespace Byway.Thrift.Data } [DataMember(Order = 0)] - public int Sence + public int Level { get { - return _Sence; + return _Level; } set { - __isset.Sence = true; - this._Sence = value; + __isset.Level = true; + this._Level = value; } } @@ -95,7 +95,7 @@ namespace Byway.Thrift.Data [DataMember] public bool Id; [DataMember] - public bool Sence; + public bool Level; [DataMember] public bool Factor; } @@ -107,9 +107,9 @@ namespace Byway.Thrift.Data return __isset.Id; } - public bool ShouldSerializeSence() + public bool ShouldSerializeLevel() { - return __isset.Sence; + return __isset.Level; } public bool ShouldSerializeFactor() @@ -131,11 +131,11 @@ namespace Byway.Thrift.Data tmp0.Id = this.Id; } tmp0.__isset.Id = this.__isset.Id; - if(__isset.Sence) + if(__isset.Level) { - tmp0.Sence = this.Sence; + tmp0.Level = this.Level; } - tmp0.__isset.Sence = this.__isset.Sence; + tmp0.__isset.Level = this.__isset.Level; if(__isset.Factor) { tmp0.Factor = this.Factor; @@ -174,7 +174,7 @@ namespace Byway.Thrift.Data case 2: if (field.Type == TType.I32) { - Sence = await iprot.ReadI32Async(cancellationToken); + Level = await iprot.ReadI32Async(cancellationToken); } else { @@ -224,13 +224,13 @@ namespace Byway.Thrift.Data await oprot.WriteI32Async(Id, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if(__isset.Sence) + if(__isset.Level) { - tmp2.Name = "Sence"; + tmp2.Name = "Level"; tmp2.Type = TType.I32; tmp2.ID = 2; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteI32Async(Sence, cancellationToken); + await oprot.WriteI32Async(Level, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } if(__isset.Factor) @@ -256,7 +256,7 @@ namespace Byway.Thrift.Data if (!(that is OrderSceneItem 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.Sence == other.__isset.Sence) && ((!__isset.Sence) || (global::System.Object.Equals(Sence, other.Sence)))) + && ((__isset.Level == other.__isset.Level) && ((!__isset.Level) || (global::System.Object.Equals(Level, other.Level)))) && ((__isset.Factor == other.__isset.Factor) && ((!__isset.Factor) || (global::System.Object.Equals(Factor, other.Factor)))); } @@ -267,9 +267,9 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Id.GetHashCode(); } - if(__isset.Sence) + if(__isset.Level) { - hashcode = (hashcode * 397) + Sence.GetHashCode(); + hashcode = (hashcode * 397) + Level.GetHashCode(); } if(__isset.Factor) { @@ -289,11 +289,11 @@ namespace Byway.Thrift.Data tmp3.Append("Id: "); Id.ToString(tmp3); } - if(__isset.Sence) + if(__isset.Level) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("Sence: "); - Sence.ToString(tmp3); + tmp3.Append("Level: "); + Level.ToString(tmp3); } if(__isset.Factor) { diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetCareItemItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetCareItemItem.cs index 79790ef..f812597 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetCareItemItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetCareItemItem.cs @@ -55,6 +55,7 @@ namespace Byway.Thrift.Data private int _Sort; private string _Tex2D; private string _Name; + private int _Unlock; [DataMember(Order = 0)] public int Id @@ -266,6 +267,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public int Unlock + { + get + { + return _Unlock; + } + set + { + __isset.Unlock = true; + this._Unlock = value; + } + } + [DataMember(Order = 1)] public Isset __isset; @@ -302,6 +317,8 @@ namespace Byway.Thrift.Data public bool Tex2D; [DataMember] public bool Name; + [DataMember] + public bool Unlock; } #region XmlSerializer support @@ -381,6 +398,11 @@ namespace Byway.Thrift.Data return __isset.Name; } + public bool ShouldSerializeUnlock() + { + return __isset.Unlock; + } + #endregion XmlSerializer support public PetCareItemItem() @@ -465,6 +487,11 @@ namespace Byway.Thrift.Data tmp0.Name = this.Name; } tmp0.__isset.Name = this.__isset.Name; + if(__isset.Unlock) + { + tmp0.Unlock = this.Unlock; + } + tmp0.__isset.Unlock = this.__isset.Unlock; return tmp0; } @@ -635,6 +662,16 @@ namespace Byway.Thrift.Data await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); } break; + case 16: + if (field.Type == TType.I32) + { + Unlock = await iprot.ReadI32Async(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; default: await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); break; @@ -794,6 +831,15 @@ namespace Byway.Thrift.Data await oprot.WriteStringAsync(Name, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if(__isset.Unlock) + { + tmp2.Name = "Unlock"; + tmp2.Type = TType.I32; + tmp2.ID = 16; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteI32Async(Unlock, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } await oprot.WriteFieldStopAsync(cancellationToken); await oprot.WriteStructEndAsync(cancellationToken); } @@ -821,7 +867,8 @@ namespace Byway.Thrift.Data && ((__isset.Exp == other.__isset.Exp) && ((!__isset.Exp) || (global::System.Object.Equals(Exp, other.Exp)))) && ((__isset.Sort == other.__isset.Sort) && ((!__isset.Sort) || (global::System.Object.Equals(Sort, other.Sort)))) && ((__isset.Tex2D == other.__isset.Tex2D) && ((!__isset.Tex2D) || (global::System.Object.Equals(Tex2D, other.Tex2D)))) - && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))); + && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))) + && ((__isset.Unlock == other.__isset.Unlock) && ((!__isset.Unlock) || (global::System.Object.Equals(Unlock, other.Unlock)))); } public override int GetHashCode() { @@ -887,6 +934,10 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Name.GetHashCode(); } + if(__isset.Unlock) + { + hashcode = (hashcode * 397) + Unlock.GetHashCode(); + } } return hashcode; } @@ -985,6 +1036,12 @@ namespace Byway.Thrift.Data tmp3.Append("Name: "); Name.ToString(tmp3); } + if(__isset.Unlock) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("Unlock: "); + Unlock.ToString(tmp3); + } tmp3.Append(')'); return tmp3.ToString(); } diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetPlayJoyItemItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetPlayJoyItemItem.cs index 5686d66..b64170c 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetPlayJoyItemItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetPlayJoyItemItem.cs @@ -54,6 +54,7 @@ namespace Byway.Thrift.Data private int _Sort; private string _Tex2D; private string _Name; + private int _Unlock; [DataMember(Order = 0)] public int Id @@ -251,6 +252,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public int Unlock + { + get + { + return _Unlock; + } + set + { + __isset.Unlock = true; + this._Unlock = value; + } + } + [DataMember(Order = 1)] public Isset __isset; @@ -285,6 +300,8 @@ namespace Byway.Thrift.Data public bool Tex2D; [DataMember] public bool Name; + [DataMember] + public bool Unlock; } #region XmlSerializer support @@ -359,6 +376,11 @@ namespace Byway.Thrift.Data return __isset.Name; } + public bool ShouldSerializeUnlock() + { + return __isset.Unlock; + } + #endregion XmlSerializer support public PetPlayJoyItemItem() @@ -438,6 +460,11 @@ namespace Byway.Thrift.Data tmp0.Name = this.Name; } tmp0.__isset.Name = this.__isset.Name; + if(__isset.Unlock) + { + tmp0.Unlock = this.Unlock; + } + tmp0.__isset.Unlock = this.__isset.Unlock; return tmp0; } @@ -598,6 +625,16 @@ namespace Byway.Thrift.Data await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); } break; + case 15: + if (field.Type == TType.I32) + { + Unlock = await iprot.ReadI32Async(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; default: await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); break; @@ -748,6 +785,15 @@ namespace Byway.Thrift.Data await oprot.WriteStringAsync(Name, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if(__isset.Unlock) + { + tmp2.Name = "Unlock"; + tmp2.Type = TType.I32; + tmp2.ID = 15; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteI32Async(Unlock, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } await oprot.WriteFieldStopAsync(cancellationToken); await oprot.WriteStructEndAsync(cancellationToken); } @@ -774,7 +820,8 @@ namespace Byway.Thrift.Data && ((__isset.Exp == other.__isset.Exp) && ((!__isset.Exp) || (global::System.Object.Equals(Exp, other.Exp)))) && ((__isset.Sort == other.__isset.Sort) && ((!__isset.Sort) || (global::System.Object.Equals(Sort, other.Sort)))) && ((__isset.Tex2D == other.__isset.Tex2D) && ((!__isset.Tex2D) || (global::System.Object.Equals(Tex2D, other.Tex2D)))) - && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))); + && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))) + && ((__isset.Unlock == other.__isset.Unlock) && ((!__isset.Unlock) || (global::System.Object.Equals(Unlock, other.Unlock)))); } public override int GetHashCode() { @@ -836,6 +883,10 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Name.GetHashCode(); } + if(__isset.Unlock) + { + hashcode = (hashcode * 397) + Unlock.GetHashCode(); + } } return hashcode; } @@ -928,6 +979,12 @@ namespace Byway.Thrift.Data tmp3.Append("Name: "); Name.ToString(tmp3); } + if(__isset.Unlock) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("Unlock: "); + Unlock.ToString(tmp3); + } tmp3.Append(')'); return tmp3.ToString(); } diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetShopItemItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetShopItemItem.cs index 496737e..a683f83 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetShopItemItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/PetShopItemItem.cs @@ -58,6 +58,7 @@ namespace Byway.Thrift.Data private int _Cooldown; private int _Dailystorage; private string _Name; + private int _Unlock; [DataMember(Order = 0)] public int Id @@ -311,6 +312,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public int Unlock + { + get + { + return _Unlock; + } + set + { + __isset.Unlock = true; + this._Unlock = value; + } + } + [DataMember(Order = 1)] public Isset __isset; @@ -353,6 +368,8 @@ namespace Byway.Thrift.Data public bool Dailystorage; [DataMember] public bool Name; + [DataMember] + public bool Unlock; } #region XmlSerializer support @@ -447,6 +464,11 @@ namespace Byway.Thrift.Data return __isset.Name; } + public bool ShouldSerializeUnlock() + { + return __isset.Unlock; + } + #endregion XmlSerializer support public PetShopItemItem() @@ -546,6 +568,11 @@ namespace Byway.Thrift.Data tmp0.Name = this.Name; } tmp0.__isset.Name = this.__isset.Name; + if(__isset.Unlock) + { + tmp0.Unlock = this.Unlock; + } + tmp0.__isset.Unlock = this.__isset.Unlock; return tmp0; } @@ -746,6 +773,16 @@ namespace Byway.Thrift.Data await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); } break; + case 19: + if (field.Type == TType.I32) + { + Unlock = await iprot.ReadI32Async(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; default: await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); break; @@ -932,6 +969,15 @@ namespace Byway.Thrift.Data await oprot.WriteStringAsync(Name, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if(__isset.Unlock) + { + tmp2.Name = "Unlock"; + tmp2.Type = TType.I32; + tmp2.ID = 19; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteI32Async(Unlock, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } await oprot.WriteFieldStopAsync(cancellationToken); await oprot.WriteStructEndAsync(cancellationToken); } @@ -962,7 +1008,8 @@ namespace Byway.Thrift.Data && ((__isset.Exp == other.__isset.Exp) && ((!__isset.Exp) || (global::System.Object.Equals(Exp, other.Exp)))) && ((__isset.Cooldown == other.__isset.Cooldown) && ((!__isset.Cooldown) || (global::System.Object.Equals(Cooldown, other.Cooldown)))) && ((__isset.Dailystorage == other.__isset.Dailystorage) && ((!__isset.Dailystorage) || (global::System.Object.Equals(Dailystorage, other.Dailystorage)))) - && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))); + && ((__isset.Name == other.__isset.Name) && ((!__isset.Name) || (global::System.Object.Equals(Name, other.Name)))) + && ((__isset.Unlock == other.__isset.Unlock) && ((!__isset.Unlock) || (global::System.Object.Equals(Unlock, other.Unlock)))); } public override int GetHashCode() { @@ -1040,6 +1087,10 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Name.GetHashCode(); } + if(__isset.Unlock) + { + hashcode = (hashcode * 397) + Unlock.GetHashCode(); + } } return hashcode; } @@ -1156,6 +1207,12 @@ namespace Byway.Thrift.Data tmp3.Append("Name: "); Name.ToString(tmp3); } + if(__isset.Unlock) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("Unlock: "); + Unlock.ToString(tmp3); + } tmp3.Append(')'); return tmp3.ToString(); }