Implement command combination

Update command version
Add set all skill levels
Add skill level in avatar
This commit is contained in:
2022-10-23 11:13:35 +08:00
parent c6b2c0ea65
commit fec144cb64
7 changed files with 5498 additions and 5258 deletions

View File

@ -75,7 +75,6 @@ namespace GrasscutterTools.Forms
this.DTPBanEndTime = new System.Windows.Forms.DateTimePicker();
this.BtnUnban = new System.Windows.Forms.Button();
this.BtnBan = new System.Windows.Forms.Button();
this.TxtBanReason = new GrasscutterTools.Controls.TextBoxXP();
this.NUDBanUID = new System.Windows.Forms.NumericUpDown();
this.LblBanUID = new System.Windows.Forms.Label();
this.GrpAccount = new System.Windows.Forms.GroupBox();
@ -143,14 +142,18 @@ namespace GrasscutterTools.Forms
this.NUDStat = new System.Windows.Forms.NumericUpDown();
this.CmbStat = new System.Windows.Forms.ComboBox();
this.GrpTalentLevel = new System.Windows.Forms.GroupBox();
this.LnkTalentAll = new System.Windows.Forms.LinkLabel();
this.LnkTalentE = new System.Windows.Forms.LinkLabel();
this.LnkTalentQ = new System.Windows.Forms.LinkLabel();
this.LnkTalentNormalATK = new System.Windows.Forms.LinkLabel();
this.NUDTalentLevel = new System.Windows.Forms.NumericUpDown();
this.LblStatsDescription = new System.Windows.Forms.Label();
this.TPAvatar = new System.Windows.Forms.TabPage();
this.LblAvatarSkillLevelTip = new System.Windows.Forms.Label();
this.BtnGiveAllChar = new System.Windows.Forms.Button();
this.LblAvatarSkillLevelLabel = new System.Windows.Forms.Label();
this.LblAvatarConstellation = new System.Windows.Forms.Label();
this.NUDAvatarSkillLevel = new System.Windows.Forms.NumericUpDown();
this.NUDAvatarConstellation = new System.Windows.Forms.NumericUpDown();
this.ImgAvatar = new System.Windows.Forms.PictureBox();
this.LblAvatar = new System.Windows.Forms.Label();
@ -230,6 +233,7 @@ namespace GrasscutterTools.Forms
this.ChkIncludeUID = new System.Windows.Forms.CheckBox();
this.LblDefaultUid = new System.Windows.Forms.Label();
this.TCMain = new System.Windows.Forms.TabControl();
this.TxtBanReason = new GrasscutterTools.Controls.TextBoxXP();
this.GrpCommand.SuspendLayout();
this.TPRemoteCall.SuspendLayout();
this.GrpServerStatus.SuspendLayout();
@ -266,6 +270,7 @@ namespace GrasscutterTools.Forms
this.GrpTalentLevel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUDTalentLevel)).BeginInit();
this.TPAvatar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarSkillLevel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarConstellation)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ImgAvatar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarLevel)).BeginInit();
@ -326,7 +331,6 @@ 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);
@ -338,6 +342,7 @@ 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;
this.TPRemoteCall.Enter += new System.EventHandler(this.TPRemoteCall_Enter);
@ -435,15 +440,14 @@ 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);
@ -451,6 +455,7 @@ 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;
//
@ -522,11 +527,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;
//
@ -571,10 +576,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;
//
@ -599,10 +604,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;
//
@ -620,8 +625,8 @@ namespace GrasscutterTools.Forms
//
// DTPBanEndTime
//
resources.ApplyResources(this.DTPBanEndTime, "DTPBanEndTime");
this.DTPBanEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Short;
resources.ApplyResources(this.DTPBanEndTime, "DTPBanEndTime");
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";
@ -641,14 +646,6 @@ namespace GrasscutterTools.Forms
this.BtnBan.UseVisualStyleBackColor = true;
this.BtnBan.Click += new System.EventHandler(this.BtnBan_Click);
//
// TxtBanReason
//
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";
//
// NUDBanUID
//
resources.ApplyResources(this.NUDBanUID, "NUDBanUID");
@ -744,10 +741,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
@ -809,7 +806,6 @@ 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.LblTpZ);
@ -824,6 +820,7 @@ namespace GrasscutterTools.Forms
this.TPScene.Controls.Add(this.LblSceneDescription);
this.TPScene.Controls.Add(this.ListScenes);
this.TPScene.Controls.Add(this.LblTp);
resources.ApplyResources(this.TPScene, "TPScene");
this.TPScene.Name = "TPScene";
this.TPScene.UseVisualStyleBackColor = true;
//
@ -958,7 +955,6 @@ 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);
@ -971,6 +967,7 @@ 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;
//
@ -1088,7 +1085,6 @@ namespace GrasscutterTools.Forms
//
// TPWeapon
//
resources.ApplyResources(this.TPWeapon, "TPWeapon");
this.TPWeapon.Controls.Add(this.BtnGiveAllWeapons);
this.TPWeapon.Controls.Add(this.TxtWeaponFilter);
this.TPWeapon.Controls.Add(this.LblWeaponDescription);
@ -1099,6 +1095,7 @@ 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;
//
@ -1202,10 +1199,10 @@ namespace GrasscutterTools.Forms
//
// TPStats
//
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;
//
@ -1237,9 +1234,9 @@ namespace GrasscutterTools.Forms
//
// 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
@ -1265,15 +1262,16 @@ 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);
//
// GrpTalentLevel
//
resources.ApplyResources(this.GrpTalentLevel, "GrpTalentLevel");
this.GrpTalentLevel.Controls.Add(this.LnkTalentAll);
this.GrpTalentLevel.Controls.Add(this.LnkTalentE);
this.GrpTalentLevel.Controls.Add(this.LnkTalentQ);
this.GrpTalentLevel.Controls.Add(this.LnkTalentNormalATK);
@ -1281,6 +1279,14 @@ namespace GrasscutterTools.Forms
this.GrpTalentLevel.Name = "GrpTalentLevel";
this.GrpTalentLevel.TabStop = false;
//
// LnkTalentAll
//
resources.ApplyResources(this.LnkTalentAll, "LnkTalentAll");
this.LnkTalentAll.Name = "LnkTalentAll";
this.LnkTalentAll.TabStop = true;
this.LnkTalentAll.Tag = "all";
this.LnkTalentAll.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LnkSetTalentClicked);
//
// LnkTalentE
//
resources.ApplyResources(this.LnkTalentE, "LnkTalentE");
@ -1327,18 +1333,27 @@ namespace GrasscutterTools.Forms
//
// TPAvatar
//
resources.ApplyResources(this.TPAvatar, "TPAvatar");
this.TPAvatar.Controls.Add(this.LblAvatarSkillLevelTip);
this.TPAvatar.Controls.Add(this.BtnGiveAllChar);
this.TPAvatar.Controls.Add(this.LblAvatarSkillLevelLabel);
this.TPAvatar.Controls.Add(this.LblAvatarConstellation);
this.TPAvatar.Controls.Add(this.NUDAvatarSkillLevel);
this.TPAvatar.Controls.Add(this.NUDAvatarConstellation);
this.TPAvatar.Controls.Add(this.ImgAvatar);
this.TPAvatar.Controls.Add(this.LblAvatar);
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;
//
// LblAvatarSkillLevelTip
//
resources.ApplyResources(this.LblAvatarSkillLevelTip, "LblAvatarSkillLevelTip");
this.LblAvatarSkillLevelTip.ForeColor = System.Drawing.SystemColors.GrayText;
this.LblAvatarSkillLevelTip.Name = "LblAvatarSkillLevelTip";
//
// BtnGiveAllChar
//
resources.ApplyResources(this.BtnGiveAllChar, "BtnGiveAllChar");
@ -1346,11 +1361,32 @@ namespace GrasscutterTools.Forms
this.BtnGiveAllChar.UseVisualStyleBackColor = true;
this.BtnGiveAllChar.Click += new System.EventHandler(this.BtnGiveAllChar_Click);
//
// LblAvatarSkillLevelLabel
//
resources.ApplyResources(this.LblAvatarSkillLevelLabel, "LblAvatarSkillLevelLabel");
this.LblAvatarSkillLevelLabel.Name = "LblAvatarSkillLevelLabel";
//
// LblAvatarConstellation
//
resources.ApplyResources(this.LblAvatarConstellation, "LblAvatarConstellation");
this.LblAvatarConstellation.Name = "LblAvatarConstellation";
//
// NUDAvatarSkillLevel
//
resources.ApplyResources(this.NUDAvatarSkillLevel, "NUDAvatarSkillLevel");
this.NUDAvatarSkillLevel.Maximum = new decimal(new int[] {
16,
0,
0,
0});
this.NUDAvatarSkillLevel.Name = "NUDAvatarSkillLevel";
this.NUDAvatarSkillLevel.Value = new decimal(new int[] {
10,
0,
0,
0});
this.NUDAvatarSkillLevel.ValueChanged += new System.EventHandler(this.NUDAvatarConstellation_ValueChanged);
//
// NUDAvatarConstellation
//
resources.ApplyResources(this.NUDAvatarConstellation, "NUDAvatarConstellation");
@ -1415,7 +1451,6 @@ namespace GrasscutterTools.Forms
//
// TPSpawn
//
resources.ApplyResources(this.TPSpawn, "TPSpawn");
this.TPSpawn.Controls.Add(this.ChkInfiniteHP);
this.TPSpawn.Controls.Add(this.LblClearSpawnLogs);
this.TPSpawn.Controls.Add(this.BtnSaveSpawnLog);
@ -1429,6 +1464,7 @@ 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;
//
@ -1568,13 +1604,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;
//
@ -1646,7 +1682,6 @@ 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);
@ -1666,6 +1701,7 @@ 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;
//
@ -1831,7 +1867,6 @@ 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);
@ -1839,6 +1874,7 @@ 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;
//
@ -1902,13 +1938,13 @@ namespace GrasscutterTools.Forms
//
// TPHome
//
resources.ApplyResources(this.TPHome, "TPHome");
this.TPHome.Controls.Add(this.LnkNewVersion);
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;
//
@ -1966,9 +2002,9 @@ namespace GrasscutterTools.Forms
//
// CmbGcVersions
//
resources.ApplyResources(this.CmbGcVersions, "CmbGcVersions");
this.CmbGcVersions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.CmbGcVersions.FormattingEnabled = true;
resources.ApplyResources(this.CmbGcVersions, "CmbGcVersions");
this.CmbGcVersions.Name = "CmbGcVersions";
//
// ChkTopMost
@ -1979,9 +2015,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";
//
// LblLanguage
@ -2034,6 +2070,14 @@ namespace GrasscutterTools.Forms
this.TCMain.Name = "TCMain";
this.TCMain.SelectedIndex = 0;
//
// TxtBanReason
//
this.TxtBanReason.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.TxtBanReason, "TxtBanReason");
this.TxtBanReason.Maximum = 0F;
this.TxtBanReason.Minimum = 0F;
this.TxtBanReason.Name = "TxtBanReason";
//
// FormMain
//
resources.ApplyResources(this, "$this");
@ -2097,6 +2141,7 @@ namespace GrasscutterTools.Forms
((System.ComponentModel.ISupportInitialize)(this.NUDTalentLevel)).EndInit();
this.TPAvatar.ResumeLayout(false);
this.TPAvatar.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarSkillLevel)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarConstellation)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ImgAvatar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUDAvatarLevel)).EndInit();
@ -2334,5 +2379,9 @@ namespace GrasscutterTools.Forms
private System.Windows.Forms.LinkLabel LnkNewVersion;
private System.Windows.Forms.Button BtnGiveAllWeapons;
private System.Windows.Forms.CheckBox ChkInfiniteHP;
private System.Windows.Forms.LinkLabel LnkTalentAll;
private System.Windows.Forms.NumericUpDown NUDAvatarSkillLevel;
private System.Windows.Forms.Label LblAvatarSkillLevelLabel;
private System.Windows.Forms.Label LblAvatarSkillLevelTip;
}
}

View File

@ -985,16 +985,21 @@ namespace GrasscutterTools.Forms
private void AvatarInputChanged()
{
if (CmbAvatar.SelectedIndex >= 0)
GenAvatar((int)NUDAvatarLevel.Value, (int)NUDAvatarConstellation.Value);
GenAvatar((int)NUDAvatarLevel.Value, (int)NUDAvatarConstellation.Value, (int)NUDAvatarSkillLevel.Value);
}
/// <summary>
/// 获取角色命令
/// </summary>
/// <param name="level">等级</param>
private void GenAvatar(int level, int constellation)
private void GenAvatar(int level, int constellation, int skillLevel)
{
if (Check(CommandVersion.V1_2_2))
if (Check(CommandVersion.V1_4_1))
{
int avatarId = GameData.Avatars.Ids[CmbAvatar.SelectedIndex];
SetCommand("/give", $"{avatarId} lv{level} c{constellation} sl{skillLevel}");
}
else if (Check(CommandVersion.V1_2_2))
{
int avatarId = GameData.Avatars.Ids[CmbAvatar.SelectedIndex];
SetCommand("/give", $"{avatarId} lv{level} c{constellation}");
@ -1015,7 +1020,11 @@ namespace GrasscutterTools.Forms
{
var level = NUDAvatarLevel.Value;
var constellation = NUDAvatarConstellation.Value;
SetCommand("/give avatars", $"lv{level} c{constellation}");
var skillLevel = NUDAvatarSkillLevel.Value;
if (Check(CommandVersion.V1_4_1))
SetCommand("/give avatars", $"lv{level} c{constellation} sl{skillLevel}");
else
SetCommand("/give avatars", $"lv{level} c{constellation}");
}
#endregion - Avatars -
@ -1479,7 +1488,10 @@ namespace GrasscutterTools.Forms
ShowTip(Resources.CommandContentCannotBeEmpty, TxtCommand);
return;
}
await RunCommands(TxtCommand.Text);
if (TxtCommand.Text.IndexOf('|') == -1)
await RunCommands(TxtCommand.Text);
else
await RunCommands(TxtCommand.Text.Split('|').Select(it => it.Trim()).ToArray());
}
/// <summary>
@ -1509,7 +1521,7 @@ namespace GrasscutterTools.Forms
if (commands.Length > 1)
TxtCommandRunLog.AppendText($" ({++i}/{commands.Length})");
TxtCommandRunLog.AppendText(Environment.NewLine);
var cmd = command.Substring(1);
var cmd = command.TrimStart('/');
try
{
var msg = await OC.Invoke(cmd);

View File

@ -128,7 +128,7 @@
<value>Auto</value>
</data>
<data name="GrpCommand.Text" xml:space="preserve">
<value>Command (Press and hold Ctrl to run automatically)</value>
<value>Command - [Ctrl] Autorun - [|] Split multiple commands</value>
</data>
<data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
<value>Run(F5)</value>
@ -547,6 +547,15 @@ In the command, you can use ~ to indicate the current position, and ~N to indica
<data name="GrpTalentLevel.Text" xml:space="preserve">
<value>Talent Level</value>
</data>
<data name="LnkTalentAll.Location" type="System.Drawing.Point, System.Drawing">
<value>146, 24</value>
</data>
<data name="LnkTalentAll.Size" type="System.Drawing.Size, System.Drawing">
<value>22, 17</value>
</data>
<data name="LnkTalentAll.Text" xml:space="preserve">
<value>All</value>
</data>
<data name="LnkTalentE.Location" type="System.Drawing.Point, System.Drawing">
<value>283, 24</value>
</data>
@ -575,7 +584,7 @@ In the command, you can use ~ to indicate the current position, and ~N to indica
<value>NormalATK</value>
</data>
<data name="NUDTalentLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 23</value>
<value>96, 23</value>
</data>
<data name="LblStatsDescription.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 17</value>
@ -589,6 +598,12 @@ In the command, you can use ~ to indicate the current position, and ~N to indica
<data name="BtnGiveAllChar.Text" xml:space="preserve">
<value>Give All Char</value>
</data>
<data name="LblAvatarSkillLevelLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 17</value>
</data>
<data name="LblAvatarSkillLevelLabel.Text" xml:space="preserve">
<value>Skill level</value>
</data>
<data name="LblAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 17</value>
</data>

File diff suppressed because it is too large Load Diff

View File

@ -143,7 +143,7 @@
<value>Авто</value>
</data>
<data name="GrpCommand.Text" xml:space="preserve">
<value>Команда (нажмите и удерживайте Ctrl для автоматического запуска)</value>
<value>Команды - [Ctrl] Автозапуск - [|] Разделить несколько команд</value>
</data>
<data name="BtnInvokeOpenCommand.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
@ -638,7 +638,7 @@
<value>207, 218</value>
</data>
<data name="LblWeaponRefinement.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 17</value>
<value>115, 17</value>
</data>
<data name="LblWeaponRefinement.Text" xml:space="preserve">
<value>Ур. пробуждения</value>
@ -688,6 +688,15 @@
<data name="GrpTalentLevel.Text" xml:space="preserve">
<value>Уровень таланта</value>
</data>
<data name="LnkTalentAll.Location" type="System.Drawing.Point, System.Drawing">
<value>144, 24</value>
</data>
<data name="LnkTalentAll.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 17</value>
</data>
<data name="LnkTalentAll.Text" xml:space="preserve">
<value>все</value>
</data>
<data name="LnkTalentE.Location" type="System.Drawing.Point, System.Drawing">
<value>309, 24</value>
</data>
@ -716,7 +725,7 @@
<value>Обычная атака</value>
</data>
<data name="NUDTalentLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 23</value>
<value>94, 23</value>
</data>
<data name="LblStatsDescription.Size" type="System.Drawing.Size, System.Drawing">
<value>316, 17</value>
@ -727,6 +736,9 @@
<data name="TPAvatar.Text" xml:space="preserve">
<value>Персонаж</value>
</data>
<data name="LblAvatarSkillLevelTip.Location" type="System.Drawing.Point, System.Drawing">
<value>552, 141</value>
</data>
<data name="BtnGiveAllChar.Location" type="System.Drawing.Point, System.Drawing">
<value>425, 182</value>
</data>
@ -736,8 +748,17 @@
<data name="BtnGiveAllChar.Text" xml:space="preserve">
<value> Дать всех персонажей</value>
</data>
<data name="LblAvatarSkillLevelLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>428, 119</value>
</data>
<data name="LblAvatarSkillLevelLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 17</value>
</data>
<data name="LblAvatarSkillLevelLabel.Text" xml:space="preserve">
<value>Уровень квалификации</value>
</data>
<data name="LblAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
<value>428, 125</value>
<value>428, 90</value>
</data>
<data name="LblAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 17</value>
@ -745,8 +766,14 @@
<data name="LblAvatarConstellation.Text" xml:space="preserve">
<value>Созвездия</value>
</data>
<data name="NUDAvatarSkillLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>431, 139</value>
</data>
<data name="NUDAvatarSkillLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 23</value>
</data>
<data name="NUDAvatarConstellation.Location" type="System.Drawing.Point, System.Drawing">
<value>503, 122</value>
<value>503, 88</value>
</data>
<data name="NUDAvatarConstellation.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 23</value>
@ -761,7 +788,7 @@
<value>Персонаж</value>
</data>
<data name="LblAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>428, 78</value>
<value>428, 61</value>
</data>
<data name="LblAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 17</value>
@ -770,7 +797,7 @@
<value>Уровень</value>
</data>
<data name="NUDAvatarLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>503, 75</value>
<value>503, 59</value>
</data>
<data name="NUDAvatarLevel.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 23</value>
@ -1003,7 +1030,7 @@
<value>Загрузить</value>
</data>
<data name="LblCustomName.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 17</value>
<value>34, 17</value>
</data>
<data name="LblCustomName.Text" xml:space="preserve">
<value>Имя</value>
@ -1015,7 +1042,7 @@
<value>535, -1</value>
</data>
<data name="LnkResetCustomCommands.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 17</value>
<value>66, 17</value>
</data>
<data name="LnkResetCustomCommands.Text" xml:space="preserve">
<value>Сбросить</value>

View File

@ -124,7 +124,7 @@
<value>自動</value>
</data>
<data name="GrpCommand.Text" xml:space="preserve">
<value>命令(按住 Ctrl 自動執行)</value>
<value>命令 - [Ctrl] 自動執行 - [|] 分割多條命令</value>
</data>
<data name="BtnInvokeOpenCommand.Text" xml:space="preserve">
<value>執行(F5)</value>
@ -246,6 +246,9 @@
提示:大部分場景沒有作用,無法進入。</value>
</data>
<data name="LblTp.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 51</value>
</data>
<data name="LblTp.Text" xml:space="preserve">
<value>座標傳送
提示:遊戲內可以通過小地圖的'魚鉤'標記來快捷傳送
@ -317,6 +320,9 @@
<data name="BtnGiveAllChar.Text" xml:space="preserve">
<value>一鍵獲得所有角色</value>
</data>
<data name="LblAvatarSkillLevelLabel.Text" xml:space="preserve">
<value>技能等級</value>
</data>
<data name="LblAvatarLevel.Text" xml:space="preserve">
<value>等級</value>
</data>

View File

@ -105,12 +105,21 @@ namespace GrasscutterTools.Game
/// </summary>
public static readonly Version V1_3_1 = new Version(1, 3, 1);
/// <summary>
/// 2022/10/13
/// </summary>
public static readonly Version V1_4_0 = new Version(1, 4, 0);
/// <summary>
/// 2022/10/18
/// </summary>
public static readonly Version V1_4_1 = new Version(1, 4, 1);
// More...
/// <summary>
/// v1.2.3 -> v1.2.4 2022/7/21
/// git hash
/// 2022/10/18
/// </summary>
//public static readonly Version V1_2_4 = new Version(1, 2, 4);
//public static readonly Version V1_4_2 = new Version(1, 4, 2);
public static Version[] List { get; } = new Version[] {
V1_2_1,
@ -118,7 +127,9 @@ namespace GrasscutterTools.Game
V1_2_3,
V1_3_0,
V1_3_1,
//V1_3_2,
V1_4_0,
V1_4_1,
//V1_4_2,
};
#endregion - Version List -