From e58de20d6bbc6459589351b72a7dd1d19d85d2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=91=D1=80=D0=BE=D0=BD?= <71507444+EgorBron@users.noreply.github.com> Date: Wed, 21 Sep 2022 18:19:47 +0300 Subject: [PATCH] Waypoints implementation --- .../Forms/FormMain.Designer.cs | 211 +++++++++--------- Source/GrasscutterTools/Forms/FormMain.cs | 121 +++++++++- .../Forms/FormMain.en-us.resx | 3 + Source/GrasscutterTools/Forms/FormMain.resx | 154 +++++++------ .../Forms/FormMain.ru-ru.resx | 3 + .../Forms/FormMain.zh-TW.resx | 2 +- .../Properties/Resources.Designer.cs | 22 +- .../Properties/Resources.en-us.resx | 13 +- .../Properties/Resources.ru-ru.resx | 7 +- 9 files changed, 356 insertions(+), 180 deletions(-) diff --git a/Source/GrasscutterTools/Forms/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs index 1a58f1c..52bba8d 100644 --- a/Source/GrasscutterTools/Forms/FormMain.Designer.cs +++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs @@ -230,19 +230,19 @@ namespace GrasscutterTools.Forms 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.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + 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.WaypointZ = new System.Windows.Forms.Label(); - this.WaypointY = new System.Windows.Forms.Label(); - this.WaypointX = new System.Windows.Forms.Label(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); this.GrpCommand.SuspendLayout(); this.TPRemoteCall.SuspendLayout(); this.GrpServerStatus.SuspendLayout(); @@ -301,10 +301,10 @@ namespace GrasscutterTools.Forms ((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(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); this.SuspendLayout(); // // TxtCommand @@ -2047,10 +2047,10 @@ namespace GrasscutterTools.Forms // TPWaypoints // this.TPWaypoints.Controls.Add(this.WaypointX); - this.TPWaypoints.Controls.Add(this.numericUpDown1); + this.TPWaypoints.Controls.Add(this.NUDWaypointZ); this.TPWaypoints.Controls.Add(this.WaypointZ); - this.TPWaypoints.Controls.Add(this.numericUpDown2); - this.TPWaypoints.Controls.Add(this.numericUpDown3); + 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); @@ -2061,16 +2061,96 @@ namespace GrasscutterTools.Forms 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.flowLayoutPanel1); + this.WaypointsGroupBox.Controls.Add(this.FLPWaypointsList); this.WaypointsGroupBox.Name = "WaypointsGroupBox"; this.WaypointsGroupBox.TabStop = false; // @@ -2079,109 +2159,32 @@ namespace GrasscutterTools.Forms resources.ApplyResources(this.LnkResetWaypoints, "LnkResetWaypoints"); this.LnkResetWaypoints.Name = "LnkResetWaypoints"; this.LnkResetWaypoints.TabStop = true; + this.LnkResetWaypoints.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkResetWaypoints_LinkClicked); // - // flowLayoutPanel1 + // FLPWaypointsList // - resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + 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"; // - // WaypointZ - // - resources.ApplyResources(this.WaypointZ, "WaypointZ"); - this.WaypointZ.Name = "WaypointZ"; - // - // WaypointY - // - resources.ApplyResources(this.WaypointY, "WaypointY"); - this.WaypointY.Name = "WaypointY"; - // - // WaypointX - // - resources.ApplyResources(this.WaypointX, "WaypointX"); - this.WaypointX.Name = "WaypointX"; - // - // numericUpDown1 - // - resources.ApplyResources(this.numericUpDown1, "numericUpDown1"); - this.numericUpDown1.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDown1.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.numericUpDown1.Minimum = new decimal(new int[] { - -2147483648, - 0, - 0, - -2147483648}); - this.numericUpDown1.Name = "numericUpDown1"; - // - // numericUpDown2 - // - resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); - this.numericUpDown2.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDown2.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.numericUpDown2.Minimum = new decimal(new int[] { - -2147483648, - 0, - 0, - -2147483648}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Value = new decimal(new int[] { - 300, - 0, - 0, - 0}); - // - // numericUpDown3 - // - resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); - this.numericUpDown3.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDown3.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.numericUpDown3.Minimum = new decimal(new int[] { - -2147483648, - 0, - 0, - -2147483648}); - this.numericUpDown3.Name = "numericUpDown3"; - // // FormMain // resources.ApplyResources(this, "$this"); @@ -2277,11 +2280,11 @@ namespace GrasscutterTools.Forms 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(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); this.ResumeLayout(false); } @@ -2493,13 +2496,13 @@ namespace GrasscutterTools.Forms private System.Windows.Forms.Label WaypointName; private System.Windows.Forms.GroupBox WaypointsGroupBox; private System.Windows.Forms.LinkLabel LnkResetWaypoints; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + 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 numericUpDown3; - private System.Windows.Forms.NumericUpDown numericUpDown2; - private System.Windows.Forms.NumericUpDown numericUpDown1; + 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.cs b/Source/GrasscutterTools/Forms/FormMain.cs index 5fc01a1..fc04ef6 100644 --- a/Source/GrasscutterTools/Forms/FormMain.cs +++ b/Source/GrasscutterTools/Forms/FormMain.cs @@ -61,15 +61,15 @@ namespace GrasscutterTools.Forms private void FormMain_Load(object sender, EventArgs e) { + Text += " - by jie65535 - v" + AppVersion.ToString(3) #if DEBUG - Text += " - by jie65535 - v" + AppVersion.ToString(3) + "-debug"; -#else - Text += " - by jie65535 - v" + AppVersion.ToString(3); + + "-debug"; #endif GameData.LoadResources(); LoadCustomCommands(); + LoadWaypoints(); InitArtifactList(); InitGameItemList(); InitWeapons(); @@ -138,6 +138,7 @@ namespace GrasscutterTools.Forms try { Settings.Default.AutoCopy = ChkAutoCopy.Checked; + SaveWaypoints(); SaveCustomCommands(); SaveGiveItemRecord(); SaveSpawnRecord(); @@ -311,6 +312,119 @@ namespace GrasscutterTools.Forms #endregion - 主页 Home - + #region Waypoints + private readonly string WaypointsFilePath = Path.Combine(Application.LocalUserAppDataPath, "Waypoints.txt"); + private bool WaypointsChanged; + + private void LoadWaypoints() { + if (File.Exists(WaypointsFilePath)) + LoadWaypointsControls(File.ReadAllText(WaypointsFilePath)); + else + LoadWaypointsControls(""); + } + private void LoadWaypointsControls(string waypoints) { + FLPWaypointsList.Controls.Clear(); + var lines = waypoints.Split('\n'); + for (int i = 0; i < lines.Length - 1; i += 2) + AddWaypoint(lines[i].Trim(), lines[i + 1].Trim()); + } + + private void SaveWaypoints() { + if (WaypointsChanged) + File.WriteAllText(WaypointsFilePath, SaveWaypointsControls()); + } + private string SaveWaypointsControls() { + StringBuilder builder = new StringBuilder(); + foreach (LinkLabel lnk in FLPWaypointsList.Controls) { + builder.AppendLine(lnk.Text); + builder.AppendLine(lnk.Tag as string); + } + return builder.ToString(); + } + private void Waypoint_Click(object sender, LinkLabelLinkClickedEventArgs e) { + if (sender is LinkLabel lnk && lnk.Tag is string command) { + WaypointNameInput.Text = lnk.Text; + SetCommand(command); + } + } + + /// + /// 点击保存自定义命令列表时触发 + /// + /// + /// + private async void CreateWaypoint_Click(object sender, EventArgs e) { + if (string.IsNullOrWhiteSpace(WaypointNameInput.Text)) { + MessageBox.Show(Resources.WaypointNameCannotBeEmpty, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + var name = WaypointNameInput.Text.Trim(); + var command = $"/tp {NUDWaypointX.Value} {NUDWaypointY.Value} {NUDWaypointZ.Value}"; + + foreach (LinkLabel lnk in FLPWaypointsList.Controls) { + if (lnk.Text == name) { + lnk.Tag = command; + WaypointsChanged = true; + await ButtonComplete(CreateWaypoint); + MessageBox.Show("aa"); + return; + } + } + + WaypointsChanged = true; + AddWaypoint(name, command); + await ButtonComplete(CreateWaypoint); + } + + /// + /// 添加自定义命令 + /// + /// 标签 + /// 命令 + private void AddWaypoint(string name, string command) { + var lnk = new LinkLabel { + Text = name, + Tag = command, + AutoSize = true, + }; + lnk.LinkClicked += Waypoint_Click; + FLPWaypointsList.Controls.Add(lnk); + } + + /// + /// 点击移除自定义命令按钮时触发 + /// + private async void DeleteWaypoint_Click(object sender, EventArgs e) { + if (string.IsNullOrWhiteSpace(WaypointNameInput.Text)) { + MessageBox.Show(Resources.WaypointNameCannotBeEmpty, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + var name = WaypointNameInput.Text.Trim(); + + foreach (LinkLabel lnk in FLPWaypointsList.Controls) { + if (lnk.Text == name && MessageBox.Show(Resources.AskConfirmDeletion, Resources.Tips, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { + FLPWaypointsList.Controls.Remove(lnk); + WaypointsChanged = true; + //TxtCustomName.Text = ""; + //TxtCommand.Text = ""; + await ButtonComplete(DeleteWaypoint); + return; + } + } + + MessageBox.Show(Resources.WaypointNotFound, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + private void LnkResetWaypoints_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { + if (MessageBox.Show(Resources.RestoreCustomCommands, Resources.Tips, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) { + if (File.Exists(WaypointsFilePath)) + File.Delete(WaypointsFilePath); + LoadWaypointsControls(""); + } + } + + #endregion + #region - 自定义 Custom - /// @@ -2124,6 +2238,5 @@ namespace GrasscutterTools.Forms } #endregion - 任务 Quests - - } } diff --git a/Source/GrasscutterTools/Forms/FormMain.en-us.resx b/Source/GrasscutterTools/Forms/FormMain.en-us.resx index a9b7303..13dc1d2 100644 --- a/Source/GrasscutterTools/Forms/FormMain.en-us.resx +++ b/Source/GrasscutterTools/Forms/FormMain.en-us.resx @@ -885,6 +885,9 @@ Therefore, the quest can be added and finished, but not necessarily work. Name + + Waypoint not found + Waypoints list diff --git a/Source/GrasscutterTools/Forms/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx index f1700e2..50d0b7a 100644 --- a/Source/GrasscutterTools/Forms/FormMain.resx +++ b/Source/GrasscutterTools/Forms/FormMain.resx @@ -8001,28 +8001,28 @@ 0 - + Bottom, Left - + 453, 216 - + 48, 23 - + 17 - - numericUpDown1 + + NUDWaypointZ - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TPWaypoints - + 1 @@ -8058,52 +8058,52 @@ 2 - + Bottom, Left - + 383, 216 - + 50, 23 - + 16 - - numericUpDown2 + + 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 - - numericUpDown3 + + NUDWaypointX - + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TPWaypoints - + 4 @@ -8175,24 +8175,6 @@ Top, Bottom, Left, Right - - True - - - NoControl - - - 552, -1 - - - 32, 17 - - - 1 - - - 重置 - LnkResetWaypoints @@ -8205,31 +8187,16 @@ 0 - - True + + FLPWaypointsList - - Fill - - - 3, 19 - - - 634, 182 - - - 0 - - - flowLayoutPanel1 - - + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + WaypointsGroupBox - + 1 @@ -8388,6 +8355,63 @@ 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 diff --git a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx index 2858c63..87bc4cf 100644 --- a/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx +++ b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx @@ -1104,4 +1104,7 @@ Удалить + + Метка не найдена + \ No newline at end of file diff --git a/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx b/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx index ca5d895..316da6c 100644 --- a/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx +++ b/Source/GrasscutterTools/Forms/FormMain.zh-TW.resx @@ -249,7 +249,7 @@ 座標傳送 提示：遊戲內可以通過小地圖的'魚鉤'標記來快捷傳送 -命令中可以用~表示當前位置，~100表示相對當前100 +命令中可以用~表示當前位置，~N 表示相對當前N √ 記錄 diff --git a/Source/GrasscutterTools/Properties/Resources.Designer.cs b/Source/GrasscutterTools/Properties/Resources.Designer.cs index 96b3e7c..7254d43 100644 --- a/Source/GrasscutterTools/Properties/Resources.Designer.cs +++ b/Source/GrasscutterTools/Properties/Resources.Designer.cs @@ -487,7 +487,7 @@ namespace GrasscutterTools.Properties { return ResourceManager.GetString("CommandNotFound", resourceCulture); } } - + /// /// 查找类似 命令标签不能为空 的本地化字符串。 /// @@ -496,7 +496,25 @@ namespace GrasscutterTools.Properties { return ResourceManager.GetString("CommandTagCannotBeEmpty", resourceCulture); } } - + + internal static string WaypointNameCannotBeEmpty { + get { + return ResourceManager.GetString("WaypointNameCannotBeEmpty", resourceCulture); + } + } + + internal static string WaypointNotFound { + get { + return ResourceManager.GetString("WaypointNotFound", resourceCulture); + } + } + + internal static string ResetWayopints { + get { + return ResourceManager.GetString("ResetWaypoints", resourceCulture); + } + } + /// /// 查找类似 现在你可以远程执行命令了哦！ 的本地化字符串。 /// diff --git a/Source/GrasscutterTools/Properties/Resources.en-us.resx b/Source/GrasscutterTools/Properties/Resources.en-us.resx index d9181e1..387d4a0 100644 --- a/Source/GrasscutterTools/Properties/Resources.en-us.resx +++ b/Source/GrasscutterTools/Properties/Resources.en-us.resx @@ -166,6 +166,9 @@ Command cannot be empty + + Waypoint name cannot be empty + Command not found @@ -205,7 +208,7 @@ Update info : Do you want to check for updates? Selecting No will no longer remind you of this version. - 1. Fill in the correct uid\n2. Send verification code to player\n3. Enter the correct verification code\n4. Connection\n5. Enjoy + 1. Fill in the correct UID\n2. Send verification code to player\n3. Enter the correct verification code\n4. Connection\n5. Enjoy Permission cannot be empty! @@ -220,11 +223,17 @@ Do you want to check for updates? Selecting No will no longer remind you of this ..\Resources\en-us\Quest.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - Please connect to a server that supports [opencommand] first + Please connect to a server that supports [OpenCommand] first Are you sure you want to restore custom commands to defaults? + + Are you sure you want to reset all waypoints? + + + Waypoint not found + ..\Resources\en-us\Scene.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/Source/GrasscutterTools/Properties/Resources.ru-ru.resx b/Source/GrasscutterTools/Properties/Resources.ru-ru.resx index 3726b8f..271d71a 100644 --- a/Source/GrasscutterTools/Properties/Resources.ru-ru.resx +++ b/Source/GrasscutterTools/Properties/Resources.ru-ru.resx @@ -205,7 +205,7 @@ Вы хотите проверить наличие обновлений? Выбирая "Нет", программа больше не будет напоминать вам об этой версии. - 1. Заполните правильный UID\n2. Отправьте проверочный код игроку\n3. Введите правильный проверочный код\n4. Покдлючитесь\n5. Наслаждайтесь! + 1. Введите правильный UID\n2. Отправьте проверочный код игроку\n3. Введите правильный проверочный код\n4. Покдлючитесь\n5. Наслаждайтесь! Разрешение не может быть пустым! @@ -225,9 +225,12 @@ Вы уверены, что хотите восстановить пользовательские команды по умолчанию? - + Вы уверены, что хотите сбросить метки? + + Метка не найдена + ..\Resources\ru-ru\Scene.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8