Update gacha avatars

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs

@@ -377,8 +377,7 @@ namespace GrasscutterTools.Forms
             ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups1"))),
             ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups2"))),
             ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups3"))),
-            ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups4"))),
+            ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups4")))});
-            ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups5")))});
             this.ListFallbackItems.HideSelection = false;
             this.ListFallbackItems.Name = "ListFallbackItems";
             this.ListFallbackItems.UseCompatibleStateImageBehavior = false;

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs

@@ -72,16 +72,13 @@ namespace GrasscutterTools.Forms
             ListFallbackItems.BeginUpdate();
             var a5 = ListFallbackItems.Groups["GroupA5"];
             var a4 = ListFallbackItems.Groups["GroupA4"];
-            var a3 = ListFallbackItems.Groups["GroupA3"];
             var w5 = ListFallbackItems.Groups["GroupW5"];
             var w4 = ListFallbackItems.Groups["GroupW4"];
             var w3 = ListFallbackItems.Groups["GroupW3"];
-            var avatars = GetAvatarsByColor("yellow")
+            var avatars = GetAvatarsByColor("5")
                 .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a5) { ForeColor = Color.OrangeRed })
-                .Concat(GetAvatarsByColor("purple")
+                .Concat(GetAvatarsByColor("4")
-                .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a4) { ForeColor = Color.Purple }))
+                .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a4) { ForeColor = Color.Purple }));
-                .Concat(GetAvatarsByColor("blue")
-                .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a3) { ForeColor = Color.Blue }));
             var weapons = GetWeaponsByColor("yellow")
                 .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, w5) { ForeColor = Color.OrangeRed })
                 .Concat(GetWeaponsByColor("purple")
@@ -96,9 +93,9 @@ namespace GrasscutterTools.Forms
             var ua4 = ListUpItems.Groups["GroupUpA4"];
             var uw5 = ListUpItems.Groups["GroupUpW5"];
             var uw4 = ListUpItems.Groups["GroupUpW4"];
-            var upAvatars = GetAvatarsByColor("yellow")
+            var upAvatars = GetAvatarsByColor("5")
                 .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, ua5) { ForeColor = Color.OrangeRed })
-                .Concat(GetAvatarsByColor("purple")
+                .Concat(GetAvatarsByColor("4")
                 .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, ua4) { ForeColor = Color.Purple }));
             var upWeapons = GetWeaponsByColor("yellow")
                 .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, uw5) { ForeColor = Color.OrangeRed })

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx

@@ -303,16 +303,6 @@
 </value>
   </data>
   <data name="ListFallbackItems.Groups4" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
-        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAA0zLXN0YXIgYXZhdGFyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdu
-        bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws=
-</value>
-  </data>
-  <data name="ListFallbackItems.Groups5" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx

@@ -131,21 +131,12 @@
   <data name="BtnGen.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
   </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 4, 3, 4</value>
-  </data>
   <data name="LblBannerType.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="&gt;&gt;RbCostItem223.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="GrpJson.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;GrpWeights.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="&gt;&gt;ChkRemoveC6FormPool.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -231,9 +222,6 @@
   <data name="&gt;&gt;ColUpName.Name" xml:space="preserve">
     <value>ColUpName</value>
   </data>
-  <data name="DTPEndTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>302, 173</value>
-  </data>
   <data name="&gt;&gt;ChkAutoStripRateUpFromFallback.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -246,6 +234,9 @@
   <data name="&gt;&gt;GrpBannerValues.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="LblEventChance5Tip.Text" xml:space="preserve">
+    <value>%</value>
+  </data>
   <data name="LblCostItem.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -280,6 +271,9 @@
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNQs=
 </value>
   </data>
+  <data name="ListUpItems.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;LblGachaType.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -316,15 +310,8 @@
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNAs=
 </value>
   </data>
-  <data name="ListFallbackItems.Groups5" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="ChkAutoStripRateUpFromFallback.Location" type="System.Drawing.Point, System.Drawing">
-    <value>
+    <value>217, 260</value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
-        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
-        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws=
-</value>
   </data>
   <data name="CmbBannerType.Items1" xml:space="preserve">
     <value>限时角色祈愿池</value>
@@ -359,15 +346,9 @@
   <data name="&gt;&gt;LblEventChance4Tip.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="LblPoolWeight5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
   <data name="LblCostItem.Text" xml:space="preserve">
     <value>祈愿道具</value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="TxtPoolWeight4.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 23</value>
   </data>
@@ -377,9 +358,6 @@
   <data name="&gt;&gt;NUDEventChance4.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>402, 0</value>
-  </data>
   <data name="LblEventChance4Tip.TabIndex" type="System.Int32, mscorlib">
     <value>89</value>
   </data>
@@ -410,11 +388,14 @@
   <data name="GrpUpPool.Text" xml:space="preserve">
     <value>UP池</value>
   </data>
+  <data name="TxtWeight5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 23</value>
+  </data>
   <data name="BtnParse.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="DTPBeginTime.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;LblOptions.Parent" xml:space="preserve">
-    <value>6</value>
+    <value>GrpBannerValues</value>
   </data>
   <data name="RbCostItem224.Size" type="System.Drawing.Size, System.Drawing">
     <value>74, 21</value>
@@ -431,8 +412,8 @@
   <data name="BtnParse.Text" xml:space="preserve">
     <value>解析Json</value>
   </data>
-  <data name="&gt;&gt;LblPoolWeight4.Parent" xml:space="preserve">
+  <data name="LblScheduleId.TabIndex" type="System.Int32, mscorlib">
-    <value>GrpBalance</value>
+    <value>53</value>
   </data>
   <data name="&gt;&gt;LblWeight4.Parent" xml:space="preserve">
     <value>GrpWeights</value>
@@ -455,12 +436,12 @@
   <data name="&gt;&gt;BtnParse.Parent" xml:space="preserve">
     <value>GrpJson</value>
   </data>
-  <data name="&gt;&gt;GrpFallbackPool.Name" xml:space="preserve">
-    <value>GrpFallbackPool</value>
-  </data>
   <data name="&gt;&gt;GrpBalance.Name" xml:space="preserve">
     <value>GrpBalance</value>
   </data>
+  <data name="&gt;&gt;LblWeight5.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
   <data name="&gt;&gt;LblEventChance5Tip.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -470,8 +451,8 @@
   <data name="TxtJson.WordWrap" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="&gt;&gt;NUDScheduleId.Type" xml:space="preserve">
+  <data name="CmbPrefab.Location" type="System.Drawing.Point, System.Drawing">
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>112, 115</value>
   </data>
   <data name="LblWeight4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -524,8 +505,11 @@
   <data name="&gt;&gt;NUDSortId.Name" xml:space="preserve">
     <value>NUDSortId</value>
   </data>
-  <data name="LblBeginTime.AutoSize" type="System.Boolean, mscorlib">
+  <data name="&gt;&gt;LblEventChance5Tip.ZOrder" xml:space="preserve">
-    <value>True</value>
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;TxtPoolWeight5.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <data name="ListUpItems.Groups3" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -563,14 +547,11 @@
   <data name="LnkWeightHelp.Text" xml:space="preserve">
     <value>帮助</value>
   </data>
-  <data name="LblPrefabPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>74, 118</value>
-  </data>
   <data name="&gt;&gt;ColFallbackId.Type" xml:space="preserve">
     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="LblScheduleIdTip.AutoSize" type="System.Boolean, mscorlib">
+  <data name="&gt;&gt;TxtWeight4.Name" xml:space="preserve">
-    <value>True</value>
+    <value>TxtWeight4</value>
   </data>
   <data name="&gt;&gt;ChartWeights.Name" xml:space="preserve">
     <value>ChartWeights</value>
@@ -596,6 +577,9 @@
   <data name="ChartWeights.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 19</value>
   </data>
+  <data name="ColFallbackName.Width" type="System.Int32, mscorlib">
+    <value>110</value>
+  </data>
   <data name="&gt;&gt;CmbPrefab.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
@@ -617,9 +601,6 @@
   <data name="LblScheduleId.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="&gt;&gt;LblPrefabPath.Name" xml:space="preserve">
-    <value>LblPrefabPath</value>
-  </data>
   <data name="GrpFallbackPool.Location" type="System.Drawing.Point, System.Drawing">
     <value>458, 248</value>
   </data>
@@ -632,8 +613,8 @@
   <data name="&gt;&gt;LblPrefabPath.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;LblBeginTime.Type" xml:space="preserve">
+  <data name="ChkRemoveC6FormPool.Location" type="System.Drawing.Point, System.Drawing">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>112, 260</value>
   </data>
   <data name="LblSortIdTip.Text" xml:space="preserve">
     <value>客户端中显示的顺序</value>
@@ -647,11 +628,14 @@
   <data name="LblGachaTypeTip.Size" type="System.Drawing.Size, System.Drawing">
     <value>125, 17</value>
   </data>
+  <data name="&gt;&gt;NUDScheduleId.Parent" xml:space="preserve">
+    <value>GrpBannerValues</value>
+  </data>
   <data name="CmbPrefab.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="&gt;&gt;LblWeight5.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;GrpWeights.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;ListFallbackItems.Name" xml:space="preserve">
     <value>ListFallbackItems</value>
@@ -662,6 +646,12 @@
   <data name="LnkOpenOldEditor.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 309</value>
   </data>
+  <data name="&gt;&gt;LblEndTime.Name" xml:space="preserve">
+    <value>LblEndTime</value>
+  </data>
+  <data name="GrpWeightChart.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
   <data name="LblBannerType.TabIndex" type="System.Int32, mscorlib">
     <value>59</value>
   </data>
@@ -677,6 +667,12 @@
   <data name="&gt;&gt;LnkWeightHelp.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="&gt;&gt;ListUpItems.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;CmbBannerType.ZOrder" xml:space="preserve">
+    <value>23</value>
+  </data>
   <data name="&gt;&gt;LblSortId.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -746,16 +742,19 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
         ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
+        AwAAAAoz5pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
-        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws=
+        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws=
 </value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.Type" xml:space="preserve">
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;GrpBalance.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="NUDScheduleId.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
   <data name="&gt;&gt;LblBannerType.ZOrder" xml:space="preserve">
     <value>25</value>
   </data>
@@ -771,6 +770,9 @@
   <data name="&gt;&gt;RbCostItem223.Name" xml:space="preserve">
     <value>RbCostItem223</value>
   </data>
+  <data name="LblEventChance5Tip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>181, 233</value>
+  </data>
   <data name="&gt;&gt;LblEndTime.ZOrder" xml:space="preserve">
     <value>18</value>
   </data>
@@ -789,15 +791,8 @@
   <data name="GrpFallbackPool.Size" type="System.Drawing.Size, System.Drawing">
     <value>210, 305</value>
   </data>
-  <data name="ListUpItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="&gt;&gt;LblEventChance4.Name" xml:space="preserve">
-    <value>
+    <value>LblEventChance4</value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
-        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
-        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw==
-</value>
   </data>
   <data name="NUDEventChance4.Location" type="System.Drawing.Point, System.Drawing">
     <value>302, 231</value>
@@ -850,12 +845,12 @@
   <data name="GrpBannerValues.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
+  <data name="&gt;&gt;ListFallbackItems.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;LnkOpenOldEditor.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
-  <data name="LblPoolWeight5.Text" xml:space="preserve">
-    <value>5星池权重</value>
-  </data>
   <data name="&gt;&gt;NUDGachaType.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -898,9 +893,6 @@
   <data name="&gt;&gt;LblScheduleId.ZOrder" xml:space="preserve">
     <value>19</value>
   </data>
-  <data name="&gt;&gt;LblWeight5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;LblScheduleId.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -910,9 +902,15 @@
   <data name="GrpFallbackPool.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
+  <data name="CmbBannerType.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
   <data name="DTPBeginTime.Size" type="System.Drawing.Size, System.Drawing">
     <value>110, 23</value>
   </data>
+  <data name="LnkOpenOldEditor.Text" xml:space="preserve">
+    <value>打开旧版本编辑器</value>
+  </data>
   <data name="&gt;&gt;NUDSortId.Type" xml:space="preserve">
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -925,12 +923,19 @@
   <data name="&gt;&gt;LnkOpenOldEditor.Type" xml:space="preserve">
     <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="ListUpItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
+        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
+        AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
+        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw==
+</value>
+  </data>
   <data name="LblPoolWeight4.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <data name="CmbPrefab.Location" type="System.Drawing.Point, System.Drawing">
-    <value>112, 115</value>
-  </data>
   <data name="NUDSortId.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 202</value>
   </data>
@@ -958,18 +963,12 @@
   <data name="LnkWeightHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>32, 17</value>
   </data>
-  <data name="&gt;&gt;BtnParse.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="TxtJson.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="BtnGen.Text" xml:space="preserve">
     <value>生成Json</value>
   </data>
-  <data name="LblEventChance4.Text" xml:space="preserve">
-    <value>4星活动爆率</value>
-  </data>
   <data name="&gt;&gt;TxtJson.Name" xml:space="preserve">
     <value>TxtJson</value>
   </data>
@@ -979,8 +978,8 @@
   <data name="GrpWeightChart.Location" type="System.Drawing.Point, System.Drawing">
     <value>674, 248</value>
   </data>
-  <data name="&gt;&gt;LblEventChance5Tip.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;TxtPoolWeight5.Type" xml:space="preserve">
-    <value>8</value>
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;LblPrefabPath.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
@@ -994,11 +993,11 @@
   <data name="&gt;&gt;NUDScheduleId.ZOrder" xml:space="preserve">
     <value>21</value>
   </data>
-  <data name="NUDGachaType.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;LblPoolWeight4.Parent" xml:space="preserve">
-    <value>0</value>
+    <value>GrpBalance</value>
   </data>
-  <data name="&gt;&gt;BtnGen.Parent" xml:space="preserve">
+  <data name="LblPrefabPath.TabIndex" type="System.Int32, mscorlib">
-    <value>GrpJson</value>
+    <value>61</value>
   </data>
   <data name="NUDScheduleId.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 55</value>
@@ -1009,8 +1008,8 @@
   <data name="&gt;&gt;LblScheduleIdTip.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TxtWeight4.Name" xml:space="preserve">
+  <data name="LblScheduleIdTip.AutoSize" type="System.Boolean, mscorlib">
-    <value>TxtWeight4</value>
+    <value>True</value>
   </data>
   <data name="&gt;&gt;LblEventChance4.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1048,9 +1047,6 @@
   <data name="&gt;&gt;RbCostItem224.Name" xml:space="preserve">
     <value>RbCostItem224</value>
   </data>
-  <data name="LblPrefabPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>32, 17</value>
-  </data>
   <data name="&gt;&gt;TxtJson.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
@@ -1063,9 +1059,6 @@
   <data name="ChartWeights.Text" xml:space="preserve">
     <value>chart1</value>
   </data>
-  <data name="LblBeginTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>50, 176</value>
-  </data>
   <data name="GrpJson.Location" type="System.Drawing.Point, System.Drawing">
     <value>674, 12</value>
   </data>
@@ -1123,9 +1116,6 @@
   <data name="LblPrefabPath.Text" xml:space="preserve">
     <value>预制</value>
   </data>
-  <data name="ChkAutoStripRateUpFromFallback.Location" type="System.Drawing.Point, System.Drawing">
-    <value>217, 260</value>
-  </data>
   <data name="&gt;&gt;GrpBalance.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
@@ -1162,12 +1152,15 @@
   <data name="&gt;&gt;GrpWeightChart.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="LblEventChance5Tip.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="LblBeginTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>181, 233</value>
+    <value>50, 176</value>
   </data>
   <data name="&gt;&gt;LblEventChance4.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
+  <data name="LblEndTime.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
+  </data>
   <data name="ColFallbackId.Text" xml:space="preserve">
     <value>ID</value>
   </data>
@@ -1198,11 +1191,14 @@
   <data name="&gt;&gt;GrpBalance.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
+  <data name="LblCostItem.Location" type="System.Drawing.Point, System.Drawing">
+    <value>50, 148</value>
+  </data>
   <data name="&gt;&gt;TxtJson.Parent" xml:space="preserve">
     <value>GrpJson</value>
   </data>
-  <data name="&gt;&gt;LblEndTime.Name" xml:space="preserve">
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>LblEndTime</value>
+    <value>3, 4, 3, 4</value>
   </data>
   <data name="LblPoolWeight4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1213,14 +1209,17 @@
   <data name="LblCostItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
   </data>
+  <data name="&gt;&gt;NUDScheduleId.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;TxtWeight4.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;ListUpItems.Parent" xml:space="preserve">
     <value>GrpUpPool</value>
   </data>
-  <data name="&gt;&gt;ListUpItems.Type" xml:space="preserve">
+  <data name="LblPoolWeight5.AutoSize" type="System.Boolean, mscorlib">
-    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>True</value>
   </data>
   <data name="CmbBannerType.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 84</value>
@@ -1231,14 +1230,14 @@
   <data name="&gt;&gt;GrpUpPool.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;LnkWeightHelp.Parent" xml:space="preserve">
+  <data name="LblEventChance4.Text" xml:space="preserve">
-    <value>GrpWeights</value>
+    <value>4星活动爆率</value>
   </data>
   <data name="LblEventChance4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="ColFallbackName.Width" type="System.Int32, mscorlib">
+  <data name="DTPEndTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>110</value>
+    <value>302, 173</value>
   </data>
   <data name="ChkAutoStripRateUpFromFallback.Size" type="System.Drawing.Size, System.Drawing">
     <value>151, 21</value>
@@ -1255,15 +1254,9 @@
   <data name="NUDGachaType.Location" type="System.Drawing.Point, System.Drawing">
     <value>112, 26</value>
   </data>
-  <data name="&gt;&gt;RbCostItem224.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="TxtPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 23</value>
   </data>
-  <data name="ColUpName.Width" type="System.Int32, mscorlib">
-    <value>110</value>
-  </data>
   <data name="&gt;&gt;DTPBeginTime.Parent" xml:space="preserve">
     <value>GrpBannerValues</value>
   </data>
@@ -1273,11 +1266,8 @@
   <data name="LblScheduleId.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 17</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+  <data name="&gt;&gt;RbCostItem224.Type" xml:space="preserve">
-    <value>FormGachaBannerEditor2</value>
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="LblEndTime.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 17</value>
   </data>
   <data name="GrpBalance.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1288,9 +1278,6 @@
   <data name="&gt;&gt;GrpUpPool.Name" xml:space="preserve">
     <value>GrpUpPool</value>
   </data>
-  <data name="&gt;&gt;LnkWeightHelp.Type" xml:space="preserve">
-    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
@@ -1309,9 +1296,6 @@
   <data name="&gt;&gt;LblGachaTypeTip.Name" xml:space="preserve">
     <value>LblGachaTypeTip</value>
   </data>
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>1200, 600</value>
-  </data>
   <data name="LblGachaTypeTip.Location" type="System.Drawing.Point, System.Drawing">
     <value>218, 28</value>
   </data>
@@ -1324,9 +1308,6 @@
   <data name="BtnGen.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 201</value>
   </data>
-  <data name="&gt;&gt;TxtPoolWeight5.Name" xml:space="preserve">
-    <value>TxtPoolWeight5</value>
-  </data>
   <data name="LblScheduleIdTip.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 17</value>
   </data>
@@ -1342,8 +1323,8 @@
   <data name="TxtWeight5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="ListUpItems.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;BtnGen.Parent" xml:space="preserve">
-    <value>0</value>
+    <value>GrpJson</value>
   </data>
   <data name="&gt;&gt;LblGachaType.ZOrder" xml:space="preserve">
     <value>11</value>
@@ -1375,8 +1356,8 @@
   <data name="&gt;&gt;TxtWeight4.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="LnkOpenOldEditor.Text" xml:space="preserve">
+  <data name="LblPoolWeight5.Text" xml:space="preserve">
-    <value>打开旧版本编辑器</value>
+    <value>5星池权重</value>
   </data>
   <data name="&gt;&gt;LblPoolWeight4.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -1390,12 +1371,12 @@
   <data name="LblEventChance5.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 17</value>
   </data>
-  <data name="LblPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 17</value>
-  </data>
   <data name="BtnParse.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
+  <data name="&gt;&gt;LblOptions.Name" xml:space="preserve">
+    <value>LblOptions</value>
+  </data>
   <data name="&gt;&gt;LblWeight5.Name" xml:space="preserve">
     <value>LblWeight5</value>
   </data>
@@ -1405,20 +1386,23 @@
   <data name="CmbBannerType.Items2" xml:space="preserve">
     <value>限时武器祈愿池</value>
   </data>
-  <data name="CmbBannerType.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;GrpFallbackPool.Name" xml:space="preserve">
-    <value>2</value>
+    <value>GrpFallbackPool</value>
   </data>
   <data name="LblBannerType.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
   </data>
+  <data name="NUDGachaType.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;GrpWeightChart.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
   <data name="&gt;&gt;LblEventChance5.ZOrder" xml:space="preserve">
     <value>13</value>
   </data>
-  <data name="&gt;&gt;LblOptions.Name" xml:space="preserve">
+  <data name="LblPrefabPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>LblOptions</value>
+    <value>74, 118</value>
   </data>
   <data name="&gt;&gt;CmbBannerType.Type" xml:space="preserve">
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1432,8 +1416,8 @@
   <data name="LblSortId.Location" type="System.Drawing.Point, System.Drawing">
     <value>74, 204</value>
   </data>
-  <data name="GrpWeightChart.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;LblPrefabPath.Name" xml:space="preserve">
-    <value>7</value>
+    <value>LblPrefabPath</value>
   </data>
   <data name="&gt;&gt;GrpUpPool.ZOrder" xml:space="preserve">
     <value>5</value>
@@ -1462,8 +1446,8 @@
   <data name="&gt;&gt;LblPoolWeight4.Name" xml:space="preserve">
     <value>LblPoolWeight4</value>
   </data>
-  <data name="TxtWeight5.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="LblPrefabPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 23</value>
+    <value>32, 17</value>
   </data>
   <data name="ChartWeights.Size" type="System.Drawing.Size, System.Drawing">
     <value>494, 280</value>
@@ -1477,8 +1461,8 @@
   <data name="LblWeight5.Text" xml:space="preserve">
     <value>5星权重</value>
   </data>
-  <data name="LblPrefabPath.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;LblBeginTime.Type" xml:space="preserve">
-    <value>61</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ChkAutoStripRateUpFromFallback.TabIndex" type="System.Int32, mscorlib">
     <value>92</value>
@@ -1486,8 +1470,8 @@
   <data name="&gt;&gt;LblGachaTypeTip.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="LblEventChance5Tip.Text" xml:space="preserve">
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>%</value>
+    <value>1200, 600</value>
   </data>
   <data name="LblEventChance5.Location" type="System.Drawing.Point, System.Drawing">
     <value>31, 233</value>
@@ -1501,11 +1485,17 @@
   <data name="LblSortId.TabIndex" type="System.Int32, mscorlib">
     <value>75</value>
   </data>
+  <data name="&gt;&gt;LblBannerType.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="DTPBeginTime.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
   <data name="&gt;&gt;ChkAutoStripRateUpFromFallback.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+  <data name="&gt;&gt;LnkWeightHelp.Parent" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>GrpWeights</value>
   </data>
   <data name="LblEventChance4.Location" type="System.Drawing.Point, System.Drawing">
     <value>221, 233</value>
@@ -1516,8 +1506,8 @@
   <data name="LblGachaType.TabIndex" type="System.Int32, mscorlib">
     <value>48</value>
   </data>
-  <data name="LblCostItem.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="&gt;&gt;LblWeight5.Type" xml:space="preserve">
-    <value>50, 148</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;RbCostItem223.ZOrder" xml:space="preserve">
     <value>29</value>
@@ -1525,6 +1515,9 @@
   <data name="&gt;&gt;LblWeight5.Parent" xml:space="preserve">
     <value>GrpWeights</value>
   </data>
+  <data name="LblBeginTime.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="&gt;&gt;GrpFallbackPool.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
@@ -1534,17 +1527,17 @@
   <data name="&gt;&gt;NUDScheduleId.Name" xml:space="preserve">
     <value>NUDScheduleId</value>
   </data>
-  <data name="NUDScheduleId.TabIndex" type="System.Int32, mscorlib">
+  <data name="ColUpName.Width" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>110</value>
   </data>
-  <data name="&gt;&gt;LblBannerType.Type" xml:space="preserve">
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>FormGachaBannerEditor2</value>
   </data>
   <data name="&gt;&gt;ChkAutoStripRateUpFromFallback.Name" xml:space="preserve">
     <value>ChkAutoStripRateUpFromFallback</value>
   </data>
-  <data name="&gt;&gt;ListFallbackItems.ZOrder" xml:space="preserve">
+  <data name="GrpJson.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>6</value>
   </data>
   <data name="RbCostItem223.Location" type="System.Drawing.Point, System.Drawing">
     <value>192, 146</value>
@@ -1573,8 +1566,8 @@
   <data name="LblPoolWeight4.Size" type="System.Drawing.Size, System.Drawing">
     <value>63, 17</value>
   </data>
-  <data name="ChkRemoveC6FormPool.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="&gt;&gt;TxtPoolWeight5.Name" xml:space="preserve">
-    <value>112, 260</value>
+    <value>TxtPoolWeight5</value>
   </data>
   <data name="GrpWeightChart.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
@@ -1588,23 +1581,20 @@
   <data name="&gt;&gt;CmbPrefab.Name" xml:space="preserve">
     <value>CmbPrefab</value>
   </data>
-  <data name="&gt;&gt;LblOptions.Parent" xml:space="preserve">
-    <value>GrpBannerValues</value>
-  </data>
   <data name="GrpBannerValues.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 12</value>
   </data>
-  <data name="&gt;&gt;NUDScheduleId.Parent" xml:space="preserve">
+  <data name="LblPoolWeight5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>GrpBannerValues</value>
+    <value>63, 17</value>
   </data>
   <data name="LblScheduleId.Text" xml:space="preserve">
     <value>ScheduleId</value>
   </data>
-  <data name="&gt;&gt;LblEventChance4.Name" xml:space="preserve">
+  <data name="&gt;&gt;LnkWeightHelp.Type" xml:space="preserve">
-    <value>LblEventChance4</value>
+    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="LblScheduleId.TabIndex" type="System.Int32, mscorlib">
+  <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>53</value>
+    <value>402, 0</value>
   </data>
   <data name="LblCostItem.TabIndex" type="System.Int32, mscorlib">
     <value>80</value>
@@ -1621,8 +1611,8 @@
   <data name="&gt;&gt;LblPoolWeight4.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;CmbBannerType.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;BtnParse.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>2</value>
   </data>
   <data name="ListUpItems.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 19</value>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx

@@ -283,9 +283,6 @@
   <data name="GrpBannerValues.Text" xml:space="preserve">
     <value>Баннер</value>
   </data>
-  <data name="GrpFallbackPool.Text" xml:space="preserve">
-    <value>Запасной Пул</value>
-  </data>
   <data name="ListFallbackItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -327,16 +324,6 @@
 </value>
   </data>
   <data name="ListFallbackItems.Groups4" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
-        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAA0zLXN0YXIgYXZhdGFyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdu
-        bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws=
-</value>
-  </data>
-  <data name="ListFallbackItems.Groups5" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
@@ -346,8 +333,8 @@
         bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws=
 </value>
   </data>
-  <data name="GrpUpPool.Text" xml:space="preserve">
+  <data name="GrpFallbackPool.Text" xml:space="preserve">
-    <value>Верхний Пул</value>
+    <value>Запасной Пул</value>
   </data>
   <data name="ListUpItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -389,6 +376,9 @@
         bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw==
 </value>
   </data>
+  <data name="GrpUpPool.Text" xml:space="preserve">
+    <value>Верхний Пул</value>
+  </data>
   <data name="BtnGen.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 23</value>
   </data>
@@ -404,9 +394,6 @@
   <data name="BtnParse.Text" xml:space="preserve">
     <value>Загр. Json</value>
   </data>
-  <data name="GrpWeights.Text" xml:space="preserve">
-    <value>Gacha Веса</value>
-  </data>
   <data name="LnkWeightHelp.Location" type="System.Drawing.Point, System.Drawing">
     <value>375, 0</value>
   </data>
@@ -434,8 +421,8 @@
   <data name="LblWeight5.Text" xml:space="preserve">
     <value>Веса 5*</value>
   </data>
-  <data name="GrpBalance.Text" xml:space="preserve">
+  <data name="GrpWeights.Text" xml:space="preserve">
-    <value>Баланс персонажа и оружия (работают только смешанные пулы)</value>
+    <value>Gacha Веса</value>
   </data>
   <data name="LblPoolWeight4.Location" type="System.Drawing.Point, System.Drawing">
     <value>28, 61</value>
@@ -455,6 +442,9 @@
   <data name="LblPoolWeight5.Text" xml:space="preserve">
     <value>Пул Веса 5*</value>
   </data>
+  <data name="GrpBalance.Text" xml:space="preserve">
+    <value>Баланс персонажа и оружия (работают только смешанные пулы)</value>
+  </data>
   <data name="GrpWeightChart.Text" xml:space="preserve">
     <value>Таблица веса</value>
   </data>

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx

@@ -165,6 +165,9 @@
   <data name="GrpBannerValues.Text" xml:space="preserve">
     <value>卡池參數</value>
   </data>
+  <data name="GrpFallbackPool.Text" xml:space="preserve">
+    <value>基礎池</value>
+  </data>
   <data name="ListFallbackItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -211,23 +214,10 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
         ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
+        AwAAAAoz5pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
-        dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws=
-</value>
-  </data>
-  <data name="ListFallbackItems.Groups5" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh
-        ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG
-        AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws=
 </value>
   </data>
-  <data name="GrpFallbackPool.Text" xml:space="preserve">
-    <value>基礎池</value>
-  </data>
   <data name="ListUpItems.Groups" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -268,6 +258,9 @@
         dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw==
 </value>
   </data>
+  <data name="GrpWeights.Text" xml:space="preserve">
+    <value>卡池權重與保底機制</value>
+  </data>
   <data name="LnkWeightHelp.Text" xml:space="preserve">
     <value>幫助</value>
   </data>
@@ -277,8 +270,8 @@
   <data name="LblWeight5.Text" xml:space="preserve">
     <value>5星權重</value>
   </data>
-  <data name="GrpWeights.Text" xml:space="preserve">
+  <data name="GrpBalance.Text" xml:space="preserve">
-    <value>卡池權重與保底機制</value>
+    <value>角色和武器平衡機制（僅混合池有效）</value>
   </data>
   <data name="LblPoolWeight4.Text" xml:space="preserve">
     <value>4星池權重</value>
@@ -286,9 +279,6 @@
   <data name="LblPoolWeight5.Text" xml:space="preserve">
     <value>5星池權重</value>
   </data>
-  <data name="GrpBalance.Text" xml:space="preserve">
-    <value>角色和武器平衡機制（僅混合池有效）</value>
-  </data>
   <data name="GrpWeightChart.Text" xml:space="preserve">
     <value>權重圖表</value>
   </data>

Source/GrasscutterTools/Resources/AvatarColor.txt

@@ -1,53 +1,61 @@
-1001:purple
+1001:4
-1002:yellow
+1002:5
-1003:yellow
+1003:5
-1005:yellow
+1005:5
-1006:purple
+1006:4
-1007:yellow
+1007:5
-1014:purple
+1014:4
-1015:purple
+1015:4
-1016:yellow
+1016:5
-1020:purple
+1020:4
-1021:purple
+1021:4
-1022:yellow
+1022:5
-1023:purple
+1023:4
-1024:purple
+1024:4
-1025:purple
+1025:4
-1026:yellow
+1026:5
-1027:purple
+1027:4
-1029:yellow
+1029:5
-1030:yellow
+1030:5
-1031:purple
+1031:4
-1032:purple
+1032:4
-1033:yellow
+1033:5
-1034:purple
+1034:4
-1035:yellow
+1035:5
-1036:purple
+1036:4
-1037:yellow
+1037:5
-1038:yellow
+1038:5
-1039:purple
+1039:4
-1041:yellow
+1041:5
-1042:yellow
+1042:5
-1043:purple
+1043:4
-1044:purple
+1044:4
-1045:purple
+1045:4
-1046:yellow
+1046:5
-1047:yellow
+1047:5
-1048:purple
+1048:4
-1049:yellow
+1049:5
-1050:purple
+1050:4
-1051:yellow
+1051:5
-1052:yellow
+1052:5
-1053:purple
+1053:4
-1054:yellow
+1054:5
-1055:purple
+1055:4
-1056:purple
+1056:4
-1057:yellow
+1057:5
-1058:yellow
+1058:5
-1062:blue
+1059:4
-1063:yellow
+1060:5
-1064:purple
+1062:5
-1066:yellow
+1063:5
-1067:green
+1064:4
-1068:purple
+1065:4
-1069:green
+1066:5
+1067:4
+1068:4
+1069:5
+1070:5
+1071:5
+1072:4
+1073:5
+1074:4