diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs index 2f47caf..819998d 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.Designer.cs @@ -377,8 +377,7 @@ namespace GrasscutterTools.Forms ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups1"))), ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups2"))), ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups3"))), - ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups4"))), - ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups5")))}); + ((System.Windows.Forms.ListViewGroup)(resources.GetObject("ListFallbackItems.Groups4")))}); this.ListFallbackItems.HideSelection = false; this.ListFallbackItems.Name = "ListFallbackItems"; this.ListFallbackItems.UseCompatibleStateImageBehavior = false; diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs index 24c300d..667443c 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs @@ -72,16 +72,13 @@ namespace GrasscutterTools.Forms ListFallbackItems.BeginUpdate(); var a5 = ListFallbackItems.Groups["GroupA5"]; var a4 = ListFallbackItems.Groups["GroupA4"]; - var a3 = ListFallbackItems.Groups["GroupA3"]; var w5 = ListFallbackItems.Groups["GroupW5"]; var w4 = ListFallbackItems.Groups["GroupW4"]; var w3 = ListFallbackItems.Groups["GroupW3"]; - var avatars = GetAvatarsByColor("yellow") + var avatars = GetAvatarsByColor("5") .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a5) { ForeColor = Color.OrangeRed }) - .Concat(GetAvatarsByColor("purple") - .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a4) { ForeColor = Color.Purple })) - .Concat(GetAvatarsByColor("blue") - .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a3) { ForeColor = Color.Blue })); + .Concat(GetAvatarsByColor("4") + .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, a4) { ForeColor = Color.Purple })); var weapons = GetWeaponsByColor("yellow") .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, w5) { ForeColor = Color.OrangeRed }) .Concat(GetWeaponsByColor("purple") @@ -96,9 +93,9 @@ namespace GrasscutterTools.Forms var ua4 = ListUpItems.Groups["GroupUpA4"]; var uw5 = ListUpItems.Groups["GroupUpW5"]; var uw4 = ListUpItems.Groups["GroupUpW4"]; - var upAvatars = GetAvatarsByColor("yellow") + var upAvatars = GetAvatarsByColor("5") .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, ua5) { ForeColor = Color.OrangeRed }) - .Concat(GetAvatarsByColor("purple") + .Concat(GetAvatarsByColor("4") .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, ua4) { ForeColor = Color.Purple })); var upWeapons = GetWeaponsByColor("yellow") .Select(it => new ListViewItem(new string[] { it.Item1.ToString(), it.Item2 }, uw5) { ForeColor = Color.OrangeRed }) diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx index d968cf4..3bfa4d2 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx @@ -303,16 +303,6 @@ - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAA0zLXN0YXIgYXZhdGFyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdu - bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx index 6a1e1a5..f7a4b03 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -131,21 +131,12 @@ Bottom, Left - - 3, 4, 3, 4 - True System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - - - 2 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -231,9 +222,6 @@ ColUpName - - 302, 173 - GrpBannerValues @@ -246,6 +234,9 @@ 6 + + % + True @@ -280,6 +271,9 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNQs= + + 0 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -316,15 +310,8 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNAs= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - + + 217, 260 限时角色祈愿池 @@ -359,15 +346,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - 祈愿道具 - - 1 - 300, 23 @@ -377,9 +358,6 @@ 9 - - 402, 0 - 89 @@ -410,11 +388,14 @@ UP池 + + 300, 23 + 1 - - 6 + + GrpBannerValues 74, 21 @@ -431,8 +412,8 @@ 解析Json - - GrpBalance + + 53 GrpWeights @@ -455,12 +436,12 @@ GrpJson - - GrpFallbackPool - GrpBalance + + 4 + GrpBannerValues @@ -470,8 +451,8 @@ False - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 112, 115 True @@ -524,8 +505,11 @@ NUDSortId - - True + + 8 + + + 1 @@ -563,14 +547,11 @@ 帮助 - - 74, 118 - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + TxtWeight4 ChartWeights @@ -596,6 +577,9 @@ 3, 19 + + 110 + 6 @@ -617,9 +601,6 @@ True - - LblPrefabPath - 458, 248 @@ -632,8 +613,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 112, 260 客户端中显示的顺序 @@ -647,11 +628,14 @@ 125, 17 + + GrpBannerValues + 3 - - 4 + + 2 ListFallbackItems @@ -662,6 +646,12 @@ 6, 309 + + LblEndTime + + + 7 + 59 @@ -677,6 +667,12 @@ 0 + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 23 + GrpBannerValues @@ -746,16 +742,19 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= + AwAAAAoz5pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - System.Windows.Forms.TextBox, 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 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 + 25 @@ -771,6 +770,9 @@ RbCostItem223 + + 181, 233 + 18 @@ -789,15 +791,8 @@ 210, 305 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw== - + + LblEventChance4 302, 231 @@ -850,12 +845,12 @@ 0 + + 0 + GrpBannerValues - - 5星池权重 - GrpBannerValues @@ -898,9 +893,6 @@ 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 @@ -910,9 +902,15 @@ Top, Bottom, Left + + 2 + 110, 23 + + 打开旧版本编辑器 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -925,12 +923,19 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh + ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG + AwAAAAo15pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcEE1Cw== + + 5 - - 112, 115 - 112, 202 @@ -958,18 +963,12 @@ 32, 17 - - 2 - 2 生成Json - - 4星活动爆率 - TxtJson @@ -979,8 +978,8 @@ 674, 248 - - 8 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 GrpBannerValues @@ -994,11 +993,11 @@ 21 - - 0 + + GrpBalance - - GrpJson + + 61 112, 55 @@ -1009,8 +1008,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TxtWeight4 + + True System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1048,9 +1047,6 @@ RbCostItem224 - - 32, 17 - 1 @@ -1063,9 +1059,6 @@ chart1 - - 50, 176 - 674, 12 @@ -1123,9 +1116,6 @@ 预制 - - 217, 260 - 1 @@ -1162,12 +1152,15 @@ 0 - - 181, 233 + + 50, 176 12 + + 56, 17 + ID @@ -1198,11 +1191,14 @@ $this + + 50, 148 + GrpJson - - LblEndTime + + 3, 4, 3, 4 True @@ -1213,14 +1209,17 @@ 56, 17 + + System.Windows.Forms.NumericUpDown, 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 GrpUpPool - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 112, 84 @@ -1231,14 +1230,14 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpWeights + + 4星活动爆率 True - - 110 + + 302, 173 151, 21 @@ -1255,15 +1254,9 @@ 112, 26 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 300, 23 - - 110 - GrpBannerValues @@ -1273,11 +1266,8 @@ 72, 17 - - FormGachaBannerEditor2 - - - 56, 17 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3 @@ -1288,9 +1278,6 @@ GrpUpPool - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 微软雅黑, 9pt @@ -1309,9 +1296,6 @@ LblGachaTypeTip - - 1200, 600 - 218, 28 @@ -1324,9 +1308,6 @@ 6, 201 - - TxtPoolWeight5 - 69, 17 @@ -1342,8 +1323,8 @@ 1 - - 0 + + GrpJson 11 @@ -1375,8 +1356,8 @@ 1 - - 打开旧版本编辑器 + + 5星池权重 2 @@ -1390,12 +1371,12 @@ 75, 17 - - 63, 17 - Bottom, Right + + LblOptions + LblWeight5 @@ -1405,20 +1386,23 @@ 限时武器祈愿池 - - 2 + + GrpFallbackPool 56, 17 + + 0 + $this 13 - - LblOptions + + 74, 118 System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1432,8 +1416,8 @@ 74, 204 - - 7 + + LblPrefabPath 5 @@ -1462,8 +1446,8 @@ LblPoolWeight4 - - 300, 23 + + 32, 17 494, 280 @@ -1477,8 +1461,8 @@ 5星权重 - - 61 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 92 @@ -1486,8 +1470,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - % + + 1200, 600 31, 233 @@ -1501,11 +1485,17 @@ 75 + + System.Windows.Forms.Label, 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.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GrpWeights 221, 233 @@ -1516,8 +1506,8 @@ 48 - - 50, 148 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 29 @@ -1525,6 +1515,9 @@ GrpWeights + + True + $this @@ -1534,17 +1527,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 @@ -1573,8 +1566,8 @@ 63, 17 - - 112, 260 + + TxtPoolWeight5 Top, Bottom, Left, Right @@ -1588,23 +1581,20 @@ CmbPrefab - - GrpBannerValues - 12, 12 - - GrpBannerValues + + 63, 17 ScheduleId - - LblEventChance4 + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 53 + + 402, 0 80 @@ -1621,8 +1611,8 @@ 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 53d0417..94b2599 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx @@ -283,9 +283,6 @@ Баннер - - Запасной Пул - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -327,16 +324,6 @@ - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAA0zLXN0YXIgYXZhdGFyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdu - bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 @@ -346,8 +333,8 @@ bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - Верхний Пул + + Запасной Пул @@ -389,6 +376,9 @@ bWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== + + Верхний Пул + 85, 23 @@ -404,9 +394,6 @@ Загр. Json - - Gacha Веса - 375, 0 @@ -434,8 +421,8 @@ Веса 5* - - Баланс персонажа и оружия (работают только смешанные пулы) + + Gacha Веса 28, 61 @@ -455,6 +442,9 @@ Пул Веса 5* + + Баланс персонажа и оружия (работают только смешанные пулы) + Таблица веса diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx index 0641174..8fe4a48 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.zh-TW.resx @@ -165,6 +165,9 @@ 卡池參數 + + 基礎池 + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -211,23 +214,10 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + AwAAAAoz5pif5q2m5ZmoBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - 基礎池 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -268,6 +258,9 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAJR3JvdXBVcFc0Cw== + + 卡池權重與保底機制 + 幫助 @@ -277,8 +270,8 @@ 5星權重 - - 卡池權重與保底機制 + + 角色和武器平衡機制（僅混合池有效） 4星池權重 @@ -286,9 +279,6 @@ 5星池權重 - - 角色和武器平衡機制（僅混合池有效） - 權重圖表 diff --git a/Source/GrasscutterTools/Resources/AvatarColor.txt b/Source/GrasscutterTools/Resources/AvatarColor.txt index 6acd7a2..24bf602 100644 --- a/Source/GrasscutterTools/Resources/AvatarColor.txt +++ b/Source/GrasscutterTools/Resources/AvatarColor.txt @@ -1,53 +1,61 @@ -1001:purple -1002:yellow -1003:yellow -1005:yellow -1006:purple -1007:yellow -1014:purple -1015:purple -1016:yellow -1020:purple -1021:purple -1022:yellow -1023:purple -1024:purple -1025:purple -1026:yellow -1027:purple -1029:yellow -1030:yellow -1031:purple -1032:purple -1033:yellow -1034:purple -1035:yellow -1036:purple -1037:yellow -1038:yellow -1039:purple -1041:yellow -1042:yellow -1043:purple -1044:purple -1045:purple -1046:yellow -1047:yellow -1048:purple -1049:yellow -1050:purple -1051:yellow -1052:yellow -1053:purple -1054:yellow -1055:purple -1056:purple -1057:yellow -1058:yellow -1062:blue -1063:yellow -1064:purple -1066:yellow -1067:green -1068:purple -1069:green \ No newline at end of file +1001:4 +1002:5 +1003:5 +1005:5 +1006:4 +1007:5 +1014:4 +1015:4 +1016:5 +1020:4 +1021:4 +1022:5 +1023:4 +1024:4 +1025:4 +1026:5 +1027:4 +1029:5 +1030:5 +1031:4 +1032:4 +1033:5 +1034:4 +1035:5 +1036:4 +1037:5 +1038:5 +1039:4 +1041:5 +1042:5 +1043:4 +1044:4 +1045:4 +1046:5 +1047:5 +1048:4 +1049:5 +1050:4 +1051:5 +1052:5 +1053:4 +1054:5 +1055:4 +1056:4 +1057:5 +1058:5 +1059:4 +1060:5 +1062:5 +1063:5 +1064:4 +1065:4 +1066:5 +1067:4 +1068:4 +1069:5 +1070:5 +1071:5 +1072:4 +1073:5 +1074:4 \ No newline at end of file