diff --git a/Doc/Screenshots-en/10-GachaBannerEditor.png b/Doc/Screenshots-en/10-GachaBannerEditor.png index 5d29185..bed8e5e 100644 Binary files a/Doc/Screenshots-en/10-GachaBannerEditor.png and b/Doc/Screenshots-en/10-GachaBannerEditor.png differ diff --git a/Doc/Screenshots-ru/10-GachaBannerEditor.png b/Doc/Screenshots-ru/10-GachaBannerEditor.png index b6b1d1f..576da1d 100644 Binary files a/Doc/Screenshots-ru/10-GachaBannerEditor.png and b/Doc/Screenshots-ru/10-GachaBannerEditor.png differ diff --git a/Doc/Screenshots/10-GachaBannerEditor.png b/Doc/Screenshots/10-GachaBannerEditor.png index 8e70ed3..4aa9390 100644 Binary files a/Doc/Screenshots/10-GachaBannerEditor.png and b/Doc/Screenshots/10-GachaBannerEditor.png differ diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx index d1cc542..ad9c085 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.resx @@ -156,6 +156,9 @@ True + + True + GrpBannerValues @@ -243,6 +246,9 @@ Fill + + 51, 17 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -268,6 +274,9 @@ 0 + + 32, 17 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -304,8 +313,15 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBNAs= - - 217, 260 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh + ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG + AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu + dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= + 限时角色祈愿池 @@ -322,8 +338,8 @@ 12, 453 - - 1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 纠缠之缘 @@ -352,19 +368,6 @@ 9 - - 常驻池 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh - ZwROYW1lAQQCAShTeXN0ZW0uV2luZG93cy5Gb3Jtcy5Ib3Jpem9udGFsQWxpZ25tZW50AgAAAAIAAAAG - AwAAAAoz5pif6KeS6ImyBfz///8oU3lzdGVtLldpbmRvd3MuRm9ybXMuSG9yaXpvbnRhbEFsaWdubWVu - dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBXMws= - - Bottom, Left @@ -383,8 +386,8 @@ 1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DTPBeginTime 88 @@ -392,15 +395,12 @@ 3 - - 预制 + + GrpBannerValues UP池 - - 300, 23 - 1 @@ -422,8 +422,8 @@ 解析Json - - 53 + + GrpBalance GrpWeights @@ -449,14 +449,20 @@ GrpBalance + + GrpWeights + GrpBannerValues GrpFallbackPool - - 112, 115 + + False + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True @@ -503,6 +509,9 @@ 角色和武器平衡机制（仅混合池有效） + + 43, 32 + 20 @@ -569,6 +578,9 @@ True + + 53 + 0 @@ -593,9 +605,6 @@ 112, 146 - - 8 - 5 @@ -608,8 +617,8 @@ 0 - - DTPBeginTime + + GrpBalance System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -629,14 +638,17 @@ 125, 17 + + Bottom, Left + GrpBannerValues 3 - - 4 + + 1 ListFallbackItems @@ -671,8 +683,8 @@ 23 - - Bottom, Left + + GrpBannerValues 204, 208 @@ -695,8 +707,8 @@ 27 - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + LblEventChance4Tip System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -707,8 +719,8 @@ LblSortId - - GrpWeights + + True 65 @@ -741,9 +753,6 @@ dAEAAAAHdmFsdWVfXwAIAgAAAAAAAAAKBgUAAAAHR3JvdXBBMws= - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1 @@ -820,11 +829,8 @@ 440, 100 - - LblEventChance4Tip - - - LblWeight4 + + 4星活动爆率 True @@ -835,8 +841,8 @@ Both - - False + + 8 NoControl @@ -847,9 +853,6 @@ 0 - - GrpBannerValues - GrpBannerValues @@ -859,6 +862,9 @@ 3 + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -925,6 +931,9 @@ 5 + + 112, 115 + 112, 202 @@ -943,14 +952,17 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + LblWeight4 + 288, 487 ID - - 32, 17 + + GrpBannerValues 2 @@ -979,8 +991,8 @@ 21 - - GrpBalance + + 0 100, 23 @@ -1003,9 +1015,6 @@ GrpBalance - - GrpBalance - 10 @@ -1102,11 +1111,11 @@ 300, 25 - - TxtWeight5 + + 预制 - - GrpBannerValues + + 217, 260 0 @@ -1120,8 +1129,11 @@ True - - True + + 99, 21 + + + TxtWeight5 3 @@ -1132,8 +1144,8 @@ 32, 17 - - 51, 17 + + LblScheduleIdTip 32, 17 @@ -1168,8 +1180,11 @@ NUDGachaType - - LblScheduleIdTip + + 32, 17 + + + CmbPrefab GrpBannerValues @@ -1213,8 +1228,8 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4星活动爆率 + + GrpWeights True @@ -1249,9 +1264,6 @@ 72, 17 - - 99, 21 - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1324,8 +1336,8 @@ Top, Bottom, Left, Right - - 43, 32 + + 4 从400开始，顺序递增 @@ -1372,9 +1384,6 @@ 56, 17 - - 0 - 13 @@ -1384,11 +1393,8 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 - - - GrpBannerValues + + 奖池类型 74, 204 @@ -1411,9 +1417,6 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - 51 @@ -1423,11 +1426,11 @@ LblPoolWeight4 - - 32, 17 + + 300, 23 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 常驻池 7, 17 @@ -1462,8 +1465,8 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GrpWeights + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 221, 233 @@ -1540,8 +1543,8 @@ 63, 23 - - CmbPrefab + + 4 GrpBannerValues @@ -1564,9 +1567,6 @@ 80 - - 奖池类型 - 59 @@ -1591,7 +1591,4 @@ 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 a584e3f..990efc5 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.ru-ru.resx @@ -122,16 +122,16 @@ 112, 287 - 225, 21 + 288, 21 Авто возврат шанса выпадения с баннера - 52, 260 + 56, 261 - 54, 17 + 50, 17 Опции @@ -143,7 +143,7 @@ Удалить пул форм C6 - 102, 17 + 167, 17 Открыть старый редактор @@ -158,19 +158,19 @@ Тип Гачи - 203, 233 + 210, 233 - 93, 17 + 86, 17 Шанс соб. 4* - 13, 233 + 20, 233 - 93, 17 + 86, 17 Шанс соб. 5* @@ -408,25 +408,25 @@ 375, 0 - 35, 17 + 60, 17 Помощь - 35, 61 + 54, 61 - 71, 17 + 52, 17 Веса 5* - 35, 32 + 54, 32 - 71, 17 + 52, 17 Веса 5* @@ -435,19 +435,19 @@ Gacha Веса - 5, 61 + 28, 61 - 101, 17 + 78, 17 Пул Веса 4* - 7, 32 + 28, 29 - 101, 17 + 78, 17 Пул Веса 5* diff --git a/Source/GrasscutterTools/GrasscutterTools.csproj b/Source/GrasscutterTools/GrasscutterTools.csproj index c6ee0c0..5dae757 100644 --- a/Source/GrasscutterTools/GrasscutterTools.csproj +++ b/Source/GrasscutterTools/GrasscutterTools.csproj @@ -245,6 +245,7 @@ FormGachaBannerEditor2.cs + Designer FormGachaBannerEditor.cs