Remove deprecated methods

by Remove Costuar/Fody

Source/GrasscutterTools/Controls/TextBoxXP.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 

Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs

@@ -18,7 +18,6 @@
  **/
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;

Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs

@@ -19,7 +19,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;

Source/GrasscutterTools/Forms/FormMain.Designer.cs

@@ -132,9 +132,9 @@ namespace GrasscutterTools.Forms
             this.NUDWeaponLevel = new System.Windows.Forms.NumericUpDown();
             this.ListWeapons = new System.Windows.Forms.ListBox();
             this.TPStats = new System.Windows.Forms.TabPage();
-            this.LblResetStatsCommand = new System.Windows.Forms.LinkLabel();
-            this.LblResetStatsTip = new System.Windows.Forms.Label();
             this.GrpSetStats = new System.Windows.Forms.GroupBox();
+            this.BtnUnlockStat = new System.Windows.Forms.Button();
+            this.BtnLockStat = new System.Windows.Forms.Button();
             this.LblStatTip = new System.Windows.Forms.Label();
             this.LblStatPercent = new System.Windows.Forms.Label();
             this.NUDStat = new System.Windows.Forms.NumericUpDown();
@@ -322,6 +322,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPRemoteCall
             // 
+            resources.ApplyResources(this.TPRemoteCall, "TPRemoteCall");
             this.TPRemoteCall.Controls.Add(this.LnkLinks);
             this.TPRemoteCall.Controls.Add(this.LnkGOODHelp);
             this.TPRemoteCall.Controls.Add(this.LnkInventoryKamera);
@@ -333,7 +334,6 @@ namespace GrasscutterTools.Forms
             this.TPRemoteCall.Controls.Add(this.TxtHost);
             this.TPRemoteCall.Controls.Add(this.BtnQueryServerStatus);
             this.TPRemoteCall.Controls.Add(this.LblHost);
-            resources.ApplyResources(this.TPRemoteCall, "TPRemoteCall");
             this.TPRemoteCall.Name = "TPRemoteCall";
             this.TPRemoteCall.UseVisualStyleBackColor = true;
             // 
@@ -430,14 +430,15 @@ namespace GrasscutterTools.Forms
             // 
             // TPOpenCommandCheck
             // 
+            resources.ApplyResources(this.TPOpenCommandCheck, "TPOpenCommandCheck");
             this.TPOpenCommandCheck.Controls.Add(this.TPPlayerCheck);
             this.TPOpenCommandCheck.Controls.Add(this.TPConsoleCheck);
-            resources.ApplyResources(this.TPOpenCommandCheck, "TPOpenCommandCheck");
             this.TPOpenCommandCheck.Name = "TPOpenCommandCheck";
             this.TPOpenCommandCheck.SelectedIndex = 0;
             // 
             // TPPlayerCheck
             // 
+            resources.ApplyResources(this.TPPlayerCheck, "TPPlayerCheck");
             this.TPPlayerCheck.Controls.Add(this.LnkRCHelp);
             this.TPPlayerCheck.Controls.Add(this.NUDRemotePlayerId);
             this.TPPlayerCheck.Controls.Add(this.BtnConnectOpenCommand);
@@ -445,7 +446,6 @@ namespace GrasscutterTools.Forms
             this.TPPlayerCheck.Controls.Add(this.BtnSendVerificationCode);
             this.TPPlayerCheck.Controls.Add(this.NUDVerificationCode);
             this.TPPlayerCheck.Controls.Add(this.LblRemotePlayerId);
-            resources.ApplyResources(this.TPPlayerCheck, "TPPlayerCheck");
             this.TPPlayerCheck.Name = "TPPlayerCheck";
             this.TPPlayerCheck.UseVisualStyleBackColor = true;
             // 
@@ -517,11 +517,11 @@ namespace GrasscutterTools.Forms
             // 
             // TPConsoleCheck
             // 
+            resources.ApplyResources(this.TPConsoleCheck, "TPConsoleCheck");
             this.TPConsoleCheck.Controls.Add(this.BtnConsoleConnect);
             this.TPConsoleCheck.Controls.Add(this.TxtToken);
             this.TPConsoleCheck.Controls.Add(this.LblToken);
             this.TPConsoleCheck.Controls.Add(this.LblConsoleTip);
-            resources.ApplyResources(this.TPConsoleCheck, "TPConsoleCheck");
             this.TPConsoleCheck.Name = "TPConsoleCheck";
             this.TPConsoleCheck.UseVisualStyleBackColor = true;
             // 
@@ -566,10 +566,10 @@ namespace GrasscutterTools.Forms
             // 
             // TPAbout
             // 
+            resources.ApplyResources(this.TPAbout, "TPAbout");
             this.TPAbout.Controls.Add(this.GrasscutterToolsSupport);
             this.TPAbout.Controls.Add(this.LnkGithub);
             this.TPAbout.Controls.Add(this.LblSupportDescription);
-            resources.ApplyResources(this.TPAbout, "TPAbout");
             this.TPAbout.Name = "TPAbout";
             this.TPAbout.UseVisualStyleBackColor = true;
             // 
@@ -594,10 +594,10 @@ namespace GrasscutterTools.Forms
             // 
             // TPManage
             // 
+            resources.ApplyResources(this.TPManage, "TPManage");
             this.TPManage.Controls.Add(this.GrpBanPlayer);
             this.TPManage.Controls.Add(this.GrpAccount);
             this.TPManage.Controls.Add(this.GrpPermission);
-            resources.ApplyResources(this.TPManage, "TPManage");
             this.TPManage.Name = "TPManage";
             this.TPManage.UseVisualStyleBackColor = true;
             // 
@@ -615,8 +615,8 @@ namespace GrasscutterTools.Forms
             // 
             // DTPBanEndTime
             // 
-            this.DTPBanEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             resources.ApplyResources(this.DTPBanEndTime, "DTPBanEndTime");
+            this.DTPBanEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.DTPBanEndTime.MaxDate = new System.DateTime(2034, 12, 31, 0, 0, 0, 0);
             this.DTPBanEndTime.MinDate = new System.DateTime(2022, 6, 28, 0, 0, 0, 0);
             this.DTPBanEndTime.Name = "DTPBanEndTime";
@@ -638,8 +638,8 @@ namespace GrasscutterTools.Forms
             // 
             // TxtBanReason
             // 
-            this.TxtBanReason.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             resources.ApplyResources(this.TxtBanReason, "TxtBanReason");
+            this.TxtBanReason.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.TxtBanReason.Maximum = 0F;
             this.TxtBanReason.Minimum = 0F;
             this.TxtBanReason.Name = "TxtBanReason";
@@ -737,10 +737,10 @@ namespace GrasscutterTools.Forms
             // 
             // CmbPerm
             // 
+            resources.ApplyResources(this.CmbPerm, "CmbPerm");
             this.CmbPerm.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.CmbPerm.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.CmbPerm.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbPerm, "CmbPerm");
             this.CmbPerm.Name = "CmbPerm";
             // 
             // NUDPermUID
@@ -786,6 +786,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPScene
             // 
+            resources.ApplyResources(this.TPScene, "TPScene");
             this.TPScene.Controls.Add(this.TxtSceneFilter);
             this.TPScene.Controls.Add(this.ChkIncludeSceneId);
             this.TPScene.Controls.Add(this.LblTp);
@@ -800,7 +801,6 @@ namespace GrasscutterTools.Forms
             this.TPScene.Controls.Add(this.LblClimateType);
             this.TPScene.Controls.Add(this.LblSceneDescription);
             this.TPScene.Controls.Add(this.ListScenes);
-            resources.ApplyResources(this.TPScene, "TPScene");
             this.TPScene.Name = "TPScene";
             this.TPScene.UseVisualStyleBackColor = true;
             // 
@@ -935,6 +935,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPItem
             // 
+            resources.ApplyResources(this.TPItem, "TPItem");
             this.TPItem.Controls.Add(this.LblClearGiveItemLogs);
             this.TPItem.Controls.Add(this.BtnSaveGiveItemLog);
             this.TPItem.Controls.Add(this.BtnRemoveGiveItemLog);
@@ -947,7 +948,6 @@ namespace GrasscutterTools.Forms
             this.TPItem.Controls.Add(this.NUDGameItemAmout);
             this.TPItem.Controls.Add(this.NUDGameItemLevel);
             this.TPItem.Controls.Add(this.LblGiveCommandDescription);
-            resources.ApplyResources(this.TPItem, "TPItem");
             this.TPItem.Name = "TPItem";
             this.TPItem.UseVisualStyleBackColor = true;
             // 
@@ -1065,6 +1065,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPWeapon
             // 
+            resources.ApplyResources(this.TPWeapon, "TPWeapon");
             this.TPWeapon.Controls.Add(this.TxtWeaponFilter);
             this.TPWeapon.Controls.Add(this.LblWeaponDescription);
             this.TPWeapon.Controls.Add(this.LblWeaponRefinement);
@@ -1074,7 +1075,6 @@ namespace GrasscutterTools.Forms
             this.TPWeapon.Controls.Add(this.NUDWeaponAmout);
             this.TPWeapon.Controls.Add(this.NUDWeaponLevel);
             this.TPWeapon.Controls.Add(this.ListWeapons);
-            resources.ApplyResources(this.TPWeapon, "TPWeapon");
             this.TPWeapon.Name = "TPWeapon";
             this.TPWeapon.UseVisualStyleBackColor = true;
             // 
@@ -1171,31 +1171,18 @@ namespace GrasscutterTools.Forms
             // 
             // TPStats
             // 
-            this.TPStats.Controls.Add(this.LblResetStatsCommand);
-            this.TPStats.Controls.Add(this.LblResetStatsTip);
+            resources.ApplyResources(this.TPStats, "TPStats");
             this.TPStats.Controls.Add(this.GrpSetStats);
             this.TPStats.Controls.Add(this.GrpTalentLevel);
             this.TPStats.Controls.Add(this.LblStatsDescription);
-            resources.ApplyResources(this.TPStats, "TPStats");
             this.TPStats.Name = "TPStats";
             this.TPStats.UseVisualStyleBackColor = true;
             // 
-            // LblResetStatsCommand
-            // 
-            resources.ApplyResources(this.LblResetStatsCommand, "LblResetStatsCommand");
-            this.LblResetStatsCommand.Name = "LblResetStatsCommand";
-            this.LblResetStatsCommand.TabStop = true;
-            this.LblResetStatsCommand.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LblResetStatsCommand_LinkClicked);
-            // 
-            // LblResetStatsTip
-            // 
-            resources.ApplyResources(this.LblResetStatsTip, "LblResetStatsTip");
-            this.LblResetStatsTip.ForeColor = System.Drawing.SystemColors.ActiveCaption;
-            this.LblResetStatsTip.Name = "LblResetStatsTip";
-            // 
             // GrpSetStats
             // 
             resources.ApplyResources(this.GrpSetStats, "GrpSetStats");
+            this.GrpSetStats.Controls.Add(this.BtnUnlockStat);
+            this.GrpSetStats.Controls.Add(this.BtnLockStat);
             this.GrpSetStats.Controls.Add(this.LblStatTip);
             this.GrpSetStats.Controls.Add(this.LblStatPercent);
             this.GrpSetStats.Controls.Add(this.NUDStat);
@@ -1203,11 +1190,25 @@ namespace GrasscutterTools.Forms
             this.GrpSetStats.Name = "GrpSetStats";
             this.GrpSetStats.TabStop = false;
             // 
+            // BtnUnlockStat
+            // 
+            resources.ApplyResources(this.BtnUnlockStat, "BtnUnlockStat");
+            this.BtnUnlockStat.Name = "BtnUnlockStat";
+            this.BtnUnlockStat.UseVisualStyleBackColor = true;
+            this.BtnUnlockStat.Click += new System.EventHandler(this.BtnUnlockStat_Click);
+            // 
+            // BtnLockStat
+            // 
+            resources.ApplyResources(this.BtnLockStat, "BtnLockStat");
+            this.BtnLockStat.Name = "BtnLockStat";
+            this.BtnLockStat.UseVisualStyleBackColor = true;
+            this.BtnLockStat.Click += new System.EventHandler(this.BtnLockStat_Click);
+            // 
             // LblStatTip
             // 
+            resources.ApplyResources(this.LblStatTip, "LblStatTip");
             this.LblStatTip.AutoEllipsis = true;
             this.LblStatTip.ForeColor = System.Drawing.SystemColors.GrayText;
-            resources.ApplyResources(this.LblStatTip, "LblStatTip");
             this.LblStatTip.Name = "LblStatTip";
             // 
             // LblStatPercent
@@ -1233,9 +1234,9 @@ namespace GrasscutterTools.Forms
             // 
             // CmbStat
             // 
+            resources.ApplyResources(this.CmbStat, "CmbStat");
             this.CmbStat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.CmbStat.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbStat, "CmbStat");
             this.CmbStat.Name = "CmbStat";
             this.CmbStat.SelectedIndexChanged += new System.EventHandler(this.SetStatsInputChanged);
             // 
@@ -1295,6 +1296,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPAvatar
             // 
+            resources.ApplyResources(this.TPAvatar, "TPAvatar");
             this.TPAvatar.Controls.Add(this.BtnGiveAllChar);
             this.TPAvatar.Controls.Add(this.LblConstellationTip);
             this.TPAvatar.Controls.Add(this.LblAvatarConstellation);
@@ -1304,7 +1306,6 @@ namespace GrasscutterTools.Forms
             this.TPAvatar.Controls.Add(this.LblAvatarLevel);
             this.TPAvatar.Controls.Add(this.NUDAvatarLevel);
             this.TPAvatar.Controls.Add(this.CmbAvatar);
-            resources.ApplyResources(this.TPAvatar, "TPAvatar");
             this.TPAvatar.Name = "TPAvatar";
             this.TPAvatar.UseVisualStyleBackColor = true;
             // 
@@ -1390,6 +1391,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPSpawn
             // 
+            resources.ApplyResources(this.TPSpawn, "TPSpawn");
             this.TPSpawn.Controls.Add(this.LblClearSpawnLogs);
             this.TPSpawn.Controls.Add(this.BtnSaveSpawnLog);
             this.TPSpawn.Controls.Add(this.BtnRemoveSpawnLog);
@@ -1402,7 +1404,6 @@ namespace GrasscutterTools.Forms
             this.TPSpawn.Controls.Add(this.NUDEntityLevel);
             this.TPSpawn.Controls.Add(this.TxtEntityFilter);
             this.TPSpawn.Controls.Add(this.ListEntity);
-            resources.ApplyResources(this.TPSpawn, "TPSpawn");
             this.TPSpawn.Name = "TPSpawn";
             this.TPSpawn.UseVisualStyleBackColor = true;
             // 
@@ -1543,13 +1544,13 @@ namespace GrasscutterTools.Forms
             // 
             // TPQuest
             // 
+            resources.ApplyResources(this.TPQuest, "TPQuest");
             this.TPQuest.Controls.Add(this.GrpQuestFilters);
             this.TPQuest.Controls.Add(this.BtnFinishQuest);
             this.TPQuest.Controls.Add(this.BtnAddQuest);
             this.TPQuest.Controls.Add(this.LblQuestDescription);
             this.TPQuest.Controls.Add(this.TxtQuestFilter);
             this.TPQuest.Controls.Add(this.ListQuest);
-            resources.ApplyResources(this.TPQuest, "TPQuest");
             this.TPQuest.Name = "TPQuest";
             this.TPQuest.UseVisualStyleBackColor = true;
             // 
@@ -1621,6 +1622,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPArtifact
             // 
+            resources.ApplyResources(this.TPArtifact, "TPArtifact");
             this.TPArtifact.Controls.Add(this.LblArtifactLevelTip);
             this.TPArtifact.Controls.Add(this.BtnAddSubAttr);
             this.TPArtifact.Controls.Add(this.LblArtifactName);
@@ -1640,7 +1642,6 @@ namespace GrasscutterTools.Forms
             this.TPArtifact.Controls.Add(this.NUDArtifactLevel);
             this.TPArtifact.Controls.Add(this.LblArtifactStars);
             this.TPArtifact.Controls.Add(this.NUDArtifactStars);
-            resources.ApplyResources(this.TPArtifact, "TPArtifact");
             this.TPArtifact.Name = "TPArtifact";
             this.TPArtifact.UseVisualStyleBackColor = true;
             // 
@@ -1806,6 +1807,7 @@ namespace GrasscutterTools.Forms
             // 
             // TPCustom
             // 
+            resources.ApplyResources(this.TPCustom, "TPCustom");
             this.TPCustom.Controls.Add(this.BtnExportCustomCommands);
             this.TPCustom.Controls.Add(this.BtnLoadCustomCommands);
             this.TPCustom.Controls.Add(this.LblCustomName);
@@ -1813,7 +1815,6 @@ namespace GrasscutterTools.Forms
             this.TPCustom.Controls.Add(this.BtnRemoveCustomCommand);
             this.TPCustom.Controls.Add(this.BtnSaveCustomCommand);
             this.TPCustom.Controls.Add(this.TxtCustomName);
-            resources.ApplyResources(this.TPCustom, "TPCustom");
             this.TPCustom.Name = "TPCustom";
             this.TPCustom.UseVisualStyleBackColor = true;
             // 
@@ -1877,12 +1878,12 @@ namespace GrasscutterTools.Forms
             // 
             // TPHome
             // 
+            resources.ApplyResources(this.TPHome, "TPHome");
             this.TPHome.Controls.Add(this.LblAbout);
             this.TPHome.Controls.Add(this.BtnOpenTextMap);
             this.TPHome.Controls.Add(this.BtnOpenGachaBannerEditor);
             this.TPHome.Controls.Add(this.GrasscutterToolsIcon);
             this.TPHome.Controls.Add(this.GrpSettings);
-            resources.ApplyResources(this.TPHome, "TPHome");
             this.TPHome.Name = "TPHome";
             this.TPHome.UseVisualStyleBackColor = true;
             // 
@@ -1941,9 +1942,9 @@ namespace GrasscutterTools.Forms
             // 
             // CmbLanguage
             // 
+            resources.ApplyResources(this.CmbLanguage, "CmbLanguage");
             this.CmbLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.CmbLanguage.FormattingEnabled = true;
-            resources.ApplyResources(this.CmbLanguage, "CmbLanguage");
             this.CmbLanguage.Name = "CmbLanguage";
             this.CmbLanguage.SelectedIndexChanged += new System.EventHandler(this.CmbLanguage_SelectedIndexChanged);
             // 
@@ -2281,8 +2282,6 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.Label LblArtifactLevelTip;
         private System.Windows.Forms.Label LblClearSpawnLogs;
         private System.Windows.Forms.Label LblClearGiveItemLogs;
-        private System.Windows.Forms.LinkLabel LblResetStatsCommand;
-        private System.Windows.Forms.Label LblResetStatsTip;
         private System.Windows.Forms.Label LblAvatarConstellation;
         private System.Windows.Forms.NumericUpDown NUDAvatarConstellation;
         private System.Windows.Forms.Label LblConstellationTip;
@@ -2293,5 +2292,7 @@ namespace GrasscutterTools.Forms
         private System.Windows.Forms.Label LblGOODHelp;
         private System.Windows.Forms.LinkLabel LnkGOODHelp;
         private System.Windows.Forms.LinkLabel LnkLinks;
+        private System.Windows.Forms.Button BtnUnlockStat;
+        private System.Windows.Forms.Button BtnLockStat;
     }
 }

Source/GrasscutterTools/Forms/FormMain.cs

@@ -32,6 +32,7 @@ using GrasscutterTools.GOOD;
 using GrasscutterTools.OpenCommand;
 using GrasscutterTools.Properties;
 using GrasscutterTools.Utils;
+
 using Newtonsoft.Json;
 
 namespace GrasscutterTools.Forms
@@ -137,11 +138,12 @@ namespace GrasscutterTools.Forms
         private void LoadUpdate()
         {
 #if !DEBUG
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 try
                 {
-                    var info = Github.ReleaseAPI.GetReleasesLastest("jie65535", "GrasscutterCommandGenerator").Result;
+                    await Task.Delay(5000);
+                    var info = await ReleaseAPI.GetReleasesLastest("jie65535", "GrasscutterCommandGenerator");
                     if (Version.TryParse(info.TagName.Substring(1), out Version lastestVersion) && AppVersion < lastestVersion)
                     {
                         if (!string.IsNullOrEmpty(Settings.Default.CheckedLastVersion)
@@ -617,37 +619,44 @@ namespace GrasscutterTools.Forms
             var id = GameData.Artifacts.Ids[Array.LastIndexOf(GameData.Artifacts.Names, name)];
             id = id / 1000 * 1000 + (int)NUDArtifactStars.Value * 100 + id % 100;
             if (CmbMainAttribution.SelectedIndex < 0)
-                return;
-
-            var t = CmbMainAttribution.SelectedItem as string;
-            var mainAttr = t.Substring(0, t.IndexOf(':')).Trim();
-
-            var subAttrs = "";
-            if (ListSubAttributionChecked.Items.Count > 0)
             {
-                var subAttrDir = new Dictionary<string, int>(ListSubAttributionChecked.Items.Count);
-                foreach (string item in ListSubAttributionChecked.Items)
-                {
-                    var subId = item.Substring(0, item.IndexOf(':')).Trim();
-                    var times = int.Parse(item.Substring(item.LastIndexOf('x') + 1));
-                    if (subAttrDir.ContainsKey(subId))
-                        subAttrDir[subId] += times;
-                    else
-                        subAttrDir[subId] = times;
-                }
-
-                foreach (var kv in subAttrDir)
-                {
-                    if (kv.Value > 1)
-                        subAttrs += $"{kv.Key},{kv.Value} ";
-                    else
-                        subAttrs += $"{kv.Key} ";
-                }
+                if (ChkNewCommand.Checked)
+                    SetCommand("/give", $"{id} lv{NUDArtifactLevel.Value}");
+                else
+                    SetCommand("/giveart", $"{id} {NUDArtifactLevel.Value}");
             }
-            if (ChkNewCommand.Checked)
-                SetCommand("/give", $"{id} lv{NUDArtifactLevel.Value} {mainAttr} {subAttrs}");
             else
-                SetCommand("/giveart", $"{id} {mainAttr} {subAttrs}{NUDArtifactLevel.Value}");
+            {
+                var t = CmbMainAttribution.SelectedItem as string;
+                var mainAttr = t.Substring(0, t.IndexOf(':')).Trim();
+
+                var subAttrs = "";
+                if (ListSubAttributionChecked.Items.Count > 0)
+                {
+                    var subAttrDir = new Dictionary<string, int>(ListSubAttributionChecked.Items.Count);
+                    foreach (string item in ListSubAttributionChecked.Items)
+                    {
+                        var subId = item.Substring(0, item.IndexOf(':')).Trim();
+                        var times = int.Parse(item.Substring(item.LastIndexOf('x') + 1));
+                        if (subAttrDir.ContainsKey(subId))
+                            subAttrDir[subId] += times;
+                        else
+                            subAttrDir[subId] = times;
+                    }
+
+                    foreach (var kv in subAttrDir)
+                    {
+                        if (kv.Value > 1)
+                            subAttrs += $"{kv.Key},{kv.Value} ";
+                        else
+                            subAttrs += $"{kv.Key} ";
+                    }
+                }
+                if (ChkNewCommand.Checked)
+                    SetCommand("/give", $"{id} lv{NUDArtifactLevel.Value} {mainAttr} {subAttrs}");
+                else
+                    SetCommand("/giveart", $"{id} {mainAttr} {subAttrs}{NUDArtifactLevel.Value}");
+            }
         }
 
         private void ListSubAttributionChecked_SelectedIndexChanged(object sender, EventArgs e)
@@ -662,6 +671,7 @@ namespace GrasscutterTools.Forms
 
         private void LblClearSubAttrCheckedList_Click(object sender, EventArgs e)
         {
+            CmbMainAttribution.SelectedIndex = -1;
             ListSubAttributionChecked.Items.Clear();
             ArtifactInputChanged(null, EventArgs.Empty);
         }
@@ -1090,6 +1100,8 @@ namespace GrasscutterTools.Forms
         {
             if (CmbStat.SelectedIndex < 0)
                 return;
+            else
+                BtnLockStat.Enabled = BtnUnlockStat.Enabled = true;
 
             var stat = SetStatsCommand.Stats[CmbStat.SelectedIndex];
             LblStatPercent.Visible = stat.Percent;
@@ -1098,16 +1110,23 @@ namespace GrasscutterTools.Forms
             SetCommand("/setstats", $"{stat.ArgName} {NUDStat.Value}{(stat.Percent ? "%" : "")}");
         }
 
+        private void BtnLockStat_Click(object sender, EventArgs e)
+        {
+            var stat = SetStatsCommand.Stats[CmbStat.SelectedIndex];
+            SetCommand("/setstats", $"lock {stat.ArgName} {NUDStat.Value}{(stat.Percent ? "%" : "")}");
+        }
+
+        private void BtnUnlockStat_Click(object sender, EventArgs e)
+        {
+            var stat = SetStatsCommand.Stats[CmbStat.SelectedIndex];
+            SetCommand("/setstats", $"unlock {stat.ArgName}");
+        }
+
         private void LnkSetTalentClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             SetCommand("/talent", $"{(sender as LinkLabel).Tag} {NUDTalentLevel.Value}");
         }
 
-        private void LblResetStatsCommand_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            SetCommand("/give 101");
-        }
-
         #endregion - 数据 -
 
         #region - 管理 -
@@ -1225,35 +1244,41 @@ namespace GrasscutterTools.Forms
             }
 
             ExpandCommandRunLog();
-            BtnInvokeOpenCommand.Enabled = false;
-            BtnInvokeOpenCommand.Cursor = Cursors.WaitCursor;
-            int i = 0;
-            foreach (var command in commands)
+            try
             {
-                TxtCommandRunLog.AppendText(">");
-                TxtCommandRunLog.AppendText(command);
-                if (commands.Length > 1)
-                    TxtCommandRunLog.AppendText($" ({++i}/{commands.Length})");
-                TxtCommandRunLog.AppendText(Environment.NewLine);
-                var cmd = command.Substring(1);
-                try
+                BtnInvokeOpenCommand.Enabled = false;
+                BtnInvokeOpenCommand.Cursor = Cursors.WaitCursor;
+                int i = 0;
+                foreach (var command in commands)
                 {
-                    var msg = await OC.Invoke(cmd);
-                    TxtCommandRunLog.AppendText(string.IsNullOrEmpty(msg) ? "OK" : msg);
+                    TxtCommandRunLog.AppendText(">");
+                    TxtCommandRunLog.AppendText(command);
+                    if (commands.Length > 1)
+                        TxtCommandRunLog.AppendText($" ({++i}/{commands.Length})");
                     TxtCommandRunLog.AppendText(Environment.NewLine);
+                    var cmd = command.Substring(1);
+                    try
+                    {
+                        var msg = await OC.Invoke(cmd);
+                        TxtCommandRunLog.AppendText(string.IsNullOrEmpty(msg) ? "OK" : msg);
+                        TxtCommandRunLog.AppendText(Environment.NewLine);
+                    }
+                    catch (Exception ex)
+                    {
+                        TxtCommandRunLog.AppendText("Error: ");
+                        TxtCommandRunLog.AppendText(ex.Message);
+                        TxtCommandRunLog.AppendText(Environment.NewLine);
+                        MessageBox.Show(ex.Message, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        return false;
+                    }
+                    TxtCommandRunLog.ScrollToCaret();
                 }
-                catch (Exception ex)
-                {
-                    TxtCommandRunLog.AppendText("Error: ");
-                    TxtCommandRunLog.AppendText(ex.Message);
-                    TxtCommandRunLog.AppendText(Environment.NewLine);
-                    MessageBox.Show(ex.Message, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return false;
-                }
-                TxtCommandRunLog.ScrollToCaret();
             }
-            BtnInvokeOpenCommand.Cursor = Cursors.Default;
-            BtnInvokeOpenCommand.Enabled = true;
+            finally
+            {
+                BtnInvokeOpenCommand.Cursor = Cursors.Default;
+                BtnInvokeOpenCommand.Enabled = true;
+            }
             return true;
         }
 

Source/GrasscutterTools/Forms/FormMain.en-us.resx

@@ -217,6 +217,9 @@
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>Send Code</value>
   </data>
+  <data name="TPConsoleCheck.Size" type="System.Drawing.Size, System.Drawing">
+    <value>296, 111</value>
+  </data>
   <data name="TPConsoleCheck.Text" xml:space="preserve">
     <value>Console</value>
   </data>
@@ -518,27 +521,15 @@ Tip: Most of the scenes have no effect and cannot be entered.</value>
   <data name="TPStats.Text" xml:space="preserve">
     <value>Stats</value>
   </data>
-  <data name="LblResetStatsCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>126, 135</value>
-  </data>
-  <data name="LblResetStatsCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 17</value>
-  </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>When getting CEP</value>
-  </data>
-  <data name="LblResetStatsTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>235, 135</value>
-  </data>
-  <data name="LblResetStatsTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>243, 17</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>the current character's stats will be reset</value>
-  </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>Stats</value>
   </data>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>Unlock</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>Lock</value>
+  </data>
   <data name="LblStatTip.Text" xml:space="preserve">
     <value>Tip</value>
   </data>
@@ -865,4 +856,8 @@ Therefore, the quest can be added and finished, but not necessarily work.</value
   <data name="ChkIncludeUID.Text" xml:space="preserve">
     <value>Include UID</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
+  </data>
 </root>

Source/GrasscutterTools/Forms/FormMain.ru-ru.resx

@@ -220,6 +220,9 @@
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>Отправить код</value>
   </data>
+  <data name="TPConsoleCheck.Size" type="System.Drawing.Size, System.Drawing">
+    <value>296, 111</value>
+  </data>
   <data name="TPConsoleCheck.Text" xml:space="preserve">
     <value>консоль</value>
   </data>
@@ -567,27 +570,15 @@
   <data name="TPStats.Text" xml:space="preserve">
     <value>Статы</value>
   </data>
-  <data name="LblResetStatsCommand.Location" type="System.Drawing.Point, System.Drawing">
-    <value>88, 135</value>
-  </data>
-  <data name="LblResetStatsCommand.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 17</value>
-  </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>При получении CEP</value>
-  </data>
-  <data name="LblResetStatsTip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>214, 135</value>
-  </data>
-  <data name="LblResetStatsTip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 17</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>атрибуты текущего персонажа будут сброшены</value>
-  </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>Статистика</value>
   </data>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>разморозить</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>заморозить</value>
+  </data>
   <data name="LblStatTip.Text" xml:space="preserve">
     <value>Совет</value>
   </data>
@@ -986,6 +977,10 @@
   <data name="ChkIncludeUID.Text" xml:space="preserve">
     <value>Включить UID</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>GrasscutterTools - перевод Юрий Дворецкий</value>
   </data>

Source/GrasscutterTools/Forms/FormMain.zh-TW.resx

@@ -123,11 +123,14 @@
   <data name="ChkAutoCopy.Text" xml:space="preserve">
     <value>自動</value>
   </data>
+  <data name="GrpCommand.Text" xml:space="preserve">
+    <value>命令（按住 Ctrl 自動執行）</value>
+  </data>
   <data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
     <value>執行(F5)</value>
   </data>
-  <data name="GrpCommand.Text" xml:space="preserve">
-    <value>命令（按住 Ctrl 自動執行）</value>
+  <data name="TPRemoteCall.Text" xml:space="preserve">
+    <value>遠程</value>
   </data>
   <data name="LnkInventoryKamera.Text" xml:space="preserve">
     <value>存檔掃描開源工具</value>
@@ -145,6 +148,9 @@
   <data name="LblHostTip.Text" xml:space="preserve">
     <value>請確保地址中包含 http:// 或 https://</value>
   </data>
+  <data name="GrpServerStatus.Text" xml:space="preserve">
+    <value>伺服器狀態</value>
+  </data>
   <data name="LnkOpenCommandLabel.Text" xml:space="preserve">
     <value>遠程執行插件</value>
   </data>
@@ -154,8 +160,11 @@
   <data name="LblPlayerCountLabel.Text" xml:space="preserve">
     <value>當前玩家數</value>
   </data>
-  <data name="GrpServerStatus.Text" xml:space="preserve">
-    <value>伺服器狀態</value>
+  <data name="GrpRemoteCommand.Text" xml:space="preserve">
+    <value>遠程執行</value>
+  </data>
+  <data name="TPPlayerCheck.Text" xml:space="preserve">
+    <value>玩家驗證</value>
   </data>
   <data name="LnkRCHelp.Text" xml:space="preserve">
     <value>幫助</value>
@@ -169,8 +178,8 @@
   <data name="BtnSendVerificationCode.Text" xml:space="preserve">
     <value>發送驗證碼</value>
   </data>
-  <data name="TPPlayerCheck.Text" xml:space="preserve">
-    <value>玩家驗證</value>
+  <data name="TPConsoleCheck.Size" type="System.Drawing.Size, System.Drawing">
+    <value>296, 111</value>
   </data>
   <data name="BtnConsoleConnect.Text" xml:space="preserve">
     <value>連接</value>
@@ -179,17 +188,14 @@
     <value>請注意，控制台狀態下普通命令必須指定目標
 （即設置包含UID）</value>
   </data>
-  <data name="GrpRemoteCommand.Text" xml:space="preserve">
-    <value>遠程執行</value>
-  </data>
   <data name="BtnQueryServerStatus.Text" xml:space="preserve">
     <value>查詢</value>
   </data>
   <data name="LblHost.Text" xml:space="preserve">
     <value>伺服器地址</value>
   </data>
-  <data name="TPRemoteCall.Text" xml:space="preserve">
-    <value>遠程</value>
+  <data name="TPAbout.Text" xml:space="preserve">
+    <value>關於</value>
   </data>
   <data name="LblSupportDescription.Text" xml:space="preserve">
     <value>割草機工具箱
@@ -199,15 +205,15 @@
 如果願意請我喝一杯奶茶，那就更好了 : )
 指令生成有問題，或者有新的功能請求，都可以來Github提出</value>
   </data>
-  <data name="TPAbout.Text" xml:space="preserve">
-    <value>關於</value>
-  </data>
   <data name="BtnBan.Text" xml:space="preserve">
     <value>封號</value>
   </data>
   <data name="LblBanUID.Text" xml:space="preserve">
     <value>目標UID</value>
   </data>
+  <data name="GrpAccount.Text" xml:space="preserve">
+    <value>賬號管理</value>
+  </data>
   <data name="BtnDeleteAccount.Text" xml:space="preserve">
     <value>- 刪除</value>
   </data>
@@ -217,8 +223,8 @@
   <data name="LblAccountUserName.Text" xml:space="preserve">
     <value>用戶名</value>
   </data>
-  <data name="GrpAccount.Text" xml:space="preserve">
-    <value>賬號管理</value>
+  <data name="GrpPermission.Text" xml:space="preserve">
+    <value>權限管理</value>
   </data>
   <data name="LblPerm.Text" xml:space="preserve">
     <value>權限</value>
@@ -226,8 +232,8 @@
   <data name="LblPermUID.Text" xml:space="preserve">
     <value>目標UID</value>
   </data>
-  <data name="GrpPermission.Text" xml:space="preserve">
-    <value>權限管理</value>
+  <data name="TPScene.Text" xml:space="preserve">
+    <value>場景</value>
   </data>
   <data name="ChkIncludeSceneId.Text" xml:space="preserve">
     <value>含場景ID</value>
@@ -248,9 +254,6 @@
 
 提示：大部分場景沒有作用，無法進入。</value>
   </data>
-  <data name="TPScene.Text" xml:space="preserve">
-    <value>場景</value>
-  </data>
   <data name="BtnSaveGiveItemLog.Text" xml:space="preserve">
     <value>√ 記錄</value>
   </data>
@@ -290,27 +293,27 @@
   <data name="LblWeaponLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
-  <data name="LblResetStatsCommand.Text" xml:space="preserve">
-    <value>獲得角色經驗時</value>
-  </data>
-  <data name="LblResetStatsTip.Text" xml:space="preserve">
-    <value>當前角色屬性將會重置</value>
+  <data name="TPStats.Text" xml:space="preserve">
+    <value>數據</value>
   </data>
   <data name="GrpSetStats.Text" xml:space="preserve">
     <value>角色屬性</value>
   </data>
-  <data name="LnkTalentNormalATK.Text" xml:space="preserve">
-    <value>普通攻擊</value>
+  <data name="BtnUnlockStat.Text" xml:space="preserve">
+    <value>解鎖</value>
+  </data>
+  <data name="BtnLockStat.Text" xml:space="preserve">
+    <value>鎖定</value>
   </data>
   <data name="GrpTalentLevel.Text" xml:space="preserve">
     <value>技能等級</value>
   </data>
+  <data name="LnkTalentNormalATK.Text" xml:space="preserve">
+    <value>普通攻擊</value>
+  </data>
   <data name="LblStatsDescription.Text" xml:space="preserve">
     <value>設置當前活躍角色數據</value>
   </data>
-  <data name="TPStats.Text" xml:space="preserve">
-    <value>數據</value>
-  </data>
   <data name="BtnGiveAllChar.Text" xml:space="preserve">
     <value>一鍵獲得所有角色</value>
   </data>
@@ -326,15 +329,15 @@
   <data name="GrpSpawnRecord.Text" xml:space="preserve">
     <value>生成記錄本</value>
   </data>
+  <data name="GrpEntityType.Text" xml:space="preserve">
+    <value>列表分類</value>
+  </data>
   <data name="RbEntityAnimal.Text" xml:space="preserve">
     <value>生物誌</value>
   </data>
   <data name="RbEntityMonster.Text" xml:space="preserve">
     <value>討伐對象</value>
   </data>
-  <data name="GrpEntityType.Text" xml:space="preserve">
-    <value>列表分類</value>
-  </data>
   <data name="LblSpawnDescription.Text" xml:space="preserve">
     <value>在玩家附近召喚生物</value>
   </data>
@@ -344,6 +347,12 @@
   <data name="LblEntityLevel.Text" xml:space="preserve">
     <value>等級</value>
   </data>
+  <data name="TPQuest.Text" xml:space="preserve">
+    <value>任務</value>
+  </data>
+  <data name="GrpQuestFilters.Text" xml:space="preserve">
+    <value>列表過濾</value>
+  </data>
   <data name="ChkQuestFilterTEST.Text" xml:space="preserve">
     <value>測試任務</value>
   </data>
@@ -353,9 +362,6 @@
   <data name="ChkQuestFilterHIDDEN.Text" xml:space="preserve">
     <value>隱藏的任務</value>
   </data>
-  <data name="GrpQuestFilters.Text" xml:space="preserve">
-    <value>列表過濾</value>
-  </data>
   <data name="BtnFinishQuest.Text" xml:space="preserve">
     <value>完成任務</value>
   </data>
@@ -367,8 +373,8 @@
 提示：許多任務需要服務端腳本支持
 囙此任務可以接，可以完成，但是不一定可以做</value>
   </data>
-  <data name="TPQuest.Text" xml:space="preserve">
-    <value>任務</value>
+  <data name="TPArtifact.Text" xml:space="preserve">
+    <value>聖遺物</value>
   </data>
   <data name="LblArtifactSet.Text" xml:space="preserve">
     <value>套裝</value>
@@ -385,8 +391,8 @@
   <data name="LblArtifactStars.Text" xml:space="preserve">
     <value>星級</value>
   </data>
-  <data name="TPArtifact.Text" xml:space="preserve">
-    <value>聖遺物</value>
+  <data name="TPCustom.Text" xml:space="preserve">
+    <value>自定義</value>
   </data>
   <data name="BtnExportCustomCommands.Text" xml:space="preserve">
     <value>導出</value>
@@ -400,8 +406,8 @@
   <data name="BtnRemoveCustomCommand.Text" xml:space="preserve">
     <value>× 刪除</value>
   </data>
-  <data name="TPCustom.Text" xml:space="preserve">
-    <value>自定義</value>
+  <data name="TPHome.Text" xml:space="preserve">
+    <value>主頁</value>
   </data>
   <data name="BtnOpenTextMap.Text" xml:space="preserve">
     <value>文本瀏覽器</value>
@@ -412,7 +418,8 @@
   <data name="ChkTopMost.Text" xml:space="preserve">
     <value>置頂</value>
   </data>
-  <data name="TPHome.Text" xml:space="preserve">
-    <value>主頁</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
   </data>
 </root>

Source/GrasscutterTools/Forms/FormTextMapBrowser.cs

@@ -18,7 +18,6 @@
  **/
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;

Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs

@@ -16,8 +16,6 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  * 
  **/
-using System.ComponentModel;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 

Source/GrasscutterTools/GrasscutterTools.csproj

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props" Condition="Exists('..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props')" />
-  <Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,160 +38,18 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\IconGrasscutter.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Resources\Newtonsoft.Json.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\TextBoxXP.cs">
@@ -233,7 +89,6 @@
     <Compile Include="Game\ItemMap.cs" />
     <Compile Include="Game\SetStatsCommand.cs" />
     <Compile Include="Game\TextMapData.cs" />
-    <Compile Include="Github\ReleaseAPI.cs" />
     <Compile Include="GOOD\GOOD.cs" />
     <Compile Include="GOOD\Artifact.cs" />
     <Compile Include="GOOD\Character.cs" />
@@ -250,6 +105,7 @@
     </Compile>
     <Compile Include="Utils\ArtifactUtils.cs" />
     <Compile Include="Utils\HttpHelper.cs" />
+    <Compile Include="Utils\ReleaseAPI.cs" />
     <EmbeddedResource Include="Forms\FormGachaBannerEditor2.en-us.resx">
       <DependentUpon>FormGachaBannerEditor2.cs</DependentUpon>
     </EmbeddedResource>
@@ -287,6 +143,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormMain.zh-TW.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormTextMapBrowser.en-US.resx">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
@@ -335,8 +192,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
-    <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -369,6 +224,7 @@
     <Content Include="Resources\en-us\Quest.txt" />
     <Content Include="Resources\en-us\Scene.txt" />
     <Content Include="Resources\en-us\Weapon.txt" />
+    <None Include="Resources\Newtonsoft.Json.dll" />
     <Content Include="Resources\ru-ru\Animal.txt" />
     <Content Include="Resources\ru-ru\Artifact.txt" />
     <Content Include="Resources\ru-ru\ArtifactCat.txt" />
@@ -425,24 +281,11 @@
       <ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Resource.Embedder">
+      <Version>2.2.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.6.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.6.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props'))" />
-    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-  </Target>
-  <Import Project="..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
-  <Import Project="..\packages\Fody.6.6.1\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.1\build\Fody.targets')" />
-  <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>

Source/GrasscutterTools/Program.cs

@@ -17,6 +17,8 @@
  * 
  **/
 using System;
+using System.Globalization;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
@@ -27,6 +29,33 @@ namespace GrasscutterTools
 {
     internal static class Program
     {
+        static Program()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssembly;
+        }
+
+        private static Assembly OnResolveAssembly(object sender, ResolveEventArgs args)
+        {
+            //var executingAssembly = Assembly.GetExecutingAssembly();
+            //var assemblyName = new AssemblyName(args.Name);
+
+            //var path = assemblyName.Name + ".dll";
+            //if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
+            //    path = $@"{assemblyName.CultureInfo}\{path}";
+            //using (var stream = executingAssembly.GetManifestResourceStream(path))
+            //{
+            //    if (stream == null) return null;
+            //    var assemblyRawBytes = new byte[stream.Length];
+            //    stream.Read(assemblyRawBytes, 0, assemblyRawBytes.Length);
+            //    return Assembly.Load(assemblyRawBytes);
+            //}
+
+            // 手工加载嵌入的dll文件
+            if (new AssemblyName(args.Name).Name == "Newtonsoft.Json")
+                return Assembly.Load(Resources.Newtonsoft_Json);
+            return null;
+        }
+
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>

Source/GrasscutterTools/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("GrasscutterTools")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Grasscutter Command Generator")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("jie65535")]
 [assembly: AssemblyProduct("GrasscutterTools")]
 [assembly: AssemblyCopyright("Copyright © jie65535 2022")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("jie65535")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 会使此程序集中的类型
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.6.2")]
+[assembly: AssemblyFileVersion("1.6.2")]

Source/GrasscutterTools/Properties/Resources.resx

@@ -273,4 +273,7 @@
   <data name="GOODImportSuccess" xml:space="preserve">
     <value>导入成功!</value>
   </data>
+  <data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

Source/GrasscutterTools/Properties/app.manifest

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC 清单选项
-             如果想要更改 Windows 用户帐户控制级别，请使用
-             以下节点之一替换 requestedExecutionLevel 节点。
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
-            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
-            元素。
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-      <applicationRequestMinimum>
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
-      </applicationRequestMinimum>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
-           Windows 版本的列表。取消评论适当的元素，
-           Windows 将自动选择最兼容的环境。 -->
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-      <!-- Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
-       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
-       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
-       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
-       
-       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
-    </windowsSettings>
-  </application>
-  -->
-  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-</assembly>

Source/GrasscutterTools/Resources/en-us/ArtifactCat.txt

@@ -1,4 +1,4 @@
-20:Deepwood Memories
+20:Deepwood Memories
 21:Gilded Dreams
 51:Resolution of Sojourner
 52:Brave Heart

Source/GrasscutterTools/Resources/en-us/CustomCommands.txt

@@ -8,6 +8,8 @@ Level up to 60
 /give 102 x1880200
 Set World Level
 /prop wl 8
+Unlock Map
+/prop unlockmap 1
 Unlock The Tower
 /prop ut 12
 Set BattlePass Level

Source/GrasscutterTools/Resources/ru-ru/ArtifactCat.txt

@@ -1,4 +1,4 @@
-20:Deepwood Memories
+20:Deepwood Memories
 21:Gilded Dreams
 51:Решимость временщика
 52:Душа храбреца

Source/GrasscutterTools/Resources/ru-ru/CustomCommands.txt

@@ -8,6 +8,8 @@
 /give 102 x1880200
 Уровень мира
 /prop wl 8
+Разгадка карту
+/prop unlockmap 1
 Разгадка бездны
 /prop ut 12
 Уровень Боевой пропуск

Source/GrasscutterTools/Resources/zh-cn/ArtifactCat.txt

@@ -1,4 +1,4 @@
-20:深林的记忆
+20:深林的记忆
 21:饰金之梦
 51:行者之心
 52:勇士之心

Source/GrasscutterTools/Resources/zh-cn/CustomCommands.txt

@@ -8,6 +8,8 @@
 /give 102 x1880200
 设置世界等级
 /prop wl 8
+点亮地图
+/prop unlockmap 1
 一键解锁深渊
 /prop ut 12
 设置纪行等级

Source/GrasscutterTools/Resources/zh-tw/CustomCommands.txt

@@ -8,6 +8,8 @@
 /give 102 x1880200
 設置世界等級
 /prop wl 8
+點亮地圖
+/prop unlockmap 1
 一鍵解鎖深淵
 /prop ut 12
 設置紀行等級

Source/GrasscutterTools/Utils/ReleaseAPI.cs

@@ -2,11 +2,11 @@
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 
-using GrasscutterTools.Utils;
+using Newtonsoft.Json;
 
-namespace GrasscutterTools.Github
+namespace GrasscutterTools.Utils
 {
-    public static class ReleaseAPI
+    internal class ReleaseAPI
     {
         public static async Task<ReleaseInfo> GetReleasesLastest(string username, string repo)
         {
@@ -14,15 +14,14 @@ namespace GrasscutterTools.Github
             try
             {
                 HttpHelper.HttpClient.DefaultRequestHeaders.UserAgent.Add(headerValue);
-                var r = await HttpHelper.GetAsync<dynamic>($"https://api.github.com/repos/{username}/{repo}/releases/latest");
-                return new ReleaseInfo
-                {
-                    TagName = r.tag_name,
-                    Url = r.html_url,
-                    CraeteTime = r.created_at,
-                    Name = r.name,
-                    Body = r.body
-                };
+                return await HttpHelper.GetAsync<ReleaseInfo>($"https://api.github.com/repos/{username}/{repo}/releases/latest");
+            }
+            catch
+            {
+                // 如果Github无法访问，尝试从Gitee获取
+                var release = await HttpHelper.GetAsync<ReleaseInfo>($"https://gitee.com/api/v5/repos/{username}/{repo}/releases/latest");
+                release.Url = $"https://gitee.com/{username}/{repo}/releases";
+                return release;
             }
             finally
             {
@@ -32,14 +31,19 @@ namespace GrasscutterTools.Github
 
         public class ReleaseInfo
         {
+            [JsonProperty("tag_name")]
             public string TagName { get; set; }
 
+            [JsonProperty("html_url")]
             public string Url { get; set; }
 
+            [JsonProperty("created_at")]
             public DateTimeOffset CraeteTime { get; set; }
 
+            [JsonProperty("name")]
             public string Name { get; set; }
 
+            [JsonProperty("body")]
             public string Body { get; set; }
         }
     }

Source/GrasscutterTools/packages.config

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Costura.Fody" version="5.7.0" targetFramework="net48" developmentDependency="true" />
-  <package id="Fody" version="6.6.1" targetFramework="net48" developmentDependency="true" />
-  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net48" />
-  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
-  <package id="Resource.Embedder" version="2.2.0" targetFramework="net48" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net48" />
-  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
-  <package id="System.Console" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net48" />
-  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net48" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Net.Http" version="4.3.0" targetFramework="net48" />
-  <package id="System.Net.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net48" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net48" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
-  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net48" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
-  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net48" />
-  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net48" />
-  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net48" />
-  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net48" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
-</packages>