diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs index 41c3764..3f861f5 100644 --- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs @@ -116,13 +116,14 @@ namespace GrasscutterTools.Forms // // MenuSpawnEntityFilter // + this.MenuSpawnEntityFilter.ImageScalingSize = new System.Drawing.Size(24, 24); this.MenuSpawnEntityFilter.Name = "MenuSpawnEntityFilter"; resources.ApplyResources(this.MenuSpawnEntityFilter, "MenuSpawnEntityFilter"); // // FormMain // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.NavContainer); this.Controls.Add(this.GrpCommand); this.KeyPreview = true; diff --git a/Source/GrasscutterTools/Forms/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx index e250650..aab0c4c 100644 --- a/Source/GrasscutterTools/Forms/FormMain.resx +++ b/Source/GrasscutterTools/Forms/FormMain.resx @@ -123,7 +123,10 @@ - 12, 12 + 19, 17 + + + 5, 4, 5, 4 Fill @@ -138,8 +141,11 @@ 0, 0 + + 5, 4, 5, 4 + - 150, 275 + 235, 388 5 @@ -187,10 +193,13 @@ 610 - 810, 275 + 1273, 388 - 150 + 235 + + + 6 6 @@ -211,10 +220,13 @@ Top, Left, Right - 115, 22 + 181, 31 + + + 5, 4, 5, 4 - 600, 25 + 941, 32 1 @@ -235,10 +247,13 @@ NoControl - 59, 22 + 93, 31 + + + 5, 4, 5, 4 - 50, 25 + 79, 35 2 @@ -265,10 +280,13 @@ NoControl - 10, 24 + 16, 34 + + + 5, 4, 5, 4 - 51, 21 + 72, 28 3 @@ -301,10 +319,13 @@ NoControl - 680, 26 + 1069, 37 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 24 @@ -334,10 +355,13 @@ NoControl - 721, 22 + 1133, 31 + + + 5, 4, 5, 4 - 75, 25 + 118, 35 0 @@ -358,13 +382,19 @@ 1 - 12, 293 + 19, 414 + + + 5, 4, 5, 4 - 610, 56 + 959, 79 + + + 5, 4, 5, 4 - 810, 56 + 1273, 79 3 @@ -399,20 +429,17 @@ True - - 7, 17 - - 834, 361 + 1311, 510 Microsoft YaHei UI, 9pt - 3, 4, 3, 4 + 5, 6, 5, 6 - 850, 400 + 1323, 542 CenterScreen diff --git a/Source/GrasscutterTools/Pages/PageAchievement.resx b/Source/GrasscutterTools/Pages/PageAchievement.resx index c1af8de..ba02fdb 100644 --- a/Source/GrasscutterTools/Pages/PageAchievement.resx +++ b/Source/GrasscutterTools/Pages/PageAchievement.resx @@ -123,14 +123,17 @@ - 17 + 24 - 6, 51 + 9, 72 + + + 5, 4, 5, 4 - 628, 106 + 985, 148 3 @@ -160,10 +163,13 @@ NoControl - 617, 25 + 970, 35 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 18 @@ -190,10 +196,13 @@ Top, Left, Right - 6, 22 + 9, 31 + + + 5, 4, 5, 4 - 628, 23 + 985, 30 2 @@ -217,10 +226,13 @@ True - 578, 0 + 908, 0 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 1 @@ -247,10 +259,13 @@ True - 516, 0 + 811, 0 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 0 @@ -271,10 +286,16 @@ 4 - 3, 3 + 5, 4 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 640, 167 + 1006, 236 1 @@ -301,10 +322,13 @@ Top, Right - 579, 25 + 910, 35 + + + 5, 4, 5, 4 - 55, 23 + 86, 30 3 @@ -325,10 +349,13 @@ Top, Right - 473, 25 + 743, 35 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 2 @@ -349,10 +376,13 @@ 1 - 112, 25 + 176, 35 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 1 @@ -373,10 +403,13 @@ 2 - 6, 25 + 9, 35 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 0 @@ -397,10 +430,16 @@ 3 - 3, 176 + 5, 248 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 640, 60 + 1006, 85 2 @@ -424,12 +463,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageAchievement - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageAvatar.resx b/Source/GrasscutterTools/Pages/PageAvatar.resx index 9337564..6d88c0a 100644 --- a/Source/GrasscutterTools/Pages/PageAvatar.resx +++ b/Source/GrasscutterTools/Pages/PageAvatar.resx @@ -130,10 +130,13 @@ - 198, 24 + 311, 34 + + + 5, 0, 5, 0 - 80, 17 + 118, 24 2 @@ -160,10 +163,13 @@ NoControl - 112, 24 + 176, 34 + + + 5, 0, 5, 0 - 80, 17 + 118, 24 1 @@ -184,10 +190,13 @@ 1 - 44, 22 + 69, 31 + + + 5, 4, 5, 4 - 62, 23 + 97, 30 0 @@ -205,10 +214,16 @@ 2 - 285, 173 + 448, 244 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 332, 55 + 522, 78 3 @@ -238,10 +253,13 @@ NoControl - 174, 67 + 273, 95 + + + 5, 4, 5, 4 - 125, 23 + 196, 32 5 @@ -268,10 +286,13 @@ NoControl - 43, 67 + 67, 95 + + + 5, 4, 5, 4 - 125, 23 + 196, 32 4 @@ -295,10 +316,13 @@ NoControl - 40, 16 + 63, 23 + + + 5, 0, 5, 0 - 286, 17 + 449, 24 0 @@ -325,10 +349,13 @@ NoControl - 283, 39 + 443, 59 + + + 5, 0, 5, 0 - 19, 17 + 26, 24 3 @@ -352,10 +379,13 @@ 3 - 207, 37 + 323, 56 + + + 5, 4, 5, 4 - 70, 23 + 110, 30 2 @@ -373,10 +403,13 @@ 4 - 43, 36 + 67, 55 + + + 5, 4, 5, 4 - 158, 25 + 246, 32 1 @@ -394,10 +427,16 @@ 5 - 285, 10 + 448, 14 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 332, 96 + 522, 136 1 @@ -420,6 +459,96 @@ None + + LnkTalentAll + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTalentLevel + + + 0 + + + LnkTalentE + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTalentLevel + + + 1 + + + LnkTalentQ + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTalentLevel + + + 2 + + + LnkTalentNormalATK + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTalentLevel + + + 3 + + + NUDTalentLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpTalentLevel + + + 4 + + + 448, 158 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 + + + 522, 78 + + + 2 + + + 技能等级 + + + GrpTalentLevel + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + True @@ -427,10 +556,13 @@ NoControl - 112, 24 + 176, 34 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 1 @@ -457,10 +589,13 @@ NoControl - 260, 24 + 409, 34 + + + 5, 0, 5, 0 - 39, 17 + 56, 24 4 @@ -487,10 +622,13 @@ NoControl - 212, 24 + 333, 34 + + + 5, 0, 5, 0 - 42, 17 + 61, 24 3 @@ -517,10 +655,13 @@ NoControl - 150, 24 + 236, 34 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 2 @@ -541,10 +682,13 @@ 3 - 44, 22 + 69, 31 + + + 5, 4, 5, 4 - 62, 23 + 97, 30 0 @@ -561,33 +705,183 @@ 4 - - 285, 112 - - - 332, 55 - - - 2 - - - 技能等级 - - - GrpTalentLevel - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - None + + CmbSwitchElement + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 0 + + + LnkSwitchElement + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 1 + + + CmbAvatar + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 2 + + + LblAvatarSkillLevelTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 3 + + + NUDAvatarLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 4 + + + BtnGiveAllChar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 5 + + + LblAvatarLevel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 6 + + + LblAvatarSkillLevelLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 7 + + + LblAvatar + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 8 + + + LblAvatarConstellation + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 9 + + + NUDAvatarConstellation + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 10 + + + NUDAvatarSkillLevel + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveAvatar + + + 11 + + + 46, 14 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 + + + 393, 308 + + + 0 + + + 获取角色 + + + GrpGiveAvatar + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 无 @@ -613,10 +907,13 @@ 草 - 112, 187 + 176, 264 + + + 5, 4, 5, 4 - 87, 25 + 134, 32 11 @@ -640,10 +937,13 @@ NoControl - 16, 191 + 25, 270 + + + 5, 0, 5, 0 - 80, 17 + 118, 24 10 @@ -664,10 +964,13 @@ 1 - 89, 22 + 140, 31 + + + 5, 4, 5, 4 - 110, 25 + 171, 32 1 @@ -691,10 +994,13 @@ NoControl - 201, 113 + 316, 160 + + + 5, 0, 5, 0 - 46, 17 + 68, 24 8 @@ -715,10 +1021,13 @@ 3 - 89, 53 + 140, 75 + + + 5, 4, 5, 4 - 110, 23 + 173, 30 3 @@ -742,10 +1051,13 @@ NoControl - 49, 140 + 77, 198 + + + 5, 4, 5, 4 - 150, 30 + 236, 42 9 @@ -772,10 +1084,13 @@ NoControl - 27, 55 + 42, 78 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 2 @@ -802,10 +1117,13 @@ NoControl - 27, 113 + 42, 160 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 6 @@ -832,10 +1150,13 @@ NoControl - 27, 25 + 42, 35 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 0 @@ -862,10 +1183,13 @@ NoControl - 27, 84 + 42, 119 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 4 @@ -886,10 +1210,13 @@ 9 - 89, 82 + 140, 116 + + + 5, 4, 5, 4 - 110, 23 + 173, 30 5 @@ -907,10 +1234,13 @@ 10 - 89, 111 + 140, 157 + + + 5, 4, 5, 4 - 110, 23 + 173, 30 7 @@ -927,40 +1257,19 @@ 11 - - 29, 10 - - - 250, 218 - - - 0 - - - 获取角色 - - - GrpGiveAvatar - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - True - 7, 17 + 11, 24 + + + 1015, 337 PageAvatar - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.7.4.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveArtifact.resx b/Source/GrasscutterTools/Pages/PageGiveArtifact.resx index e621e31..faf8605 100644 --- a/Source/GrasscutterTools/Pages/PageGiveArtifact.resx +++ b/Source/GrasscutterTools/Pages/PageGiveArtifact.resx @@ -130,10 +130,13 @@ - 534, 214 + 839, 302 + + + 5, 0, 5, 0 - 109, 17 + 159, 24 18 @@ -163,10 +166,13 @@ NoControl - 218, 37 + 343, 52 + + + 5, 0, 5, 0 - 42, 17 + 63, 24 6 @@ -193,10 +199,13 @@ NoControl - 460, 125 + 723, 176 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 16 @@ -226,10 +235,13 @@ NoControl - 457, 7 + 718, 10 + + + 5, 0, 5, 0 - 0, 17 + 0, 24 24 @@ -256,10 +268,13 @@ NoControl - 293, 7 + 460, 10 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 2 @@ -283,10 +298,13 @@ Top - 331, 4 + 520, 6 + + + 5, 4, 5, 4 - 120, 25 + 186, 32 3 @@ -307,10 +325,13 @@ Top - 162, 4 + 255, 6 + + + 5, 4, 5, 4 - 125, 25 + 194, 32 1 @@ -337,10 +358,13 @@ NoControl - 124, 7 + 195, 10 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 0 @@ -364,10 +388,13 @@ Top - 460, 96 + 723, 136 + + + 5, 4, 5, 4 - 51, 23 + 80, 30 14 @@ -388,10 +415,13 @@ Top - 331, 94 + 520, 133 + + + 5, 4, 5, 4 - 120, 25 + 186, 32 13 @@ -412,10 +442,13 @@ Top - 162, 95 + 255, 134 + + + 5, 4, 5, 4 - 163, 25 + 254, 32 12 @@ -442,10 +475,13 @@ NoControl - 457, 214 + 718, 302 + + + 5, 0, 5, 0 - 44, 17 + 63, 24 17 @@ -469,13 +505,16 @@ Top, Bottom - 17 + 24 - 162, 125 + 255, 176 + + + 5, 4, 5, 4 - 289, 106 + 452, 148 15 @@ -502,10 +541,13 @@ NoControl - 124, 37 + 195, 52 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 4 @@ -535,10 +577,13 @@ NoControl - 112, 98 + 176, 138 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 11 @@ -562,10 +607,13 @@ Top - 162, 64 + 255, 90 + + + 5, 4, 5, 4 - 289, 25 + 452, 32 10 @@ -592,10 +640,13 @@ NoControl - 112, 67 + 176, 95 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 9 @@ -619,10 +670,13 @@ Top - 162, 35 + 255, 49 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 5 @@ -649,10 +703,13 @@ NoControl - 348, 37 + 547, 52 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 7 @@ -676,10 +733,13 @@ Top - 386, 35 + 607, 49 + + + 5, 4, 5, 4 - 65, 23 + 102, 30 8 @@ -700,12 +760,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageGiveArtifact - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.9.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs index cf2a36b..6d32c4a 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageGiveItem.Designer.cs @@ -172,6 +172,7 @@ // // MenuItemFilter // + this.MenuItemFilter.ImageScalingSize = new System.Drawing.Size(24, 24); this.MenuItemFilter.Name = "MenuSpawnEntityFilter"; resources.ApplyResources(this.MenuItemFilter, "MenuItemFilter"); // diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.resx b/Source/GrasscutterTools/Pages/PageGiveItem.resx index 8940ba7..601dbd4 100644 --- a/Source/GrasscutterTools/Pages/PageGiveItem.resx +++ b/Source/GrasscutterTools/Pages/PageGiveItem.resx @@ -130,10 +130,13 @@ - 262, 187 + 412, 264 + + + 5, 0, 5, 0 - 44, 17 + 63, 24 16 @@ -157,10 +160,13 @@ NoControl - 265, 48 + 416, 68 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 2 @@ -187,10 +193,13 @@ NoControl - 265, 77 + 416, 109 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 3 @@ -213,21 +222,6 @@ Top, Bottom, Left - - Fill - - - 17 - - - 3, 19 - - - 243, 145 - - - 6 - ListGiveItemLogs @@ -241,10 +235,16 @@ 0 - 10, 45 + 16, 64 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 249, 167 + 391, 236 1 @@ -264,6 +264,36 @@ 6 + + Fill + + + 24 + + + 5, 27 + + + 5, 4, 5, 4 + + + 381, 205 + + + 6 + + + ListGiveItemLogs + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpGiveItemRecord + + + 0 + Bottom, Left @@ -274,10 +304,13 @@ NoControl - 256, 214 + 402, 304 + + + 5, 4, 5, 4 - 51, 21 + 72, 28 8 @@ -301,10 +334,13 @@ Top, Left, Right - 498, 3 + 783, 4 + + + 5, 4, 5, 4 - 145, 23 + 226, 30 9 @@ -325,13 +361,16 @@ Top, Bottom, Left, Right - 17 + 24 - 343, 29 + 539, 41 + + + 5, 4, 5, 4 - 300, 208 + 469, 292 11 @@ -358,10 +397,13 @@ NoControl - 7, 215 + 11, 304 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 4 @@ -391,10 +433,13 @@ NoControl - 151, 215 + 237, 304 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 6 @@ -418,10 +463,13 @@ Bottom, Left - 45, 213 + 71, 301 + + + 5, 4, 5, 4 - 100, 23 + 157, 30 5 @@ -442,10 +490,13 @@ Bottom, Left - 189, 213 + 297, 301 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 7 @@ -469,10 +520,13 @@ NoControl - 6, 6 + 9, 8 + + + 5, 0, 5, 0 - 236, 34 + 352, 48 0 @@ -497,10 +551,13 @@ NoControl - 342, 2 + 537, 3 + + + 5, 4, 5, 4 - 150, 25 + 233, 32 10 @@ -539,10 +596,13 @@ NoControl - 626, 6 + 984, 8 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 17 @@ -569,12 +629,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageGiveItem - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.resx b/Source/GrasscutterTools/Pages/PageGiveWeapon.resx index e7c0dcc..8b3556d 100644 --- a/Source/GrasscutterTools/Pages/PageGiveWeapon.resx +++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.resx @@ -129,10 +129,13 @@ NoControl - 9, 173 + 14, 244 + + + 5, 4, 5, 4 - 150, 35 + 236, 49 @@ -157,10 +160,13 @@ Top, Right - 443, 3 + 696, 4 + + + 5, 4, 5, 4 - 200, 23 + 312, 30 8 @@ -187,10 +193,13 @@ NoControl - 6, 8 + 9, 11 + + + 5, 0, 5, 0 - 200, 153 + 298, 216 0 @@ -228,10 +237,13 @@ NoControl - 194, 216 + 305, 305 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 6 @@ -261,10 +273,13 @@ NoControl - 6, 216 + 9, 305 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 2 @@ -294,10 +309,13 @@ NoControl - 100, 216 + 157, 305 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 4 @@ -321,10 +339,13 @@ Bottom, Left - 256, 214 + 402, 302 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 7 @@ -345,10 +366,13 @@ Bottom, Left - 44, 214 + 69, 302 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 3 @@ -369,10 +393,13 @@ Bottom, Left - 138, 214 + 217, 302 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 5 @@ -393,13 +420,16 @@ Top, Bottom, Right - 17 + 24 - 443, 29 + 696, 41 + + + 5, 4, 5, 4 - 200, 208 + 312, 292 9 @@ -426,10 +456,13 @@ NoControl - 626, 6 + 984, 8 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 20 @@ -456,12 +489,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageGiveWeapon - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageMail.Designer.cs b/Source/GrasscutterTools/Pages/PageMail.Designer.cs index 659623c..85cd236 100644 --- a/Source/GrasscutterTools/Pages/PageMail.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageMail.Designer.cs @@ -34,6 +34,7 @@ this.BtnDeleteMailItem = new System.Windows.Forms.Button(); this.TCMailRight = new System.Windows.Forms.TabControl(); this.TPMailSelectableItemList = new System.Windows.Forms.TabPage(); + this.LblClearFilter = new System.Windows.Forms.Label(); this.ListMailSelectableItems = new System.Windows.Forms.ListBox(); this.TxtMailSelectableItemFilter = new System.Windows.Forms.TextBox(); this.PanelMailItemArgs = new System.Windows.Forms.Panel(); @@ -59,7 +60,6 @@ this.LblMailTitleLabel = new System.Windows.Forms.Label(); this.TxtMailSender = new System.Windows.Forms.TextBox(); this.LblMailSenderLabel = new System.Windows.Forms.Label(); - this.LblClearFilter = new System.Windows.Forms.Label(); this.TCMailRight.SuspendLayout(); this.TPMailSelectableItemList.SuspendLayout(); this.PanelMailItemArgs.SuspendLayout(); @@ -109,6 +109,14 @@ this.TPMailSelectableItemList.Name = "TPMailSelectableItemList"; this.TPMailSelectableItemList.UseVisualStyleBackColor = true; // + // LblClearFilter + // + resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); + this.LblClearFilter.BackColor = System.Drawing.Color.White; + this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.LblClearFilter.Name = "LblClearFilter"; + this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); + // // ListMailSelectableItems // resources.ApplyResources(this.ListMailSelectableItems, "ListMailSelectableItems"); @@ -298,14 +306,6 @@ resources.ApplyResources(this.LblMailSenderLabel, "LblMailSenderLabel"); this.LblMailSenderLabel.Name = "LblMailSenderLabel"; // - // LblClearFilter - // - resources.ApplyResources(this.LblClearFilter, "LblClearFilter"); - this.LblClearFilter.BackColor = System.Drawing.Color.White; - this.LblClearFilter.Cursor = System.Windows.Forms.Cursors.Hand; - this.LblClearFilter.Name = "LblClearFilter"; - this.LblClearFilter.Click += new System.EventHandler(this.LblClearFilter_Click); - // // PageMail // resources.ApplyResources(this, "$this"); diff --git a/Source/GrasscutterTools/Pages/PageMail.resx b/Source/GrasscutterTools/Pages/PageMail.resx index 30aea54..83710a5 100644 --- a/Source/GrasscutterTools/Pages/PageMail.resx +++ b/Source/GrasscutterTools/Pages/PageMail.resx @@ -127,10 +127,13 @@ - 384, 88 + 603, 124 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 10 @@ -157,10 +160,13 @@ NoControl - 326, 147 + 510, 211 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 13 @@ -187,10 +193,13 @@ NoControl - 326, 176 + 510, 251 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 14 @@ -223,10 +232,13 @@ NoControl - 206, 6 + 324, 8 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 22 @@ -253,16 +265,16 @@ Fill - 17 + 24 - 3, 26 + 5, 34 0, 0, 0, 0 - 222, 141 + 353, 208 1 @@ -283,10 +295,13 @@ Top - 3, 3 + 5, 4 + + + 5, 4, 5, 4 - 222, 23 + 353, 30 0 @@ -304,10 +319,13 @@ 2 - 171, 5 + 247, 7 + + + 5, 4, 5, 4 - 50, 23 + 79, 30 3 @@ -325,10 +343,13 @@ 0 - 47, 5 + 69, 7 + + + 5, 4, 5, 4 - 60, 23 + 94, 30 1 @@ -352,10 +373,13 @@ NoControl - -3, 7 + -5, 10 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 0 @@ -382,10 +406,13 @@ NoControl - 123, 7 + 173, 10 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 2 @@ -409,10 +436,13 @@ Bottom - 3, 167 + 5, 242 + + + 5, 4, 5, 4 - 222, 30 + 353, 42 2 @@ -430,13 +460,16 @@ 3 - 4, 26 + 4, 33 + + + 5, 4, 5, 4 - 3, 3, 3, 3 + 5, 4, 5, 4 - 228, 200 + 363, 288 0 @@ -456,20 +489,98 @@ 0 + + ListMailList + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPMailList + + + 0 + + + PanelMailListControls + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPMailList + + + 1 + + + 4, 33 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 + + + 363, 288 + + + 1 + + + 邮件列表 + + + TPMailList + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TCMailRight + + + 1 + + + 640, 6 + + + 5, 4, 5, 4 + + + 371, 325 + + + 16 + + + TCMailRight + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + Fill - 17 + 24 - 3, 3 + 5, 4 0, 0, 0, 0 - 222, 166 + 353, 240 0 @@ -486,14 +597,68 @@ 0 + + BtnClearMail + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailListControls + + + 0 + + + BtnRemoveMail + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PanelMailListControls + + + 1 + + + Bottom + + + 5, 244 + + + 5, 4, 5, 4 + + + 353, 40 + + + 1 + + + PanelMailListControls + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TPMailList + + + 1 + NoControl - 84, 3 + 132, 4 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 1 @@ -517,10 +682,13 @@ NoControl - 3, 3 + 5, 4 + + + 5, 4, 5, 4 - 75, 23 + 118, 32 0 @@ -540,78 +708,6 @@ 1 - - Bottom - - - 3, 169 - - - 222, 28 - - - 1 - - - PanelMailListControls - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TPMailList - - - 1 - - - 4, 26 - - - 3, 3, 3, 3 - - - 228, 200 - - - 1 - - - 邮件列表 - - - TPMailList - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TCMailRight - - - 1 - - - 407, 4 - - - 236, 230 - - - 16 - - - TCMailRight - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - Bottom, Left @@ -619,10 +715,13 @@ NoControl - 326, 202 + 510, 288 + + + 5, 4, 5, 4 - 75, 32 + 118, 38 15 @@ -646,13 +745,16 @@ Bottom, Left - 17 + 24 - 70, 147 + 110, 211 + + + 5, 4, 5, 4 - 250, 89 + 391, 100 12 @@ -679,10 +781,13 @@ NoControl - 3, 150 + 5, 212 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 11 @@ -703,10 +808,13 @@ 6 - 280, 31 + 440, 44 + + + 5, 4, 5, 4 - 121, 23 + 190, 30 5 @@ -730,10 +838,13 @@ NoControl - 224, 31 + 352, 44 + + + 5, 4, 5, 4 - 50, 21 + 71, 28 4 @@ -760,10 +871,13 @@ NoControl - 75, 31 + 118, 44 + + + 5, 4, 5, 4 - 62, 21 + 89, 28 3 @@ -790,10 +904,13 @@ NoControl - 3, 33 + 5, 47 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 2 @@ -817,7 +934,10 @@ Top, Bottom, Left - 70, 89 + 110, 126 + + + 5, 4, 5, 4 True @@ -826,7 +946,7 @@ Vertical - 331, 52 + 518, 72 9 @@ -850,10 +970,13 @@ NoControl - 3, 92 + 5, 130 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 8 @@ -874,10 +997,13 @@ 12 - 70, 60 + 110, 85 + + + 5, 4, 5, 4 - 331, 23 + 518, 30 7 @@ -901,10 +1027,13 @@ NoControl - 3, 63 + 5, 89 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 6 @@ -925,10 +1054,13 @@ 14 - 70, 2 + 110, 3 + + + 5, 4, 5, 4 - 331, 23 + 518, 30 1 @@ -952,10 +1084,13 @@ NoControl - 3, 5 + 5, 7 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 0 @@ -979,12 +1114,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageMail - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageOpenCommand.resx b/Source/GrasscutterTools/Pages/PageOpenCommand.resx index 211cf92..a511f49 100644 --- a/Source/GrasscutterTools/Pages/PageOpenCommand.resx +++ b/Source/GrasscutterTools/Pages/PageOpenCommand.resx @@ -130,10 +130,13 @@ - 436, 204 + 685, 288 + + + 5, 0, 5, 0 - 37, 17 + 53, 24 9 @@ -163,10 +166,13 @@ NoControl - 384, 204 + 603, 288 + + + 5, 0, 5, 0 - 46, 17 + 67, 24 8 @@ -193,10 +199,13 @@ NoControl - 478, 181 + 744, 256 + + + 5, 0, 5, 0 - 107, 17 + 168, 24 7 @@ -223,10 +232,13 @@ NoControl - 380, 137 + 597, 193 + + + 5, 0, 5, 0 - 205, 58 + 322, 82 6 @@ -253,10 +265,13 @@ NoControl - 476, 201 + 748, 284 + + + 5, 4, 5, 4 - 104, 23 + 163, 32 10 @@ -286,10 +301,13 @@ NoControl - 133, 14 + 209, 20 + + + 5, 0, 5, 0 - 210, 17 + 314, 24 0 @@ -319,10 +337,13 @@ NoControl - 13, 62 + 20, 88 + + + 5, 0, 5, 0 - 80, 17 + 118, 24 4 @@ -349,10 +370,13 @@ NoControl - 99, 62 + 156, 88 + + + 5, 0, 5, 0 - 23, 17 + 34, 24 5 @@ -379,10 +403,13 @@ NoControl - 99, 28 + 156, 40 + + + 5, 0, 5, 0 - 23, 17 + 34, 24 1 @@ -409,10 +436,13 @@ NoControl - 99, 45 + 156, 64 + + + 5, 0, 5, 0 - 23, 17 + 34, 24 3 @@ -439,10 +469,13 @@ NoControl - 37, 28 + 58, 40 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 0 @@ -469,10 +502,13 @@ NoControl - 25, 45 + 39, 64 + + + 5, 0, 5, 0 - 68, 17 + 100, 24 2 @@ -493,10 +529,16 @@ 5 - 380, 34 + 597, 48 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 200, 100 + 314, 141 5 @@ -526,10 +568,13 @@ NoControl - 189, 15 + 297, 21 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 2 @@ -550,10 +595,13 @@ 0 - 65, 13 + 102, 18 + + + 5, 4, 5, 4 - 118, 23 + 185, 30 1 @@ -577,10 +625,13 @@ NoControl - 92, 82 + 145, 116 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 6 @@ -607,10 +658,13 @@ NoControl - 15, 44 + 24, 62 + + + 5, 0, 5, 0 - 44, 17 + 64, 24 3 @@ -634,10 +688,13 @@ NoControl - 189, 42 + 297, 59 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 5 @@ -661,10 +718,13 @@ False - 65, 42 + 102, 59 + + + 5, 4, 5, 4 - 118, 23 + 185, 30 4 @@ -688,10 +748,13 @@ NoControl - 29, 15 + 46, 21 + + + 5, 0, 5, 0 - 30, 17 + 42, 24 0 @@ -712,13 +775,16 @@ 6 - 4, 26 + 4, 33 + + + 5, 4, 5, 4 - 3, 3, 3, 3 + 5, 4, 5, 4 - 296, 109 + 469, 159 0 @@ -742,10 +808,13 @@ NoControl - 92, 82 + 145, 116 + + + 5, 4, 5, 4 - 100, 23 + 157, 32 3 @@ -766,10 +835,13 @@ 0 - 65, 13 + 102, 18 + + + 5, 4, 5, 4 - 182, 23 + 284, 30 1 @@ -793,10 +865,13 @@ NoControl - 15, 16 + 24, 23 + + + 5, 0, 5, 0 - 44, 17 + 62, 24 0 @@ -823,10 +898,13 @@ NoControl - 15, 39 + 24, 55 + + + 5, 0, 5, 0 - 275, 40 + 432, 56 2 @@ -848,13 +926,16 @@ 3 - 4, 26 + 4, 33 + + + 5, 4, 5, 4 - 3, 3, 3, 3 + 5, 4, 5, 4 - 296, 111 + 470, 152 1 @@ -878,10 +959,13 @@ Fill - 3, 19 + 5, 27 + + + 5, 4, 5, 4 - 304, 139 + 477, 196 0 @@ -902,10 +986,16 @@ False - 64, 63 + 101, 89 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 310, 161 + 487, 227 4 @@ -929,10 +1019,13 @@ None - 136, 34 + 214, 48 + + + 5, 4, 5, 4 - 182, 25 + 284, 32 2 @@ -956,10 +1049,13 @@ NoControl - 324, 34 + 509, 48 + + + 5, 4, 5, 4 - 50, 25 + 79, 35 3 @@ -989,10 +1085,13 @@ NoControl - 62, 37 + 97, 52 + + + 5, 0, 5, 0 - 68, 17 + 100, 24 1 @@ -1016,12 +1115,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageOpenCommand - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageProxy.resx b/Source/GrasscutterTools/Pages/PageProxy.resx index 9c6623d..080d839 100644 --- a/Source/GrasscutterTools/Pages/PageProxy.resx +++ b/Source/GrasscutterTools/Pages/PageProxy.resx @@ -123,10 +123,13 @@ - 227, 40 + 357, 56 + + + 5, 4, 5, 4 - 160, 23 + 249, 30 @@ -151,10 +154,13 @@ True - 84, 43 + 132, 61 + + + 5, 0, 5, 0 - 137, 17 + 203, 24 3 @@ -178,10 +184,13 @@ Top, Right - 393, 40 + 618, 56 + + + 5, 4, 5, 4 - 120, 25 + 189, 35 5 @@ -208,10 +217,13 @@ True - 519, 42 + 826, 59 + + + 5, 4, 5, 4 - 75, 21 + 108, 28 6 @@ -235,7 +247,10 @@ Top, Bottom, Left, Right - 48, 72 + 75, 102 + + + 5, 4, 5, 4 True @@ -244,7 +259,7 @@ Vertical - 550, 120 + 862, 182 7 @@ -271,10 +286,13 @@ Bottom, Right - 529, 207 + 831, 292 + + + 5, 4, 5, 4 - 100, 25 + 157, 35 10 @@ -301,10 +319,13 @@ True - 15, 211 + 24, 298 + + + 5, 0, 5, 0 - 70, 17 + 99, 24 8 @@ -331,10 +352,13 @@ True - 482, 211 + 757, 298 + + + 5, 0, 5, 0 - 32, 17 + 46, 24 9 @@ -358,10 +382,13 @@ True - 102, 14 + 160, 20 + + + 5, 0, 5, 0 - 119, 17 + 172, 24 0 @@ -388,10 +415,13 @@ Top, Left, Right - 227, 11 + 357, 16 + + + 5, 4, 5, 4 - 160, 23 + 249, 30 1 @@ -415,10 +445,13 @@ Top, Right - 393, 11 + 618, 16 + + + 5, 4, 5, 4 - 120, 25 + 189, 35 2 @@ -445,15 +478,18 @@ True - 7, 17 + 11, 24 True + + 1015, 337 + PageProxy - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageQuest.resx b/Source/GrasscutterTools/Pages/PageQuest.resx index b7da284..3ff0fd3 100644 --- a/Source/GrasscutterTools/Pages/PageQuest.resx +++ b/Source/GrasscutterTools/Pages/PageQuest.resx @@ -117,345 +117,384 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 26, 55 + + + Bottom, Left - - 1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 添加任务 - - - 288, 23 - - - 6 - - - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.1.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 - - - ChkQuestFilterUNRELEASED - - - 99, 21 - - - 26, 28 - - - TxtQuestFilter - - - 22 - - - 3, 3 - - - 626, 5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17 - - - 90, 23 - - - - Top, Bottom, Left + + True NoControl - - $this - - - 7, 17 - + - 26, 82 + 41, 116 - - Bottom, Left - - - 2 - - - 4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5, 4, 5, 4 - 75, 21 - - - $this - - - NoControl - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpQuestFilters - - - Bottom, Left - - - ListQuest - - - GrpQuestFilters - - - GrpQuestFilters - - - 完成任务 - - - 3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 列表过滤 - - - NoControl - - - $this - - - True - - - 1 - - - 选中时添加并完成 - - - 2 - - - 199, 106 - - - 87, 21 - - - 23 - - - ChkAddAndFinishQuest - - - 123, 21 - - - ChkQuestFilterTEST - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 4 - - - Top, Bottom, Left, Right - - - NoControl - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 108, 28 2 - - 346, 100 - 测试任务 - - 6, 186 + + ChkQuestFilterTEST - - 16, 17 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + GrpQuestFilters + + + 0 + + True - - 288, 208 + + NoControl + + + 41, 78 + + + 5, 4, 5, 4 + + + 144, 28 + + + 1 + + + 未发布的任务 + + + ChkQuestFilterUNRELEASED + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpQuestFilters + + + 1 + + + True + + + NoControl + + + 41, 40 + + + 5, 4, 5, 4 + + + 126, 28 + + + 0 + + + 隐藏的任务 + + + ChkQuestFilterHIDDEN + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpQuestFilters + + + 2 + + + 313, 150 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 150, 130 + 236, 184 + + + 3 + + + 列表过滤 + + + GrpQuestFilters + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Left + + + NoControl + + + 156, 301 + + + 5, 4, 5, 4 + + + 141, 32 + + + 5 + + + 完成任务 BtnFinishQuest - - True + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this 3 - + + Bottom, Left + + NoControl - - Top, Right + + 5, 301 - - 99, 213 + + 5, 4, 5, 4 - - X + + 141, 32 + + + 4 + + + 添加任务 BtnAddQuest - - Bottom, Left + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ChkQuestFilterHIDDEN - - - NoControl - - - 1 - - - 3, 213 - - + $this - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 + + + Top, Bottom, Left + + + NoControl + + + 5, 4 + + + 5, 0, 5, 0 + + + 544, 141 + + + 0 添加或完成任务 提示：许多任务需要服务端脚本支持 因此任务可以接，可以完成，但是不一定可以做 + + LblQuestDescription + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + Top, Left, Right - - PageQuest + + 558, 3 + + + 5, 4, 5, 4 + + + 450, 30 + + + 1 + + + TxtQuestFilter + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Top, Bottom, Left, Right + + + 24 + + + 558, 40 + + + 5, 4, 5, 4 + + + 450, 292 + + + 2 + + + ListQuest + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Top, Right + + + True + + + NoControl + + + 984, 7 + + + 5, 0, 5, 0 + + + 22, 24 + + + 22 + + + X + + + False LblClearFilter - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this 1 - - $this - - - System.Windows.Forms.TextBox, 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 - - - False - - - GrpQuestFilters - - - 0 - - - NoControl - - - 355, 2 - - - 5 - - - 隐藏的任务 - - - 355, 28 - - - 90, 23 - - - 5 - - - 0 - - + Bottom, Left - - 7 + + True - - 2 + + 9, 265 - + + 5, 4, 5, 4 + + + 180, 28 + + + 23 + + + 选中时添加并完成 + + + ChkAddAndFinishQuest + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 未发布的任务 - - - LblQuestDescription - - - 0 - 0 True + + 11, 24 + + + 1015, 337 + + + PageQuest + + + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageScene.resx b/Source/GrasscutterTools/Pages/PageScene.resx index 0dd51a3..a06a2cb 100644 --- a/Source/GrasscutterTools/Pages/PageScene.resx +++ b/Source/GrasscutterTools/Pages/PageScene.resx @@ -127,10 +127,13 @@ - 287, 30 + 451, 42 + + + 5, 4, 5, 4 - 50, 21 + 71, 28 2 @@ -157,10 +160,13 @@ NoControl - 287, 3 + 451, 4 + + + 5, 4, 5, 4 - 50, 21 + 71, 28 1 @@ -184,10 +190,13 @@ Top, Left, Right - 343, 2 + 539, 3 + + + 5, 4, 5, 4 - 300, 23 + 469, 30 14 @@ -217,10 +226,13 @@ NoControl - 87, 188 + 137, 267 + + + 5, 4, 5, 4 - 76, 21 + 109, 28 13 @@ -250,10 +262,13 @@ NoControl - 215, 158 + 338, 223 + + + 5, 0, 5, 0 - 14, 17 + 19, 24 10 @@ -283,10 +298,13 @@ NoControl - 109, 158 + 171, 223 + + + 5, 0, 5, 0 - 14, 17 + 20, 24 8 @@ -313,10 +331,13 @@ NoControl - 6, 185 + 9, 261 + + + 5, 4, 5, 4 - 75, 25 + 118, 35 12 @@ -346,10 +367,13 @@ NoControl - 3, 158 + 5, 223 + + + 5, 0, 5, 0 - 14, 17 + 19, 24 6 @@ -373,10 +397,13 @@ Bottom, Left - 235, 156 + 369, 220 + + + 5, 4, 5, 4 - 80, 23 + 126, 30 11 @@ -397,10 +424,13 @@ Bottom, Left - 129, 156 + 203, 220 + + + 5, 4, 5, 4 - 80, 23 + 126, 30 9 @@ -421,10 +451,13 @@ Bottom, Left - 23, 156 + 36, 220 + + + 5, 4, 5, 4 - 80, 23 + 126, 30 7 @@ -448,10 +481,13 @@ NoControl - 3, 3 + 5, 4 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 0 @@ -475,13 +511,16 @@ Top, Bottom, Left, Right - 17 + 24 - 343, 28 + 539, 40 + + + 5, 4, 5, 4 - 300, 208 + 469, 268 15 @@ -508,10 +547,13 @@ NoControl - 3, 102 + 5, 144 + + + 5, 0, 5, 0 - 296, 51 + 444, 72 5 @@ -541,10 +583,13 @@ NoControl - 287, 57 + 451, 80 + + + 5, 4, 5, 4 - 50, 21 + 71, 28 3 @@ -571,10 +616,13 @@ NoControl - 215, 184 + 338, 260 + + + 5, 4, 5, 4 - 100, 25 + 157, 35 17 @@ -604,10 +652,13 @@ NoControl - 626, 5 + 984, 7 + + + 5, 0, 5, 0 - 16, 17 + 22, 24 23 @@ -634,12 +685,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageScene - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageSceneTag.Designer.cs b/Source/GrasscutterTools/Pages/PageSceneTag.Designer.cs index 561a3b9..a796317 100644 --- a/Source/GrasscutterTools/Pages/PageSceneTag.Designer.cs +++ b/Source/GrasscutterTools/Pages/PageSceneTag.Designer.cs @@ -56,9 +56,9 @@ // // GrpOnSelectedCheck // - resources.ApplyResources(this.GrpOnSelectedCheck, "GrpOnSelectedCheck"); this.GrpOnSelectedCheck.Controls.Add(this.RbOnSelectedUncheck); this.GrpOnSelectedCheck.Controls.Add(this.RbOnSelectedCheck); + resources.ApplyResources(this.GrpOnSelectedCheck, "GrpOnSelectedCheck"); this.GrpOnSelectedCheck.Name = "GrpOnSelectedCheck"; this.GrpOnSelectedCheck.TabStop = false; // @@ -79,9 +79,9 @@ // // GrpOnDefaultSelectedCheck // - resources.ApplyResources(this.GrpOnDefaultSelectedCheck, "GrpOnDefaultSelectedCheck"); this.GrpOnDefaultSelectedCheck.Controls.Add(this.RbOnDefaultSelectedCheck); this.GrpOnDefaultSelectedCheck.Controls.Add(this.RbOnDefaultSelectedUncheck); + resources.ApplyResources(this.GrpOnDefaultSelectedCheck, "GrpOnDefaultSelectedCheck"); this.GrpOnDefaultSelectedCheck.Name = "GrpOnDefaultSelectedCheck"; this.GrpOnDefaultSelectedCheck.TabStop = false; // diff --git a/Source/GrasscutterTools/Pages/PageSceneTag.resx b/Source/GrasscutterTools/Pages/PageSceneTag.resx index 3d1a0cf..ad16a9d 100644 --- a/Source/GrasscutterTools/Pages/PageSceneTag.resx +++ b/Source/GrasscutterTools/Pages/PageSceneTag.resx @@ -117,358 +117,406 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Top, Bottom, Left, Right - - 111, 21 + + 539, 4 - - 5 + + 5, 4, 5, 4 + + + 469, 326 - - True - - - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - RbOnDefaultSelectedUncheck - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - RbOnSelectedUncheck - - + 8 + + TvSceneTags + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this - + + 8 + + + True + + + 20, 69 + + + 5, 4, 5, 4 + + + 107, 28 + + 1 移除标签 - - 7, 17 - - - BtnResetAll - - - 150, 25 - - - True - - - 6 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrpOnDefaultSelectedCheck - - - - NoControl - - - System.Windows.Forms.Label, 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 - - - 80, 17 - - - 3 - - - True - - - TvSceneTags - - - 180, 80 - - - BtnUnlockAll - - - $this - - - RbOnDefaultSelectedCheck - - - 1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LblTitle - - - 1 - - - $this - - - $this - - - 74, 21 - - - 13, 22 - - - GrpOnSelectedCheck - - - 预设(Default)标签通常是锁定或者之前的状态 - - - 189, 96 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - GrpOnSelectedCheck - - - 0 - - - 解锁全部 - - - 13, 49 - - - True - - - 0 - - - RbOnSelectedCheck - - - 点击标签时 - - - 4 - - - $this - - - $this - - - 7 - - - 74, 21 - - - 右键点击相反 - - - 还原预设 - - - 场景标签管理 (GC v1.7.2 起) - - - 74, 21 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 162, 17 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 189, 34 - - - 点击场景时进入 - - - 4 - - - LblDefaultTagTip - - - 3, 109 - - - 189, 3 - - - 7 - - - 3, 23 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - $this - - - True - - - ChkOnSceneSelectedEnter - - - 8 - - - 1 - - - 1 - - - 2 - - - LblRightButtonClickTip - - - 0 - - - PageSceneTag - - - GrpOnSelectedCheck - - - 2 - - - 3 - - - 300, 233 - - - 0 - - - Top, Bottom, Left, Right - - - 180, 80 - - - GrpOnDefaultSelectedCheck - - - True - - - True - - - 150, 25 - - - 3, 192 - - - 13, 49 - - - 249, 17 - - - 13, 22 - - - 74, 21 - - - 移除标签 + + RbOnSelectedUncheck System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + GrpOnSelectedCheck - - 添加标签 + + 0 - - 343, 3 + + True - - GrpOnDefaultSelectedCheck + + 20, 31 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5, 4, 5, 4 - - 6, 214 + + 107, 28 - - 点击(预设)标签时 - - - 3, 3 + + 0 添加标签 - - True + + RbOnSelectedCheck + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpOnSelectedCheck + + + 1 + + + 5, 32 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 + + + 283, 113 + + + 2 + + + 点击标签时 + + + GrpOnSelectedCheck + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this 7 + + True + + + 20, 31 + + + 5, 4, 5, 4 + + + 107, 28 + + + 0 + + + 添加标签 + + + RbOnDefaultSelectedCheck + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpOnDefaultSelectedCheck + + + 0 + + + True + + + 20, 69 + + + 5, 4, 5, 4 + + + 107, 28 + + + 1 + + + 移除标签 + + + RbOnDefaultSelectedUncheck + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrpOnDefaultSelectedCheck + + + 1 + + + 5, 154 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 + + + 283, 113 + + + 3 + + + 点击(预设)标签时 + + + GrpOnDefaultSelectedCheck + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 5, 4 + + + 5, 0, 5, 0 + + + 238, 24 + + + 1 + + + 场景标签管理 (GC v1.7.2 起) + + + LblTitle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + 5, 271 + + + 5, 0, 5, 0 + + + 373, 24 + + + 4 + + + 预设(Default)标签通常是锁定或者之前的状态 + + + LblDefaultTagTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 297, 4 + + + 5, 4, 5, 4 + + + 236, 35 + + + 7 + + + 解锁全部 + + + BtnUnlockAll + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + 9, 302 + + + 5, 4, 5, 4 + + + 162, 28 + + + 5 + + + 点击场景时进入 + + + ChkOnSceneSelectedEnter + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + 1 + + True + + + 297, 136 + + + 5, 0, 5, 0 + + + 118, 24 + + + 6 + + + 右键点击相反 + + + LblRightButtonClickTip + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + NoControl + + + 297, 48 + + + 5, 4, 5, 4 + + + 236, 35 + + + 7 + + + 还原预设 + + + BtnResetAll + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + True + + 11, 24 + + + 1015, 337 + + + PageSceneTag + + + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + \ No newline at end of file diff --git a/Source/GrasscutterTools/Pages/PageSettings.resx b/Source/GrasscutterTools/Pages/PageSettings.resx index 9d1189e..7efd6ad 100644 --- a/Source/GrasscutterTools/Pages/PageSettings.resx +++ b/Source/GrasscutterTools/Pages/PageSettings.resx @@ -123,10 +123,14 @@ - 3, 3 + 5, 4 + + + + 5, 0, 5, 0 - 56, 17 + 82, 24 0 @@ -147,10 +151,13 @@ 10 - 87, 39 + 137, 55 + + + 5, 4, 5, 4 - 100, 23 + 157, 30 2 @@ -170,15 +177,17 @@ True - NoControl - 28, 40 + 44, 56 + + + 5, 4, 5, 4 - 65, 21 + 92, 28 1 @@ -202,10 +211,13 @@ True - 193, 41 + 303, 58 + + + 5, 0, 5, 0 - 104, 17 + 154, 24 3 @@ -232,10 +244,13 @@ Bottom, Left - 6, 202 + 9, 285 + + + 5, 4, 5, 4 - 155, 25 + 244, 35 3 @@ -259,10 +274,13 @@ Bottom, Left - 86, 171 + 135, 241 + + + 5, 4, 5, 4 - 75, 25 + 118, 35 2 @@ -286,10 +304,13 @@ Bottom, Left - 5, 171 + 8, 241 + + + 5, 4, 5, 4 - 75, 25 + 118, 35 1 @@ -313,10 +334,13 @@ Top, Bottom, Left, Right - 6, 22 + 9, 31 + + + 5, 4, 5, 4 - 155, 148 + 241, 193 0 @@ -334,10 +358,16 @@ 3 - 476, 3 + 748, 4 + + + 5, 4, 5, 4 + + + 5, 4, 5, 4 - 167, 233 + 262, 329 100 @@ -364,10 +394,13 @@ NoControl - 53, 70 + 83, 99 + + + 5, 0, 5, 0 - 25, 17 + 35, 24 6 @@ -388,10 +421,13 @@ 4 - 87, 67 + 137, 95 + + + 5, 4, 5, 4 - 100, 25 + 155, 32 7 @@ -412,10 +448,13 @@ True - 193, 70 + 303, 99 + + + 5, 0, 5, 0 - 104, 17 + 154, 24 8 @@ -442,10 +481,13 @@ NoControl - 197, 98 + 310, 138 + + + 5, 4, 5, 4 - 75, 21 + 108, 28 10 @@ -469,10 +511,13 @@ True - 25, 99 + 39, 140 + + + 5, 0, 5, 0 - 56, 17 + 82, 24 11 @@ -493,10 +538,13 @@ 1 - 87, 98 + 137, 138 + + + 5, 4, 5, 4 - 104, 45 + 163, 69 12 @@ -517,12 +565,15 @@ True - 7, 17 + 11, 24 + + + 1015, 337 PageSettings - GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.13.0.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 + GrasscutterTools.Pages.BasePage, GrasscutterTools, Version=1.15.2.0, Culture=neutral, PublicKeyToken=de2b1c089621e923 \ No newline at end of file