From 2de8a46bd52b1382b80fa95cc1ee94554e880622 Mon Sep 17 00:00:00 2001 From: jie65535 Date: Sat, 21 May 2022 16:35:59 +0800 Subject: [PATCH] fix en button miss bug --- .../Forms/FormGachaBannerEditor2.en-us.resx | 2 +- .../Forms/FormGachaBannerEditor2.resx | 318 +++++++++--------- 2 files changed, 160 insertions(+), 160 deletions(-) diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx index aefb744..ef47334 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.en-us.resx @@ -372,7 +372,7 @@ Gen Json - 209, 437 + 209, 512 85, 23 diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx index 88cda9f..917cecf 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -124,6 +124,10 @@ GrpBannerValues + + + 75, 17 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -134,9 +138,6 @@ 3, 4, 3, 4 - - 限时角色祈愿池 - True @@ -146,9 +147,6 @@ 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 @@ -158,7 +156,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 112, 58 @@ -207,11 +204,8 @@ 371, 233 - - 7 - - - 0 + + 2 LblEventChance5Tip @@ -219,11 +213,14 @@ Fill + + GrpBannerValues + 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 + + Top, Bottom, Right ColUpName @@ -240,24 +237,15 @@ True - - Top, Bottom, Left - 5 - - 300, 23 - True 2 - - NoControl - Fill @@ -322,18 +310,11 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNAs= - - GrpBannerValues + + 217, 260 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - + + 限时角色祈愿池 110, 23 @@ -347,14 +328,11 @@ 12, 453 - - 1 - 纠缠之缘 - - GrpBannerValues + + 4 GrpWeights @@ -368,14 +346,11 @@ True - - Name - 祈愿道具 - - 74, 118 + + 300, 23 9 @@ -408,8 +383,8 @@ 22 - - 99, 21 + + True 1 @@ -453,9 +428,6 @@ 解析Json - - GrpBalance - GrpWeights @@ -477,21 +449,18 @@ GrpJson + + GrpFallbackPool + GrpBalance - - GrpWeights - GrpBannerValues GrpFallbackPool - - False - 112, 115 @@ -516,8 +485,8 @@ 结束时间 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7 10 @@ -585,8 +554,8 @@ 帮助 - - True + + 74, 118 System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -621,6 +590,9 @@ 0 + + 112, 173 + 1 @@ -645,9 +617,6 @@ 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 - 客户端中显示的顺序 @@ -663,8 +632,8 @@ 3 - - 112, 173 + + 1 ListFallbackItems @@ -675,11 +644,8 @@ 6, 309 - - TxtJson - - - 59 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 BtnGen @@ -687,14 +653,14 @@ 5 - - GrpBannerValues + + Json - - True + + 0 - - GrpBannerValues + + Bottom, Left 204, 208 @@ -705,15 +671,9 @@ 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 @@ -723,11 +683,14 @@ 27 - - LblEventChance4Tip + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 56, 17 + + 7, 17 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 204, 283 @@ -735,8 +698,8 @@ LblSortId - - True + + GrpWeights 65 @@ -750,24 +713,37 @@ Name - - 100, 23 + + Top, Bottom, Left + + + GrpBannerValues System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh + ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG + AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= + + 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 25 - - GrpBalance - 5星活动爆率 @@ -832,14 +808,17 @@ 6, 19 - - Top, Bottom, Right + + Top, Left, Right 440, 100 - - 4星活动爆率 + + LblEventChance4Tip + + + LblWeight4 True @@ -850,11 +829,8 @@ Both - - 2 - - - 8 + + False NoControl @@ -904,15 +880,15 @@ 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 - - 0 - Top, Bottom, Left, Right @@ -925,8 +901,8 @@ 1 - - GrpFallbackPool + + 55, 61 System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -940,8 +916,8 @@ 34, 57 - - 112, 58 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3, 19 @@ -958,9 +934,6 @@ ID - - Json - GrpBannerValues @@ -976,8 +949,8 @@ 1 - - GrpUpPool + + TxtJson 74 @@ -991,18 +964,21 @@ 自动避免UP被基础抽中 - - 4 + + True 21 - - 0 + + GrpBalance GrpJson + + 100, 23 + 112, 55 @@ -1042,9 +1018,15 @@ 89 + + GrpBannerValues + LnkWeightHelp + + 59 + 218, 57 @@ -1078,12 +1060,15 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - LblPrefabPath + + 112, 58 GrpBannerValues + + 常驻池 + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1120,17 +1105,14 @@ 预制 - - 217, 260 - - - LblScheduleIdTip + + 0 System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Bottom, Left + + GrpBalance True @@ -1180,6 +1162,9 @@ NUDGachaType + + LblScheduleIdTip + GrpBannerValues @@ -1195,8 +1180,11 @@ True - - Top, Left, Right + + 99, 21 + + + 56, 17 System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1216,8 +1204,8 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpWeights + + 4星活动爆率 True @@ -1234,8 +1222,8 @@ 75, 23 - - 72 + + Name 112, 26 @@ -1264,17 +1252,14 @@ 56, 17 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 3 ColFallbackName - - 4 + + GrpUpPool System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1366,8 +1351,8 @@ CenterScreen - - 75, 17 + + 4 63, 17 @@ -1390,6 +1375,9 @@ 56, 17 + + 0 + 51 @@ -1402,12 +1390,15 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 奖池类型 + + GrpBannerValues 74, 204 + + LblPrefabPath + 4 @@ -1417,12 +1408,15 @@ GrpBannerValues - - 221, 233 + + 72 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + 0 @@ -1432,23 +1426,20 @@ LblPoolWeight4 - - 63, 17 - 32, 17 - - 常驻池 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7, 17 + + 8 5星权重 - - 61 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 92 @@ -1471,8 +1462,11 @@ 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 440, 100 @@ -1483,6 +1477,9 @@ 50, 148 + + 61 + 29 @@ -1531,8 +1528,8 @@ 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, 260 @@ -1567,11 +1564,14 @@ 80 + + 奖池类型 + 51, 17 - - LblWeight4 + + NoControl GrpBannerValues @@ -1592,6 +1592,6 @@ True - ru-RU + en-US \ No newline at end of file