diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs b/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs
index 0484d2e..524d9f2 100644
--- a/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs
+++ b/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs
@@ -31,6 +31,7 @@ namespace GrasscutterTools
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGachaBannerEditor));
this.GrpBannerValues = new System.Windows.Forms.GroupBox();
+ this.LblBannerEditorOldTip = new System.Windows.Forms.Label();
this.CmbPrefab = new System.Windows.Forms.ComboBox();
this.LblEventChanceTip = new System.Windows.Forms.Label();
this.NUDEventChance = new System.Windows.Forms.NumericUpDown();
@@ -97,6 +98,7 @@ namespace GrasscutterTools
// GrpBannerValues
//
resources.ApplyResources(this.GrpBannerValues, "GrpBannerValues");
+ this.GrpBannerValues.Controls.Add(this.LblBannerEditorOldTip);
this.GrpBannerValues.Controls.Add(this.CmbPrefab);
this.GrpBannerValues.Controls.Add(this.LblEventChanceTip);
this.GrpBannerValues.Controls.Add(this.NUDEventChance);
@@ -139,6 +141,12 @@ namespace GrasscutterTools
this.GrpBannerValues.Name = "GrpBannerValues";
this.GrpBannerValues.TabStop = false;
//
+ // LblBannerEditorOldTip
+ //
+ resources.ApplyResources(this.LblBannerEditorOldTip, "LblBannerEditorOldTip");
+ this.LblBannerEditorOldTip.ForeColor = System.Drawing.Color.Red;
+ this.LblBannerEditorOldTip.Name = "LblBannerEditorOldTip";
+ //
// CmbPrefab
//
resources.ApplyResources(this.CmbPrefab, "CmbPrefab");
@@ -575,5 +583,6 @@ namespace GrasscutterTools
private System.Windows.Forms.Button BtnGen;
private System.Windows.Forms.Button BtnParse;
private System.Windows.Forms.ComboBox CmbPrefab;
+ private System.Windows.Forms.Label LblBannerEditorOldTip;
}
}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx b/Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx
index 2872900..ed1c46e 100644
--- a/Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx
+++ b/Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx
@@ -117,7 +117,20 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ False
+
+
+ 22, 415
+
+
+ 390, 35
+
+
+ Tip: The latest version of the dev Banner is currently not supported, waiting for PR : )
+
401, 262
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.resx b/Source/GrasscutterTools/FormGachaBannerEditor.resx
index 4558cdc..58e993d 100644
--- a/Source/GrasscutterTools/FormGachaBannerEditor.resx
+++ b/Source/GrasscutterTools/FormGachaBannerEditor.resx
@@ -127,8 +127,8 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 50, 87
+
+ CmbPrefab
System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -138,7 +138,10 @@
True
- 13
+ 14
+
+
+ LblBeginTime
3, 19
@@ -146,8 +149,8 @@
75, 17
-
- 软保底
+
+ True
GrpBannerValues
@@ -156,22 +159,22 @@
34, 28
- 30
+ 31
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- LblBeginTime
+
+ 5
-
- 20
+
+ System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 56, 17
+
+ 87
112, 318
@@ -182,8 +185,11 @@
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ GrpBannerValues
+
- 19
+ 20
True
@@ -192,10 +198,7 @@
71
- 2
-
-
- 连续非的次数达到该值，增加抽中概率
+ 3
LblEndTime
@@ -203,6 +206,9 @@
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 89
+
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -228,8 +234,14 @@
True
+
+ 243, 262
+
- 35
+ 36
+
+
+ 软保底
True
@@ -252,8 +264,8 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 34
GrpBannerValues
@@ -267,9 +279,6 @@
72, 17
-
- True
-
69
@@ -279,23 +288,26 @@
纠缠之缘
+
+ 生成Json
+
+
+ 160, 230
+
31, 234
从400开始，顺序递增
-
- 31, 350
-
-
- 祈愿道具
+
+ 12
51
- 28
+ 29
LblSoftPityTip
@@ -312,8 +324,8 @@
GrpBannerValues
-
- System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 24
GrpBannerValues
@@ -352,13 +364,19 @@
70
- 9
+ 10
+
+
+ 154, 208
解析Json
-
- 243, 262
+
+ 预制
+
+
+ 62, 320
0
@@ -375,15 +393,15 @@
GrpBannerValues
-
- GrpBannerValues
-
2
LblEventChanceTip
+
+ True
+
True
@@ -405,23 +423,23 @@
%
-
- ListPurplePool
-
- 17
+ 18
61
+
+ Top, Bottom, Right
+
结束时间
73
-
- 440, 466
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
300, 25
@@ -433,7 +451,7 @@
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 18
+ 19
NUDSortId
@@ -441,8 +459,8 @@
GrpPurplePool
-
- True
+
+ 19, 17
81
@@ -451,26 +469,26 @@
GrpBannerValues
- 31
+ 32
+
+
+ GrpBannerValues
True
- 34
+ 35
GrpBannerValues
- 25
+ 26
212, 17
-
- 33
-
53
@@ -478,7 +496,7 @@
300, 23
- 0
+ 1
100, 23
@@ -504,8 +522,8 @@
GrpBannerValues
-
- 76
+
+ 相遇之缘
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -516,12 +534,21 @@
客户端中显示的顺序
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
125, 17
+
+ 0
+
硬保底
+
+ GrpYellowPool
+
90
@@ -543,20 +570,20 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 62, 320
-
True
NUDEventChance
+
+ GrpBannerValues
+
GrpBannerValues
-
- 37
+
+ GrpBannerValues
LblSortIdTip
@@ -570,11 +597,14 @@
218, 320
-
- 75
+
+ 31, 437
+
+
+ 440, 466
- 36
+ 37
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -582,11 +612,8 @@
218, 291
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 56, 17
LblSortId
@@ -601,7 +628,7 @@
GrpBannerValues
- 5
+ 6
System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -610,7 +637,7 @@
GrpBannerValues
- 32
+ 33
ListYellowPool
@@ -618,6 +645,9 @@
300, 23
+
+ 提示：当前不支持最新版dev奖池，等一个有缘人PR
+
$this
@@ -625,7 +655,7 @@
RbCostItem223
- 14
+ 15
True
@@ -639,18 +669,15 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 87
-
-
- 11
-
83
56
+
+ CmbBannerType
+
LblCostItem
@@ -661,11 +688,14 @@
6, 19
- 26
+ 27
19, 17
+
+ 0
+
Fill
@@ -675,6 +705,9 @@
True
+
+ FormGachaBannerEditor
+
458, 248
@@ -691,7 +724,7 @@
88
- 22
+ 23
GrpBannerValues
@@ -720,9 +753,6 @@
LblScheduleId
-
- GrpJson
-
56, 17
@@ -733,13 +763,13 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 10
+ 11
-
- 75, 17
+
+ ListPurplePool
-
- 0
+
+ 50
1
@@ -753,8 +783,8 @@
System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 23
+
+ 31, 350
112, 202
@@ -762,6 +792,9 @@
34, 57
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -769,7 +802,7 @@
288, 412
- 7
+ 8
True
@@ -789,8 +822,8 @@
0
-
- 生成Json
+
+ 284, 17
TxtJson
@@ -801,11 +834,14 @@
GrpBannerValues
+
+ 38
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 21
+ 22
458, 12
@@ -813,14 +849,17 @@
47
+
+ 祈愿道具
+
75, 17
112, 55
-
- 154, 208
+
+ 218, 262
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -838,13 +877,10 @@
True
- 38
+ 39
-
- 相遇之缘
-
-
- 开始时间
+
+ 1
218, 57
@@ -862,29 +898,23 @@
GrpBannerValues
- 6
+ 7
-
- 624, 12
+
+ 13
GrpBannerValues
-
- 1
+
+ True
4星基础爆率
-
- 19, 17
-
LblPrefabPath
-
- True
-
GrpBannerValues
@@ -894,8 +924,8 @@
LblEventChance
-
- FormGachaBannerEditor
+
+ $this
100, 23
@@ -927,14 +957,14 @@
112, 347
-
- 预制
+
+ GachaType
GrpBannerValues
- 16
+ 17
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -966,8 +996,8 @@
56, 17
-
- 160, 230
+
+ 75, 17
62, 291
@@ -975,6 +1005,9 @@
Top, Bottom, Left, Right
+
+ LblBannerEditorOldTip
+
NUDGachaType
@@ -993,6 +1026,9 @@
System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ GrpBannerValues
+
63, 23
@@ -1008,11 +1044,8 @@
112, 84
-
- System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 218, 262
+
+ 50, 87
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1020,14 +1053,17 @@
微软雅黑, 9pt
+
+ 91
+
75, 23
112, 26
-
- GrpYellowPool
+
+ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
100, 23
@@ -1062,17 +1098,17 @@
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 29
+
+ GrpJson
-
- 0
+
+ 连续非的次数达到该值，增加抽中概率
-
- GrpBannerValues
+
+ LblGachaTypeTip
-
- CmbBannerType
+
+ %
218, 28
@@ -1083,9 +1119,6 @@
6, 437
-
- $this
-
69, 17
@@ -1093,7 +1126,7 @@
116, 17
- 24
+ 25
74, 21
@@ -1102,16 +1135,16 @@
GrpJson
- 3
+ 4
GrpBannerValues
-
- GrpBannerValues
+
+ 76
-
- GachaType
+
+ 21
Top, Bottom, Left, Right
@@ -1123,7 +1156,7 @@
5星基础爆率
- 8
+ 9
True
@@ -1140,15 +1173,12 @@
限时武器祈愿池
-
- 50
-
-
- Top, Bottom, Right
-
LblBasePurpleWeightTip
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1158,9 +1188,6 @@
GrpYellowPool
-
- %
-
79
@@ -1189,7 +1216,7 @@
72
- 1
+ 2
75, 17
@@ -1203,6 +1230,9 @@
GrpBannerValues
+
+ 0
+
32, 17
@@ -1215,11 +1245,8 @@
7, 17
-
- CmbPrefab
-
- 15
+ 16
3, 19
@@ -1230,21 +1257,24 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 12
-
100, 23
62
+
+ 75
+
- 27
+ 28
65
+
+ 624, 12
+
0
@@ -1266,6 +1296,9 @@
5星活动奖池
+
+ True
+
NUDBaseYellowWeight
@@ -1293,11 +1326,8 @@
100, 23
-
- 4
-
-
- 89
+
+ 开始时间
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1338,17 +1368,14 @@
Top, Left, Right
-
- LblGachaTypeTip
-
53
80
-
- GrpBannerValues
+
+ 30
66