diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs
index 52bba8d..b1c9290 100644
--- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs
@@ -229,20 +229,6 @@ namespace GrasscutterTools.Forms
this.ChkIncludeUID = new System.Windows.Forms.CheckBox();
this.LblDefaultUid = new System.Windows.Forms.Label();
this.TCMain = new System.Windows.Forms.TabControl();
- this.TPWaypoints = new System.Windows.Forms.TabPage();
- this.WaypointX = new System.Windows.Forms.Label();
- this.NUDWaypointZ = new System.Windows.Forms.NumericUpDown();
- this.WaypointZ = new System.Windows.Forms.Label();
- this.NUDWaypointY = new System.Windows.Forms.NumericUpDown();
- this.NUDWaypointX = new System.Windows.Forms.NumericUpDown();
- this.WaypointName = new System.Windows.Forms.Label();
- this.WaypointY = new System.Windows.Forms.Label();
- this.WaypointsGroupBox = new System.Windows.Forms.GroupBox();
- this.LnkResetWaypoints = new System.Windows.Forms.LinkLabel();
- this.FLPWaypointsList = new System.Windows.Forms.FlowLayoutPanel();
- this.DeleteWaypoint = new System.Windows.Forms.Button();
- this.CreateWaypoint = new System.Windows.Forms.Button();
- this.WaypointNameInput = new System.Windows.Forms.TextBox();
this.GrpCommand.SuspendLayout();
this.TPRemoteCall.SuspendLayout();
this.GrpServerStatus.SuspendLayout();
@@ -300,11 +286,6 @@ namespace GrasscutterTools.Forms
this.GrpSettings.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUDUid)).BeginInit();
this.TCMain.SuspendLayout();
- this.TPWaypoints.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointZ)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointY)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointX)).BeginInit();
- this.WaypointsGroupBox.SuspendLayout();
this.SuspendLayout();
//
// TxtCommand
@@ -2037,154 +2018,12 @@ namespace GrasscutterTools.Forms
this.TCMain.Controls.Add(this.TPWeapon);
this.TCMain.Controls.Add(this.TPItem);
this.TCMain.Controls.Add(this.TPScene);
- this.TCMain.Controls.Add(this.TPWaypoints);
this.TCMain.Controls.Add(this.TPManage);
this.TCMain.Controls.Add(this.TPAbout);
this.TCMain.Controls.Add(this.TPRemoteCall);
this.TCMain.Name = "TCMain";
this.TCMain.SelectedIndex = 0;
- //
- // TPWaypoints
- //
- this.TPWaypoints.Controls.Add(this.WaypointX);
- this.TPWaypoints.Controls.Add(this.NUDWaypointZ);
- this.TPWaypoints.Controls.Add(this.WaypointZ);
- this.TPWaypoints.Controls.Add(this.NUDWaypointY);
- this.TPWaypoints.Controls.Add(this.NUDWaypointX);
- this.TPWaypoints.Controls.Add(this.WaypointName);
- this.TPWaypoints.Controls.Add(this.WaypointY);
- this.TPWaypoints.Controls.Add(this.WaypointsGroupBox);
- this.TPWaypoints.Controls.Add(this.DeleteWaypoint);
- this.TPWaypoints.Controls.Add(this.CreateWaypoint);
- this.TPWaypoints.Controls.Add(this.WaypointNameInput);
- resources.ApplyResources(this.TPWaypoints, "TPWaypoints");
- this.TPWaypoints.Name = "TPWaypoints";
- this.TPWaypoints.UseVisualStyleBackColor = true;
- //
- // WaypointX
- //
- resources.ApplyResources(this.WaypointX, "WaypointX");
- this.WaypointX.Name = "WaypointX";
- //
- // NUDWaypointZ
- //
- resources.ApplyResources(this.NUDWaypointZ, "NUDWaypointZ");
- this.NUDWaypointZ.Increment = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- this.NUDWaypointZ.Maximum = new decimal(new int[] {
- 2147483647,
- 0,
- 0,
- 0});
- this.NUDWaypointZ.Minimum = new decimal(new int[] {
- -2147483648,
- 0,
- 0,
- -2147483648});
- this.NUDWaypointZ.Name = "NUDWaypointZ";
- //
- // WaypointZ
- //
- resources.ApplyResources(this.WaypointZ, "WaypointZ");
- this.WaypointZ.Name = "WaypointZ";
- //
- // NUDWaypointY
- //
- resources.ApplyResources(this.NUDWaypointY, "NUDWaypointY");
- this.NUDWaypointY.Increment = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- this.NUDWaypointY.Maximum = new decimal(new int[] {
- 2147483647,
- 0,
- 0,
- 0});
- this.NUDWaypointY.Minimum = new decimal(new int[] {
- -2147483648,
- 0,
- 0,
- -2147483648});
- this.NUDWaypointY.Name = "NUDWaypointY";
- this.NUDWaypointY.Value = new decimal(new int[] {
- 300,
- 0,
- 0,
- 0});
- //
- // NUDWaypointX
- //
- resources.ApplyResources(this.NUDWaypointX, "NUDWaypointX");
- this.NUDWaypointX.Increment = new decimal(new int[] {
- 100,
- 0,
- 0,
- 0});
- this.NUDWaypointX.Maximum = new decimal(new int[] {
- 2147483647,
- 0,
- 0,
- 0});
- this.NUDWaypointX.Minimum = new decimal(new int[] {
- -2147483648,
- 0,
- 0,
- -2147483648});
- this.NUDWaypointX.Name = "NUDWaypointX";
- //
- // WaypointName
- //
- resources.ApplyResources(this.WaypointName, "WaypointName");
- this.WaypointName.Name = "WaypointName";
- //
- // WaypointY
- //
- resources.ApplyResources(this.WaypointY, "WaypointY");
- this.WaypointY.Name = "WaypointY";
- //
- // WaypointsGroupBox
- //
- resources.ApplyResources(this.WaypointsGroupBox, "WaypointsGroupBox");
- this.WaypointsGroupBox.Controls.Add(this.LnkResetWaypoints);
- this.WaypointsGroupBox.Controls.Add(this.FLPWaypointsList);
- this.WaypointsGroupBox.Name = "WaypointsGroupBox";
- this.WaypointsGroupBox.TabStop = false;
- //
- // LnkResetWaypoints
- //
- resources.ApplyResources(this.LnkResetWaypoints, "LnkResetWaypoints");
- this.LnkResetWaypoints.Name = "LnkResetWaypoints";
- this.LnkResetWaypoints.TabStop = true;
- this.LnkResetWaypoints.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkResetWaypoints_LinkClicked);
- //
- // FLPWaypointsList
- //
- resources.ApplyResources(this.FLPWaypointsList, "FLPWaypointsList");
- this.FLPWaypointsList.Name = "FLPWaypointsList";
- //
- // DeleteWaypoint
- //
- resources.ApplyResources(this.DeleteWaypoint, "DeleteWaypoint");
- this.DeleteWaypoint.Name = "DeleteWaypoint";
- this.DeleteWaypoint.UseVisualStyleBackColor = true;
- this.DeleteWaypoint.Click += new System.EventHandler(this.DeleteWaypoint_Click);
- //
- // CreateWaypoint
- //
- resources.ApplyResources(this.CreateWaypoint, "CreateWaypoint");
- this.CreateWaypoint.Name = "CreateWaypoint";
- this.CreateWaypoint.UseVisualStyleBackColor = true;
- this.CreateWaypoint.Click += new System.EventHandler(this.CreateWaypoint_Click);
- //
- // WaypointNameInput
- //
- resources.ApplyResources(this.WaypointNameInput, "WaypointNameInput");
- this.WaypointNameInput.Name = "WaypointNameInput";
- //
+ //
// FormMain
//
resources.ApplyResources(this, "$this");
@@ -2278,13 +2117,6 @@ namespace GrasscutterTools.Forms
this.GrpSettings.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.NUDUid)).EndInit();
this.TCMain.ResumeLayout(false);
- this.TPWaypoints.ResumeLayout(false);
- this.TPWaypoints.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointZ)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointY)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.NUDWaypointX)).EndInit();
- this.WaypointsGroupBox.ResumeLayout(false);
- this.WaypointsGroupBox.PerformLayout();
this.ResumeLayout(false);
}
@@ -2492,19 +2324,5 @@ namespace GrasscutterTools.Forms
private System.Windows.Forms.LinkLabel LnkNewVersion;
private System.Windows.Forms.Button BtnGiveAllWeapons;
private System.Windows.Forms.CheckBox ChkInfiniteHP;
- private System.Windows.Forms.TabPage TPWaypoints;
- private System.Windows.Forms.Label WaypointName;
- private System.Windows.Forms.GroupBox WaypointsGroupBox;
- private System.Windows.Forms.LinkLabel LnkResetWaypoints;
- private System.Windows.Forms.FlowLayoutPanel FLPWaypointsList;
- private System.Windows.Forms.Button DeleteWaypoint;
- private System.Windows.Forms.Button CreateWaypoint;
- private System.Windows.Forms.TextBox WaypointNameInput;
- private System.Windows.Forms.NumericUpDown NUDWaypointX;
- private System.Windows.Forms.NumericUpDown NUDWaypointY;
- private System.Windows.Forms.NumericUpDown NUDWaypointZ;
- private System.Windows.Forms.Label WaypointX;
- private System.Windows.Forms.Label WaypointY;
- private System.Windows.Forms.Label WaypointZ;
}
}
diff --git a/Source/GrasscutterTools/Forms/FormMain.en-us.resx b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
index 13dc1d2..4256ab0 100644
--- a/Source/GrasscutterTools/Forms/FormMain.en-us.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
@@ -870,25 +870,4 @@ Therefore, the quest can be added and finished, but not necessarily work.
Include UID
-
- Add
-
-
- Delete
-
-
- Reset
-
-
- Waypoints
-
-
- Name
-
-
- Waypoint not found
-
-
- Waypoints list
-
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Forms/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx
index 50d0b7a..1a07dde 100644
--- a/Source/GrasscutterTools/Forms/FormMain.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.resx
@@ -1002,7 +1002,7 @@
System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
TPPlayerCheck
@@ -1314,6 +1314,51 @@
TxtToken
+
+ True
+
+
+ NoControl
+
+
+ 29, 15
+
+
+ 30, 17
+
+
+ 7
+
+
+ UID
+
+
+ LblRemotePlayerId
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TPPlayerCheck
+
+
+ 6
+
+
+ BtnConsoleConnect
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TPConsoleCheck
+
+
+ 0
+
+
+ TxtToken
+
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1555,6 +1600,15 @@
1
+
+ 70, 39
+
+
+ 68, 17
+
+
+ 1
+
服务器地址
@@ -4336,6 +4390,9 @@
CmbStat
+
+ CmbStat
+
System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -4558,6 +4615,18 @@
1
+
+ LnkTalentQ
+
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ GrpTalentLevel
+
+
+ 1
+
LnkTalentNormalATK
@@ -4756,8 +4825,8 @@
TPAvatar
-
- 0
+
+ 56, 17
LblAvatarConstellation
@@ -4852,7 +4921,7 @@
652, 245
-
+
5
@@ -5632,8 +5701,8 @@
32, 17
-
- 10
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
数量
@@ -6103,8 +6172,8 @@
6, 6
-
- 346, 100
+
+ RbEntityMonster
4
@@ -6678,8 +6747,8 @@
CmbSubAttributionValue
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 3
TPArtifact
@@ -7137,8 +7206,8 @@
BtnLoadCustomCommands
-
- System.Windows.Forms.Button, 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
TPCustom
@@ -7215,8 +7284,8 @@
1
-
- 列表
+
+ NUDSubAttributionTimes
groupBox1
@@ -7356,8 +7425,8 @@
355, 23
-
- 1
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
TxtCustomName
@@ -7668,8 +7737,8 @@
2
-
- CmbLanguage
+
+ FLPCustomCommands
System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -7707,8 +7776,8 @@
ChkIncludeUID
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ groupBox1
GrpSettings
@@ -7962,375 +8031,13 @@
GrpSettings
-
- 7
+
+ 2
Top, Bottom, Left, Right
-
- Bottom, Left
-
-
- True
-
-
- NoControl
-
-
- 297, 218
-
-
- 14, 17
-
-
- 18
-
-
- x
-
-
- WaypointX
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 0
-
-
- Bottom, Left
-
-
- 453, 216
-
-
- 48, 23
-
-
- 17
-
-
- NUDWaypointZ
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 1
-
-
- Bottom, Left
-
-
- True
-
-
- NoControl
-
-
- 437, 218
-
-
- 14, 17
-
-
- 20
-
-
- z
-
-
- WaypointZ
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 2
-
-
- Bottom, Left
-
-
- 383, 216
-
-
- 50, 23
-
-
- 16
-
-
- NUDWaypointY
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 3
-
-
- Bottom, Left
-
-
- 314, 216
-
-
- 47, 23
-
-
- 15
-
-
- NUDWaypointX
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 4
-
-
- Bottom, Left
-
-
- True
-
-
- NoControl
-
-
- 6, 219
-
-
- 32, 17
-
-
- 12
-
-
- 名称
-
-
- WaypointName
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 5
-
-
- Bottom, Left
-
-
- True
-
-
- NoControl
-
-
- 367, 218
-
-
- 14, 17
-
-
- 19
-
-
- y
-
-
- WaypointY
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 6
-
-
- Top, Bottom, Left, Right
-
-
- LnkResetWaypoints
-
-
- System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- WaypointsGroupBox
-
-
- 0
-
-
- FLPWaypointsList
-
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- WaypointsGroupBox
-
-
- 1
-
-
- 6, 6
-
-
- 640, 204
-
-
- 8
-
-
- 航点列表
-
-
- WaypointsGroupBox
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 7
-
-
- Bottom, Right
-
-
- NoControl
-
-
- 573, 216
-
-
- 70, 23
-
-
- 11
-
-
- 删除
-
-
- DeleteWaypoint
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 8
-
-
- Bottom, Right
-
-
- NoControl
-
-
- 507, 216
-
-
- 60, 23
-
-
- 10
-
-
- 增加
-
-
- CreateWaypoint
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 9
-
-
- Bottom, Left, Right
-
-
- 55, 216
-
-
- 242, 23
-
-
- 9
-
-
- WaypointNameInput
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TPWaypoints
-
-
- 10
-
-
- 4, 26
-
-
- 652, 245
-
-
- 16
-
-
- 航点
-
-
- TPWaypoints
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- TCMain
-
-
- 10
-
+
12, 12
@@ -8355,63 +8062,6 @@
0
-
- True
-
-
- NoControl
-
-
- 552, -1
-
-
- 32, 17
-
-
- 1
-
-
- 重置
-
-
- LnkResetWaypoints
-
-
- System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- WaypointsGroupBox
-
-
- 0
-
-
- True
-
-
- Fill
-
-
- 3, 19
-
-
- 634, 182
-
-
- 0
-
-
- FLPWaypointsList
-
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- WaypointsGroupBox
-
-
- 1
-
True
@@ -8442,4 +8092,31 @@
System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 7, 17
+
+
+ 684, 361
+
+
+ Microsoft YaHei UI, 9pt
+
+
+ 3, 4, 3, 4
+
+
+ 700, 400
+
+
+ CenterScreen
+
+
+ GrasscutterTools
+
+
+ FormMain
+
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
index 16a0bb0..f69acf9 100644
--- a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
+++ b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
@@ -276,7 +276,7 @@
Обратите внимание, что обычные команды в состоянии консоли должны указывать цель
-(установите галочку "Включить UID")
+(установите галочку галочку "Включить UID")
111, 36
@@ -315,7 +315,7 @@
есть запрос на новую функцию,
вы можете написать в Issues на Github.
- Спасибо: Dhar_Jinxed
+ Спасибо: Dhar_Jinxed
@@ -1086,25 +1086,4 @@
Включить UID
-
- Сбросить
-
-
- Метки
-
-
- Имя
-
-
- Список меток
-
-
- Сохр.
-
-
- Удалить
-
-
- Метка не найдена
-
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Properties/Resources.ru-ru.resx b/Source/GrasscutterTools/Properties/Resources.ru-ru.resx
index 271d71a..9bacfb1 100644
--- a/Source/GrasscutterTools/Properties/Resources.ru-ru.resx
+++ b/Source/GrasscutterTools/Properties/Resources.ru-ru.resx
@@ -224,12 +224,6 @@
Вы уверены, что хотите восстановить пользовательские команды по умолчанию?
-
-
- Вы уверены, что хотите сбросить метки?
-
-
- Метка не найдена
..\Resources\ru-ru\Scene.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8