diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs index 2e378d4..b06ac21 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs @@ -173,9 +173,9 @@ namespace GrasscutterTools.Forms // // 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"; // // LblEventChance4Tip @@ -305,13 +305,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 @@ -358,11 +358,11 @@ namespace GrasscutterTools.Forms // // ListFallbackItems // + resources.ApplyResources(this.ListFallbackItems, "ListFallbackItems"); this.ListFallbackItems.CheckBoxes = true; this.ListFallbackItems.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.ColFallbackId, this.ColFallbackName}); - resources.ApplyResources(this.ListFallbackItems, "ListFallbackItems"); this.ListFallbackItems.FullRowSelect = true; this.ListFallbackItems.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] { ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups"))), @@ -393,11 +393,11 @@ namespace GrasscutterTools.Forms // // ListUpItems // + resources.ApplyResources(this.ListUpItems, "ListUpItems"); this.ListUpItems.CheckBoxes = true; this.ListUpItems.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.ColUpId, this.ColUpName}); - resources.ApplyResources(this.ListUpItems, "ListUpItems"); this.ListUpItems.FullRowSelect = true; this.ListUpItems.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] { ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListUpItems.Groups"))), diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx index b7403b3..88cda9f 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -117,849 +117,162 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Bottom, Left - - - True - - - - 217, 260 - - - 151, 21 - - - 92 - - - 自动避免UP被基础抽中 - - - ChkAutoStripRateUpFromFallback - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 0 - - - True - - - 74, 261 - - - 32, 17 - - - 91 - - - 选项 - - - LblOptions - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 1 - - - True - - - 112, 260 - - - 99, 21 - - - 90 - - - 避免命座溢出 - - - ChkRemoveC6FormPool - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 2 - - - True - - - 6, 309 - - - 104, 17 - - - 20 - - - 打开旧版本编辑器 - - - LnkOpenOldEditor - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 3 - - - 302, 173 - - - 110, 23 - - - 7 - - - DTPEndTime - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 4 - - - 112, 173 - - - 110, 23 - - - 6 - - - DTPBeginTime - - - System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 5 - - - 112, 115 - - - 300, 25 - - - 3 - - - CmbPrefab - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 6 - - - True - - - NoControl - - - 371, 233 - - - 19, 17 - - - 89 - - - % - - - LblEventChance4Tip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 7 - True - - 181, 233 - - - 19, 17 - - - 89 - - - % - - - LblEventChance5Tip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 8 - - - 302, 231 - - - 63, 23 - - - 10 - - - NUDEventChance4 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 9 - - - 112, 231 - - - 63, 23 - - - 9 - - - NUDEventChance5 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 10 - - - 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 - - - 11 - - - True - - - NoControl - - - 221, 233 - - - 75, 17 - - - 88 - - - 4星活动爆率 - - - LblEventChance4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 12 - - - 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 - - - 13 - - - True - - - 74, 204 - - - 32, 17 - - - 75 - - - 顺序 - - - LblSortId - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 14 - - - 112, 26 - - - 100, 23 - - - 0 - - - NUDGachaType - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 15 - - - 112, 202 - - - 100, 23 - - - 8 - - - NUDSortId - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GrpBannerValues - - 16 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + + Bottom, Left - - 218, 28 - - - 125, 17 - - - 51 - - - 从400开始，顺序递增 - - - LblGachaTypeTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 17 - - - True - - - 240, 176 - - - 56, 17 - - - 74 - - - 结束时间 - - - LblEndTime - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 18 - - - 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 - - - 19 - - - True - - - 50, 176 - - - 56, 17 - - - 72 - - - 开始时间 - - - LblBeginTime - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 20 - - - 112, 55 - - - 100, 23 - - - 1 - - - NUDScheduleId - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 21 - - - 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 - - - 22 - - - 常驻池 + + 3, 4, 3, 4 限时角色祈愿池 - - 限时武器祈愿池 - - - 112, 84 - - - 300, 25 - - - 2 - - - CmbBannerType - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 23 - - - True - - - 218, 204 - - - 116, 17 - - - 83 - - - 客户端中显示的顺序 - - - LblSortIdTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 24 - True - - 50, 87 - - - 56, 17 - - - 59 - - - 奖池类型 - - - LblBannerType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 25 - - - True - - - 112, 146 - - - 74, 21 - - - 4 - - - 相遇之缘 - - - RbCostItem224 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 26 - - - True - - - 50, 148 - - - 56, 17 - - - 80 - - - 祈愿道具 - - - LblCostItem - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 27 - - - True - - - 74, 118 - - - 32, 17 - - - 61 - - - 预制 - - - LblPrefabPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBannerValues - - - 28 - - - True - - - 192, 146 - - - 74, 21 - - - 5 - - - 纠缠之缘 - - - RbCostItem223 - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 6 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpBannerValues - - 29 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 12, 12 + + + 112, 58 - - 440, 329 + + 2 - - 0 + + True + + + GrpBannerValues + + + 100, 23 + + + 34, 28 + + + 24 + + + 65 + + + 17 + + + LblBeginTime + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 相遇之缘 卡池参数 - + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + 371, 233 + + + 7 + + + 0 + + + LblEventChance5Tip + + + Fill + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ColUpName + + + 302, 173 + + GrpBannerValues - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + BtnParse - - $this + + True + + + Top, Bottom, Left 5 - - Top, Bottom, Left, Right + + 300, 23 - - ListFallbackItems + + True - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - GrpFallbackPool - - - 0 - - - 458, 248 - - - 210, 305 - - - 5 - - - 基础池 - - - GrpFallbackPool - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 + + NoControl Fill + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12, 347 + + + GrpBannerValues + + + LblBannerType + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -970,6 +283,12 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNQs= + + 32, 17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -978,6 +297,19 @@ ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG AwAAAAo15pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXNQs= + + + + 19, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh + ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG + AwAAAAo05pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXNAs= @@ -990,15 +322,8 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNAs= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAo05pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXNAs= - + + GrpBannerValues @@ -1010,6 +335,57 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= + + 110, 23 + + + LblEventChance5 + + + 72, 17 + + + 12, 453 + + + 1 + + + 纠缠之缘 + + + GrpBannerValues + + + GrpWeights + + + CmbBannerType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + Name + + + 祈愿道具 + + + 74, 118 + + + 9 + + + 9 + + + 402, 0 + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -1020,99 +396,167 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - 3, 19 + + Bottom, Left - - 204, 283 + + 89 - - 0 + + 55, 32 - - ListFallbackItems + + 22 - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 99, 21 - - GrpFallbackPool + + 1 - - 0 + + DTPBeginTime - - ID + + 88 - - 65 + + 3 - - Name - - - 110 - - - Top, Left, Right - - - ListUpItems - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpUpPool - - - 0 - - - 458, 12 - - - 210, 230 - - - 4 + + GrpBannerValues UP池 - - GrpUpPool + + 300, 23 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 - - $this + + 6 - + + 74, 21 + + + 300, 23 + + + 15 + + + LblPoolWeight5 + + + 解析Json + + + GrpBalance + + + GrpWeights + + + NUDEventChance5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 16 + + + 0 + + + 984, 561 + + + GrpJson + + + GrpBalance + + + GrpWeights + + + GrpBannerValues + + + GrpFallbackPool + + + False + + + 112, 115 + + + True + + + % + + + True + + + 4星权重 + + 4 - - Fill + + ListUpItems - + + 结束时间 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 10 + + + 458, 12 + + + 顺序 + + + 440, 329 + + + 63, 23 + + + 300, 25 + + + 角色和武器平衡机制（仅混合池有效） + + + 20 + + + NUDSortId + + + True + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAo15pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc1Cw== + AwAAAAo05pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== @@ -1125,602 +569,1029 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE0Cw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAo05pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== + AwAAAAo15pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc1Cw== - - 3, 19 - - - 204, 208 - - - 0 - - - ListUpItems - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpUpPool - - - 0 - - - ID - - - 65 - - - Name - - - 110 - - - Top, Bottom, Right - - - Bottom, Left - - - 6, 512 - - - 75, 23 - - - 0 - - - 生成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 - - - Both - - - 288, 487 - - - 2 - - - False - - - 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 - - - 1 - - - 解析Json - - - BtnParse - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpJson - - - 2 - - - 674, 12 - - - 300, 541 - - - 6 - - - Json - - - GrpJson - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - Bottom, Left - - - LnkWeightHelp - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 0 - - - TxtWeight4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 1 - - - TxtWeight5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 2 - - - LblWeight4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 3 - - - LblWeight5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 4 - - - 12, 347 - - - 440, 100 - - - 1 - - - 卡池权重与保底机制 - - - GrpWeights - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - True - - - 402, 0 - - - 32, 17 - - - 2 + + GrpBannerValues 帮助 - - LnkWeightHelp - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 0 - - - 112, 58 - - - 300, 23 - - - 2 - - - TxtWeight4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 1 - - - 112, 29 - - - 300, 23 - - - 1 - - - TxtWeight5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 2 - - + True - - 55, 61 - - - 51, 17 - - - 1 - - - 4星权重 - - - LblWeight4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 3 - - - True - - - 55, 32 - - - 51, 17 - - - 0 - - - 5星权重 - - - LblWeight5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpWeights - - - 4 - - - Bottom, Left - - - TxtPoolWeight4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 0 - - - TxtPoolWeight5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 1 - - - LblPoolWeight4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 2 - - - LblPoolWeight5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 3 - - - 12, 453 - - - 440, 100 - - - 3 - - - 角色和武器平衡机制（仅混合池有效） - - - GrpBalance - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - 112, 58 - - - 300, 23 - - - 2 - - - TxtPoolWeight4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 0 - - - 112, 29 - - - 300, 23 - - - 1 - - - TxtPoolWeight5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 1 - - - True - - - NoControl - - - 43, 61 - - - 63, 17 - - - 5 - - - 4星池权重 - - - LblPoolWeight4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 2 - - - True - - - NoControl - - - 43, 32 - - - 63, 17 - - - 4 - - - 5星池权重 - - - LblPoolWeight5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpBalance - - - 3 - - - True - - - 7, 17 - - - 984, 561 - - - 微软雅黑, 9pt - - - 3, 4, 3, 4 - - - 1000, 600 - - - CenterScreen - - - 卡池编辑器 - - - ColFallbackId - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ColFallbackName + + True + + + 26 + + + 210, 230 + + + GrpBannerValues + + + 91 + + + True + + + 0 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6 + + + 0 + + + 1 + + + 112, 146 + + + 5 + + + True + + + 458, 248 + + + 0 + + + GrpBalance + + + 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 + + + 客户端中显示的顺序 + + + 112, 29 + + + True + + + 125, 17 + + + 3 + + + 112, 173 + + + ListFallbackItems + + + 300, 541 + + + 6, 309 + + + TxtJson + + + 59 + + + BtnGen + + + 5 + + + GrpBannerValues + + + True + + + GrpBannerValues + + + 204, 208 + + + 28 + + + LblSortIdTip + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 55, 61 + + + 104, 17 + + + 88 + + + 27 + + + LblEventChance4Tip + + + 56, 17 + + + 204, 283 + + + LblSortId + + + True + + + 65 + + + 避免命座溢出 + + + NoControl + + + Name + + + 100, 23 + + + System.Windows.Forms.DateTimePicker, 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 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 25 + + + GrpBalance + + + 5星活动爆率 + + + 5 + + + $this + + + RbCostItem223 + + + 18 + + + True + + + 19, 17 + + + True + + + 112, 29 + + + 210, 305 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh + ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG + AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw== + + + + 302, 231 + + + 74, 261 + + + 83 + + + 56 + + + LblCostItem + + + GrpBannerValues + + + GrpBannerValues + + + 6, 19 + + + Top, Bottom, Right + + + 440, 100 + + + 4星活动爆率 + + + True + + + 112, 231 + + + Both + + + 2 + + + 8 + + + NoControl + + + 0 + + + 5星池权重 + + + GrpBannerValues + + + 2 + + + 3 System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ColUpId + + True - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NUDEventChance4 - - ColUpName + + $this + + + 219, 512 + + + True + + + LblScheduleId + + + 56, 17 + + + 90 + + + 19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GachaType + + + 0 + + + Top, Bottom, Left, Right + + + 110, 23 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + GrpFallbackPool + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 5 + + + 112, 202 + + + 34, 57 + + + 112, 58 + + + 3, 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 + + + 288, 487 + + + ID + + + Json + + + GrpBannerValues + + + 2 + + + 2 + + + 生成Json + + + 1 + + + GrpUpPool + + + 74 + + + 8 + + + GrpBannerValues + + + 自动避免UP被基础抽中 + + + 4 + + + 21 + + + 0 + + + GrpJson + + + 112, 55 + + + 选项 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TxtWeight4 + + + 4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpBalance + + + 10 + + + 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 + + GrpBannerValues + + + 89 + + + LnkWeightHelp + + + 218, 57 + + + RbCostItem224 + + + 1 + + + ChkRemoveC6FormPool + + + 14 + + + 50, 176 + + + 674, 12 + + + GrpBannerValues + + + 4 + + + 卡池权重与保底机制 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LblPrefabPath + + + GrpBannerValues + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 基础池 + + + 3 + + + ID要求唯一 + + + DTPEndTime + + + LblGachaType + + + 0 + + + 218, 204 + + + GrpBannerValues + + + 300, 25 + + + 预制 + + + 217, 260 + + + LblScheduleIdTip + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom, Left + + + True + + + True + + + TxtWeight5 + + + 3 + + + GrpWeights + + + 32, 17 + + + 51, 17 + + + 32, 17 + + + 181, 233 + + + 12 + + + ID + + + 0 + + + TxtPoolWeight4 + + + ColUpId + + + NoControl + + + NUDGachaType + + + GrpBannerValues + + + $this + + + GrpJson + + + LblEndTime + + + True + + + Top, Left, Right + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpUpPool + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 112, 84 + + + 50, 87 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpWeights + + + True + + + 110 + + + 151, 21 + + + LnkOpenOldEditor + + + 75, 23 + + + 72 + + + 112, 26 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 300, 23 + + + 110 + + + GrpBannerValues + + + GrpBannerValues + + + 72, 17 + FormGachaBannerEditor2 + + 56, 17 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + ColFallbackName + + + 4 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 微软雅黑, 9pt + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpJson + + + $this + + + LblGachaTypeTip + + + 1000, 600 + + + 218, 28 + + + 2 + + + 4星池权重 + + + 6, 512 + + + TxtPoolWeight5 + + + 69, 17 + + + 7 + + + 116, 17 + + + 74, 21 + + + 1 + + + 0 + + + 11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Bottom, Left, Right + + + 43, 32 + + + 从400开始，顺序递增 + + + 20 + + + 1 + + + 打开旧版本编辑器 + + + 2 + + + True + + + CenterScreen + + + 75, 17 + + + 63, 17 + + + Bottom, Right + + + LblWeight5 + + + 75, 23 + + + 限时武器祈愿池 + + + 2 + + + 56, 17 + + + 51 + + + 13 + + + LblOptions + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 奖池类型 + + + 74, 204 + + + 4 + + + GrpBannerValues + + + GrpBannerValues + + + 221, 233 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 43, 61 + + + LblPoolWeight4 + + + 63, 17 + + + 32, 17 + + + 常驻池 + + + 7, 17 + + + 5星权重 + + + 61 + + + 92 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + % + + + 31, 233 + + + ColFallbackId + + + 75 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 440, 100 + + + 48 + + + 50, 148 + + + 29 + + + GrpWeights + + + $this + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NUDScheduleId + + + 1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChkAutoStripRateUpFromFallback + + + 0 + + + 192, 146 + + + True + + + 75, 17 + + + GrpBannerValues + + + 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 + + + 112, 260 + + + 卡池编辑器 + + + 63, 23 + + + CmbPrefab + + + GrpBannerValues + + + 12, 12 + + + GrpBannerValues + + + ScheduleId + + + LblEventChance4 + + + 53 + + + 80 + + + 51, 17 + + + LblWeight4 + + + GrpBannerValues + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 23 + + + 3, 19 + + + 1 + + + True + + + ru-RU + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx index ae87d7e..452a6a2 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx @@ -283,9 +283,6 @@ Баннеп - - Fallback Pool - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -346,8 +343,8 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - UP Pool + + Fallback Pool @@ -389,6 +386,9 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== + + UP Pool + 85, 23 @@ -396,7 +396,7 @@ Сген. Json - 209, 437 + 209, 512 85, 23 @@ -404,9 +404,6 @@ Загр.Json - - Gacha Weights - 399, 0 @@ -434,8 +431,8 @@ Weights 5* - - Character and weapon balance (only mixed pools work) + + Gacha Weights 5, 61 @@ -455,6 +452,9 @@ Pool Weights 5* + + Character and weapon balance (only mixed pools work) + Редактор баннеров Gacha