挖矿表格重新生成

Scripts/DR_Generated/DRDailyTaskReward.cs

@@ -39,24 +39,24 @@ namespace CrazyMaple
         }
 
         /// <summary>
-        /// ItemReward
+        /// ItemID
         /// </summary>
-        public string ItemReward
+        public string ItemID
         {
             get
             {
-                return _configData?.ItemReward ?? "";
+                return _configData?.ItemID ?? "";
             }
         }
 
         /// <summary>
-        /// ScoreReward
+        /// PetCoinBase
         /// </summary>
-        public int ScoreReward
+        public int PetCoinBase
         {
             get
             {
-                return _configData?.ScoreReward ?? 0;
+                return _configData?.PetCoinBase ?? 0;
             }
         }
 

Scripts/DR_Generated/DRMiningReward.cs

@@ -28,13 +28,46 @@ namespace CrazyMaple
         }
 
         /// <summary>
-        /// Level
+        /// Template
         /// </summary>
-        public int Level
+        public int Template
         {
             get
             {
-                return _configData?.Level ?? 0;
+                return _configData?.Template ?? 0;
+            }
+        }
+
+        /// <summary>
+        /// Items
+        /// </summary>
+        public string Items
+        {
+            get
+            {
+                return _configData?.Items ?? "";
+            }
+        }
+
+        /// <summary>
+        /// StarReward
+        /// </summary>
+        public string StarReward
+        {
+            get
+            {
+                return _configData?.StarReward ?? "";
+            }
+        }
+
+        /// <summary>
+        /// Area
+        /// </summary>
+        public string Area
+        {
+            get
+            {
+                return _configData?.Area ?? "";
             }
         }
 
@@ -49,28 +82,6 @@ namespace CrazyMaple
             }
         }
 
-        /// <summary>
-        /// Size
-        /// </summary>
-        public string Size
-        {
-            get
-            {
-                return _configData?.Size ?? "";
-            }
-        }
-
-        /// <summary>
-        /// Reward
-        /// </summary>
-        public string Reward
-        {
-            get
-            {
-                return _configData?.Reward ?? "";
-            }
-        }
-
         /// <summary>
         /// 从配置加载数据（优先使用传入的配置实例）
         /// </summary>

Scripts/thrift/gen-netstd/Byway/Thrift/Data/DailyTaskRewardItem.cs

@@ -42,8 +42,8 @@ namespace Byway.Thrift.Data
   {
     private int _Id;
     private int _SortId;
-    private string _ItemReward;
-    private int _ScoreReward;
+    private string _ItemID;
+    private int _PetCoinBase;
 
     [DataMember(Order = 0)]
     public int Id
@@ -74,30 +74,30 @@ namespace Byway.Thrift.Data
     }
 
     [DataMember(Order = 0)]
-    public string ItemReward
+    public string ItemID
     {
       get
       {
-        return _ItemReward;
+        return _ItemID;
       }
       set
       {
-        __isset.ItemReward = true;
-        this._ItemReward = value;
+        __isset.ItemID = true;
+        this._ItemID = value;
       }
     }
 
     [DataMember(Order = 0)]
-    public int ScoreReward
+    public int PetCoinBase
     {
       get
       {
-        return _ScoreReward;
+        return _PetCoinBase;
       }
       set
       {
-        __isset.ScoreReward = true;
-        this._ScoreReward = value;
+        __isset.PetCoinBase = true;
+        this._PetCoinBase = value;
       }
     }
 
@@ -112,9 +112,9 @@ namespace Byway.Thrift.Data
       [DataMember]
       public bool SortId;
       [DataMember]
-      public bool ItemReward;
+      public bool ItemID;
       [DataMember]
-      public bool ScoreReward;
+      public bool PetCoinBase;
     }
 
     #region XmlSerializer support
@@ -129,14 +129,14 @@ namespace Byway.Thrift.Data
       return __isset.SortId;
     }
 
-    public bool ShouldSerializeItemReward()
+    public bool ShouldSerializeItemID()
     {
-      return __isset.ItemReward;
+      return __isset.ItemID;
     }
 
-    public bool ShouldSerializeScoreReward()
+    public bool ShouldSerializePetCoinBase()
     {
-      return __isset.ScoreReward;
+      return __isset.PetCoinBase;
     }
 
     #endregion XmlSerializer support
@@ -158,16 +158,16 @@ namespace Byway.Thrift.Data
         tmp0.SortId = this.SortId;
       }
       tmp0.__isset.SortId = this.__isset.SortId;
-      if((ItemReward != null) && __isset.ItemReward)
+      if((ItemID != null) && __isset.ItemID)
       {
-        tmp0.ItemReward = this.ItemReward;
+        tmp0.ItemID = this.ItemID;
       }
-      tmp0.__isset.ItemReward = this.__isset.ItemReward;
-      if(__isset.ScoreReward)
+      tmp0.__isset.ItemID = this.__isset.ItemID;
+      if(__isset.PetCoinBase)
       {
-        tmp0.ScoreReward = this.ScoreReward;
+        tmp0.PetCoinBase = this.PetCoinBase;
       }
-      tmp0.__isset.ScoreReward = this.__isset.ScoreReward;
+      tmp0.__isset.PetCoinBase = this.__isset.PetCoinBase;
       return tmp0;
     }
 
@@ -211,7 +211,7 @@ namespace Byway.Thrift.Data
             case 3:
               if (field.Type == TType.String)
               {
-                ItemReward = await iprot.ReadStringAsync(cancellationToken);
+                ItemID = await iprot.ReadStringAsync(cancellationToken);
               }
               else
               {
@@ -221,7 +221,7 @@ namespace Byway.Thrift.Data
             case 4:
               if (field.Type == TType.I32)
               {
-                ScoreReward = await iprot.ReadI32Async(cancellationToken);
+                PetCoinBase = await iprot.ReadI32Async(cancellationToken);
               }
               else
               {
@@ -270,22 +270,22 @@ namespace Byway.Thrift.Data
           await oprot.WriteI32Async(SortId, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
-        if((ItemReward != null) && __isset.ItemReward)
+        if((ItemID != null) && __isset.ItemID)
         {
-          tmp2.Name = "ItemReward";
+          tmp2.Name = "ItemID";
           tmp2.Type = TType.String;
           tmp2.ID = 3;
           await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
-          await oprot.WriteStringAsync(ItemReward, cancellationToken);
+          await oprot.WriteStringAsync(ItemID, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
-        if(__isset.ScoreReward)
+        if(__isset.PetCoinBase)
         {
-          tmp2.Name = "ScoreReward";
+          tmp2.Name = "PetCoinBase";
           tmp2.Type = TType.I32;
           tmp2.ID = 4;
           await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
-          await oprot.WriteI32Async(ScoreReward, cancellationToken);
+          await oprot.WriteI32Async(PetCoinBase, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
         await oprot.WriteFieldStopAsync(cancellationToken);
@@ -303,8 +303,8 @@ namespace Byway.Thrift.Data
       if (ReferenceEquals(this, other)) return true;
       return ((__isset.Id == other.__isset.Id) && ((!__isset.Id) || (global::System.Object.Equals(Id, other.Id))))
         && ((__isset.SortId == other.__isset.SortId) && ((!__isset.SortId) || (global::System.Object.Equals(SortId, other.SortId))))
-        && ((__isset.ItemReward == other.__isset.ItemReward) && ((!__isset.ItemReward) || (global::System.Object.Equals(ItemReward, other.ItemReward))))
-        && ((__isset.ScoreReward == other.__isset.ScoreReward) && ((!__isset.ScoreReward) || (global::System.Object.Equals(ScoreReward, other.ScoreReward))));
+        && ((__isset.ItemID == other.__isset.ItemID) && ((!__isset.ItemID) || (global::System.Object.Equals(ItemID, other.ItemID))))
+        && ((__isset.PetCoinBase == other.__isset.PetCoinBase) && ((!__isset.PetCoinBase) || (global::System.Object.Equals(PetCoinBase, other.PetCoinBase))));
     }
 
     public override int GetHashCode() {
@@ -318,13 +318,13 @@ namespace Byway.Thrift.Data
         {
           hashcode = (hashcode * 397) + SortId.GetHashCode();
         }
-        if((ItemReward != null) && __isset.ItemReward)
+        if((ItemID != null) && __isset.ItemID)
         {
-          hashcode = (hashcode * 397) + ItemReward.GetHashCode();
+          hashcode = (hashcode * 397) + ItemID.GetHashCode();
         }
-        if(__isset.ScoreReward)
+        if(__isset.PetCoinBase)
         {
-          hashcode = (hashcode * 397) + ScoreReward.GetHashCode();
+          hashcode = (hashcode * 397) + PetCoinBase.GetHashCode();
         }
       }
       return hashcode;
@@ -346,17 +346,17 @@ namespace Byway.Thrift.Data
         tmp3.Append("SortId: ");
         SortId.ToString(tmp3);
       }
-      if((ItemReward != null) && __isset.ItemReward)
+      if((ItemID != null) && __isset.ItemID)
       {
         if(0 < tmp4++) { tmp3.Append(", "); }
-        tmp3.Append("ItemReward: ");
-        ItemReward.ToString(tmp3);
+        tmp3.Append("ItemID: ");
+        ItemID.ToString(tmp3);
       }
-      if(__isset.ScoreReward)
+      if(__isset.PetCoinBase)
       {
         if(0 < tmp4++) { tmp3.Append(", "); }
-        tmp3.Append("ScoreReward: ");
-        ScoreReward.ToString(tmp3);
+        tmp3.Append("PetCoinBase: ");
+        PetCoinBase.ToString(tmp3);
       }
       tmp3.Append(')');
       return tmp3.ToString();

Scripts/thrift/gen-netstd/Byway/Thrift/Data/MiningRewardItem.cs

@@ -41,10 +41,11 @@ namespace Byway.Thrift.Data
   public partial class MiningRewardItem : TBase
   {
     private int _Id;
-    private int _Level;
+    private int _Template;
+    private string _Items;
+    private string _StarReward;
+    private string _Area;
     private string _Gem;
-    private string _Size;
-    private string _Reward;
 
     [DataMember(Order = 0)]
     public int Id
@@ -61,16 +62,58 @@ namespace Byway.Thrift.Data
     }
 
     [DataMember(Order = 0)]
-    public int Level
+    public int Template
     {
       get
       {
-        return _Level;
+        return _Template;
       }
       set
       {
-        __isset.Level = true;
-        this._Level = value;
+        __isset.Template = true;
+        this._Template = value;
+      }
+    }
+
+    [DataMember(Order = 0)]
+    public string Items
+    {
+      get
+      {
+        return _Items;
+      }
+      set
+      {
+        __isset.Items = true;
+        this._Items = value;
+      }
+    }
+
+    [DataMember(Order = 0)]
+    public string StarReward
+    {
+      get
+      {
+        return _StarReward;
+      }
+      set
+      {
+        __isset.StarReward = true;
+        this._StarReward = value;
+      }
+    }
+
+    [DataMember(Order = 0)]
+    public string Area
+    {
+      get
+      {
+        return _Area;
+      }
+      set
+      {
+        __isset.Area = true;
+        this._Area = value;
       }
     }
 
@@ -88,34 +131,6 @@ namespace Byway.Thrift.Data
       }
     }
 
-    [DataMember(Order = 0)]
-    public string Size
-    {
-      get
-      {
-        return _Size;
-      }
-      set
-      {
-        __isset.Size = true;
-        this._Size = value;
-      }
-    }
-
-    [DataMember(Order = 0)]
-    public string Reward
-    {
-      get
-      {
-        return _Reward;
-      }
-      set
-      {
-        __isset.Reward = true;
-        this._Reward = value;
-      }
-    }
-
 
     [DataMember(Order = 1)]
     public Isset __isset;
@@ -125,13 +140,15 @@ namespace Byway.Thrift.Data
       [DataMember]
       public bool Id;
       [DataMember]
-      public bool Level;
+      public bool Template;
+      [DataMember]
+      public bool Items;
+      [DataMember]
+      public bool StarReward;
+      [DataMember]
+      public bool Area;
       [DataMember]
       public bool Gem;
-      [DataMember]
-      public bool Size;
-      [DataMember]
-      public bool Reward;
     }
 
     #region XmlSerializer support
@@ -141,9 +158,24 @@ namespace Byway.Thrift.Data
       return __isset.Id;
     }
 
-    public bool ShouldSerializeLevel()
+    public bool ShouldSerializeTemplate()
     {
-      return __isset.Level;
+      return __isset.Template;
+    }
+
+    public bool ShouldSerializeItems()
+    {
+      return __isset.Items;
+    }
+
+    public bool ShouldSerializeStarReward()
+    {
+      return __isset.StarReward;
+    }
+
+    public bool ShouldSerializeArea()
+    {
+      return __isset.Area;
     }
 
     public bool ShouldSerializeGem()
@@ -151,16 +183,6 @@ namespace Byway.Thrift.Data
       return __isset.Gem;
     }
 
-    public bool ShouldSerializeSize()
-    {
-      return __isset.Size;
-    }
-
-    public bool ShouldSerializeReward()
-    {
-      return __isset.Reward;
-    }
-
     #endregion XmlSerializer support
 
     public MiningRewardItem()
@@ -175,26 +197,31 @@ namespace Byway.Thrift.Data
         tmp0.Id = this.Id;
       }
       tmp0.__isset.Id = this.__isset.Id;
-      if(__isset.Level)
+      if(__isset.Template)
       {
-        tmp0.Level = this.Level;
+        tmp0.Template = this.Template;
       }
-      tmp0.__isset.Level = this.__isset.Level;
+      tmp0.__isset.Template = this.__isset.Template;
+      if((Items != null) && __isset.Items)
+      {
+        tmp0.Items = this.Items;
+      }
+      tmp0.__isset.Items = this.__isset.Items;
+      if((StarReward != null) && __isset.StarReward)
+      {
+        tmp0.StarReward = this.StarReward;
+      }
+      tmp0.__isset.StarReward = this.__isset.StarReward;
+      if((Area != null) && __isset.Area)
+      {
+        tmp0.Area = this.Area;
+      }
+      tmp0.__isset.Area = this.__isset.Area;
       if((Gem != null) && __isset.Gem)
       {
         tmp0.Gem = this.Gem;
       }
       tmp0.__isset.Gem = this.__isset.Gem;
-      if((Size != null) && __isset.Size)
-      {
-        tmp0.Size = this.Size;
-      }
-      tmp0.__isset.Size = this.__isset.Size;
-      if((Reward != null) && __isset.Reward)
-      {
-        tmp0.Reward = this.Reward;
-      }
-      tmp0.__isset.Reward = this.__isset.Reward;
       return tmp0;
     }
 
@@ -228,7 +255,7 @@ namespace Byway.Thrift.Data
             case 2:
               if (field.Type == TType.I32)
               {
-                Level = await iprot.ReadI32Async(cancellationToken);
+                Template = await iprot.ReadI32Async(cancellationToken);
               }
               else
               {
@@ -238,7 +265,7 @@ namespace Byway.Thrift.Data
             case 3:
               if (field.Type == TType.String)
               {
-                Gem = await iprot.ReadStringAsync(cancellationToken);
+                Items = await iprot.ReadStringAsync(cancellationToken);
               }
               else
               {
@@ -248,7 +275,7 @@ namespace Byway.Thrift.Data
             case 4:
               if (field.Type == TType.String)
               {
-                Size = await iprot.ReadStringAsync(cancellationToken);
+                StarReward = await iprot.ReadStringAsync(cancellationToken);
               }
               else
               {
@@ -258,7 +285,17 @@ namespace Byway.Thrift.Data
             case 5:
               if (field.Type == TType.String)
               {
-                Reward = await iprot.ReadStringAsync(cancellationToken);
+                Area = await iprot.ReadStringAsync(cancellationToken);
+              }
+              else
+              {
+                await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken);
+              }
+              break;
+            case 6:
+              if (field.Type == TType.String)
+              {
+                Gem = await iprot.ReadStringAsync(cancellationToken);
               }
               else
               {
@@ -298,42 +335,51 @@ namespace Byway.Thrift.Data
           await oprot.WriteI32Async(Id, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
-        if(__isset.Level)
+        if(__isset.Template)
         {
-          tmp2.Name = "Level";
+          tmp2.Name = "Template";
           tmp2.Type = TType.I32;
           tmp2.ID = 2;
           await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
-          await oprot.WriteI32Async(Level, cancellationToken);
+          await oprot.WriteI32Async(Template, cancellationToken);
+          await oprot.WriteFieldEndAsync(cancellationToken);
+        }
+        if((Items != null) && __isset.Items)
+        {
+          tmp2.Name = "Items";
+          tmp2.Type = TType.String;
+          tmp2.ID = 3;
+          await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
+          await oprot.WriteStringAsync(Items, cancellationToken);
+          await oprot.WriteFieldEndAsync(cancellationToken);
+        }
+        if((StarReward != null) && __isset.StarReward)
+        {
+          tmp2.Name = "StarReward";
+          tmp2.Type = TType.String;
+          tmp2.ID = 4;
+          await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
+          await oprot.WriteStringAsync(StarReward, cancellationToken);
+          await oprot.WriteFieldEndAsync(cancellationToken);
+        }
+        if((Area != null) && __isset.Area)
+        {
+          tmp2.Name = "Area";
+          tmp2.Type = TType.String;
+          tmp2.ID = 5;
+          await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
+          await oprot.WriteStringAsync(Area, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
         if((Gem != null) && __isset.Gem)
         {
           tmp2.Name = "Gem";
           tmp2.Type = TType.String;
-          tmp2.ID = 3;
+          tmp2.ID = 6;
           await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
           await oprot.WriteStringAsync(Gem, cancellationToken);
           await oprot.WriteFieldEndAsync(cancellationToken);
         }
-        if((Size != null) && __isset.Size)
-        {
-          tmp2.Name = "Size";
-          tmp2.Type = TType.String;
-          tmp2.ID = 4;
-          await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
-          await oprot.WriteStringAsync(Size, cancellationToken);
-          await oprot.WriteFieldEndAsync(cancellationToken);
-        }
-        if((Reward != null) && __isset.Reward)
-        {
-          tmp2.Name = "Reward";
-          tmp2.Type = TType.String;
-          tmp2.ID = 5;
-          await oprot.WriteFieldBeginAsync(tmp2, cancellationToken);
-          await oprot.WriteStringAsync(Reward, cancellationToken);
-          await oprot.WriteFieldEndAsync(cancellationToken);
-        }
         await oprot.WriteFieldStopAsync(cancellationToken);
         await oprot.WriteStructEndAsync(cancellationToken);
       }
@@ -348,10 +394,11 @@ namespace Byway.Thrift.Data
       if (!(that is MiningRewardItem 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.Level == other.__isset.Level) && ((!__isset.Level) || (global::System.Object.Equals(Level, other.Level))))
-        && ((__isset.Gem == other.__isset.Gem) && ((!__isset.Gem) || (global::System.Object.Equals(Gem, other.Gem))))
-        && ((__isset.Size == other.__isset.Size) && ((!__isset.Size) || (global::System.Object.Equals(Size, other.Size))))
-        && ((__isset.Reward == other.__isset.Reward) && ((!__isset.Reward) || (global::System.Object.Equals(Reward, other.Reward))));
+        && ((__isset.Template == other.__isset.Template) && ((!__isset.Template) || (global::System.Object.Equals(Template, other.Template))))
+        && ((__isset.Items == other.__isset.Items) && ((!__isset.Items) || (global::System.Object.Equals(Items, other.Items))))
+        && ((__isset.StarReward == other.__isset.StarReward) && ((!__isset.StarReward) || (global::System.Object.Equals(StarReward, other.StarReward))))
+        && ((__isset.Area == other.__isset.Area) && ((!__isset.Area) || (global::System.Object.Equals(Area, other.Area))))
+        && ((__isset.Gem == other.__isset.Gem) && ((!__isset.Gem) || (global::System.Object.Equals(Gem, other.Gem))));
     }
 
     public override int GetHashCode() {
@@ -361,22 +408,26 @@ namespace Byway.Thrift.Data
         {
           hashcode = (hashcode * 397) + Id.GetHashCode();
         }
-        if(__isset.Level)
+        if(__isset.Template)
         {
-          hashcode = (hashcode * 397) + Level.GetHashCode();
+          hashcode = (hashcode * 397) + Template.GetHashCode();
+        }
+        if((Items != null) && __isset.Items)
+        {
+          hashcode = (hashcode * 397) + Items.GetHashCode();
+        }
+        if((StarReward != null) && __isset.StarReward)
+        {
+          hashcode = (hashcode * 397) + StarReward.GetHashCode();
+        }
+        if((Area != null) && __isset.Area)
+        {
+          hashcode = (hashcode * 397) + Area.GetHashCode();
         }
         if((Gem != null) && __isset.Gem)
         {
           hashcode = (hashcode * 397) + Gem.GetHashCode();
         }
-        if((Size != null) && __isset.Size)
-        {
-          hashcode = (hashcode * 397) + Size.GetHashCode();
-        }
-        if((Reward != null) && __isset.Reward)
-        {
-          hashcode = (hashcode * 397) + Reward.GetHashCode();
-        }
       }
       return hashcode;
     }
@@ -391,11 +442,29 @@ namespace Byway.Thrift.Data
         tmp3.Append("Id: ");
         Id.ToString(tmp3);
       }
-      if(__isset.Level)
+      if(__isset.Template)
       {
         if(0 < tmp4++) { tmp3.Append(", "); }
-        tmp3.Append("Level: ");
-        Level.ToString(tmp3);
+        tmp3.Append("Template: ");
+        Template.ToString(tmp3);
+      }
+      if((Items != null) && __isset.Items)
+      {
+        if(0 < tmp4++) { tmp3.Append(", "); }
+        tmp3.Append("Items: ");
+        Items.ToString(tmp3);
+      }
+      if((StarReward != null) && __isset.StarReward)
+      {
+        if(0 < tmp4++) { tmp3.Append(", "); }
+        tmp3.Append("StarReward: ");
+        StarReward.ToString(tmp3);
+      }
+      if((Area != null) && __isset.Area)
+      {
+        if(0 < tmp4++) { tmp3.Append(", "); }
+        tmp3.Append("Area: ");
+        Area.ToString(tmp3);
       }
       if((Gem != null) && __isset.Gem)
       {
@@ -403,18 +472,6 @@ namespace Byway.Thrift.Data
         tmp3.Append("Gem: ");
         Gem.ToString(tmp3);
       }
-      if((Size != null) && __isset.Size)
-      {
-        if(0 < tmp4++) { tmp3.Append(", "); }
-        tmp3.Append("Size: ");
-        Size.ToString(tmp3);
-      }
-      if((Reward != null) && __isset.Reward)
-      {
-        if(0 < tmp4++) { tmp3.Append(", "); }
-        tmp3.Append("Reward: ");
-        Reward.ToString(tmp3);
-      }
       tmp3.Append(')');
       return tmp3.ToString();
     }