jie65535/GrasscutterCommandGenerator
1
0
Fork 0
mirror of https://github.com/jie65535/GrasscutterCommandGenerator.git synced 2025-08-02 16:59:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up all files

Browse Source
This commit is contained in:
杰 2022-05-13 11:39:07 +08:00
parent 3defcbbdc1
commit 2a3ba29b1d
18 changed files with 68 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/GrasscutterTools/App.config
View File

@ -2,11 +2,11 @@
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="GrasscutterTools.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/> <section name="GrasscutterTools.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup> </startup>
<userSettings> <userSettings>
<GrasscutterTools.Properties.Settings> <GrasscutterTools.Properties.Settings>

2
Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs
View File

@ -7,12 +7,10 @@ namespace GrasscutterTools.DispatchServer
{ {
public static class DispatchServerAPI public static class DispatchServerAPI
{ {
public static async Task<ServerStatus> QueryServerStatus(string host) public static async Task<ServerStatus> QueryServerStatus(string host)
{ {
var response = await HttpHelper.GetAsync<ServerStatusResponse>(host + "/status/server"); var response = await HttpHelper.GetAsync<ServerStatusResponse>(host + "/status/server");
return response?.Status; return response?.Status;
} }
} }
} }

3
Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs
View File

@ -1,5 +1,4 @@
 using Newtonsoft.Json;
using Newtonsoft.Json;
namespace GrasscutterTools.DispatchServer.Model namespace GrasscutterTools.DispatchServer.Model
{ {

2
Source/GrasscutterTools/FormGachaBannerEditor.cs
View File

@ -202,7 +202,7 @@ namespace GrasscutterTools
foreach (string item in list.CheckedItems) foreach (string item in list.CheckedItems)
builder.Append(item.Substring(0, item.IndexOf(':'))) builder.Append(item.Substring(0, item.IndexOf(':')))
.Append(", "); .Append(", ");
txt.Text = builder.ToString(0, builder.Length-2); txt.Text = builder.ToString(0, builder.Length - 2);
} }
} }

54
Source/GrasscutterTools/FormMain.cs
View File

@ -53,7 +53,6 @@ namespace GrasscutterTools
SaveSettings(); SaveSettings();
} }
private readonly string[] LanguageNames = new string[] { "简体中文", "English" }; private readonly string[] LanguageNames = new string[] { "简体中文", "English" };
private readonly string[] Languages = new string[] { "zh-CN", "en-US" }; private readonly string[] Languages = new string[] { "zh-CN", "en-US" };
@ -99,8 +98,8 @@ namespace GrasscutterTools
#region - 主页 - #region - 主页 -
private FormGachaBannerEditor FormGachaBannerEditor;
FormGachaBannerEditor FormGachaBannerEditor;
private void BtnOpenGachaBannerEditor_Click(object sender, EventArgs e) private void BtnOpenGachaBannerEditor_Click(object sender, EventArgs e)
{ {
if (FormGachaBannerEditor == null || FormGachaBannerEditor.IsDisposed) if (FormGachaBannerEditor == null || FormGachaBannerEditor.IsDisposed)
@ -115,7 +114,8 @@ namespace GrasscutterTools
} }
} }
FormTextMapBrowser FormTextMapBrowser; private FormTextMapBrowser FormTextMapBrowser;
private void BtnOpenTextMap_Click(object sender, EventArgs e) private void BtnOpenTextMap_Click(object sender, EventArgs e)
{ {
if (FormTextMapBrowser == null || FormTextMapBrowser.IsDisposed) if (FormTextMapBrowser == null || FormTextMapBrowser.IsDisposed)
@ -139,6 +139,7 @@ namespace GrasscutterTools
#endregion - 主页 - #endregion - 主页 -
#region - 自定义 - #region - 自定义 -
private readonly string CustomCommandsFilePath = Path.Combine(Application.LocalUserAppDataPath, "CustomCommands.txt"); private readonly string CustomCommandsFilePath = Path.Combine(Application.LocalUserAppDataPath, "CustomCommands.txt");
private bool CustomCommandsChanged; private bool CustomCommandsChanged;
@ -155,8 +156,8 @@ namespace GrasscutterTools
{ {
FLPCustomCommands.Controls.Clear(); FLPCustomCommands.Controls.Clear();
var lines = commands.Split('\n'); var lines = commands.Split('\n');
for (int i = 0; i < lines.Length-1; i += 2) for (int i = 0; i < lines.Length - 1; i += 2)
AddCustomCommand(lines[i].Trim(), lines[i+1].Trim()); AddCustomCommand(lines[i].Trim(), lines[i + 1].Trim());
} }
private void SaveCustomCommands() private void SaveCustomCommands()
@ -351,8 +352,7 @@ namespace GrasscutterTools
NUDArtifactStars.Minimum = GameData.Artifacts.Ids[beginIndex] / 100 % 10; NUDArtifactStars.Minimum = GameData.Artifacts.Ids[beginIndex] / 100 % 10;
NUDArtifactStars.Maximum = GameData.Artifacts.Ids[endIndex] / 100 % 10; NUDArtifactStars.Maximum = GameData.Artifacts.Ids[endIndex] / 100 % 10;
var parts = GameData.Artifacts.Names.Skip(beginIndex).Take(endIndex - beginIndex + 1).Distinct().ToArray();
var parts = GameData.Artifacts.Names.Skip(beginIndex).Take(endIndex-beginIndex+1).Distinct().ToArray();
var i = CmbArtifactPart.SelectedIndex; var i = CmbArtifactPart.SelectedIndex;
CmbArtifactPart.Items.Clear(); CmbArtifactPart.Items.Clear();
CmbArtifactPart.Items.AddRange(parts); CmbArtifactPart.Items.AddRange(parts);
@ -362,7 +362,8 @@ namespace GrasscutterTools
ArtifactInputChanged(sender, e); ArtifactInputChanged(sender, e);
} }
readonly string[] ArtifactPartLabels = new string[] { "空之杯", "死之羽", "理之冠", "生之花", "时之沙"}; private readonly string[] ArtifactPartLabels = new string[] { "空之杯", "死之羽", "理之冠", "生之花", "时之沙" };
private void CmbArtifactPart_SelectedIndexChanged(object sender, EventArgs e) private void CmbArtifactPart_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (CmbArtifactPart.SelectedIndex < 0) if (CmbArtifactPart.SelectedIndex < 0)
@ -407,7 +408,7 @@ namespace GrasscutterTools
foreach (string item in ListSubAttributionChecked.Items) foreach (string item in ListSubAttributionChecked.Items)
{ {
var subId = item.Substring(0, item.IndexOf(':')).Trim(); var subId = item.Substring(0, item.IndexOf(':')).Trim();
var times = int.Parse(item.Substring(item.LastIndexOf('x')+1)); var times = int.Parse(item.Substring(item.LastIndexOf('x') + 1));
if (subAttrDir.ContainsKey(subId)) if (subAttrDir.ContainsKey(subId))
subAttrDir[subId] += times; subAttrDir[subId] += times;
else else
@ -523,8 +524,9 @@ namespace GrasscutterTools
#region -- 物品记录 -- #region -- 物品记录 --
readonly string GiveItemCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "GiveItemCommands.txt"); private readonly string GiveItemCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "GiveItemCommands.txt");
List<GameCommand> GiveItemCommands; private List<GameCommand> GiveItemCommands;
private void InitGiveItemRecord() private void InitGiveItemRecord()
{ {
if (File.Exists(GiveItemCommandsRecordPath)) if (File.Exists(GiveItemCommandsRecordPath))
@ -574,7 +576,8 @@ namespace GrasscutterTools
ListGiveItemLogs.Items.RemoveAt(ListGiveItemLogs.SelectedIndex); ListGiveItemLogs.Items.RemoveAt(ListGiveItemLogs.SelectedIndex);
} }
} }
#endregion
#endregion -- 物品记录 --
#endregion - 物品 - #endregion - 物品 -
@ -672,8 +675,9 @@ namespace GrasscutterTools
#region -- 生成记录 -- #region -- 生成记录 --
readonly string SpawnCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "SpawnCommands.txt"); private readonly string SpawnCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "SpawnCommands.txt");
List<GameCommand> SpawnCommands; private List<GameCommand> SpawnCommands;
private void InitSpawnRecord() private void InitSpawnRecord()
{ {
if (File.Exists(SpawnCommandsRecordPath)) if (File.Exists(SpawnCommandsRecordPath))
@ -686,6 +690,7 @@ namespace GrasscutterTools
SpawnCommands = new List<GameCommand>(); SpawnCommands = new List<GameCommand>();
} }
} }
private void SaveSpawnRecord() private void SaveSpawnRecord()
{ {
File.WriteAllText(SpawnCommandsRecordPath, GetCommandsText(SpawnCommands)); File.WriteAllText(SpawnCommandsRecordPath, GetCommandsText(SpawnCommands));
@ -723,7 +728,7 @@ namespace GrasscutterTools
} }
} }
#endregion #endregion -- 生成记录 --
#endregion - 生成 - #endregion - 生成 -
@ -775,7 +780,7 @@ namespace GrasscutterTools
LblStatPercent.Visible = stat.Percent; LblStatPercent.Visible = stat.Percent;
LblStatTip.Text = stat.Tip; LblStatTip.Text = stat.Tip;
SetCommand("/setstats", $"{stat.ArgName} {NUDStat.Value}{(stat.Percent?"%":"")}"); SetCommand("/setstats", $"{stat.ArgName} {NUDStat.Value}{(stat.Percent ? "%" : "")}");
} }
private void LnkSetTalentClicked(object sender, LinkLabelLinkClickedEventArgs e) private void LnkSetTalentClicked(object sender, LinkLabelLinkClickedEventArgs e)
@ -834,7 +839,7 @@ namespace GrasscutterTools
} }
} }
#endregion #endregion - 关于 -
#region - 命令 - #region - 命令 -
@ -897,16 +902,16 @@ namespace GrasscutterTools
#region - 命令记录 - #region - 命令记录 -
List<GameCommand> GetCommands(string commandsText) private List<GameCommand> GetCommands(string commandsText)
{ {
var lines = commandsText.Split('\n'); var lines = commandsText.Split('\n');
List<GameCommand> commands = new List<GameCommand>(lines.Length/2); List<GameCommand> commands = new List<GameCommand>(lines.Length / 2);
for (int i = 0; i < lines.Length-1; i += 2) for (int i = 0; i < lines.Length - 1; i += 2)
commands.Add(new GameCommand(lines[i].Trim(), lines[i+1].Trim())); commands.Add(new GameCommand(lines[i].Trim(), lines[i + 1].Trim()));
return commands; return commands;
} }
string GetCommandsText(List<GameCommand> commands) private string GetCommandsText(List<GameCommand> commands)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
foreach (var cmd in commands) foreach (var cmd in commands)
@ -917,7 +922,7 @@ namespace GrasscutterTools
return builder.ToString(); return builder.ToString();
} }
#endregion #endregion - 命令记录 -
#region - 远程 - #region - 远程 -
@ -1080,7 +1085,6 @@ namespace GrasscutterTools
MessageBox.Show(Resources.OpenCommandHelp, Resources.Help, MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show(Resources.OpenCommandHelp, Resources.Help, MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
#endregion #endregion - 远程 -
} }
} }

5
Source/GrasscutterTools/FormTextMapBrowser.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
@ -150,7 +149,8 @@ namespace GrasscutterTools
.Select(kv => new { Hash = kv.Key, Id = kv.Value, Text = data.TextMap[kv.Key] }) .Select(kv => new { Hash = kv.Key, Id = kv.Value, Text = data.TextMap[kv.Key] })
.Concat( .Concat(
data.TextMap.Where(kv => r.Match(kv.Key).Success || r.Match(kv.Value).Success) data.TextMap.Where(kv => r.Match(kv.Key).Success || r.Match(kv.Value).Success)
.Select(kv => new { .Select(kv => new
{
Hash = kv.Key, Hash = kv.Key,
Id = data.ManualTextMap.TryGetValue(kv.Key, out string id) ? id : "", Id = data.ManualTextMap.TryGetValue(kv.Key, out string id) ? id : "",
Text = kv.Value Text = kv.Value
@ -179,6 +179,5 @@ namespace GrasscutterTools
if (e.KeyCode == Keys.Enter) if (e.KeyCode == Keys.Enter)
BtnSearch_Click(sender, e); BtnSearch_Click(sender, e);
} }
} }
} }

8
Source/GrasscutterTools/Game/Gacha/BannerType.cs
View File

@ -1,10 +1,4 @@
using System; namespace GrasscutterTools.Game.Gacha
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GrasscutterTools.Game.Gacha
{ {
public enum BannerType public enum BannerType
{ {

1
Source/GrasscutterTools/Game/Gacha/GachaBanner.cs
View File

@ -117,6 +117,5 @@ namespace GrasscutterTools.Game.Gacha
/// </summary> /// </summary>
[JsonProperty("hardPity", DefaultValueHandling = DefaultValueHandling.Ignore), DefaultValue(90)] [JsonProperty("hardPity", DefaultValueHandling = DefaultValueHandling.Ignore), DefaultValue(90)]
public int HardPity { get; set; } = 90; public int HardPity { get; set; } = 90;
} }
} }

4
Source/GrasscutterTools/Game/GameCommand.cs
View File

@ -4,8 +4,8 @@
{ {
public GameCommand(string name, string command) public GameCommand(string name, string command)
{ {
Name=name; Name = name;
Command=command; Command = command;
} }
public string Name { get; set; } public string Name { get; set; }

1
Source/GrasscutterTools/Game/GameData.cs
View File

@ -52,6 +52,5 @@ namespace GrasscutterTools.Game
public static ItemMap Ornaments { get; private set; } public static ItemMap Ornaments { get; private set; }
public static ItemMap GachaBannerPrefabs { get; private set; } public static ItemMap GachaBannerPrefabs { get; private set; }
} }
} }

3
Source/GrasscutterTools/Game/ItemMap.cs
View File

@ -19,7 +19,7 @@ namespace GrasscutterTools.Game
var si = line.IndexOf(':'); var si = line.IndexOf(':');
if (si > 0 && int.TryParse(line.Substring(0, si).Trim(), out int id)) if (si > 0 && int.TryParse(line.Substring(0, si).Trim(), out int id))
{ {
var name = line.Substring(si+1).Trim(); var name = line.Substring(si + 1).Trim();
if (!string.IsNullOrEmpty(name)) if (!string.IsNullOrEmpty(name))
{ {
//IdMap[id] = name; //IdMap[id] = name;
@ -41,7 +41,6 @@ namespace GrasscutterTools.Game
//List<int> IdList; //List<int> IdList;
//List<string> NameList; //List<string> NameList;
public int Count => Ids.Length; public int Count => Ids.Length;
//public string this[int id] => IdMap[id]; //public string this[int id] => IdMap[id];

9
Source/GrasscutterTools/Game/SetStatsCommand.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Text;
using System.Text;
using GrasscutterTools.Properties; using GrasscutterTools.Properties;
@ -13,9 +12,9 @@ namespace GrasscutterTools.Game
{ {
public Stat(string name, string argName, bool percent, string tip = "") public Stat(string name, string argName, bool percent, string tip = "")
{ {
Name=name; Name = name;
ArgName=argName; ArgName = argName;
Percent=percent; Percent = percent;
Tip = tip; Tip = tip;
} }

10
Source/GrasscutterTools/Game/TextMapData.cs
View File

@ -1,9 +1,6 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -22,7 +19,7 @@ namespace GrasscutterTools.Game
public string[] TextMapFilePaths; public string[] TextMapFilePaths;
public string[] TextMapFiles; public string[] TextMapFiles;
void LoadManualTextMap(string manualTextMapPath) private void LoadManualTextMap(string manualTextMapPath)
{ {
using (var fs = File.OpenRead(manualTextMapPath)) using (var fs = File.OpenRead(manualTextMapPath))
using (var sr = new StreamReader(fs)) using (var sr = new StreamReader(fs))
@ -41,7 +38,7 @@ namespace GrasscutterTools.Game
} }
} }
void LoadTextMaps(string textMapDirPath) private void LoadTextMaps(string textMapDirPath)
{ {
TextMapFilePaths = Directory.GetFiles(textMapDirPath, "TextMap*.json"); TextMapFilePaths = Directory.GetFiles(textMapDirPath, "TextMap*.json");
if (TextMapFilePaths.Length == 0) if (TextMapFilePaths.Length == 0)
@ -65,6 +62,5 @@ namespace GrasscutterTools.Game
} }
} }
} }
} }
} }

4
Source/GrasscutterTools/MultiLanguage.cs
View File

@ -3,9 +3,8 @@ using System.Windows.Forms;
namespace GrasscutterTools namespace GrasscutterTools
{ {
static class MultiLanguage internal static class MultiLanguage
{ {
public static string DefaultLanguage = "zh-CN"; public static string DefaultLanguage = "zh-CN";
public static void SetDefaultLanguage(string lang) public static void SetDefaultLanguage(string lang)
@ -16,7 +15,6 @@ namespace GrasscutterTools
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
} }
/// <summary> /// <summary>
/// 加载语言 /// 加载语言
/// </summary> /// </summary>

1
Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs
View File

@ -95,7 +95,6 @@ namespace GrasscutterTools.OpenCommand
public object Data { get; set; } public object Data { get; set; }
} }
internal class InvokeException : Exception internal class InvokeException : Exception
{ {
public InvokeException(string message) : base(message) public InvokeException(string message) : base(message)

7
Source/GrasscutterTools/Program.cs
View File

@ -1,18 +1,15 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace GrasscutterTools namespace GrasscutterTools
{ {
static class Program internal static class Program
{ {
/// <summary> /// <summary>
/// 应用程序的主入口点。 /// 应用程序的主入口点。
/// </summary> /// </summary>
[STAThread] [STAThread]
static void Main() private static void Main()
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);

2
Source/GrasscutterTools/Utils/HttpHelper.cs
View File

@ -10,7 +10,7 @@ namespace GrasscutterTools.Utils
{ {
public static class HttpHelper public static class HttpHelper
{ {
static readonly HttpClient httpClient = new HttpClient(); private static readonly HttpClient httpClient = new HttpClient();
static HttpHelper() static HttpHelper()
{ {