diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs index ff1089b..b06ac21 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs @@ -61,11 +61,11 @@ namespace GrasscutterTools.Forms 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.GrpFallbackPool = new System.Windows.Forms.GroupBox(); this.ListFallbackItems = new System.Windows.Forms.ListView(); this.ColFallbackId = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ColFallbackName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.GrpYellowPool = new System.Windows.Forms.GroupBox(); + this.GrpUpPool = new System.Windows.Forms.GroupBox(); this.ListUpItems = new System.Windows.Forms.ListView(); this.ColUpId = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ColUpName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -73,13 +73,13 @@ namespace GrasscutterTools.Forms this.BtnGen = new System.Windows.Forms.Button(); this.TxtJson = new System.Windows.Forms.TextBox(); this.BtnParse = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.GrpWeights = new System.Windows.Forms.GroupBox(); this.LnkWeightHelp = new System.Windows.Forms.LinkLabel(); this.TxtWeight4 = new System.Windows.Forms.TextBox(); this.TxtWeight5 = new System.Windows.Forms.TextBox(); this.LblWeight4 = new System.Windows.Forms.Label(); this.LblWeight5 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.GrpBalance = new System.Windows.Forms.GroupBox(); this.TxtPoolWeight4 = new System.Windows.Forms.TextBox(); this.TxtPoolWeight5 = new System.Windows.Forms.TextBox(); this.LblPoolWeight4 = new System.Windows.Forms.Label(); @@ -90,11 +90,11 @@ namespace GrasscutterTools.Forms ((System.ComponentModel.ISupportInitialize)(this.NUDGachaType)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDSortId)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDScheduleId)).BeginInit(); - this.GrpPurplePool.SuspendLayout(); - this.GrpYellowPool.SuspendLayout(); + this.GrpFallbackPool.SuspendLayout(); + this.GrpUpPool.SuspendLayout(); this.GrpJson.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); + this.GrpWeights.SuspendLayout(); + this.GrpBalance.SuspendLayout(); this.SuspendLayout(); // // GrpBannerValues @@ -349,12 +349,12 @@ namespace GrasscutterTools.Forms this.RbCostItem223.TabStop = true; this.RbCostItem223.UseVisualStyleBackColor = true; // - // GrpPurplePool + // GrpFallbackPool // - resources.ApplyResources(this.GrpPurplePool, "GrpPurplePool"); - this.GrpPurplePool.Controls.Add(this.ListFallbackItems); - this.GrpPurplePool.Name = "GrpPurplePool"; - this.GrpPurplePool.TabStop = false; + resources.ApplyResources(this.GrpFallbackPool, "GrpFallbackPool"); + this.GrpFallbackPool.Controls.Add(this.ListFallbackItems); + this.GrpFallbackPool.Name = "GrpFallbackPool"; + this.GrpFallbackPool.TabStop = false; // // ListFallbackItems // @@ -384,12 +384,12 @@ namespace GrasscutterTools.Forms // resources.ApplyResources(this.ColFallbackName, "ColFallbackName"); // - // GrpYellowPool + // GrpUpPool // - resources.ApplyResources(this.GrpYellowPool, "GrpYellowPool"); - this.GrpYellowPool.Controls.Add(this.ListUpItems); - this.GrpYellowPool.Name = "GrpYellowPool"; - this.GrpYellowPool.TabStop = false; + resources.ApplyResources(this.GrpUpPool, "GrpUpPool"); + this.GrpUpPool.Controls.Add(this.ListUpItems); + this.GrpUpPool.Name = "GrpUpPool"; + this.GrpUpPool.TabStop = false; // // ListUpItems // @@ -445,16 +445,16 @@ namespace GrasscutterTools.Forms this.BtnParse.UseVisualStyleBackColor = true; this.BtnParse.Click += new System.EventHandler(this.BtnParse_Click); // - // groupBox1 + // GrpWeights // - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Controls.Add(this.LnkWeightHelp); - this.groupBox1.Controls.Add(this.TxtWeight4); - this.groupBox1.Controls.Add(this.TxtWeight5); - this.groupBox1.Controls.Add(this.LblWeight4); - this.groupBox1.Controls.Add(this.LblWeight5); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; + resources.ApplyResources(this.GrpWeights, "GrpWeights"); + this.GrpWeights.Controls.Add(this.LnkWeightHelp); + this.GrpWeights.Controls.Add(this.TxtWeight4); + this.GrpWeights.Controls.Add(this.TxtWeight5); + this.GrpWeights.Controls.Add(this.LblWeight4); + this.GrpWeights.Controls.Add(this.LblWeight5); + this.GrpWeights.Name = "GrpWeights"; + this.GrpWeights.TabStop = false; // // LnkWeightHelp // @@ -483,15 +483,15 @@ namespace GrasscutterTools.Forms resources.ApplyResources(this.LblWeight5, "LblWeight5"); this.LblWeight5.Name = "LblWeight5"; // - // groupBox2 + // GrpBalance // - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.Controls.Add(this.TxtPoolWeight4); - this.groupBox2.Controls.Add(this.TxtPoolWeight5); - this.groupBox2.Controls.Add(this.LblPoolWeight4); - this.groupBox2.Controls.Add(this.LblPoolWeight5); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.TabStop = false; + resources.ApplyResources(this.GrpBalance, "GrpBalance"); + this.GrpBalance.Controls.Add(this.TxtPoolWeight4); + this.GrpBalance.Controls.Add(this.TxtPoolWeight5); + this.GrpBalance.Controls.Add(this.LblPoolWeight4); + this.GrpBalance.Controls.Add(this.LblPoolWeight5); + this.GrpBalance.Name = "GrpBalance"; + this.GrpBalance.TabStop = false; // // TxtPoolWeight4 // @@ -517,11 +517,11 @@ namespace GrasscutterTools.Forms // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); + this.Controls.Add(this.GrpBalance); + this.Controls.Add(this.GrpWeights); this.Controls.Add(this.GrpJson); - this.Controls.Add(this.GrpPurplePool); - this.Controls.Add(this.GrpYellowPool); + this.Controls.Add(this.GrpFallbackPool); + this.Controls.Add(this.GrpUpPool); this.Controls.Add(this.GrpBannerValues); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Name = "FormGachaBannerEditor2"; @@ -532,14 +532,14 @@ namespace GrasscutterTools.Forms ((System.ComponentModel.ISupportInitialize)(this.NUDGachaType)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDSortId)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDScheduleId)).EndInit(); - this.GrpPurplePool.ResumeLayout(false); - this.GrpYellowPool.ResumeLayout(false); + this.GrpFallbackPool.ResumeLayout(false); + this.GrpUpPool.ResumeLayout(false); this.GrpJson.ResumeLayout(false); this.GrpJson.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); + this.GrpWeights.ResumeLayout(false); + this.GrpWeights.PerformLayout(); + this.GrpBalance.ResumeLayout(false); + this.GrpBalance.PerformLayout(); this.ResumeLayout(false); } @@ -566,8 +566,8 @@ namespace GrasscutterTools.Forms 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 GrpFallbackPool; + private System.Windows.Forms.GroupBox GrpUpPool; private System.Windows.Forms.GroupBox GrpJson; private System.Windows.Forms.TextBox TxtJson; private System.Windows.Forms.Button BtnGen; @@ -584,8 +584,8 @@ namespace GrasscutterTools.Forms private System.Windows.Forms.ColumnHeader ColFallbackName; private System.Windows.Forms.ColumnHeader ColUpId; private System.Windows.Forms.ColumnHeader ColUpName; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.GroupBox GrpWeights; + private System.Windows.Forms.GroupBox GrpBalance; private System.Windows.Forms.TextBox TxtWeight4; private System.Windows.Forms.TextBox TxtWeight5; private System.Windows.Forms.Label LblWeight4; diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx index ae75146..aefb744 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx @@ -259,9 +259,6 @@ Banner - - 4 star pool - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -322,8 +319,8 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - 5 star pool + + Fallback Pool @@ -365,6 +362,9 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== + + Up Pool + 85, 23 @@ -407,6 +407,9 @@ Weights 5 + + Gacha weights + 16, 61 @@ -425,6 +428,9 @@ Pool Weight 5 + + Character and weapon balance (only mixed pools work) + Gacha Banner Editor diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx index c724384..53a3e0c 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -124,28 +124,19 @@ GrpBannerValues - - 角色和武器平衡机制（仅混合池有效） + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Bottom, Left - - 3, 4, 3, 4 - - - $this - True System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -155,8 +146,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpBannerValues + + + 112, 58 2 @@ -167,7 +159,9 @@ GrpBannerValues - + + 100, 23 + 34, 28 @@ -195,9 +189,6 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 - 2 @@ -225,8 +216,8 @@ ColUpName - - 302, 173 + + LblEventChance4 GrpBannerValues @@ -240,6 +231,9 @@ 5 + + % + True @@ -249,15 +243,12 @@ Fill - - LblPoolWeight4 - - - 5 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 347 + GrpBannerValues @@ -274,11 +265,11 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNQs= - - GrpYellowPool + + 0 - - 32, 17 + + GrpWeights System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -338,23 +329,29 @@ 72, 17 + + 12, 453 + + + 1 + 纠缠之缘 4 + + GrpWeights + CmbBannerType System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - 祈愿道具 + + 32, 17 300, 23 @@ -365,8 +362,8 @@ 9 - - 402, 0 + + Bottom, Left 89 @@ -377,9 +374,6 @@ 22 - - groupBox1 - True @@ -395,11 +389,11 @@ 3 - - GrpBannerValues + + 预制 - - groupBox1 + + UP池 1 @@ -422,11 +416,11 @@ 解析Json - - groupBox2 + + 53 - groupBox1 + GrpWeights NUDEventChance5 @@ -446,14 +440,14 @@ GrpJson - - 4 + + GrpBalance GrpBannerValues - GrpPurplePool + GrpFallbackPool 112, 115 @@ -467,9 +461,6 @@ True - - $this - 4星权重 @@ -488,12 +479,12 @@ 10 + + 458, 12 + 顺序 - - UP池 - 440, 329 @@ -503,17 +494,20 @@ 300, 25 + + 角色和武器平衡机制（仅混合池有效） + 20 NUDSortId - - GrpPurplePool + + 8 - - 1 + + True @@ -551,21 +545,18 @@ 帮助 - - 74, 118 - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True - - True - 26 + + 210, 230 + GrpBannerValues @@ -581,6 +572,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 110 + 6 @@ -593,26 +587,29 @@ 1 - - 4 + + 112, 146 5 - - 63, 17 + + True + + + 458, 248 0 - groupBox2 + GrpBalance System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 12, 453 + + 112, 260 客户端中显示的顺序 @@ -626,6 +623,9 @@ 125, 17 + + GrpBannerValues + 3 @@ -641,6 +641,9 @@ 6, 309 + + LblEndTime + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -656,8 +659,14 @@ 0 - - GrpBannerValues + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 23 + + + Bottom, Left 204, 208 @@ -677,17 +686,11 @@ 88 - - 440, 100 - 27 - - LblEventChance4Tip - - - System.Windows.Forms.LinkLabel, 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 System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -699,7 +702,7 @@ LblSortId - groupBox1 + GrpWeights 65 @@ -732,8 +735,11 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 25 @@ -741,12 +747,18 @@ 5星活动爆率 + + 5 + $this RbCostItem223 + + 181, 233 + 18 @@ -762,8 +774,8 @@ 112, 29 - - Top, Bottom, Left, Right + + 210, 305 @@ -781,9 +793,6 @@ 74, 261 - - Bottom, Left - 83 @@ -802,6 +811,12 @@ 6, 19 + + 440, 100 + + + LblEventChance4Tip + LblWeight4 @@ -814,9 +829,6 @@ Vertical - - 458, 248 - 8 @@ -826,8 +838,11 @@ 0 - - 5星池权重 + + 0 + + + GrpBannerValues GrpBannerValues @@ -838,8 +853,8 @@ 3 - - 210, 305 + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True @@ -847,6 +862,9 @@ NUDEventChance4 + + $this + 219, 512 @@ -859,39 +877,42 @@ 56, 17 + + 0 + 90 19 - - 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 GachaType - - TxtPoolWeight5 + + 51, 17 - - LblEventChance4 + + Top, Bottom, Left, Right - - 3 + + 2 110, 23 - - 210, 230 + + 打开旧版本编辑器 System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 + 55, 61 @@ -904,9 +925,6 @@ 112, 202 - - 12, 347 - 34, 57 @@ -922,20 +940,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 - 288, 487 ID - - GrpBannerValues - - - 2 + + 32, 17 2 @@ -964,14 +976,11 @@ 21 - - 458, 12 + + GrpBalance - - 0 - - - GrpJson + + 祈愿道具 100, 23 @@ -991,11 +1000,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + GrpBalance 10 @@ -1003,6 +1009,9 @@ 240, 176 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1018,18 +1027,12 @@ LnkWeightHelp - - 59 - 218, 57 RbCostItem224 - - 32, 17 - 1 @@ -1039,17 +1042,17 @@ 14 - - 50, 176 - 674, 12 GrpBannerValues - - True + + 4 + + + 卡池权重与保底机制 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1057,17 +1060,26 @@ 112, 58 - - 99, 21 + + 80 + + + GrpBannerValues + + + 限时武器祈愿池 System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - FormGachaBannerEditor2 + + $this - - 100, 23 + + 基础池 + + + 3 ID要求唯一 @@ -1090,26 +1102,23 @@ 300, 25 - - 预制 + + TxtWeight5 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpBannerValues 217, 260 - - 8 - - - LblScheduleIdTip + + 0 System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox2 + GrpBalance True @@ -1117,17 +1126,11 @@ True - - TxtWeight5 - 3 - groupBox1 - - - 32, 17 + GrpWeights 51, 17 @@ -1135,14 +1138,14 @@ 32, 17 - - 181, 233 + + 50, 176 12 - - 112, 58 + + 56, 17 ID @@ -1162,23 +1165,26 @@ NUDGachaType - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + LblScheduleIdTip GrpBannerValues + + $this + GrpJson - - LblEndTime + + 3, 4, 3, 4 True - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Left, Right 56, 17 @@ -1190,10 +1196,10 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GrpYellowPool + GrpUpPool - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 112, 84 @@ -1201,14 +1207,17 @@ 50, 87 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 4星活动爆率 True - - 110 + + 302, 173 151, 21 @@ -1225,15 +1234,9 @@ 112, 26 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 300, 23 - - 110 - GrpBannerValues @@ -1243,17 +1246,20 @@ 72, 17 - - 56, 17 + + 99, 21 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 ColFallbackName - - 4 - - - groupBox2 + + GrpUpPool 微软雅黑, 9pt @@ -1264,12 +1270,15 @@ GrpJson + + $this + + + 50, 148 + LblGachaTypeTip - - 1000, 600 - 218, 28 @@ -1282,9 +1291,6 @@ 6, 512 - - $this - 69, 17 @@ -1300,8 +1306,8 @@ 1 - - 0 + + GrpJson 11 @@ -1309,9 +1315,6 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1330,8 +1333,8 @@ 1 - - 打开旧版本编辑器 + + 5星池权重 2 @@ -1345,41 +1348,44 @@ 75, 17 - - 63, 17 - Bottom, Right + + LblOptions + LblWeight5 75, 23 - - 限时武器祈愿池 + + 1 - - 2 + + GrpFallbackPool 56, 17 - - 51 + + 0 13 - - LblOptions + + 74, 118 System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 奖池类型 + + 4 + + + GrpBannerValues 74, 204 @@ -1387,11 +1393,8 @@ LblPrefabPath - - $this - - - 基础池 + + 4 GrpBannerValues @@ -1402,21 +1405,24 @@ 72 - - 0 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 51 43, 61 - - Bottom, Left + + LblPoolWeight4 300, 23 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 常驻池 @@ -1435,14 +1441,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 卡池权重与保底机制 - - - $this - - - % + + 1000, 600 31, 233 @@ -1453,20 +1453,26 @@ 75 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 221, 233 + + 440, 100 + 48 - - 50, 148 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 61 @@ -1474,11 +1480,11 @@ 29 - - 1 + + GrpWeights - - True + + $this System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1486,17 +1492,17 @@ NUDScheduleId - - 1 + + 110 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + FormGachaBannerEditor2 ChkAutoStripRateUpFromFallback - - 0 + + 6 192, 146 @@ -1513,23 +1519,17 @@ 100, 23 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 开始时间 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 + + 63, 17 - - 112, 146 - - - 112, 260 + + TxtPoolWeight5 卡池编辑器 @@ -1546,23 +1546,26 @@ 12, 12 - - GrpBannerValues + + 63, 17 ScheduleId - - Top, Left, Right + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 53 + + 402, 0 - - 80 + + 32, 17 - - 51, 17 + + 奖池类型 + + + 59 NoControl @@ -1570,14 +1573,11 @@ GrpBannerValues - - 440, 100 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 23 + + 2 3, 19 diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx index 70b4390..ae87d7e 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx @@ -118,6 +118,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 112, 287 + + + 225, 21 + + + Auto Strip Rate Up From Fall back + + + 52, 260 + + + 54, 17 + + + Options + + + 157, 21 + + + Remove C6 Form Pool + + + 102, 17 + + + Open old editor + 43, 28 @@ -127,6 +157,24 @@ Тип Гачи + + 203, 233 + + + 93, 17 + + + EventChance4* + + + 13, 233 + + + 93, 17 + + + EventChance5* + 66, 204 @@ -235,6 +283,9 @@ Баннеп + + Fallback Pool + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -295,8 +346,8 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - 4 звёздочный пул + + UP Pool @@ -338,9 +389,6 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== - - 5 звёздочный пул - 85, 23 @@ -356,6 +404,57 @@ Загр.Json + + Gacha Weights + + + 399, 0 + + + 35, 17 + + + Help + + + 35, 61 + + + 71, 17 + + + Weights 5* + + + 35, 32 + + + 71, 17 + + + Weights 5* + + + Character and weapon balance (only mixed pools work) + + + 5, 61 + + + 101, 17 + + + Pool Weights 4* + + + 7, 32 + + + 101, 17 + + + Pool Weights 5* + Редактор баннеров Gacha