diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs index 7963956..2dc17f4 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs @@ -31,7 +31,6 @@ namespace GrasscutterTools.Forms { 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(); @@ -98,7 +97,6 @@ namespace GrasscutterTools.Forms // 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); @@ -141,17 +139,11 @@ namespace GrasscutterTools.Forms 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"); this.CmbPrefab.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CmbPrefab.FormattingEnabled = true; + resources.ApplyResources(this.CmbPrefab, "CmbPrefab"); this.CmbPrefab.Name = "CmbPrefab"; // // LblEventChanceTip @@ -181,8 +173,8 @@ namespace GrasscutterTools.Forms // // NUDBaseYellowWeight // - resources.ApplyResources(this.NUDBaseYellowWeight, "NUDBaseYellowWeight"); this.NUDBaseYellowWeight.DecimalPlaces = 2; + resources.ApplyResources(this.NUDBaseYellowWeight, "NUDBaseYellowWeight"); this.NUDBaseYellowWeight.Name = "NUDBaseYellowWeight"; this.NUDBaseYellowWeight.Value = new decimal(new int[] { 6, @@ -197,8 +189,8 @@ namespace GrasscutterTools.Forms // // TxtRateUpItems2 // - resources.ApplyResources(this.TxtRateUpItems2, "TxtRateUpItems2"); this.TxtRateUpItems2.BackColor = System.Drawing.Color.White; + resources.ApplyResources(this.TxtRateUpItems2, "TxtRateUpItems2"); this.TxtRateUpItems2.Name = "TxtRateUpItems2"; this.TxtRateUpItems2.ReadOnly = true; // @@ -294,8 +286,8 @@ namespace GrasscutterTools.Forms // // TxtRateUpItems1 // - resources.ApplyResources(this.TxtRateUpItems1, "TxtRateUpItems1"); this.TxtRateUpItems1.BackColor = System.Drawing.Color.White; + resources.ApplyResources(this.TxtRateUpItems1, "TxtRateUpItems1"); this.TxtRateUpItems1.Name = "TxtRateUpItems1"; this.TxtRateUpItems1.ReadOnly = true; // @@ -381,13 +373,13 @@ namespace GrasscutterTools.Forms // // CmbBannerType // - resources.ApplyResources(this.CmbBannerType, "CmbBannerType"); this.CmbBannerType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CmbBannerType.FormattingEnabled = true; this.CmbBannerType.Items.AddRange(new object[] { resources.GetString("CmbBannerType.Items"), resources.GetString("CmbBannerType.Items1"), resources.GetString("CmbBannerType.Items2")}); + resources.ApplyResources(this.CmbBannerType, "CmbBannerType"); this.CmbBannerType.Name = "CmbBannerType"; // // LblSortIdTip @@ -397,8 +389,8 @@ namespace GrasscutterTools.Forms // // NUDBasePurpleWeight // - resources.ApplyResources(this.NUDBasePurpleWeight, "NUDBasePurpleWeight"); this.NUDBasePurpleWeight.DecimalPlaces = 2; + resources.ApplyResources(this.NUDBasePurpleWeight, "NUDBasePurpleWeight"); this.NUDBasePurpleWeight.Name = "NUDBasePurpleWeight"; this.NUDBasePurpleWeight.Value = new decimal(new int[] { 51, @@ -455,8 +447,8 @@ namespace GrasscutterTools.Forms // // ListPurplePool // - resources.ApplyResources(this.ListPurplePool, "ListPurplePool"); this.ListPurplePool.CheckOnClick = true; + resources.ApplyResources(this.ListPurplePool, "ListPurplePool"); this.ListPurplePool.FormattingEnabled = true; this.ListPurplePool.Name = "ListPurplePool"; this.ListPurplePool.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.ListPurplePool_ItemCheck); @@ -470,8 +462,8 @@ namespace GrasscutterTools.Forms // // ListYellowPool // - resources.ApplyResources(this.ListYellowPool, "ListYellowPool"); this.ListYellowPool.CheckOnClick = true; + resources.ApplyResources(this.ListYellowPool, "ListYellowPool"); this.ListYellowPool.FormattingEnabled = true; this.ListYellowPool.Name = "ListYellowPool"; this.ListYellowPool.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.ListYellowPool_ItemCheck); @@ -583,6 +575,5 @@ namespace GrasscutterTools.Forms 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/Forms/FormGachaBannerEditor.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.resx index a21a913..ec8122e 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.resx @@ -117,1273 +117,1249 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 74, 118 - - - GrpBannerValues - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 50, 87 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - True - - - 14 - - - 3, 19 - - - 75, 17 - - - 软保底 - - - GrpBannerValues - - - 34, 28 - - - 31 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblBeginTime - - - 21 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 56, 17 - - - 112, 318 - - - 卡池参数 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 20 - - - True - - - 71 - - - 3 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 连续非的次数达到该值，增加抽中概率 - - - LblEndTime - - - Top, Bottom, Right - - - 89 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 74 - - - 100, 23 - - - $this - Top, Bottom, Left - - 280, 174 - - - True - - - 36 - - - True - - - 50 - - - NUDBasePurpleWeight - - - LblBannerType - - - GrpBannerValues - - - GrpBannerValues - - - 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 - - - GrpBannerValues - - - 限时角色祈愿池 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 72, 17 - - - True - - - 69 - - - 75, 17 - - - 纠缠之缘 - - - 生成Json - - - 31, 234 - - - 从400开始，顺序递增 - - - 31, 350 - - - 祈愿道具 - - - 51 - - - 29 - - - LblSoftPityTip - - - 68 - - - 112, 173 - - - LblBaseYellowWeightTip - - - GrpBannerValues - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - LblHardPityTip - - - % - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - GrpBannerValues - - - True - - - LblRateUpItems1 - - - 52 - - - 218, 378 - - - 74, 21 - - - 70 - - - 10 - - - 解析Json - - - 58 - - - 243, 262 - - - 0 - - - GrpBannerValues - - - 934, 486 - - - GrpJson - - - GrpBannerValues - - - GrpBannerValues - - - 2 - - - LblEventChanceTip - - - True - - - True - - - 112, 376 - - - LblBaseYellowWeight - + 112, 115 - - 3 - - - True - - - % - - - ListPurplePool - - - 18 - - - 61 - - - 结束时间 - - - 73 - - - 440, 466 - - - 300, 25 - - - 112, 231 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 19 - - - NUDSortId - - - GrpPurplePool - - - True - - - 81 - - - GrpBannerValues - - - 32 - - - True - - - 35 - - - GrpBannerValues - - - 26 - - - 212, 17 - - - 34 - - - 53 - - - 300, 23 - - - 1 - - - 100, 23 - - - System.Windows.Forms.GroupBox, 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 - - - 60 - - - 3, 19 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 218, 176 - - - GrpBannerValues - - - 76 - - - 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 - - - 0 - - - 125, 17 - - - 硬保底 - - - 90 - - - True - - - 300, 466 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 59 - - - BtnGen - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 62, 320 - - - True - - - NUDEventChance - - - GrpBannerValues - - - 38 - - - LblSortIdTip - - - 100, 23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 218, 320 - - - 31, 437 - - - 37 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - LblSortId - - - GrpBannerValues - - - 100, 23 - - - GrpBannerValues - - - 6 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 33 - - - ListYellowPool - - - 300, 23 - - - 提示：当前不支持最新版dev奖池，等一个有缘人PR - - - $this - - - RbCostItem223 - - - 15 - - - True - - - 3, 4, 3, 4 - - - 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 - - - 87 - - - 12 - - - 83 - - - 56 - - - LblCostItem - - - GrpBannerValues - - - 6, 19 - - - 27 - - - 19, 17 - - - 0 - - - Fill - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 458, 248 - - - 64 - - - 44 - - - 31, 378 - - - 88 - - - 23 - - - GrpBannerValues - - - 324, 260 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 393, 262 - - - True - - - GrpBannerValues - - - LblBasePurpleWeight - - - 219, 437 - - - LblScheduleId - - - GrpJson - - - 56, 17 - - - 顺序 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11 - - - 75, 17 - - - 0 - - - 1 - - - GrpPurplePool - - - 160, 230 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 24 - - - 112, 202 - - - 34, 57 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 288, 412 - - - 8 - - - True - - - GrpBannerValues - - - 112, 260 - - - GrpBannerValues - - - 2 - - - 284, 17 - - - TxtJson - - - 77 - - - GrpBannerValues - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 22 - - - 458, 12 - - - 47 - - - 75, 17 - - - 112, 55 - - - 154, 208 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NUDHardPity - - - 4星活动奖池 - - - 84 - - - True - - - 39 - - - 218, 57 - - - RbCostItem224 - - - 100, 23 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 7 - - - 624, 12 - - - GrpBannerValues - - - 1 - - - 4星基础爆率 - - - 19, 17 - - - LblPrefabPath - - - True - - - GrpBannerValues - - - 31, 262 - - - LblEventChance - - - FormGachaBannerEditor - - - 100, 23 - - - NUDEndTime - - - ID要求唯一 - - - BtnParse - - - LblGachaType - - - 0 - - - 218, 204 - - - GrpBannerValues - 300, 25 - - 112, 347 - - - 预制 - - - GrpBannerValues - - - 17 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblScheduleIdTip - - - LblHardPity - - - True - - - 相遇之缘 - - - GrpBannerValues - - - 32, 17 - - - 50, 176 - - - True - - - 连续非的次数达到该值，必得5星 - - - 56, 17 - - - 160, 230 - - - 62, 291 - - - Top, Bottom, Left, Right - - - LblBannerEditorOldTip - - - NUDGachaType - - - LblSoftPity - - - GrpBannerValues - - - GrpJson - - - 0 - - - 63, 23 - - - True - - - LblRateUpItems2 - - - 86 - - - 112, 84 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 218, 262 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 微软雅黑, 9pt - - - 91 - - - 75, 23 - - - 112, 26 - - - GrpYellowPool - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 19, 17 - - - GrpBannerValues - - - 72, 17 - - - True - - - 56, 17 - - - Fill - - - 57 - - - True - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 30 - - - 0 - - - GrpBannerValues - - - CmbBannerType - - - 218, 28 - - - 112, 289 - - - 6, 437 - - - $this - - - 69, 17 - - - 116, 17 - - - 25 - - - 74, 21 - - - GrpJson - - - 4 - - - GrpBannerValues - - - GrpBannerValues - - - GachaType - - - Top, Bottom, Left, Right - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5星基础爆率 - - - 9 - - - True - - - CenterScreen - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 75, 23 - - - 限时武器祈愿池 - - - 50 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblBasePurpleWeightTip - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 奖池类型 - - - GrpYellowPool - - - % - - - 79 - - - 74, 204 - - - 85 - - - TxtRateUpItems2 - - - 4星活动卡池 - - - 44, 17 - - - GrpBannerValues - - - 183, 17 - - - 72 - - - 2 - - - 75, 17 - - - 51 - - - 5星活动爆率 - - - GrpBannerValues - - - 客户端中显示的顺序 - - - 32, 17 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 常驻池 - - - 7, 17 + + + 90 CmbPrefab - - 16 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 49 + + GrpBannerValues - - NUDSoftPity + + 0 + + + True + + + 393, 262 + + + 19, 17 + + + 89 + + + % + + + LblEventChanceTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 1 + + + 324, 260 + + + 63, 23 + + + 68 + + + NUDEventChance + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 2 + + + True + + + 34, 28 + + + 72, 17 + + + 48 + + + GachaType + + + LblGachaType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 3 + + + True + + + 243, 262 + + + 75, 17 + + + 88 + + + 5星活动爆率 + + + LblEventChance + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 4 + + + 112, 260 + + + 100, 23 + + + 66 + + + NUDBaseYellowWeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 5 + + + True + + + 74, 204 + + + 32, 17 + + + 75 + + + 顺序 + + + LblSortId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 6 + + + 112, 347 + + + 300, 23 + + + 71 + + + TxtRateUpItems2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 7 + + + True + + + 31, 262 + + + 75, 17 + + + 76 + + + 5星基础爆率 + + + LblBaseYellowWeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 8 + + + 112, 26 + + + 100, 23 + + + 47 + + + NUDGachaType + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 9 + + + 112, 202 + + + 100, 23 + + + 64 + + + NUDSortId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 10 + + + True + + + 31, 350 + + + 75, 17 + + + 87 + + + 4星活动奖池 + + + LblRateUpItems2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 11 + + + True + + + 62, 291 + + + 44, 17 + + + 77 + + + 软保底 + + + LblSoftPity + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 12 + + + True + + + 218, 28 + + + 125, 17 + + + 51 + + + 从400开始，顺序递增 + + + LblGachaTypeTip System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + GrpBannerValues + + 13 - + + True + + + 218, 176 + + + 56, 17 + + + 74 + + + 结束时间 + + + LblEndTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 14 + + + True + + + 31, 234 + + + 75, 17 + + + 86 + + + 5星活动奖池 + + + LblRateUpItems1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 15 + + + 112, 289 + + 100, 23 - + + 69 + + + NUDSoftPity + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 16 + + + True + + + 34, 57 + + + 72, 17 + + + 53 + + + ScheduleId + + + LblScheduleId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 17 + + + True + + + 50, 176 + + + 56, 17 + + + 72 + + + 开始时间 + + + LblBeginTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 18 + + + 112, 231 + + + 300, 23 + + + 65 + + + TxtRateUpItems1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 19 + + + True + + + 62, 320 + + + 44, 17 + + + 78 + + + 硬保底 + + + LblHardPity + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 20 + + + 112, 55 + + + 100, 23 + + + 49 + + + NUDScheduleId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 21 + + + 280, 174 + + 100, 23 62 - - 75 + + NUDEndTime - - 28 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 65 + + GrpBannerValues - - 0 + + 22 - - 5星活动奖池 - - - 48 - - - 154, 208 - - - 50, 148 - - - 78 - - - 5星活动奖池 - - - NUDBaseYellowWeight - - - NUDScheduleId - - - 49 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 82 - - - 192, 146 - - + True - - 100, 23 + + 218, 320 - - 5 + + 183, 17 - - 开始时间 + + 85 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 连续非的次数达到该值，必得5星 - - 112, 146 + + LblHardPityTip System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Json + + GrpBannerValues - - 卡池编辑器 + + 23 - - 44, 17 + + 112, 318 - - TxtRateUpItems1 + + 100, 23 - + + 70 + + + NUDHardPity + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 24 + + + True + + + 218, 57 + + + 69, 17 + + + 56 + + + ID要求唯一 + + + LblScheduleIdTip + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpBannerValues + + + 25 + + + 112, 173 + + + 100, 23 + + + 60 + NUDBeginTime - - 12, 12 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GrpBannerValues - - ScheduleId + + 26 - - Top, Left, Right + + True - - LblGachaTypeTip + + 218, 291 - - 53 + + 212, 17 + + + 84 + + + 连续非的次数达到该值，增加抽中概率 + + + LblSoftPityTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 27 + + + True + + + 31, 378 + + + 75, 17 + + + 79 + + + 4星基础爆率 + + + LblBasePurpleWeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 28 + + + 常驻池 + + + 限时角色祈愿池 + + + 限时武器祈愿池 + + + 112, 84 + + + 300, 25 + + + 50 + + + CmbBannerType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 29 + + + True + + + 218, 204 + + + 116, 17 + + + 83 + + + 客户端中显示的顺序 + + + LblSortIdTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 30 + + + 112, 376 + + + 100, 23 + + + 73 + + + NUDBasePurpleWeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 31 + + + True + + + 50, 87 + + + 56, 17 + + + 59 + + + 奖池类型 + + + LblBannerType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 32 + + + True + + + 218, 378 + + + 19, 17 + + + 81 + + + % + + + LblBasePurpleWeightTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 33 + + + True + + + 112, 146 + + + 74, 21 + + + 57 + + + 相遇之缘 + + + RbCostItem224 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 34 + + + True + + + 218, 262 + + + 19, 17 + + + 82 + + + % + + + LblBaseYellowWeightTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 35 + + + True + + + 50, 148 + + + 56, 17 80 - + + 祈愿道具 + + + LblCostItem + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpBannerValues - - 66 + + 36 + + + True + + + 74, 118 + + + 32, 17 + + + 61 + + + 预制 + + + LblPrefabPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 37 + + + True + + + 192, 146 + + + 74, 21 + + + 58 + + + 纠缠之缘 + + + RbCostItem223 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 38 + + + 12, 12 + + + 440, 466 + + + 44 + + + 卡池参数 + + + GrpBannerValues + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Bottom, Left, Right + + + Fill + + + 3, 19 + + + 154, 208 + + + 0 + + + ListPurplePool + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpPurplePool + + + 0 + + + 458, 248 + + + 160, 230 + + + 50 + + + 4星活动卡池 + + + GrpPurplePool + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Left, Right + + + Fill + + + 3, 19 + + + 154, 208 + + + 0 + + + ListYellowPool + + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpYellowPool + + + 0 + + + 458, 12 + + + 160, 230 + + + 49 + + + 5星活动奖池 + + + GrpYellowPool + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Bottom, Right + + + Bottom, Left + + + 6, 437 + + + 75, 23 + + + 53 + + + 生成Json + + + BtnGen + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 0 + + + Top, Bottom, Left, Right + + + 6, 19 + + + True + + + 288, 412 + + + 0 + + + TxtJson + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 1 + + + Bottom, Right + + + 219, 437 + + + 75, 23 + + + 52 + + + 解析Json + + + BtnParse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 2 + + + 624, 12 + + + 300, 466 + + + 51 + + + Json + + + GrpJson + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True - - ru-RU - + + 7, 17 + + + 934, 486 + + + 微软雅黑, 9pt + + + 3, 4, 3, 4 + + + CenterScreen + + + 卡池编辑器 + + + FormGachaBannerEditor + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs new file mode 100644 index 0000000..05a62aa --- /dev/null +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs @@ -0,0 +1,493 @@ + +namespace GrasscutterTools.Forms +{ + partial class FormGachaBannerEditor2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGachaBannerEditor2)); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + this.GrpBannerValues = new System.Windows.Forms.GroupBox(); + this.CmbPrefab = new System.Windows.Forms.ComboBox(); + this.LblEventChance5Tip = new System.Windows.Forms.Label(); + this.NUDEventChance5 = new System.Windows.Forms.NumericUpDown(); + this.LblGachaType = new System.Windows.Forms.Label(); + this.LblEventChance5 = new System.Windows.Forms.Label(); + this.LblSortId = new System.Windows.Forms.Label(); + this.NUDGachaType = new System.Windows.Forms.NumericUpDown(); + this.NUDSortId = new System.Windows.Forms.NumericUpDown(); + this.LblGachaTypeTip = new System.Windows.Forms.Label(); + this.LblEndTime = new System.Windows.Forms.Label(); + this.LblScheduleId = new System.Windows.Forms.Label(); + this.LblBeginTime = new System.Windows.Forms.Label(); + this.NUDScheduleId = new System.Windows.Forms.NumericUpDown(); + this.NUDEndTime = new System.Windows.Forms.NumericUpDown(); + this.LblScheduleIdTip = new System.Windows.Forms.Label(); + this.NUDBeginTime = new System.Windows.Forms.NumericUpDown(); + this.CmbBannerType = new System.Windows.Forms.ComboBox(); + this.LblSortIdTip = new System.Windows.Forms.Label(); + this.LblBannerType = new System.Windows.Forms.Label(); + this.RbCostItem224 = new System.Windows.Forms.RadioButton(); + this.LblCostItem = new System.Windows.Forms.Label(); + this.LblPrefabPath = new System.Windows.Forms.Label(); + this.RbCostItem223 = new System.Windows.Forms.RadioButton(); + this.GrpPurplePool = new System.Windows.Forms.GroupBox(); + this.GrpYellowPool = new System.Windows.Forms.GroupBox(); + this.GrpJson = new System.Windows.Forms.GroupBox(); + this.BtnGen = new System.Windows.Forms.Button(); + this.TxtJson = new System.Windows.Forms.TextBox(); + this.BtnParse = new System.Windows.Forms.Button(); + this.treeView1 = new System.Windows.Forms.TreeView(); + this.treeView2 = new System.Windows.Forms.TreeView(); + this.LblEventChance4 = new System.Windows.Forms.Label(); + this.NUDEventChance4 = new System.Windows.Forms.NumericUpDown(); + this.LblEventChance4Tip = new System.Windows.Forms.Label(); + this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.GrpWeights = new System.Windows.Forms.GroupBox(); + this.GrpBannerValues.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDGachaType)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDSortId)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDScheduleId)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEndTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDBeginTime)).BeginInit(); + this.GrpPurplePool.SuspendLayout(); + this.GrpYellowPool.SuspendLayout(); + this.GrpJson.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.chart1)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.GrpWeights.SuspendLayout(); + this.SuspendLayout(); + // + // GrpBannerValues + // + this.GrpBannerValues.Controls.Add(this.CmbPrefab); + this.GrpBannerValues.Controls.Add(this.LblEventChance4Tip); + this.GrpBannerValues.Controls.Add(this.LblEventChance5Tip); + this.GrpBannerValues.Controls.Add(this.NUDEventChance4); + this.GrpBannerValues.Controls.Add(this.NUDEventChance5); + this.GrpBannerValues.Controls.Add(this.LblGachaType); + this.GrpBannerValues.Controls.Add(this.LblEventChance4); + this.GrpBannerValues.Controls.Add(this.LblEventChance5); + this.GrpBannerValues.Controls.Add(this.LblSortId); + this.GrpBannerValues.Controls.Add(this.NUDGachaType); + this.GrpBannerValues.Controls.Add(this.NUDSortId); + this.GrpBannerValues.Controls.Add(this.LblGachaTypeTip); + this.GrpBannerValues.Controls.Add(this.LblEndTime); + this.GrpBannerValues.Controls.Add(this.LblScheduleId); + this.GrpBannerValues.Controls.Add(this.LblBeginTime); + this.GrpBannerValues.Controls.Add(this.NUDScheduleId); + this.GrpBannerValues.Controls.Add(this.NUDEndTime); + this.GrpBannerValues.Controls.Add(this.LblScheduleIdTip); + this.GrpBannerValues.Controls.Add(this.NUDBeginTime); + this.GrpBannerValues.Controls.Add(this.CmbBannerType); + this.GrpBannerValues.Controls.Add(this.LblSortIdTip); + this.GrpBannerValues.Controls.Add(this.LblBannerType); + this.GrpBannerValues.Controls.Add(this.RbCostItem224); + this.GrpBannerValues.Controls.Add(this.LblCostItem); + this.GrpBannerValues.Controls.Add(this.LblPrefabPath); + this.GrpBannerValues.Controls.Add(this.RbCostItem223); + resources.ApplyResources(this.GrpBannerValues, "GrpBannerValues"); + this.GrpBannerValues.Name = "GrpBannerValues"; + this.GrpBannerValues.TabStop = false; + // + // CmbPrefab + // + this.CmbPrefab.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CmbPrefab.FormattingEnabled = true; + resources.ApplyResources(this.CmbPrefab, "CmbPrefab"); + this.CmbPrefab.Name = "CmbPrefab"; + // + // LblEventChance5Tip + // + resources.ApplyResources(this.LblEventChance5Tip, "LblEventChance5Tip"); + this.LblEventChance5Tip.Name = "LblEventChance5Tip"; + // + // NUDEventChance5 + // + resources.ApplyResources(this.NUDEventChance5, "NUDEventChance5"); + this.NUDEventChance5.Name = "NUDEventChance5"; + this.NUDEventChance5.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // LblGachaType + // + resources.ApplyResources(this.LblGachaType, "LblGachaType"); + this.LblGachaType.Name = "LblGachaType"; + // + // LblEventChance5 + // + resources.ApplyResources(this.LblEventChance5, "LblEventChance5"); + this.LblEventChance5.Name = "LblEventChance5"; + // + // LblSortId + // + resources.ApplyResources(this.LblSortId, "LblSortId"); + this.LblSortId.Name = "LblSortId"; + // + // NUDGachaType + // + resources.ApplyResources(this.NUDGachaType, "NUDGachaType"); + this.NUDGachaType.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.NUDGachaType.Name = "NUDGachaType"; + this.NUDGachaType.Value = new decimal(new int[] { + 400, + 0, + 0, + 0}); + // + // NUDSortId + // + resources.ApplyResources(this.NUDSortId, "NUDSortId"); + this.NUDSortId.Maximum = new decimal(new int[] { + 9999, + 0, + 0, + 0}); + this.NUDSortId.Minimum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.NUDSortId.Name = "NUDSortId"; + this.NUDSortId.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + // + // LblGachaTypeTip + // + resources.ApplyResources(this.LblGachaTypeTip, "LblGachaTypeTip"); + this.LblGachaTypeTip.Name = "LblGachaTypeTip"; + // + // LblEndTime + // + resources.ApplyResources(this.LblEndTime, "LblEndTime"); + this.LblEndTime.Name = "LblEndTime"; + // + // LblScheduleId + // + resources.ApplyResources(this.LblScheduleId, "LblScheduleId"); + this.LblScheduleId.Name = "LblScheduleId"; + // + // LblBeginTime + // + resources.ApplyResources(this.LblBeginTime, "LblBeginTime"); + this.LblBeginTime.Name = "LblBeginTime"; + // + // NUDScheduleId + // + resources.ApplyResources(this.NUDScheduleId, "NUDScheduleId"); + this.NUDScheduleId.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.NUDScheduleId.Name = "NUDScheduleId"; + this.NUDScheduleId.Value = new decimal(new int[] { + 800, + 0, + 0, + 0}); + // + // NUDEndTime + // + resources.ApplyResources(this.NUDEndTime, "NUDEndTime"); + this.NUDEndTime.Maximum = new decimal(new int[] { + 1924992000, + 0, + 0, + 0}); + this.NUDEndTime.Name = "NUDEndTime"; + this.NUDEndTime.Value = new decimal(new int[] { + 1924992000, + 0, + 0, + 0}); + // + // LblScheduleIdTip + // + resources.ApplyResources(this.LblScheduleIdTip, "LblScheduleIdTip"); + this.LblScheduleIdTip.Name = "LblScheduleIdTip"; + // + // NUDBeginTime + // + resources.ApplyResources(this.NUDBeginTime, "NUDBeginTime"); + this.NUDBeginTime.Maximum = new decimal(new int[] { + 1924992000, + 0, + 0, + 0}); + this.NUDBeginTime.Name = "NUDBeginTime"; + // + // CmbBannerType + // + this.CmbBannerType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CmbBannerType.FormattingEnabled = true; + this.CmbBannerType.Items.AddRange(new object[] { + resources.GetString("CmbBannerType.Items"), + resources.GetString("CmbBannerType.Items1"), + resources.GetString("CmbBannerType.Items2")}); + resources.ApplyResources(this.CmbBannerType, "CmbBannerType"); + this.CmbBannerType.Name = "CmbBannerType"; + // + // LblSortIdTip + // + resources.ApplyResources(this.LblSortIdTip, "LblSortIdTip"); + this.LblSortIdTip.Name = "LblSortIdTip"; + // + // LblBannerType + // + resources.ApplyResources(this.LblBannerType, "LblBannerType"); + this.LblBannerType.Name = "LblBannerType"; + // + // RbCostItem224 + // + resources.ApplyResources(this.RbCostItem224, "RbCostItem224"); + this.RbCostItem224.Checked = true; + this.RbCostItem224.Name = "RbCostItem224"; + this.RbCostItem224.TabStop = true; + this.RbCostItem224.UseVisualStyleBackColor = true; + // + // LblCostItem + // + resources.ApplyResources(this.LblCostItem, "LblCostItem"); + this.LblCostItem.Name = "LblCostItem"; + // + // LblPrefabPath + // + resources.ApplyResources(this.LblPrefabPath, "LblPrefabPath"); + this.LblPrefabPath.Name = "LblPrefabPath"; + // + // RbCostItem223 + // + resources.ApplyResources(this.RbCostItem223, "RbCostItem223"); + this.RbCostItem223.Name = "RbCostItem223"; + this.RbCostItem223.TabStop = true; + this.RbCostItem223.UseVisualStyleBackColor = true; + // + // GrpPurplePool + // + resources.ApplyResources(this.GrpPurplePool, "GrpPurplePool"); + this.GrpPurplePool.Controls.Add(this.treeView1); + this.GrpPurplePool.Name = "GrpPurplePool"; + this.GrpPurplePool.TabStop = false; + // + // GrpYellowPool + // + resources.ApplyResources(this.GrpYellowPool, "GrpYellowPool"); + this.GrpYellowPool.Controls.Add(this.treeView2); + this.GrpYellowPool.Name = "GrpYellowPool"; + this.GrpYellowPool.TabStop = false; + // + // GrpJson + // + resources.ApplyResources(this.GrpJson, "GrpJson"); + this.GrpJson.Controls.Add(this.BtnGen); + this.GrpJson.Controls.Add(this.TxtJson); + this.GrpJson.Controls.Add(this.BtnParse); + this.GrpJson.Name = "GrpJson"; + this.GrpJson.TabStop = false; + // + // BtnGen + // + resources.ApplyResources(this.BtnGen, "BtnGen"); + this.BtnGen.Name = "BtnGen"; + this.BtnGen.UseVisualStyleBackColor = true; + this.BtnGen.Click += new System.EventHandler(this.BtnGen_Click); + // + // TxtJson + // + resources.ApplyResources(this.TxtJson, "TxtJson"); + this.TxtJson.Name = "TxtJson"; + // + // BtnParse + // + resources.ApplyResources(this.BtnParse, "BtnParse"); + this.BtnParse.Name = "BtnParse"; + this.BtnParse.UseVisualStyleBackColor = true; + this.BtnParse.Click += new System.EventHandler(this.BtnParse_Click); + // + // treeView1 + // + resources.ApplyResources(this.treeView1, "treeView1"); + this.treeView1.Name = "treeView1"; + // + // treeView2 + // + resources.ApplyResources(this.treeView2, "treeView2"); + this.treeView2.Name = "treeView2"; + // + // LblEventChance4 + // + resources.ApplyResources(this.LblEventChance4, "LblEventChance4"); + this.LblEventChance4.Name = "LblEventChance4"; + // + // NUDEventChance4 + // + resources.ApplyResources(this.NUDEventChance4, "NUDEventChance4"); + this.NUDEventChance4.Name = "NUDEventChance4"; + this.NUDEventChance4.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // LblEventChance4Tip + // + resources.ApplyResources(this.LblEventChance4Tip, "LblEventChance4Tip"); + this.LblEventChance4Tip.Name = "LblEventChance4Tip"; + // + // chart1 + // + chartArea3.Name = "ChartArea1"; + this.chart1.ChartAreas.Add(chartArea3); + legend3.Name = "Legend1"; + this.chart1.Legends.Add(legend3); + resources.ApplyResources(this.chart1, "chart1"); + this.chart1.Name = "chart1"; + series3.ChartArea = "ChartArea1"; + series3.Legend = "Legend1"; + series3.Name = "Series1"; + this.chart1.Series.Add(series3); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + resources.ApplyResources(this.tabControl1, "tabControl1"); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + // + // tabPage1 + // + resources.ApplyResources(this.tabPage1, "tabPage1"); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + resources.ApplyResources(this.tabPage2, "tabPage2"); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // GrpWeights + // + resources.ApplyResources(this.GrpWeights, "GrpWeights"); + this.GrpWeights.Controls.Add(this.tabControl1); + this.GrpWeights.Controls.Add(this.chart1); + this.GrpWeights.Name = "GrpWeights"; + this.GrpWeights.TabStop = false; + // + // FormGachaBannerEditor2 + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.GrpWeights); + this.Controls.Add(this.GrpJson); + this.Controls.Add(this.GrpPurplePool); + this.Controls.Add(this.GrpYellowPool); + this.Controls.Add(this.GrpBannerValues); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "FormGachaBannerEditor2"; + this.GrpBannerValues.ResumeLayout(false); + this.GrpBannerValues.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDGachaType)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDSortId)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDScheduleId)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEndTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDBeginTime)).EndInit(); + this.GrpPurplePool.ResumeLayout(false); + this.GrpYellowPool.ResumeLayout(false); + this.GrpJson.ResumeLayout(false); + this.GrpJson.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUDEventChance4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.chart1)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.GrpWeights.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.GroupBox GrpBannerValues; + private System.Windows.Forms.Label LblEventChance5Tip; + private System.Windows.Forms.NumericUpDown NUDEventChance5; + private System.Windows.Forms.Label LblGachaType; + private System.Windows.Forms.Label LblEventChance5; + private System.Windows.Forms.Label LblSortId; + private System.Windows.Forms.NumericUpDown NUDGachaType; + private System.Windows.Forms.NumericUpDown NUDSortId; + private System.Windows.Forms.Label LblGachaTypeTip; + private System.Windows.Forms.Label LblEndTime; + private System.Windows.Forms.Label LblScheduleId; + private System.Windows.Forms.Label LblBeginTime; + private System.Windows.Forms.NumericUpDown NUDScheduleId; + private System.Windows.Forms.NumericUpDown NUDEndTime; + private System.Windows.Forms.Label LblScheduleIdTip; + private System.Windows.Forms.NumericUpDown NUDBeginTime; + private System.Windows.Forms.ComboBox CmbBannerType; + private System.Windows.Forms.Label LblSortIdTip; + private System.Windows.Forms.Label LblBannerType; + private System.Windows.Forms.RadioButton RbCostItem224; + private System.Windows.Forms.Label LblCostItem; + private System.Windows.Forms.Label LblPrefabPath; + private System.Windows.Forms.RadioButton RbCostItem223; + private System.Windows.Forms.GroupBox GrpPurplePool; + private System.Windows.Forms.GroupBox GrpYellowPool; + private System.Windows.Forms.GroupBox GrpJson; + private System.Windows.Forms.TextBox TxtJson; + private System.Windows.Forms.Button BtnGen; + private System.Windows.Forms.Button BtnParse; + private System.Windows.Forms.ComboBox CmbPrefab; + private System.Windows.Forms.Label LblEventChance4; + private System.Windows.Forms.TreeView treeView1; + private System.Windows.Forms.TreeView treeView2; + private System.Windows.Forms.Label LblEventChance4Tip; + private System.Windows.Forms.NumericUpDown NUDEventChance4; + private System.Windows.Forms.DataVisualization.Charting.Chart chart1; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.GroupBox GrpWeights; + } +} \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs new file mode 100644 index 0000000..6147a93 --- /dev/null +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs @@ -0,0 +1,184 @@ +/** + * Grasscutter Tools + * Copyright (C) 2022 jie65535 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + **/ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +using GrasscutterTools.Game; +using GrasscutterTools.Game.Gacha; +using GrasscutterTools.Properties; + +using Newtonsoft.Json; + +namespace GrasscutterTools.Forms +{ + /// + /// 卡池编辑器 + /// + public partial class FormGachaBannerEditor2 : Form + { + #region - 初始化 - + + public FormGachaBannerEditor2() + { + InitializeComponent(); + + Icon = Resources.IconGrasscutter; + CmbBannerType.SelectedIndex = 0; + InitBannerPrefab(); + InitCheckedListBoxs(); + } + + private void InitBannerPrefab() + { + CmbPrefab.Items.Clear(); + CmbPrefab.Items.AddRange(GameData.GachaBannerPrefabs.Names); + } + + private void InitCheckedListBoxs() + { + // TODO + } + + //private void InitCheckedListBox(CheckedListBox list, string color) + //{ + // var kvs = new List(); + // for (int i = 0; i < GameData.AvatarColors.Count; i++) + // { + // if (GameData.AvatarColors.Names[i] == color) + // { + // var id = GameData.AvatarColors.Ids[i]; + // var index = Array.IndexOf(GameData.Avatars.Ids, id % 1000 + 10000000); + // if (index >= 0) + // kvs.Add($"{id}:{GameData.Avatars.Names[index]}"); + // } + // } + // for (int i = 0; i < GameData.WeaponColors.Count; i++) + // { + // if (GameData.WeaponColors.Names[i] == color) + // { + // var id = GameData.WeaponColors.Ids[i]; + // var index = Array.IndexOf(GameData.Weapons.Ids, id); + // if (index >= 0) + // kvs.Add($"{id}:{GameData.Weapons.Names[index]}"); + // } + // } + // list.Items.AddRange(kvs.ToArray()); + //} + + private void InitRateUpItems(GachaBanner2 banner) + { + // TODO + } + + #endregion - 初始化 - + + #region - UI - + + private void ShowBanner(GachaBanner2 banner) + { + try + { + NUDGachaType.Value = banner.GachaType; + NUDScheduleId.Value = banner.ScheduleId; + CmbBannerType.SelectedIndex = (int)banner.BannerType; + if (string.IsNullOrEmpty(banner.TitlePath) || !int.TryParse(banner.TitlePath.Substring("UI_GACHA_SHOW_PANEL_A".Length, 3), out int prefabId)) + CmbPrefab.SelectedIndex = -1; + else + CmbPrefab.SelectedIndex = Array.IndexOf(GameData.GachaBannerPrefabs.Ids, prefabId); + RbCostItem224.Checked = banner.CostItem == 224; + RbCostItem223.Checked = banner.CostItem == 223; + NUDBeginTime.Value = banner.BeginTime; + NUDEndTime.Value = banner.EndTime; + NUDSortId.Value = banner.SortId; + NUDEventChance5.Value = banner.EventChance5; + NUDEventChance4.Value = banner.EventChance4; + InitRateUpItems(banner); + } + catch (Exception ex) + { + MessageBox.Show("UI更新失败：" + ex.Message, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private GachaBanner2 ParseBanner() + { + if (CmbBannerType.SelectedIndex < 0) + { + MessageBox.Show("请选择奖池类型", Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + return null; + } + + if (CmbPrefab.SelectedIndex < 0) + { + MessageBox.Show("请选择奖池预制", Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + return null; + } + + + var prefabId = GameData.GachaBannerPrefabs.Ids[CmbPrefab.SelectedIndex]; + var banner = new GachaBanner2 + { + GachaType = (int)NUDGachaType.Value, + ScheduleId = (int)NUDScheduleId.Value, + BannerType = (BannerType)CmbBannerType.SelectedIndex, + PrefabPath = $"GachaShowPanel_A{prefabId:000}", + PreviewPrefabPath = $"UI_Tab_GachaShowPanel_A{prefabId:000}", + TitlePath = $"UI_GACHA_SHOW_PANEL_A{prefabId:000}_TITLE", + CostItem = RbCostItem224.Checked ? 224 : 223, + BeginTime = (int)NUDBeginTime.Value, + EndTime = (int)NUDEndTime.Value, + SortId = (int)NUDSortId.Value, + EventChance5 = (int)NUDEventChance5.Value, + EventChance4 = (int)NUDEventChance4.Value, + }; + return banner; + } + + #endregion - UI - + + #region - 事件 - + + private void BtnGen_Click(object sender, EventArgs e) + { + var banner = ParseBanner(); + if (banner != null) + { + TxtJson.Text = JsonConvert.SerializeObject(banner, Formatting.Indented); + } + } + + private void BtnParse_Click(object sender, EventArgs e) + { + try + { + ShowBanner(JsonConvert.DeserializeObject(TxtJson.Text)); + } + catch (Exception ex) + { + MessageBox.Show("Json解析失败，错误消息：" + ex.Message, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + #endregion - 事件 - + } +} \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx new file mode 100644 index 0000000..ed1c46e --- /dev/null +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + 332, 260 + + + 83, 17 + + + Event chance + + + 72, 204 + + + Sort + + + 22, 262 + + + 83, 17 + + + 5 star weight + + + 44, 350 + + + 61, 17 + + + 4 star UP + + + 49, 291 + + + 56, 17 + + + Soft pity + + + 123, 17 + + + Increment from 400 + + + 62, 17 + + + End Time + + + 44, 234 + + + 61, 17 + + + 5 star UP + + + 32, 175 + + + 73, 17 + + + Begin Time + + + 42, 320 + + + 62, 17 + + + Hard pity + + + 287, 174 + + + 17, 17 + + + ... + + + 49, 17 + + + Unique + + + 17, 17 + + + ... + + + 22, 378 + + + 83, 17 + + + 4 star weight + + + Standard Wish + + + Character Event Wish + + + Weapon Event Wish + + + 76, 17 + + + Show order + + + 25, 87 + + + 81, 17 + + + Banner Type + + + 104, 21 + + + Acquaint Fate + + + 41, 148 + + + 64, 17 + + + Cost Item + + + 59, 118 + + + 46, 17 + + + Prefab + + + 222, 146 + + + 119, 21 + + + Intertwined Fate + + + Banner + + + 4 star pool + + + 5 star pool + + + 85, 23 + + + Gen Json + + + 209, 437 + + + 85, 23 + + + Parse Json + + + Gacha Banner Editor + + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx new file mode 100644 index 0000000..9ad5654 --- /dev/null +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -0,0 +1,1545 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CmbPrefab + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 0 + + + LblEventChance4Tip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 1 + + + LblEventChance5Tip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 2 + + + NUDEventChance4 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 3 + + + NUDEventChance5 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 4 + + + LblGachaType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 5 + + + LblEventChance4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 6 + + + LblEventChance5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 7 + + + LblSortId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 8 + + + NUDGachaType + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 9 + + + NUDSortId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 10 + + + LblGachaTypeTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 11 + + + LblEndTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 12 + + + LblScheduleId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 13 + + + LblBeginTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 14 + + + NUDScheduleId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 15 + + + NUDEndTime + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 16 + + + LblScheduleIdTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 17 + + + NUDBeginTime + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 18 + + + CmbBannerType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 19 + + + LblSortIdTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 20 + + + LblBannerType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 21 + + + RbCostItem224 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 22 + + + LblCostItem + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 23 + + + LblPrefabPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 24 + + + RbCostItem223 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 25 + + + + 12, 12 + + + 440, 268 + + + + 44 + + + 卡池参数 + + + GrpBannerValues + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 112, 115 + + + 300, 25 + + + 90 + + + CmbPrefab + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 0 + + + True + + + 181, 233 + + + 19, 17 + + + 89 + + + % + + + LblEventChance5Tip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 2 + + + 112, 231 + + + 63, 23 + + + 68 + + + NUDEventChance5 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 4 + + + True + + + 34, 28 + + + 72, 17 + + + 48 + + + GachaType + + + LblGachaType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 5 + + + True + + + 31, 233 + + + 75, 17 + + + 88 + + + 5星活动爆率 + + + LblEventChance5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 7 + + + True + + + 74, 204 + + + 32, 17 + + + 75 + + + 顺序 + + + LblSortId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 8 + + + 112, 26 + + + 100, 23 + + + 47 + + + NUDGachaType + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 9 + + + 112, 202 + + + 100, 23 + + + 64 + + + NUDSortId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 10 + + + True + + + 218, 28 + + + 125, 17 + + + 51 + + + 从400开始，顺序递增 + + + LblGachaTypeTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 11 + + + True + + + 218, 176 + + + 56, 17 + + + 74 + + + 结束时间 + + + LblEndTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 12 + + + True + + + 34, 57 + + + 72, 17 + + + 53 + + + ScheduleId + + + LblScheduleId + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 13 + + + True + + + 50, 176 + + + 56, 17 + + + 72 + + + 开始时间 + + + LblBeginTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 14 + + + 112, 55 + + + 100, 23 + + + 49 + + + NUDScheduleId + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 15 + + + 280, 174 + + + 100, 23 + + + 62 + + + NUDEndTime + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 16 + + + True + + + 218, 57 + + + 69, 17 + + + 56 + + + ID要求唯一 + + + LblScheduleIdTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 17 + + + 112, 173 + + + 100, 23 + + + 60 + + + NUDBeginTime + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 18 + + + 常驻池 + + + 限时角色祈愿池 + + + 限时武器祈愿池 + + + 112, 84 + + + 300, 25 + + + 50 + + + CmbBannerType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 19 + + + True + + + 218, 204 + + + 116, 17 + + + 83 + + + 客户端中显示的顺序 + + + LblSortIdTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 20 + + + True + + + 50, 87 + + + 56, 17 + + + 59 + + + 奖池类型 + + + LblBannerType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 21 + + + True + + + 112, 146 + + + 74, 21 + + + 57 + + + 相遇之缘 + + + RbCostItem224 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 22 + + + True + + + 50, 148 + + + 56, 17 + + + 80 + + + 祈愿道具 + + + LblCostItem + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 23 + + + True + + + 74, 118 + + + 32, 17 + + + 61 + + + 预制 + + + LblPrefabPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 24 + + + True + + + 192, 146 + + + 74, 21 + + + 58 + + + 纠缠之缘 + + + RbCostItem223 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 25 + + + + Top, Bottom, Left, Right + + + treeView1 + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpPurplePool + + + 0 + + + 458, 248 + + + 210, 305 + + + 50 + + + 基础池 + + + GrpPurplePool + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Left, Right + + + treeView2 + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpYellowPool + + + 0 + + + 458, 12 + + + 210, 230 + + + 49 + + + UP池 + + + GrpYellowPool + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Top, Bottom, Right + + + BtnGen + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 0 + + + TxtJson + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 1 + + + BtnParse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 2 + + + 674, 12 + + + 300, 541 + + + 51 + + + Json + + + GrpJson + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Left + + + 6, 512 + + + 75, 23 + + + 53 + + + 生成Json + + + BtnGen + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 0 + + + Top, Bottom, Left, Right + + + 6, 19 + + + True + + + 288, 487 + + + 0 + + + TxtJson + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 1 + + + Bottom, Right + + + 219, 512 + + + 75, 23 + + + 52 + + + 解析Json + + + BtnParse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + 2 + + + Fill + + + 3, 19 + + + 204, 283 + + + 1 + + + treeView1 + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpPurplePool + + + 0 + + + Fill + + + 3, 19 + + + 204, 208 + + + 0 + + + treeView2 + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpYellowPool + + + 0 + + + True + + + NoControl + + + 218, 233 + + + 75, 17 + + + 88 + + + 4星活动爆率 + + + LblEventChance4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 6 + + + 299, 231 + + + 63, 23 + + + 68 + + + NUDEventChance4 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 3 + + + True + + + NoControl + + + 368, 233 + + + 19, 17 + + + 89 + + + % + + + LblEventChance4Tip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBannerValues + + + 1 + + + 6, 103 + + + 428, 158 + + + 91 + + + chart1 + + + chart1 + + + System.Windows.Forms.DataVisualization.Charting.Chart, System.Windows.Forms.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 + + + GrpWeights + + + 1 + + + 4, 26 + + + 3, 3, 3, 3 + + + 420, 45 + + + 0 + + + 5星爆率 + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + 4, 26 + + + 3, 3, 3, 3 + + + 420, 45 + + + 1 + + + 4星爆率 + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + 6, 22 + + + 428, 75 + + + 92 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpWeights + + + 0 + + + Top, Bottom, Left + + + 12, 286 + + + 440, 267 + + + 93 + + + 奖池爆率 + + + GrpWeights + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 7, 17 + + + 984, 561 + + + 微软雅黑, 9pt + + + 3, 4, 3, 4 + + + CenterScreen + + + 卡池编辑器 + + + FormGachaBannerEditor2 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx new file mode 100644 index 0000000..837734d --- /dev/null +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + False + + + + 22, 415 + + + 390, 35 + + + Совет: Последняя версия баннера разрабатывается в настоящее время не поддерживается, ждем PR : ) + + + 401, 262 + + + 336, 260 + + + 43, 28 + + + 63, 17 + + + Тип Гачи + + + 238, 262 + + + 96, 17 + + + Шанс события + + + 66, 204 + + + 40, 17 + + + Сорт. + + + 13, 262 + + + 93, 17 + + + 5-звездочный + + + 25, 350 + + + 81, 17 + + + 4 звезды UP + + + 27, 291 + + + 79, 17 + + + Мяг. гарант + + + 116, 17 + + + Увеличение с 400 + + + 234, 176 + + + 47, 17 + + + Конец + + + 51, 234 + + + 55, 17 + + + 5 зв. UP + + + 8, 57 + + + 98, 17 + + + ID расписания + + + 53, 176 + + + 53, 17 + + + Начало + + + 21, 320 + + + 85, 17 + + + Жест. Гарант + + + 287, 174 + + + 17, 17 + + + ... + + + 84, 17 + + + Уникальный + + + 17, 17 + + + ... + + + 29, 378 + + + 77, 17 + + + 4 звездный + + + Стандартная Молитва + + + Молитва события персонажа + + + Молитва события с оружием + + + 101, 17 + + + Показать заказ + + + 18, 87 + + + 88, 17 + + + Тип баннера + + + 116, 21 + + + Судьбоносные + + + 34, 148 + + + 72, 17 + + + Стоимость + + + 47, 118 + + + 59, 17 + + + Готовый + + + 234, 146 + + + 141, 21 + + + Переплетающиеся + + + Баннеп + + + 4 звёздочный пул + + + 5 звёздочный пул + + + 85, 23 + + + Сген. Json + + + 209, 437 + + + 85, 23 + + + Загр.Json + + + Редактор баннеров Gacha + + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs index dbc8821..fec317a 100644 --- a/Source/GrasscutterTools/Forms/FormMain.cs +++ b/Source/GrasscutterTools/Forms/FormMain.cs @@ -162,35 +162,35 @@ namespace GrasscutterTools.Forms #region - 主页 - - private FormGachaBannerEditor FormGachaBannerEditor; + private Form GachaBannerEditor; private void BtnOpenGachaBannerEditor_Click(object sender, EventArgs e) { - if (FormGachaBannerEditor == null || FormGachaBannerEditor.IsDisposed) + if (GachaBannerEditor == null || GachaBannerEditor.IsDisposed) { - FormGachaBannerEditor = new FormGachaBannerEditor(); - FormGachaBannerEditor.Show(); + GachaBannerEditor = new FormGachaBannerEditor2(); + GachaBannerEditor.Show(); } else { - FormGachaBannerEditor.TopMost = true; - FormGachaBannerEditor.TopMost = false; + GachaBannerEditor.TopMost = true; + GachaBannerEditor.TopMost = false; } } - private FormTextMapBrowser FormTextMapBrowser; + private FormTextMapBrowser TextMapBrowser; private void BtnOpenTextMap_Click(object sender, EventArgs e) { - if (FormTextMapBrowser == null || FormTextMapBrowser.IsDisposed) + if (TextMapBrowser == null || TextMapBrowser.IsDisposed) { - FormTextMapBrowser = new FormTextMapBrowser(); - FormTextMapBrowser.Show(); + TextMapBrowser = new FormTextMapBrowser(); + TextMapBrowser.Show(); } else { - FormTextMapBrowser.TopMost = true; - FormTextMapBrowser.TopMost = false; + TextMapBrowser.TopMost = true; + TextMapBrowser.TopMost = false; } } diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs index 89a3453..1bd944a 100644 --- a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs +++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs @@ -90,13 +90,13 @@ namespace GrasscutterTools.Game.Gacha /// 4星的up角色或物品 /// [JsonProperty("rateUpItems4")] - public int[] RateUpItems4 { get; set; } + public int[] RateUpItems4 { get; set; } = { }; /// /// 5星的up物品或者角色 /// [JsonProperty("rateUpItems5")] - public int[] RateUpItems5 { get; set; } + public int[] RateUpItems5 { get; set; } = { }; /// /// 3星普通池 diff --git a/Source/GrasscutterTools/GrasscutterTools.csproj b/Source/GrasscutterTools/GrasscutterTools.csproj index c9eb898..ae64c79 100644 --- a/Source/GrasscutterTools/GrasscutterTools.csproj +++ b/Source/GrasscutterTools/GrasscutterTools.csproj @@ -180,6 +180,7 @@ True True + @@ -197,6 +198,12 @@ + + Form + + + FormGachaBannerEditor2.cs + Form @@ -229,6 +236,15 @@ + + FormGachaBannerEditor2.cs + + + FormGachaBannerEditor2.cs + + + FormGachaBannerEditor2.cs + FormGachaBannerEditor.cs