diff --git a/ConfigData/AllConfigs.bytes b/ConfigData/AllConfigs.bytes index dd6f204..890643f 100644 Binary files a/ConfigData/AllConfigs.bytes and b/ConfigData/AllConfigs.bytes differ diff --git a/Scripts/DR_Generated/DRLevelData.cs b/Scripts/DR_Generated/DRLevelData.cs index 9b6d2bf..8b07607 100644 --- a/Scripts/DR_Generated/DRLevelData.cs +++ b/Scripts/DR_Generated/DRLevelData.cs @@ -93,6 +93,17 @@ namespace CrazyMaple } } + /// + /// PetShow + /// + public string PetShow + { + get + { + return _configData?.PetShow ?? ""; + } + } + /// /// 从配置加载数据(优先使用传入的配置实例) /// diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/LevelDataItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/LevelDataItem.cs index 148e53e..297e1a7 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/LevelDataItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/LevelDataItem.cs @@ -47,6 +47,7 @@ namespace Byway.Thrift.Data private string _StoryReward; private string _PetReward; private string _RetireEmit; + private string _PetShow; [DataMember(Order = 0)] public int Id @@ -146,6 +147,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public string PetShow + { + get + { + return _PetShow; + } + set + { + __isset.PetShow = true; + this._PetShow = value; + } + } + [DataMember(Order = 1)] public Isset __isset; @@ -166,6 +181,8 @@ namespace Byway.Thrift.Data public bool PetReward; [DataMember] public bool RetireEmit; + [DataMember] + public bool PetShow; } #region XmlSerializer support @@ -205,6 +222,11 @@ namespace Byway.Thrift.Data return __isset.RetireEmit; } + public bool ShouldSerializePetShow() + { + return __isset.PetShow; + } + #endregion XmlSerializer support public LevelDataItem() @@ -249,6 +271,11 @@ namespace Byway.Thrift.Data tmp0.RetireEmit = this.RetireEmit; } tmp0.__isset.RetireEmit = this.__isset.RetireEmit; + if((PetShow != null) && __isset.PetShow) + { + tmp0.PetShow = this.PetShow; + } + tmp0.__isset.PetShow = this.__isset.PetShow; return tmp0; } @@ -339,6 +366,16 @@ namespace Byway.Thrift.Data await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); } break; + case 8: + if (field.Type == TType.String) + { + PetShow = await iprot.ReadStringAsync(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; default: await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); break; @@ -426,6 +463,15 @@ namespace Byway.Thrift.Data await oprot.WriteStringAsync(RetireEmit, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if((PetShow != null) && __isset.PetShow) + { + tmp2.Name = "PetShow"; + tmp2.Type = TType.String; + tmp2.ID = 8; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteStringAsync(PetShow, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } await oprot.WriteFieldStopAsync(cancellationToken); await oprot.WriteStructEndAsync(cancellationToken); } @@ -445,7 +491,8 @@ namespace Byway.Thrift.Data && ((__isset.PetExp == other.__isset.PetExp) && ((!__isset.PetExp) || (global::System.Object.Equals(PetExp, other.PetExp)))) && ((__isset.StoryReward == other.__isset.StoryReward) && ((!__isset.StoryReward) || (global::System.Object.Equals(StoryReward, other.StoryReward)))) && ((__isset.PetReward == other.__isset.PetReward) && ((!__isset.PetReward) || (global::System.Object.Equals(PetReward, other.PetReward)))) - && ((__isset.RetireEmit == other.__isset.RetireEmit) && ((!__isset.RetireEmit) || (global::System.Object.Equals(RetireEmit, other.RetireEmit)))); + && ((__isset.RetireEmit == other.__isset.RetireEmit) && ((!__isset.RetireEmit) || (global::System.Object.Equals(RetireEmit, other.RetireEmit)))) + && ((__isset.PetShow == other.__isset.PetShow) && ((!__isset.PetShow) || (global::System.Object.Equals(PetShow, other.PetShow)))); } public override int GetHashCode() { @@ -479,6 +526,10 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + RetireEmit.GetHashCode(); } + if((PetShow != null) && __isset.PetShow) + { + hashcode = (hashcode * 397) + PetShow.GetHashCode(); + } } return hashcode; } @@ -529,6 +580,12 @@ namespace Byway.Thrift.Data tmp3.Append("RetireEmit: "); RetireEmit.ToString(tmp3); } + if((PetShow != null) && __isset.PetShow) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("PetShow: "); + PetShow.ToString(tmp3); + } tmp3.Append(')'); return tmp3.ToString(); }