diff --git a/src/Economics.Core/Command/BankCommand.cs b/src/Economics.Core/Command/BankCommand.cs index 8da36e4b7..0b2b455ac 100644 --- a/src/Economics.Core/Command/BankCommand.cs +++ b/src/Economics.Core/Command/BankCommand.cs @@ -141,7 +141,7 @@ public static void BankClear(CommandArgs args) [SubCommand("query")] [CommandPermission(EconomicsPerm.QueryCurrency, EconomicsPerm.CurrencyAdmin)] - [HelpText("/bank query or /bank quer ")] + [HelpText("/bank query or /bank query ")] public static void BankQuery(CommandArgs args) { var sb = new StringBuilder(); @@ -149,7 +149,6 @@ public static void BankQuery(CommandArgs args) if (args.Parameters.Count > 1) { name = args.Parameters[1]; - return; } else { diff --git a/src/Economics.Core/Economics.cs b/src/Economics.Core/Economics.cs index f2efcd871..26047e670 100644 --- a/src/Economics.Core/Economics.cs +++ b/src/Economics.Core/Economics.cs @@ -20,12 +20,12 @@ namespace Economics.Core; [ApiVersion(2, 1)] public class Economics : TerrariaPlugin { - public override string Author => "少司命"; + public override string Author => "少司命, 千亦(修复 bug)"; public override string Description => GetString("提供经济系统API"); public override string Name => Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(2, 0, 0, 10); + public override Version Version => new Version(2, 0, 0, 11); public readonly static List ServerPlayers = []; diff --git a/src/Economics.Core/README.md b/src/Economics.Core/README.md index 6748e3cf1..52a43979c 100644 --- a/src/Economics.Core/README.md +++ b/src/Economics.Core/README.md @@ -1,6 +1,6 @@ # Economics.Core 插件[经济套件核心] -- 作者: 少司命 +- 作者: 少司命,千亦(修复 bug) - 出处: 无 - EconomicsAPI是延续POBC设计思路的新经济系统,他本身并无特别的功 能,只提供货币系统,以及一些API。 @@ -175,6 +175,9 @@ ## 更新日志 +### v2.0.0.11 +- 修复 /bank query 指定玩家无输出问题 + ### v2.0.0.10 - 修复CombatMsg无法正常显示击杀后获得货币数的问题 diff --git a/src/Economics.Regain/README.md b/src/Economics.Regain/README.md index 9f3edc084..fc8586db5 100644 --- a/src/Economics.Regain/README.md +++ b/src/Economics.Regain/README.md @@ -1,6 +1,6 @@ # Economics.Regain 回收物品插件 -- 作者: 少司命 +- 作者: 少司命,千亦(修复 bug) - 出处: 无 - 可自定义回收物品插件 @@ -19,7 +19,8 @@ > 配置文件位置:tshock/Economics/Regain.json ```json { - "回收物品列表": [ + "最大显示页": 20, + "回收物品表": [ { "物品ID": 2990, "回收价格": [ @@ -52,6 +53,10 @@ ``` ## 更新日志 +### v2.0.0.5 +- 修复 /regain list 不显示回收物品列表 +- 更正 readme 的配置错误 + ### v2.0.0.0 - 适配多货币 diff --git a/src/Economics.Regain/Regain..cs b/src/Economics.Regain/Regain..cs index 683c3d567..70bdc0004 100644 --- a/src/Economics.Regain/Regain..cs +++ b/src/Economics.Regain/Regain..cs @@ -11,19 +11,17 @@ namespace Economics.Regain; [ApiVersion(2, 1)] public class Regain : TerrariaPlugin { - public override string Author => "少司命"; + public override string Author => "少司命,千亦(修复 bug)"; public override string Description => GetString("对玩家的物品进行回收!"); public override string Name => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(2, 0, 0, 4); + public override Version Version => new Version(2, 0, 0, 5); public Regain(Main game) : base(game) { } - internal static Config Config { get; set; } = new(); - public override void Initialize() { Config.Load(); @@ -57,7 +55,7 @@ void Show(List line) line, new PaginationTools.Settings { - MaxLinesPerPage = Config.PageMax, + MaxLinesPerPage = Config.Instance.PageMax, NothingToDisplayString = GetString("当前可回收物品"), HeaderFormat = GetString("回收物品列表 ({0}/{1}):"), FooterFormat = GetString("输入 {0}regain list {{0}} 查看更多").SFormat(Commands.Specifier) @@ -66,7 +64,7 @@ void Show(List line) } bool Verify(out Config.RegainInfo? regain) { - if (!Config.TryGetRegain(args.Player.SelectedItem.type, out regain) || regain == null) + if (!Config.Instance.TryGetRegain(args.Player.SelectedItem.type, out regain) || regain == null) { args.Player.SendErrorMessage(GetString("该物品暂时无法回收!")); return false; @@ -109,7 +107,7 @@ bool Verify(out Config.RegainInfo? regain) { if (args.Parameters[0].ToLower() == "list") { - var line = Config.Regains.Select(x => x.ToString()).ToList(); + var line = Config.Instance.Regains.Select(x => x.ToString()).ToList(); Show(line); return; }