From e5b1ffd29c7ca660f565866d21a59f41a20dce3a Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 17:25:32 +0800 Subject: [PATCH 01/14] [economics_plugin] : fix shop buy number deductt currency num error fix bank pay currency num is negative update skill Multiple features --- .../Enumerates/SkillSparkType.cs | 11 ++++++++++- .../Events/PlayerSparkSkillHandler.cs | 6 +++++- .../Model/Options/SkillSparkOption.cs | 19 ++++++++++++++++++- src/Economics.Skill/Model/TermItem.cs | 5 ++++- src/Economics.Skill/README.md | 4 ++++ src/Economics.Skill/Skill.cs | 2 +- src/EconomicsAPI/Command.cs | 2 +- src/EconomicsAPI/DB/CurrencyManager.cs | 2 +- src/EconomicsAPI/Extensions/TSPlayerExt.cs | 10 ++-------- 9 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/Economics.Skill/Enumerates/SkillSparkType.cs b/src/Economics.Skill/Enumerates/SkillSparkType.cs index 9cea237a5..21ba10653 100644 --- a/src/Economics.Skill/Enumerates/SkillSparkType.cs +++ b/src/Economics.Skill/Enumerates/SkillSparkType.cs @@ -39,5 +39,14 @@ public enum SkillSparkType Jump, [Description("受击")] - Struck + Struck, + + [Description("BUFF")] + Buff, + + [Description("环境")] + Environment, + + [Description("技能")] + Skill } \ No newline at end of file diff --git a/src/Economics.Skill/Events/PlayerSparkSkillHandler.cs b/src/Economics.Skill/Events/PlayerSparkSkillHandler.cs index e2d7bd0f4..f906c633c 100644 --- a/src/Economics.Skill/Events/PlayerSparkSkillHandler.cs +++ b/src/Economics.Skill/Events/PlayerSparkSkillHandler.cs @@ -1,5 +1,6 @@ using Economics.Skill.DB; using Economics.Skill.Enumerates; +using EconomicsAPI.Extensions; using TShockAPI; namespace Economics.Skill.Events; @@ -21,13 +22,16 @@ public static bool IsSpark(TSPlayer Player, PlayerSKillManager.PlayerSkill skill SkillSparkType.MP => skill.Skill!.SkillSpark.MeetMP(Player), SkillSparkType.Jump => Player.TPlayer.jump > 0, SkillSparkType.Dash => Player.TPlayer.dashDelay == -1, - SkillSparkType.CD => skill.SkillCD <= 0, + SkillSparkType.CD => skill.SkillCD <= 0, SkillSparkType.Armor => skill.Skill!.SkillSpark.HasItem(Player), SkillSparkType.Death => Player.Dead, SkillSparkType.Take => skillSparkType == SkillSparkType.Take && skill.BindItem == Player.SelectedItem.netID, SkillSparkType.Kill => skillSparkType == SkillSparkType.Kill, SkillSparkType.Strike => skillSparkType == SkillSparkType.Strike, SkillSparkType.Struck => skillSparkType == SkillSparkType.Struck, + SkillSparkType.Buff => skill.Skill.SkillSpark.BuffsCondition.All(i => Player.TPlayer.buffType.Contains(i)), + SkillSparkType.Skill => skill.Skill.SkillSpark.SkillCondition.All(i => Skill.PlayerSKillManager.HasSkill(Player.Name, i)), + SkillSparkType.Environment => Player.InProgress(skill.Skill.SkillSpark.EnvironmentCondition), _ => false }; if (!enable) diff --git a/src/Economics.Skill/Model/Options/SkillSparkOption.cs b/src/Economics.Skill/Model/Options/SkillSparkOption.cs index 84906c41d..fb0f45a7e 100644 --- a/src/Economics.Skill/Model/Options/SkillSparkOption.cs +++ b/src/Economics.Skill/Model/Options/SkillSparkOption.cs @@ -36,6 +36,15 @@ public class SkillSparkOption [JsonProperty("物品条件")] public List TermItem { get; set; } = new(); + [JsonProperty("Buff条件")] + public List BuffsCondition { get; set; } = new(); + + [JsonProperty("环境条件")] + public List EnvironmentCondition { get; set; } = new(); + + [JsonProperty("技能条件")] + public List SkillCondition { get; set; } = new(); + public bool MeetHP(TSPlayer Player) { return (this.HpRatio ? (Player.TPlayer.statLife / (float) Player.TPlayer.statLifeMax * 100 <= this.HP) : Player.TPlayer.statLife <= this.HP) && !this.MoreHP; @@ -60,7 +69,15 @@ public bool HasItem(TSPlayer player) } if (item.Armory) { - var inv = player.TPlayer.armor.Where(x => x.netID == item.netID); + var inv = player.TPlayer.armor.Take(10).Where(x => x.netID == item.netID); + if (!inv.Any() || inv.Sum(x => x.stack) < item.Stack) + { + return false; + } + } + if (item.Misc) + { + var inv = player.TPlayer.armor.Skip(10).Where(x => x.netID == item.netID); if (!inv.Any() || inv.Sum(x => x.stack) < item.Stack) { return false; diff --git a/src/Economics.Skill/Model/TermItem.cs b/src/Economics.Skill/Model/TermItem.cs index c119379d8..796318a02 100644 --- a/src/Economics.Skill/Model/TermItem.cs +++ b/src/Economics.Skill/Model/TermItem.cs @@ -9,9 +9,12 @@ public class TermItem : Item [JsonProperty("背包物品")] public bool Inventory { get; set; } = false; - [JsonProperty("装备饰品")] + [JsonProperty("装备")] public bool Armory { get; set; } = false; + [JsonProperty("饰品")] + public bool Misc { get; set; } = false; + [JsonProperty("手持物品")] public bool HeldItem { get; set; } = false; diff --git a/src/Economics.Skill/README.md b/src/Economics.Skill/README.md index 632ed3ccb..28dfbfafc 100644 --- a/src/Economics.Skill/README.md +++ b/src/Economics.Skill/README.md @@ -139,6 +139,10 @@ ``` ## 更新日志 ``` +v2.0.0.9 +技能条件，buff条件，环境条件 +购买技能条件 + V2.0.0.0 适配多货币 diff --git a/src/Economics.Skill/Skill.cs b/src/Economics.Skill/Skill.cs index 0f9be8f95..be349cd17 100644 --- a/src/Economics.Skill/Skill.cs +++ b/src/Economics.Skill/Skill.cs @@ -21,7 +21,7 @@ public class Skill : TerrariaPlugin public override string Description => GetString("让玩家拥有技能!"); public override string Name => Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(2, 0, 0, 8); + public override Version Version => new Version(2, 0, 0, 9); internal static string PATH = Path.Combine(EconomicsAPI.Economics.SaveDirPath, "Skill.json"); diff --git a/src/EconomicsAPI/Command.cs b/src/EconomicsAPI/Command.cs index b9aab6c2b..ac2fd3abb 100644 --- a/src/EconomicsAPI/Command.cs +++ b/src/EconomicsAPI/Command.cs @@ -164,7 +164,7 @@ bool CurrencyValidator(string type, out CustomizeCurrency? currencyOption) { return; } - if (!long.TryParse(args.Parameters[2], out var num)) + if (!long.TryParse(args.Parameters[2], out var num) || num < 0) { args.Player.SendErrorMessage(GetString("请输入一个有效数值!")); return; diff --git a/src/EconomicsAPI/DB/CurrencyManager.cs b/src/EconomicsAPI/DB/CurrencyManager.cs index c240f9827..b54780164 100644 --- a/src/EconomicsAPI/DB/CurrencyManager.cs +++ b/src/EconomicsAPI/DB/CurrencyManager.cs @@ -167,7 +167,7 @@ public bool DeductUserCurrency(string name, IEnumerable 0) - { - Player.GetPlayerInRange(Range).ForEach(x => x.HealLife(life)); - } + Player.GetPlayerInRange(Range).ForEach(x => x.HealLife(life)); } public static void HealAllMana(this TSPlayer Player, int Range, int mana) { - if (mana > 0) - { - Player.GetPlayerInRange(Range).ForEach(x => x.HealMana(mana)); - } + Player.GetPlayerInRange(Range).ForEach(x => x.HealMana(mana)); } public static List GetNpcInRange(this TSPlayer Player, int range) From b1437dd6844a1a3832e8d08ccd36b1bdb5c9eb3c Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 17:40:58 +0800 Subject: [PATCH 02/14] fix skill Auto direction Not in effect --- src/Economics.Skill/Utils.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Economics.Skill/Utils.cs b/src/Economics.Skill/Utils.cs index 2fa68b95d..d46a19aa5 100644 --- a/src/Economics.Skill/Utils.cs +++ b/src/Economics.Skill/Utils.cs @@ -60,14 +60,14 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti { foreach (var opt in option.ProjectileCycle.ProjectileCycles) { - Vector2 _vel; + var _vel = vel; #region 锁定敌怪 if (option.LockNpcOption.Enable && option.LockNpcOption.Lock && lockNpc != null) { pos.Distance(lockNpc.Center); _vel = (pos.DirectionTo(lockNpc.Center).SafeNormalize(-Vector2.UnitY) * lockNpc.velocity.Length()).ToLenOf(option.Speed); } - else + if(!option.AutoDirection) { _vel = vel.RotationAngle(option.StartAngle).ToLenOf(option.Speed); } From 5b88fce63afc5fcc64a106657f43091396b14452 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 17:42:26 +0800 Subject: [PATCH 03/14] fix skill bind max Count Not in effect --- src/Economics.Skill/Utils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Economics.Skill/Utils.cs b/src/Economics.Skill/Utils.cs index d46a19aa5..66b1b2524 100644 --- a/src/Economics.Skill/Utils.cs +++ b/src/Economics.Skill/Utils.cs @@ -33,7 +33,7 @@ public static SkillContext VerifyBindSkill(TSPlayer Player, int index) throw new Exception(GetString($"当前进度无法购买此技能，限制进度:{string.Join(", ", context.LimitProgress)}")); } - var bind = Skill.PlayerSKillManager.QuerySkillByItem(Player.Name, Player.SelectedItem.netID).Where(s => s.Skill != null && s.Skill.Hidden); + var bind = Skill.PlayerSKillManager.QuerySkillByItem(Player.Name, Player.SelectedItem.netID).Where(s => s.Skill != null && !s.Skill.Hidden); return context.SkillUnique && Skill.PlayerSKillManager.HasSkill(Player.Name, index) ? throw new Exception(GetString("此技能是唯一的不能重复绑定!")) : context.SkillUniqueAll && Skill.PlayerSKillManager.HasSkill(index) From a1b3aadc20b98de5adf404ecdbc5da2213c0c7bd Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 17:57:56 +0800 Subject: [PATCH 04/14] update rpg Sole occupation --- src/Economics.RPG/Command.cs | 5 +++++ src/Economics.RPG/Model/Level.cs | 3 +++ src/Economics.RPG/PlayerLevelManager.cs | 5 +++++ src/Economics.RPG/RPG.cs | 2 +- src/EconomicsAPI/Economics.cs | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Economics.RPG/Command.cs b/src/Economics.RPG/Command.cs index f4794f32a..4c21a34d4 100644 --- a/src/Economics.RPG/Command.cs +++ b/src/Economics.RPG/Command.cs @@ -29,6 +29,11 @@ public void Rank(CommandArgs args) args.Player.SendErrorMessage(GetString($"等级 {args.Parameters[0]} 不存在！ ")); return; } + if (ranklevel.SoleOccupation && RPG.PlayerLevelManager.HasLevel(ranklevel.Name)) + { + args.Player.SendErrorMessage(GetString("此职业全服唯一，已经存在此职业无法升级。")); + return; + } if (ranklevel.SelectedWeapon.Count > 0 && !ranklevel.SelectedWeapon.Contains(args.Player.SelectedItem.netID)) { args.Player.SendErrorMessage(GetString($"升级至 {args.Parameters[0]} 需要手持武器{string.Join(",", ranklevel.SelectedWeapon.Select(i => TShock.Utils.GetItemById(i).Name))}！ ")); diff --git a/src/Economics.RPG/Model/Level.cs b/src/Economics.RPG/Model/Level.cs index b32ff7eb6..ff909819e 100644 --- a/src/Economics.RPG/Model/Level.cs +++ b/src/Economics.RPG/Model/Level.cs @@ -22,6 +22,9 @@ public class Level [JsonProperty("升级广播")] public string RankBroadcast { get; set; } = string.Empty; + [JsonProperty("唯一职业")] + public bool SoleOccupation { get; set; } + [JsonProperty("手持武器")] public HashSet SelectedWeapon { get; set; } = new(); diff --git a/src/Economics.RPG/PlayerLevelManager.cs b/src/Economics.RPG/PlayerLevelManager.cs index b2f486358..36e6d7d0c 100644 --- a/src/Economics.RPG/PlayerLevelManager.cs +++ b/src/Economics.RPG/PlayerLevelManager.cs @@ -45,6 +45,11 @@ public Level GetLevel(string userName) : RPG.Config.DefaultLevel; } + public bool HasLevel(string level) + { + return this.Levels.ContainsValue(level); + } + public void ResetPlayerLevel(string userName) { this.Update(userName, RPG.Config.DefaultLevel); diff --git a/src/Economics.RPG/RPG.cs b/src/Economics.RPG/RPG.cs index ba8cef9b8..3feeb4c76 100644 --- a/src/Economics.RPG/RPG.cs +++ b/src/Economics.RPG/RPG.cs @@ -18,7 +18,7 @@ public class RPG : TerrariaPlugin public override string Description => GetString("提供RPG玩法!"); public override string Name => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(2, 0, 0, 2); + public override Version Version => new Version(2, 0, 0, 3); internal static Config Config { get; set; } = new Config(); diff --git a/src/EconomicsAPI/Economics.cs b/src/EconomicsAPI/Economics.cs index b75a54fc0..51bb1d015 100644 --- a/src/EconomicsAPI/Economics.cs +++ b/src/EconomicsAPI/Economics.cs @@ -24,7 +24,7 @@ public class Economics : TerrariaPlugin public override string Description => GetString("提供经济系统API"); public override string Name => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(2, 0, 0, 3); + public override Version Version => new Version(2, 0, 0, 4); public readonly static List ServerPlayers = new(); From 35545ee828d928dd20654ca01eefd1253721f889 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 18:10:13 +0800 Subject: [PATCH 05/14] update plugin Readme --- src/Economics.Skill/README.md | 85 ++++++++++++++++++++++++----------- src/EconomicsAPI/README.md | 59 +++++++++++++++--------- 2 files changed, 96 insertions(+), 48 deletions(-) diff --git a/src/Economics.Skill/README.md b/src/Economics.Skill/README.md index 28dfbfafc..950f55c8b 100644 --- a/src/Economics.Skill/README.md +++ b/src/Economics.Skill/README.md @@ -12,6 +12,9 @@ - 触发模式中 `击杀` `击打` `主动` 三个模式，其中任意两个都无法组合，击杀 击打 本身就是主动的体现。 +## 触发模式 +- CD 主动 打击 击杀 死亡 血量 蓝量 冲刺 装备 跳跃 BUFF 技能 环境 + ## 指令 | 语法 | 权限 | 说明 | @@ -30,10 +33,10 @@ > 配置文件位置：tshock/Economics/Skill.json ```json5 { - "购买主动技能最大数量": 1, - "单武器绑定最大技能数量": 1, - "被动绑定最大技能数量": 4, + "绑定技能最大数量": 0, + "单武器绑定最大技能数量": 0, "禁止拉怪表": [], + "禁止伤怪表": [], "最大显示页": 20, "技能列表": [ { @@ -41,23 +44,36 @@ "喊话": "", "技能唯一": false, "全服唯一": false, - "隐藏": false, //开启后无法被主动购买 - "技能价格": 0, + "隐藏": false, + "技能价格": [], "限制等级": [], "限制进度": [], "触发设置": { - "触发模式": [ - "主动" //触发模式 CD 主动 打击 击杀 死亡 血量 蓝量 冲刺 装备 跳跃 - ], + "触发模式": [], "冷却": 0, "血量": 0, + "血量比例计算": false, + "大于血量": false, "蓝量": 0, - "物品条件": [] + "蓝量比例计算": false, + "大于蓝量": false, + "物品条件": [], + "Buff条件": [], + "环境条件": [], + "技能条件": [] }, "伤害敌怪": { "伤害": 0, "范围": 0 }, + "敌怪BUFF": { + "启用": false, + "BUFF": { + "Buff列表": [], + "范围": 0 + }, + "范围": 0 + }, "范围命令": { "命令": [], "范围": 0 @@ -78,23 +94,25 @@ }, "传送": { "启用": false, + "面向修正": false, "X轴位置": 0, "Y轴位置": 0 }, "无敌": { - "启用": true, //无敌帧，不保证完全无敌，算是我留的小坑，而且不想改，觉得这样挺好。 - "时长": 2000 + "启用": false, + "时长": 0 }, "范围Buff": { "Buff列表": [], "范围": 0 }, + "执行脚本": null, "弹幕": [ { - "弹幕ID": 132, - "伤害": 40, - "击退": 1.0, - "起始角度": 2, + "弹幕ID": 0, + "伤害": 0, + "击退": 0.0, + "起始角度": 0, "X轴起始位置": 0, "Y轴起始位置": 0, "X轴速度": 0.0, @@ -106,28 +124,41 @@ 0.0, 0.0 ], - "AI样式": 0, //目前只有0有效 - "射速": 10.0, + "AI样式": { + "样式": -1, + "发射弹幕": 0, + "伤害": 0, + "射速": 0, + "攻击范围": 50, + "环绕大小": 0, + "攻击间隔": 10, + "AI": [ + 0.0, + 0.0, + 0.0 + ] + }, + "射速": 0.0, "锁定怪物配置": { - "启用": true, - "弹幕锁定敌怪": true, - "以锁定敌怪为中心": true, - "锁定血量最少": true, //不开启则锁定距离最近 锁定方式: Boss > 小怪 - "范围": 200 + "启用": false, + "弹幕锁定敌怪": false, + "以锁定敌怪为中心": false, + "锁定血量最少": true, + "范围": 0 }, "延迟": 0, "弹幕循环": { "配置": [ { - "次数": 5, + "次数": 0, "X递增": 0, "Y递增": 0, - "角度递增": 20, - "圆面半径": 20, 把老版本画圆挪过来了 + "角度递增": 0, + "圆面半径": 0, "反向发射": false, - "延迟": 100, + "延迟": 0, "跟随玩家位置": false, - "根据角度计算新的点": true 配合画圆使用 + "根据角度计算新的点": false } ] } diff --git a/src/EconomicsAPI/README.md b/src/EconomicsAPI/README.md index e9e948511..8632cd203 100644 --- a/src/EconomicsAPI/README.md +++ b/src/EconomicsAPI/README.md @@ -21,37 +21,54 @@ > 配置文件位置：tshock/Economics/Economics.json ```json5 { - "货币名称": "魂力", - "货币转换率": 1.0, "保存时间间隔": 30, "显示收益": true, "禁用雕像": false, - "死亡掉落率": 0.0, "显示信息": true, "显示信息左移": 60, "显示信息下移": 0, - "查询提示": "[c/FFA500:你当前拥有{0}{1}个]", "渐变颜色": [ "[c/00ffbf:{0}]", "[c/1aecb8:{0}]", "[c/33d9b1:{0}]", - "[c/80a09c:{0}]", - "[c/998c95:{0}]", - "[c/b3798e:{0}]", - "[c/cc6687:{0}]", - "[c/e65380:{0}]", - "[c/ff4079:{0}]", - "[c/ed4086:{0}]", - "[c/db4094:{0}]", - "[c/9440c9:{0}]", - "[c/8240d7:{0}]", - "[c/7040e4:{0}]", - "[c/5e40f2:{0}]", - "[c/944eaa:{0}]", - "[c/b75680:{0}]", - "[c/db5d55:{0}]", - "[c/ed6040:{0}]", - "[c/ff642b:{0}]" + "[c/A6D5EA:{0}]", + "[c/A6BBEA:{0}]", + "[c/B7A6EA:{0}]", + "[c/A6EAB3:{0}]", + "[c/D5F0AA:{0}]", + "[c/F5F7AF:{0}]", + "[c/F8ECB0:{0}]", + "[c/F8DEB0:{0}]", + "[c/F8D0B0:{0}]", + "[c/F8B6B0:{0}]", + "[c/EFA9C6:{0}]", + "[c/00ffbf:{0}]", + "[c/1aecb8:{0}]" + ], + "货币配置": [ + { + "查询提示": "[c/FFA500: 当前拥有{0}{1}个]", + "货币名称": "魂力", + "兑换关系": [], + "获取关系": { + "获取方式": 0, //0 无法获取 1击杀怪物获取 + "给予数量": 0, + "比例": 1.0 + }, + "死亡掉落": { + "启用": false, + "掉落比例": 0.1 + }, + "悬浮文本": { + "启用": false, + "提示文本": "+{0}$", + "Color": [ + 255, + 255, + 255 + ] + } + } ] } ``` From f480dd8c8878dee9c09c39ee4f61a5928c9fadd3 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 22:34:59 +0800 Subject: [PATCH 06/14] feat skill DynamicDamage --- .../Model/Options/BaseProjtileOption.cs | 3 +++ src/Economics.Skill/Utils.cs | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Economics.Skill/Model/Options/BaseProjtileOption.cs b/src/Economics.Skill/Model/Options/BaseProjtileOption.cs index 880b7bcd3..7419a4cfd 100644 --- a/src/Economics.Skill/Model/Options/BaseProjtileOption.cs +++ b/src/Economics.Skill/Model/Options/BaseProjtileOption.cs @@ -35,6 +35,9 @@ public class BaseProjtileOption [JsonProperty("持续时间")] public int TimeLeft { get; set; } = -1; + [JsonProperty("动态伤害")] + public bool DynamicDamage { get; set; } + [JsonProperty("AI")] public float[] AI { get; set; } = new float[3]; diff --git a/src/Economics.Skill/Utils.cs b/src/Economics.Skill/Utils.cs index 66b1b2524..bb060b3bc 100644 --- a/src/Economics.Skill/Utils.cs +++ b/src/Economics.Skill/Utils.cs @@ -56,8 +56,9 @@ public static void EmitGeneralSkill(TSPlayer Player, SkillContext skill) } - internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, ProjectileOption option, NPC? lockNpc = null) + internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, ProjectileOption option, float Damage, NPC? lockNpc = null) { + var damage = option.DynamicDamage ? Damage / ply.SelectedItem.damage * option.Damage : Damage; foreach (var opt in option.ProjectileCycle.ProjectileCycles) { var _vel = vel; @@ -100,7 +101,7 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti _pos, _vel * (opt.Reverse ? -1 : 1), option.ID, - option.Damage, + Convert.ToInt32(Damage), option.Knockback, ply.Index, option.AI[0], @@ -141,7 +142,7 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti /// /// /// - public static void SpawnSkillProjectile(TSPlayer Player, SkillContext skill, Vector2 vel, Vector2 pos) + public static void SpawnSkillProjectile(TSPlayer Player, SkillContext skill, Vector2 vel, Vector2 pos, int Damage) { EmitGeneralSkill(Player, skill); foreach (var i in Enumerable.Range(0, skill.Projectiles.Count)) @@ -166,7 +167,7 @@ public static void SpawnSkillProjectile(TSPlayer Player, SkillContext skill, Vec } } } - CycleAdapr(Player, vel, pos, proj, lockNpc); + CycleAdapr(Player, vel, pos, proj, Damage, lockNpc); }).AddMilliSeconds(proj.Dealy * i); } } @@ -181,7 +182,7 @@ public static void EmitSkill(TSPlayer Player, SkillContext skill) var pos = Player.TPlayer.Center + Player.TPlayer.ItemOffSet(); //原始角度速度参数 var vel = Player.TPlayer.ItemOffSet(); - SpawnSkillProjectile(Player, skill, vel, pos); + SpawnSkillProjectile(Player, skill, vel, pos, Player.SelectedItem.damage); Interpreter.ExecuteScript(skill, Player, pos, vel); } @@ -191,7 +192,7 @@ public static void EmitSkill(GetDataHandlers.NewProjectileEventArgs e, SkillCont var pos = e.Position; //原始角度速度参数 var vel = e.Velocity; - SpawnSkillProjectile(e.Player, skill, vel, pos); + SpawnSkillProjectile(e.Player, skill, vel, pos, e.Damage); Interpreter.ExecuteScript(skill, e.Player, pos, vel); } } \ No newline at end of file From 9fc6968e31f568d6f2e69d0208c5570b8aff4a17 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 23:18:28 +0800 Subject: [PATCH 07/14] fix: ChattyBridge ForwardMsg Error --- src/ChattyBridge/Config.cs | 4 +++ src/ChattyBridge/Plugin.cs | 50 ++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/ChattyBridge/Config.cs b/src/ChattyBridge/Config.cs index 690e1a7bd..f3290cf0f 100644 --- a/src/ChattyBridge/Config.cs +++ b/src/ChattyBridge/Config.cs @@ -6,6 +6,10 @@ namespace ChattyBridge; [Config] public class Config : JsonConfigBase { + [LocalizedPropertyName(CultureType.English, "debug")] + [LocalizedPropertyName(CultureType.Chinese, "debug")] + public bool Debug { get; set; } = false; + [LocalizedPropertyName(CultureType.English, "forward_command")] [LocalizedPropertyName(CultureType.Chinese, "转发指令")] public bool ForwardCommand { get; set; } = false; diff --git a/src/ChattyBridge/Plugin.cs b/src/ChattyBridge/Plugin.cs index 3a3590b0b..ace33472c 100644 --- a/src/ChattyBridge/Plugin.cs +++ b/src/ChattyBridge/Plugin.cs @@ -2,9 +2,7 @@ using LazyAPI; using Newtonsoft.Json.Linq; using Rests; -using System.Net; using System.Reflection; -using System.Text; using System.Web; using Terraria; using TerrariaApi.Server; @@ -18,7 +16,7 @@ public class Plugin : LazyPlugin public override string Author => "少司命"; public override string Description => Assembly.GetExecutingAssembly().GetName().Name!; public override string Name => Assembly.GetExecutingAssembly().GetName().Name!; - public override Version Version => new Version(1, 0, 1, 2); + public override Version Version => new Version(1, 0, 1, 3); private readonly HttpClient _client = new (); @@ -53,15 +51,14 @@ protected override void Dispose(bool disposing) private static object HandleMsg(RestRequestArgs args) { var msg = args.Parameters["msg"]; - var isVer = args.Parameters["verify"] == Config.Instance.Verify; - if (!isVer) + TShock.Log.ConsoleDebug($"ChattyBridge Receive: {msg}"); + if (args.Parameters["verify"] != Config.Instance.Verify) { - return new RestObject("403"); + return new RestObject("403") { Response = "ChattyBridge Token Verify Error!" }; } try { - var sourceMsg = Encoding.UTF8.GetString(Convert.FromBase64String(msg)); - var json = JObject.Parse(sourceMsg); + var json = JObject.Parse(msg); if (json.TryGetValue("type", out var type)) { switch (type.ToString()) @@ -93,25 +90,23 @@ private static object HandleMsg(RestRequestArgs args) } catch (Exception ex) { - TShock.Log.ConsoleError(ex.ToString()); - return new RestObject("500"); + return new RestObject("500") { Response = $"An error occurred in the processing of the message: {ex.Message}" }; } - return new RestObject("200"); + return new RestObject("200") { Response = "Message Send Successfully!" }; } private void SendMsg(string msg) { - Task.Run(() => + Task.Run(async () => { - var baseStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(msg)); foreach (var host in Config.Instance.RestHost) { try { var url = $"http://{host}/chat"; - this.HttpGet(url, new Dictionary + await this.HttpGet(url, new Dictionary { - { "msg", baseStr }, + { "msg", msg }, { "verify", Config.Instance.Verify } }); } @@ -123,7 +118,7 @@ private void SendMsg(string msg) }); } - private void HttpGet(string url, Dictionary payload) + private async Task HttpGet(string url, Dictionary payload) { var urlBuilder = new UriBuilder(url); var param = HttpUtility.ParseQueryString(urlBuilder.Query); @@ -132,18 +127,19 @@ private void HttpGet(string url, Dictionary payload) param[key] = value; } urlBuilder.Query = param.ToString(); - var response = this._client.Send(new HttpRequestMessage(HttpMethod.Get, urlBuilder.ToString())); - switch (response.StatusCode) + var response = await this._client.GetAsync(urlBuilder.ToString()); + try + { + TShock.Log.ConsoleDebug($"ChattyBridge Send: {payload["msg"]}"); + response.EnsureSuccessStatusCode(); + } + catch (HttpRequestException e) + { + TShock.Log.ConsoleError($"[ChattyBridge] Error: {e.Message}"); + } + finally { - case HttpStatusCode.OK: - break; - case HttpStatusCode.Unauthorized: - TShock.Log.ConsoleError(GetString($"[聊天桥] 访问目标服务器验证失败:{url},请检查你的令牌是否配置正确!")); - break; - case HttpStatusCode.InternalServerError: - TShock.Log.ConsoleError(GetString($"[聊天桥] 目标服务器处理请求出错:{url}!")); - break; - + TShock.Log.ConsoleDebug($"ChattyBridage Response: {await response.Content.ReadAsStringAsync()}"); } } From 922d5b367a29e38225669fa667984edfe97a879a Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Mon, 20 Jan 2025 23:20:18 +0800 Subject: [PATCH 08/14] remove config option debug --- src/ChattyBridge/Config.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ChattyBridge/Config.cs b/src/ChattyBridge/Config.cs index f3290cf0f..690e1a7bd 100644 --- a/src/ChattyBridge/Config.cs +++ b/src/ChattyBridge/Config.cs @@ -6,10 +6,6 @@ namespace ChattyBridge; [Config] public class Config : JsonConfigBase { - [LocalizedPropertyName(CultureType.English, "debug")] - [LocalizedPropertyName(CultureType.Chinese, "debug")] - public bool Debug { get; set; } = false; - [LocalizedPropertyName(CultureType.English, "forward_command")] [LocalizedPropertyName(CultureType.Chinese, "转发指令")] public bool ForwardCommand { get; set; } = false; From 6f7ce869a3d0cdde675f8ea5aaa81cf9f63a7da3 Mon Sep 17 00:00:00 2001 From: github-merge-queue Date: Tue, 21 Jan 2025 01:07:16 +0000 Subject: [PATCH 09/14] New Crowdin translations [skip actions] --- src/DamageRuleLoot/i18n/en-US.po | 28 ++++++------ src/DamageRuleLoot/i18n/es-ES.po | 28 ++++++------ src/DamageRuleLoot/i18n/ru-RU.po | 28 ++++++------ src/LifemaxExtra/i18n/en-US.po | 74 ++++++++++++++++---------------- src/LifemaxExtra/i18n/es-ES.po | 74 ++++++++++++++++---------------- src/LifemaxExtra/i18n/ru-RU.po | 74 ++++++++++++++++---------------- 6 files changed, 153 insertions(+), 153 deletions(-) diff --git a/src/DamageRuleLoot/i18n/en-US.po b/src/DamageRuleLoot/i18n/en-US.po index 9f5b752d6..cbfe96aaa 100644 --- a/src/DamageRuleLoot/i18n/en-US.po +++ b/src/DamageRuleLoot/i18n/en-US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:15:44+0000\n" -"PO-Revision-Date: 2025-01-10 01:11\n" +"POT-Creation-Date: 2025-01-20 06:56:35+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "[c/F06576:【Stop Rotation】] Player:[c/F06576:{0}] " msgid "[c/F06576:【注意】]输出少于 [c/A7DDF0:{0:0.00%}] 禁止掉落宝藏袋:\n" msgstr "[c/F06576:【Attention】] Output less than [c/A7DDF0:{0:0.00%}] prohibits dropping of treasure bag:\n" -#: ../../DamageRuleLoot.cs:81 +#: ../../DamageRuleLoot.cs:82 #, csharp-format msgid "[c/FBF069:【暴击】] 玩家:[c/F06576:{0}] " msgstr "[c/FBF069:【Critical Hit】] Player: [c/F06576:{0}] " @@ -92,15 +92,15 @@ msgstr "[c/FBF069:【Damage Transfer】] Player: [c/F06576:{0}] " msgid "[c/FBF069:【转移】] 玩家:[c/F06576:{0}] " msgstr "[c/FBF069:【Transfer】] Player: [c/F06576:{0}] " -#: ../../DamageRuleLoot.cs:52 +#: ../../DamageRuleLoot.cs:53 msgid "[伤害规则掉落]重新加载配置完毕。" msgstr "[Damage Rule Loot] Configuration reload complete。" -#: ../../DamageRuleLoot.cs:348 +#: ../../DamageRuleLoot.cs:349 msgid "双子魔眼" msgstr "The Twins" -#: ../../DamageRuleLoot.cs:82 +#: ../../DamageRuleLoot.cs:83 #, csharp-format msgid "对象:[c/AEA3E4:{0}] 满血:[c/FBF069:{1}] " msgstr "Target: [c/AEA3E4:{0}] Full Health: [c/FBF069:{1}] " @@ -111,24 +111,24 @@ msgstr "Target: [c/AEA3E4:{0}] Full Health: [c/FBF069:{1}] " msgid "攻击对象:[c/AEA3E4:{0}] | " msgstr "Attack Target: [c/AEA3E4:{0}] | " -#: ../../DamageRuleLoot.cs:84 +#: ../../DamageRuleLoot.cs:85 #, csharp-format msgid "暴击数:[c/FBF069:{0}]" msgstr "Critical Hits: [c/FBF069:{0}]" -#: ../../DamageRuleLoot.cs:483 +#: ../../DamageRuleLoot.cs:479 msgid "月亮领主" msgstr "Moon Lord" -#: ../../DamageRuleLoot.cs:17 +#: ../../DamageRuleLoot.cs:18 msgid "根据输出排名榜决定是否掉落宝藏袋的惩罚，并对各个BOSS进行相对的伤害规则处理" msgstr "The penalty for dropping treasure bags is determined based on the output ranking list, and relative damage rules are dealt with for each BOSS." -#: ../../DamageRuleLoot.cs:430 +#: ../../DamageRuleLoot.cs:431 msgid "火星飞碟" msgstr "Martian Saucer" -#: ../../DamageRuleLoot.cs:452 +#: ../../DamageRuleLoot.cs:448 msgid "猪龙鱼公爵" msgstr "Duke Fishron" @@ -138,15 +138,15 @@ msgstr "Duke Fishron" msgid "生命:[c/FBF069:{0}]" msgstr "Life:[c/FBF069:{0}]" -#: ../../DamageRuleLoot.cs:659 +#: ../../DamageRuleLoot.cs:655 msgid "美杜莎" msgstr "MechQueen" -#: ../../DamageRuleLoot.cs:311 +#: ../../DamageRuleLoot.cs:312 msgid "血肉墙" msgstr "Wall of Flesh" -#: ../../DamageRuleLoot.cs:83 +#: ../../DamageRuleLoot.cs:84 #, csharp-format msgid "血量:[c/6DDA6D:{0}] 伤害:[c/F06576:{1}] " msgstr "Health: [c/6DDA6D:{0}] Damage: [c/F06576:{1}] " diff --git a/src/DamageRuleLoot/i18n/es-ES.po b/src/DamageRuleLoot/i18n/es-ES.po index 935a3083d..f32418a98 100644 --- a/src/DamageRuleLoot/i18n/es-ES.po +++ b/src/DamageRuleLoot/i18n/es-ES.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:15:44+0000\n" -"PO-Revision-Date: 2025-01-10 09:18\n" +"POT-Creation-Date: 2025-01-20 06:56:35+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "" msgid "[c/F06576:【注意】]输出少于 [c/A7DDF0:{0:0.00%}] 禁止掉落宝藏袋:\n" msgstr "" -#: ../../DamageRuleLoot.cs:81 +#: ../../DamageRuleLoot.cs:82 #, csharp-format msgid "[c/FBF069:【暴击】] 玩家:[c/F06576:{0}] " msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "[c/FBF069:【转移】] 玩家:[c/F06576:{0}] " msgstr "" -#: ../../DamageRuleLoot.cs:52 +#: ../../DamageRuleLoot.cs:53 msgid "[伤害规则掉落]重新加载配置完毕。" msgstr "" -#: ../../DamageRuleLoot.cs:348 +#: ../../DamageRuleLoot.cs:349 msgid "双子魔眼" msgstr "" -#: ../../DamageRuleLoot.cs:82 +#: ../../DamageRuleLoot.cs:83 #, csharp-format msgid "对象:[c/AEA3E4:{0}] 满血:[c/FBF069:{1}] " msgstr "" @@ -111,24 +111,24 @@ msgstr "" msgid "攻击对象:[c/AEA3E4:{0}] | " msgstr "" -#: ../../DamageRuleLoot.cs:84 +#: ../../DamageRuleLoot.cs:85 #, csharp-format msgid "暴击数:[c/FBF069:{0}]" msgstr "" -#: ../../DamageRuleLoot.cs:483 +#: ../../DamageRuleLoot.cs:479 msgid "月亮领主" msgstr "" -#: ../../DamageRuleLoot.cs:17 +#: ../../DamageRuleLoot.cs:18 msgid "根据输出排名榜决定是否掉落宝藏袋的惩罚，并对各个BOSS进行相对的伤害规则处理" msgstr "" -#: ../../DamageRuleLoot.cs:430 +#: ../../DamageRuleLoot.cs:431 msgid "火星飞碟" msgstr "" -#: ../../DamageRuleLoot.cs:452 +#: ../../DamageRuleLoot.cs:448 msgid "猪龙鱼公爵" msgstr "" @@ -138,15 +138,15 @@ msgstr "" msgid "生命:[c/FBF069:{0}]" msgstr "" -#: ../../DamageRuleLoot.cs:659 +#: ../../DamageRuleLoot.cs:655 msgid "美杜莎" msgstr "" -#: ../../DamageRuleLoot.cs:311 +#: ../../DamageRuleLoot.cs:312 msgid "血肉墙" msgstr "" -#: ../../DamageRuleLoot.cs:83 +#: ../../DamageRuleLoot.cs:84 #, csharp-format msgid "血量:[c/6DDA6D:{0}] 伤害:[c/F06576:{1}] " msgstr "" diff --git a/src/DamageRuleLoot/i18n/ru-RU.po b/src/DamageRuleLoot/i18n/ru-RU.po index 7d634efa6..92aa2aad2 100644 --- a/src/DamageRuleLoot/i18n/ru-RU.po +++ b/src/DamageRuleLoot/i18n/ru-RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:15:44+0000\n" -"PO-Revision-Date: 2025-01-10 09:18\n" +"POT-Creation-Date: 2025-01-20 06:56:35+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "" msgid "[c/F06576:【注意】]输出少于 [c/A7DDF0:{0:0.00%}] 禁止掉落宝藏袋:\n" msgstr "" -#: ../../DamageRuleLoot.cs:81 +#: ../../DamageRuleLoot.cs:82 #, csharp-format msgid "[c/FBF069:【暴击】] 玩家:[c/F06576:{0}] " msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "[c/FBF069:【转移】] 玩家:[c/F06576:{0}] " msgstr "" -#: ../../DamageRuleLoot.cs:52 +#: ../../DamageRuleLoot.cs:53 msgid "[伤害规则掉落]重新加载配置完毕。" msgstr "" -#: ../../DamageRuleLoot.cs:348 +#: ../../DamageRuleLoot.cs:349 msgid "双子魔眼" msgstr "" -#: ../../DamageRuleLoot.cs:82 +#: ../../DamageRuleLoot.cs:83 #, csharp-format msgid "对象:[c/AEA3E4:{0}] 满血:[c/FBF069:{1}] " msgstr "" @@ -111,24 +111,24 @@ msgstr "" msgid "攻击对象:[c/AEA3E4:{0}] | " msgstr "" -#: ../../DamageRuleLoot.cs:84 +#: ../../DamageRuleLoot.cs:85 #, csharp-format msgid "暴击数:[c/FBF069:{0}]" msgstr "" -#: ../../DamageRuleLoot.cs:483 +#: ../../DamageRuleLoot.cs:479 msgid "月亮领主" msgstr "" -#: ../../DamageRuleLoot.cs:17 +#: ../../DamageRuleLoot.cs:18 msgid "根据输出排名榜决定是否掉落宝藏袋的惩罚，并对各个BOSS进行相对的伤害规则处理" msgstr "" -#: ../../DamageRuleLoot.cs:430 +#: ../../DamageRuleLoot.cs:431 msgid "火星飞碟" msgstr "" -#: ../../DamageRuleLoot.cs:452 +#: ../../DamageRuleLoot.cs:448 msgid "猪龙鱼公爵" msgstr "" @@ -138,15 +138,15 @@ msgstr "" msgid "生命:[c/FBF069:{0}]" msgstr "" -#: ../../DamageRuleLoot.cs:659 +#: ../../DamageRuleLoot.cs:655 msgid "美杜莎" msgstr "" -#: ../../DamageRuleLoot.cs:311 +#: ../../DamageRuleLoot.cs:312 msgid "血肉墙" msgstr "" -#: ../../DamageRuleLoot.cs:83 +#: ../../DamageRuleLoot.cs:84 #, csharp-format msgid "血量:[c/6DDA6D:{0}] 伤害:[c/F06576:{1}] " msgstr "" diff --git a/src/LifemaxExtra/i18n/en-US.po b/src/LifemaxExtra/i18n/en-US.po index dcdeca2ec..61967d9dd 100644 --- a/src/LifemaxExtra/i18n/en-US.po +++ b/src/LifemaxExtra/i18n/en-US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:16:05+0000\n" -"PO-Revision-Date: 2025-01-10 01:11\n" +"POT-Creation-Date: 2025-01-20 06:56:55+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -17,78 +17,78 @@ msgstr "" "X-Crowdin-File-ID: 1186\n" "Language: en_US\n" -#: ../../PluginContainer.cs:233 +#: ../../PluginContainer.cs:234 msgid "/hp enh <提升数值>" msgstr "/hp enh " -#: ../../PluginContainer.cs:231 +#: ../../PluginContainer.cs:232 msgid "/hp enh <玩家> <提升数值>" msgstr "/hp enh " -#: ../../PluginContainer.cs:234 +#: ../../PluginContainer.cs:235 msgid "/hp set <数值>" msgstr "/hp set " -#: ../../PluginContainer.cs:232 +#: ../../PluginContainer.cs:233 msgid "/hp set <玩家> <数值>" msgstr "/hp set " -#: ../../PluginContainer.cs:135 +#: ../../PluginContainer.cs:136 msgid "/mp enh <提升数值>" msgstr "/mp enh " -#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:134 msgid "/mp enh <玩家> <提升数值>" msgstr "/mp enh " -#: ../../PluginContainer.cs:136 +#: ../../PluginContainer.cs:137 msgid "/mp set <数值>" msgstr "/mp set " -#: ../../PluginContainer.cs:134 +#: ../../PluginContainer.cs:135 msgid "/mp set <玩家> <数值>" msgstr "/mp set " -#: ../../PluginContainer.cs:58 +#: ../../PluginContainer.cs:59 msgid "你没有开启SSC，LifemaxExtra无法正常运行" msgstr "If you do not enable SSC, LifemaxExtra cannot run normally." -#: ../../PluginContainer.cs:147 +#: ../../PluginContainer.cs:148 msgid "最大蓝量不得超过{0}!" msgstr "Maximum mana value must not exceed {0}!" -#: ../../PluginContainer.cs:158 +#: ../../PluginContainer.cs:159 msgid "最大血量不得超过{0}!" msgstr "Maximum health value must not exceed {0}!" -#: ../../PluginContainer.cs:172 -#: ../../PluginContainer.cs:209 +#: ../../PluginContainer.cs:173 +#: ../../PluginContainer.cs:210 #, csharp-format msgid "成功为玩家`{0}`提高{1}血量上限!" msgstr "Successfully increased {1} health limit for player `{0}`!" -#: ../../PluginContainer.cs:74 -#: ../../PluginContainer.cs:111 +#: ../../PluginContainer.cs:75 +#: ../../PluginContainer.cs:112 #, csharp-format msgid "成功为玩家`{0}`提高{1}魔法上限!" msgstr "Successfully increased {1} mana limit for player `{0}`!" -#: ../../PluginContainer.cs:192 +#: ../../PluginContainer.cs:193 #, csharp-format msgid "成功设置玩家`{0}`血量上限!" msgstr "Successfully set player `{0}` health limit!" -#: ../../PluginContainer.cs:221 +#: ../../PluginContainer.cs:222 #, csharp-format msgid "成功设置玩家`{0}`血量上限{1}!" msgstr "Successfully set player `{0}` health limit {1}!" -#: ../../PluginContainer.cs:94 +#: ../../PluginContainer.cs:95 #, csharp-format msgid "成功设置玩家`{0}`魔法上限!" msgstr "Successfully set player `{0}` mana limit!" -#: ../../PluginContainer.cs:123 +#: ../../PluginContainer.cs:124 #, csharp-format msgid "成功设置玩家`{0}`魔法上限{1}!" msgstr "Successfully set player `{0}` mana limit {1}!" @@ -97,31 +97,31 @@ msgstr "Successfully set player `{0}` mana limit {1}!" msgid "提升生命值上限" msgstr "Increase health and mana limit" -#: ../../PluginContainer.cs:248 -#: ../../PluginContainer.cs:279 +#: ../../PluginContainer.cs:249 +#: ../../PluginContainer.cs:280 msgid "生命值无法大于{0}!" msgstr "Health value cannot be greater than {0}!" -#: ../../PluginContainer.cs:83 -#: ../../PluginContainer.cs:103 -#: ../../PluginContainer.cs:181 -#: ../../PluginContainer.cs:201 +#: ../../PluginContainer.cs:84 +#: ../../PluginContainer.cs:104 +#: ../../PluginContainer.cs:182 +#: ../../PluginContainer.cs:202 msgid "目标玩家不在线!" msgstr "Player is not online!" -#: ../../PluginContainer.cs:132 -#: ../../PluginContainer.cs:230 +#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:231 msgid "语法错误" msgstr "Incorrect syntax" -#: ../../PluginContainer.cs:78 -#: ../../PluginContainer.cs:98 -#: ../../PluginContainer.cs:115 -#: ../../PluginContainer.cs:127 -#: ../../PluginContainer.cs:176 -#: ../../PluginContainer.cs:196 -#: ../../PluginContainer.cs:213 -#: ../../PluginContainer.cs:225 +#: ../../PluginContainer.cs:79 +#: ../../PluginContainer.cs:99 +#: ../../PluginContainer.cs:116 +#: ../../PluginContainer.cs:128 +#: ../../PluginContainer.cs:177 +#: ../../PluginContainer.cs:197 +#: ../../PluginContainer.cs:214 +#: ../../PluginContainer.cs:226 msgid "输入的数值有误!" msgstr "Wrong value entered!" diff --git a/src/LifemaxExtra/i18n/es-ES.po b/src/LifemaxExtra/i18n/es-ES.po index 660506d44..552299187 100644 --- a/src/LifemaxExtra/i18n/es-ES.po +++ b/src/LifemaxExtra/i18n/es-ES.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:16:05+0000\n" -"PO-Revision-Date: 2025-01-10 09:18\n" +"POT-Creation-Date: 2025-01-20 06:56:55+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -17,78 +17,78 @@ msgstr "" "X-Crowdin-File-ID: 1186\n" "Language: es_ES\n" -#: ../../PluginContainer.cs:233 +#: ../../PluginContainer.cs:234 msgid "/hp enh <提升数值>" msgstr "" -#: ../../PluginContainer.cs:231 +#: ../../PluginContainer.cs:232 msgid "/hp enh <玩家> <提升数值>" msgstr "" -#: ../../PluginContainer.cs:234 +#: ../../PluginContainer.cs:235 msgid "/hp set <数值>" msgstr "" -#: ../../PluginContainer.cs:232 +#: ../../PluginContainer.cs:233 msgid "/hp set <玩家> <数值>" msgstr "" -#: ../../PluginContainer.cs:135 +#: ../../PluginContainer.cs:136 msgid "/mp enh <提升数值>" msgstr "" -#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:134 msgid "/mp enh <玩家> <提升数值>" msgstr "" -#: ../../PluginContainer.cs:136 +#: ../../PluginContainer.cs:137 msgid "/mp set <数值>" msgstr "" -#: ../../PluginContainer.cs:134 +#: ../../PluginContainer.cs:135 msgid "/mp set <玩家> <数值>" msgstr "" -#: ../../PluginContainer.cs:58 +#: ../../PluginContainer.cs:59 msgid "你没有开启SSC，LifemaxExtra无法正常运行" msgstr "" -#: ../../PluginContainer.cs:147 +#: ../../PluginContainer.cs:148 msgid "最大蓝量不得超过{0}!" msgstr "" -#: ../../PluginContainer.cs:158 +#: ../../PluginContainer.cs:159 msgid "最大血量不得超过{0}!" msgstr "" -#: ../../PluginContainer.cs:172 -#: ../../PluginContainer.cs:209 +#: ../../PluginContainer.cs:173 +#: ../../PluginContainer.cs:210 #, csharp-format msgid "成功为玩家`{0}`提高{1}血量上限!" msgstr "" -#: ../../PluginContainer.cs:74 -#: ../../PluginContainer.cs:111 +#: ../../PluginContainer.cs:75 +#: ../../PluginContainer.cs:112 #, csharp-format msgid "成功为玩家`{0}`提高{1}魔法上限!" msgstr "" -#: ../../PluginContainer.cs:192 +#: ../../PluginContainer.cs:193 #, csharp-format msgid "成功设置玩家`{0}`血量上限!" msgstr "" -#: ../../PluginContainer.cs:221 +#: ../../PluginContainer.cs:222 #, csharp-format msgid "成功设置玩家`{0}`血量上限{1}!" msgstr "" -#: ../../PluginContainer.cs:94 +#: ../../PluginContainer.cs:95 #, csharp-format msgid "成功设置玩家`{0}`魔法上限!" msgstr "" -#: ../../PluginContainer.cs:123 +#: ../../PluginContainer.cs:124 #, csharp-format msgid "成功设置玩家`{0}`魔法上限{1}!" msgstr "" @@ -97,31 +97,31 @@ msgstr "" msgid "提升生命值上限" msgstr "" -#: ../../PluginContainer.cs:248 -#: ../../PluginContainer.cs:279 +#: ../../PluginContainer.cs:249 +#: ../../PluginContainer.cs:280 msgid "生命值无法大于{0}!" msgstr "" -#: ../../PluginContainer.cs:83 -#: ../../PluginContainer.cs:103 -#: ../../PluginContainer.cs:181 -#: ../../PluginContainer.cs:201 +#: ../../PluginContainer.cs:84 +#: ../../PluginContainer.cs:104 +#: ../../PluginContainer.cs:182 +#: ../../PluginContainer.cs:202 msgid "目标玩家不在线!" msgstr "" -#: ../../PluginContainer.cs:132 -#: ../../PluginContainer.cs:230 +#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:231 msgid "语法错误" msgstr "" -#: ../../PluginContainer.cs:78 -#: ../../PluginContainer.cs:98 -#: ../../PluginContainer.cs:115 -#: ../../PluginContainer.cs:127 -#: ../../PluginContainer.cs:176 -#: ../../PluginContainer.cs:196 -#: ../../PluginContainer.cs:213 -#: ../../PluginContainer.cs:225 +#: ../../PluginContainer.cs:79 +#: ../../PluginContainer.cs:99 +#: ../../PluginContainer.cs:116 +#: ../../PluginContainer.cs:128 +#: ../../PluginContainer.cs:177 +#: ../../PluginContainer.cs:197 +#: ../../PluginContainer.cs:214 +#: ../../PluginContainer.cs:226 msgid "输入的数值有误!" msgstr "" diff --git a/src/LifemaxExtra/i18n/ru-RU.po b/src/LifemaxExtra/i18n/ru-RU.po index f276c4444..a328d1674 100644 --- a/src/LifemaxExtra/i18n/ru-RU.po +++ b/src/LifemaxExtra/i18n/ru-RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: tshock-chinese-plugin\n" -"POT-Creation-Date: 2025-01-08 13:16:05+0000\n" -"PO-Revision-Date: 2025-01-10 09:18\n" +"POT-Creation-Date: 2025-01-20 06:56:55+0000\n" +"PO-Revision-Date: 2025-01-21 01:07\n" "Last-Translator: \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -17,78 +17,78 @@ msgstr "" "X-Crowdin-File-ID: 1186\n" "Language: ru_RU\n" -#: ../../PluginContainer.cs:233 +#: ../../PluginContainer.cs:234 msgid "/hp enh <提升数值>" msgstr "" -#: ../../PluginContainer.cs:231 +#: ../../PluginContainer.cs:232 msgid "/hp enh <玩家> <提升数值>" msgstr "" -#: ../../PluginContainer.cs:234 +#: ../../PluginContainer.cs:235 msgid "/hp set <数值>" msgstr "" -#: ../../PluginContainer.cs:232 +#: ../../PluginContainer.cs:233 msgid "/hp set <玩家> <数值>" msgstr "" -#: ../../PluginContainer.cs:135 +#: ../../PluginContainer.cs:136 msgid "/mp enh <提升数值>" msgstr "" -#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:134 msgid "/mp enh <玩家> <提升数值>" msgstr "" -#: ../../PluginContainer.cs:136 +#: ../../PluginContainer.cs:137 msgid "/mp set <数值>" msgstr "" -#: ../../PluginContainer.cs:134 +#: ../../PluginContainer.cs:135 msgid "/mp set <玩家> <数值>" msgstr "" -#: ../../PluginContainer.cs:58 +#: ../../PluginContainer.cs:59 msgid "你没有开启SSC，LifemaxExtra无法正常运行" msgstr "" -#: ../../PluginContainer.cs:147 +#: ../../PluginContainer.cs:148 msgid "最大蓝量不得超过{0}!" msgstr "" -#: ../../PluginContainer.cs:158 +#: ../../PluginContainer.cs:159 msgid "最大血量不得超过{0}!" msgstr "" -#: ../../PluginContainer.cs:172 -#: ../../PluginContainer.cs:209 +#: ../../PluginContainer.cs:173 +#: ../../PluginContainer.cs:210 #, csharp-format msgid "成功为玩家`{0}`提高{1}血量上限!" msgstr "" -#: ../../PluginContainer.cs:74 -#: ../../PluginContainer.cs:111 +#: ../../PluginContainer.cs:75 +#: ../../PluginContainer.cs:112 #, csharp-format msgid "成功为玩家`{0}`提高{1}魔法上限!" msgstr "" -#: ../../PluginContainer.cs:192 +#: ../../PluginContainer.cs:193 #, csharp-format msgid "成功设置玩家`{0}`血量上限!" msgstr "" -#: ../../PluginContainer.cs:221 +#: ../../PluginContainer.cs:222 #, csharp-format msgid "成功设置玩家`{0}`血量上限{1}!" msgstr "" -#: ../../PluginContainer.cs:94 +#: ../../PluginContainer.cs:95 #, csharp-format msgid "成功设置玩家`{0}`魔法上限!" msgstr "" -#: ../../PluginContainer.cs:123 +#: ../../PluginContainer.cs:124 #, csharp-format msgid "成功设置玩家`{0}`魔法上限{1}!" msgstr "" @@ -97,31 +97,31 @@ msgstr "" msgid "提升生命值上限" msgstr "" -#: ../../PluginContainer.cs:248 -#: ../../PluginContainer.cs:279 +#: ../../PluginContainer.cs:249 +#: ../../PluginContainer.cs:280 msgid "生命值无法大于{0}!" msgstr "" -#: ../../PluginContainer.cs:83 -#: ../../PluginContainer.cs:103 -#: ../../PluginContainer.cs:181 -#: ../../PluginContainer.cs:201 +#: ../../PluginContainer.cs:84 +#: ../../PluginContainer.cs:104 +#: ../../PluginContainer.cs:182 +#: ../../PluginContainer.cs:202 msgid "目标玩家不在线!" msgstr "" -#: ../../PluginContainer.cs:132 -#: ../../PluginContainer.cs:230 +#: ../../PluginContainer.cs:133 +#: ../../PluginContainer.cs:231 msgid "语法错误" msgstr "" -#: ../../PluginContainer.cs:78 -#: ../../PluginContainer.cs:98 -#: ../../PluginContainer.cs:115 -#: ../../PluginContainer.cs:127 -#: ../../PluginContainer.cs:176 -#: ../../PluginContainer.cs:196 -#: ../../PluginContainer.cs:213 -#: ../../PluginContainer.cs:225 +#: ../../PluginContainer.cs:79 +#: ../../PluginContainer.cs:99 +#: ../../PluginContainer.cs:116 +#: ../../PluginContainer.cs:128 +#: ../../PluginContainer.cs:177 +#: ../../PluginContainer.cs:197 +#: ../../PluginContainer.cs:214 +#: ../../PluginContainer.cs:226 msgid "输入的数值有误!" msgstr "" From 6842d0361d21e90f25c9b2e3506932b699032ed2 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Tue, 21 Jan 2025 17:42:31 +0800 Subject: [PATCH 10/14] update skill buy limit and proj ai use player index --- src/Economics.Skill/Model/SkillContext.cs | 3 +++ src/Economics.Skill/Utils.cs | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Economics.Skill/Model/SkillContext.cs b/src/Economics.Skill/Model/SkillContext.cs index cedddacd3..6303725df 100644 --- a/src/Economics.Skill/Model/SkillContext.cs +++ b/src/Economics.Skill/Model/SkillContext.cs @@ -37,6 +37,9 @@ public class SkillContext [JsonProperty("限制进度")] public List LimitProgress { get; set; } = new(); + [JsonProperty("限制技能")] + public List LimitSkill { get; set; } = new(); + [JsonProperty("触发设置")] public SkillSparkOption SkillSpark { get; set; } = new(); diff --git a/src/Economics.Skill/Utils.cs b/src/Economics.Skill/Utils.cs index bb060b3bc..29d7718b8 100644 --- a/src/Economics.Skill/Utils.cs +++ b/src/Economics.Skill/Utils.cs @@ -32,7 +32,10 @@ public static SkillContext VerifyBindSkill(TSPlayer Player, int index) { throw new Exception(GetString($"当前进度无法购买此技能，限制进度:{string.Join(", ", context.LimitProgress)}")); } - + if (!context.LimitSkill.All(i => Skill.PlayerSKillManager.HasSkill(Player.Name, i))) + { + throw new Exception(GetString($"你当前等级无法购买此技能，限制必须购买技能:{string.Join(", ", context.LimitSkill)}")); + } var bind = Skill.PlayerSKillManager.QuerySkillByItem(Player.Name, Player.SelectedItem.netID).Where(s => s.Skill != null && !s.Skill.Hidden); return context.SkillUnique && Skill.PlayerSKillManager.HasSkill(Player.Name, index) ? throw new Exception(GetString("此技能是唯一的不能重复绑定!")) @@ -104,9 +107,9 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti Convert.ToInt32(Damage), option.Knockback, ply.Index, - option.AI[0], - option.AI[1], - option.AI[2], + option.AI[0] == -1 ? ply.Index : option.AI[0], + option.AI[1] == -1 ? ply.Index : option.AI[1], + option.AI[2] == -1 ? ply.Index : option.AI[2], option.TimeLeft, guid); TSPlayer.All.SendData(PacketTypes.ProjectileNew, "", index); From a09811d64062b1abd685a561283783c84f633cd0 Mon Sep 17 00:00:00 2001 From: Controllerdestiny <523321293@qq.com> Date: Tue, 21 Jan 2025 17:44:19 +0800 Subject: [PATCH 11/14] update skill Readme --- src/Economics.Skill/README.md | 2 +- src/Economics.Skill/Utils.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Economics.Skill/README.md b/src/Economics.Skill/README.md index 950f55c8b..b97a80adf 100644 --- a/src/Economics.Skill/README.md +++ b/src/Economics.Skill/README.md @@ -120,7 +120,7 @@ "自动方向": true, "持续时间": -1, "AI": [ - 0.0, + 0.0, //-1使用玩家索引 0.0, 0.0 ], diff --git a/src/Economics.Skill/Utils.cs b/src/Economics.Skill/Utils.cs index 29d7718b8..7923a9f80 100644 --- a/src/Economics.Skill/Utils.cs +++ b/src/Economics.Skill/Utils.cs @@ -107,9 +107,9 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti Convert.ToInt32(Damage), option.Knockback, ply.Index, - option.AI[0] == -1 ? ply.Index : option.AI[0], - option.AI[1] == -1 ? ply.Index : option.AI[1], - option.AI[2] == -1 ? ply.Index : option.AI[2], + option.AI[0] == -1f ? ply.Index : option.AI[0], + option.AI[1] == -1f ? ply.Index : option.AI[1], + option.AI[2] == -1f ? ply.Index : option.AI[2], option.TimeLeft, guid); TSPlayer.All.SendData(PacketTypes.ProjectileNew, "", index); From 3aed0b3385c329fc9b758cf1e9a9a388b03f5c92 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 21 Jan 2025 20:10:19 +0000 Subject: [PATCH 12/14] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=88=97=E8=A1=A8=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins.json b/Plugins.json index 15df6c4fc..7f3803be9 100644 --- a/Plugins.json +++ b/Plugins.json @@ -2521,7 +2521,7 @@ }, { "Name": "VBY.GameContentModify", - "Version": "1.9.2.120", + "Version": "1.9.2.121", "Author": "yu", "Description": { "en-US": "一些游戏内容的修改 For Terraria v1.4.4.9", @@ -2543,7 +2543,7 @@ }, { "Name": "VBY.OtherCommand", - "Version": "1.0.0.120", + "Version": "1.0.0.121", "Author": "yu", "Description": { "en-US": "一些其他的辅助命令", From 4d9bde5651e84cd5fa430aed5be70e936c9ec58c Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 22 Jan 2025 16:40:11 +0000 Subject: [PATCH 13/14] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AF=91=E6=96=87=E6=A8=A1=E6=9D=BF,=20=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins.json | 10 +++---- src/Economics.RPG/i18n/template.pot | 40 +++++++++++++++------------ src/Economics.Skill/i18n/template.pot | 17 ++++++++---- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Plugins.json b/Plugins.json index 7f3803be9..9e0d9b8ab 100644 --- a/Plugins.json +++ b/Plugins.json @@ -1080,7 +1080,7 @@ }, { "Name": "Economics.RPG", - "Version": "2.0.0.2", + "Version": "2.0.0.3", "Author": "少司命", "Description": { "en-US": "Provides RPG gameplay!", @@ -1125,7 +1125,7 @@ }, { "Name": "Economics.Skill", - "Version": "2.0.0.8", + "Version": "2.0.0.9", "Author": "少司命", "Description": { "en-US": "Let players have skills!", @@ -1194,7 +1194,7 @@ }, { "Name": "EconomicsAPI", - "Version": "2.0.0.3", + "Version": "2.0.0.4", "Author": "少司命", "Description": { "en-US": "Provides economic system API", @@ -2521,7 +2521,7 @@ }, { "Name": "VBY.GameContentModify", - "Version": "1.9.2.121", + "Version": "1.9.2.122", "Author": "yu", "Description": { "en-US": "一些游戏内容的修改 For Terraria v1.4.4.9", @@ -2543,7 +2543,7 @@ }, { "Name": "VBY.OtherCommand", - "Version": "1.0.0.121", + "Version": "1.0.0.122", "Author": "yu", "Description": { "en-US": "一些其他的辅助命令", diff --git a/src/Economics.RPG/i18n/template.pot b/src/Economics.RPG/i18n/template.pot index adcde92ad..720be9536 100644 --- a/src/Economics.RPG/i18n/template.pot +++ b/src/Economics.RPG/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Economics.RPG\n" -"POT-Creation-Date: 2025-01-08 13:15:52+0000\n" -"PO-Revision-Date: 2025-01-08 13:15:53+0000\n" +"POT-Creation-Date: 2025-01-22 16:39:23+0000\n" +"PO-Revision-Date: 2025-01-22 16:39:23+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,26 +15,26 @@ msgstr "" msgid "{0} 与 {1} 之间循环引用" msgstr "" -#: ../../Command.cs:60 +#: ../../Command.cs:65 #, csharp-format msgid "/rank {0}({1})" msgstr "" -#: ../../Command.cs:113 +#: ../../Command.cs:118 msgid "你因重置等级被踢出!" msgstr "" #: ../../Command.cs:17 -#: ../../Command.cs:101 +#: ../../Command.cs:106 msgid "你必须登陆才能使用此命令!" msgstr "" -#: ../../Command.cs:52 +#: ../../Command.cs:57 #, csharp-format msgid "升级所需 ({0})" msgstr "" -#: ../../Command.cs:87 +#: ../../Command.cs:92 #, csharp-format msgid "升级所需 {0}" msgstr "" @@ -44,13 +44,13 @@ msgstr "" msgid "升级职业: {0}" msgstr "" -#: ../../Command.cs:34 -#: ../../Command.cs:69 +#: ../../Command.cs:39 +#: ../../Command.cs:74 #, csharp-format msgid "升级至 {0} 需要手持武器{1}！ " msgstr "" -#: ../../Command.cs:92 +#: ../../Command.cs:97 msgid "已经满级了，无法继续升级!" msgstr "" @@ -59,18 +59,18 @@ msgstr "" msgid "当前职业: {0}" msgstr "" -#: ../../Command.cs:39 -#: ../../Command.cs:74 +#: ../../Command.cs:44 +#: ../../Command.cs:79 #, csharp-format msgid "必须满足进度限制:{0}" msgstr "" -#: ../../Command.cs:105 +#: ../../Command.cs:110 msgid "您已成功重置等级!" msgstr "" -#: ../../Command.cs:44 -#: ../../Command.cs:79 +#: ../../Command.cs:49 +#: ../../Command.cs:84 #, csharp-format msgid "成功升级至 {0}!" msgstr "" @@ -79,7 +79,11 @@ msgstr "" msgid "提供RPG玩法!" msgstr "" -#: ../../Command.cs:123 +#: ../../Command.cs:34 +msgid "此职业全服唯一，已经存在此职业无法升级。" +msgstr "" + +#: ../../Command.cs:128 msgid "玩家等级信息重置成功!" msgstr "" @@ -93,11 +97,11 @@ msgstr "" msgid "等级 {0} 空引用等级 {1}" msgstr "" -#: ../../Command.cs:127 +#: ../../Command.cs:132 msgid "语法错误，正确语法:" msgstr "" -#: ../../Command.cs:57 +#: ../../Command.cs:62 msgid "请选择一个升级:" msgstr "" diff --git a/src/Economics.Skill/i18n/template.pot b/src/Economics.Skill/i18n/template.pot index bda2a08b1..f8fb5d019 100644 --- a/src/Economics.Skill/i18n/template.pot +++ b/src/Economics.Skill/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Economics.Skill\n" -"POT-Creation-Date: 2025-01-09 09:33:53+0000\n" -"PO-Revision-Date: 2025-01-09 09:33:53+0000\n" +"POT-Creation-Date: 2025-01-22 16:39:24+0000\n" +"PO-Revision-Date: 2025-01-22 16:39:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,6 +66,11 @@ msgstr "" msgid "你并未绑定技能!" msgstr "" +#: ../../Utils.cs:37 +#, csharp-format +msgid "你当前等级无法购买此技能，限制必须购买技能:{0}" +msgstr "" + #: ../../Utils.cs:28 #, csharp-format msgid "你当前等级无法购买此技能，限制等级:{0}" @@ -126,7 +131,7 @@ msgstr "" msgid "技能列表 ({0}/{1})：" msgstr "" -#: ../../Utils.cs:42 +#: ../../Utils.cs:45 msgid "技能已超过规定的最大绑定数量!" msgstr "" @@ -157,7 +162,7 @@ msgstr "" msgid "查询成功!" msgstr "" -#: ../../Utils.cs:40 +#: ../../Utils.cs:43 msgid "此技能全服唯一已经有其他人绑定了此技能!" msgstr "" @@ -165,11 +170,11 @@ msgstr "" msgid "此技能无法被购买!" msgstr "" -#: ../../Utils.cs:38 +#: ../../Utils.cs:41 msgid "此技能是唯一的不能重复绑定!" msgstr "" -#: ../../Utils.cs:44 +#: ../../Utils.cs:47 msgid "此武器已超过规定的最大绑定数量!" msgstr "" From fd4be2071bd6d85e273d27373a2f9119fbf1c3d0 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 22 Jan 2025 17:43:19 +0000 Subject: [PATCH 14/14] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AF=91=E6=96=87=E6=A8=A1=E6=9D=BF,=20=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins.json | 18 ++++++++-------- src/BuildMaster/i18n/template.pot | 10 ++++----- src/Challenger/i18n/template.pot | 6 +++--- src/ChattyBridge/i18n/template.pot | 18 ++++------------ src/HouseRegion/i18n/template.pot | 6 +++--- src/ModifyWeapons/i18n/template.pot | 32 ++++++++++++++--------------- 6 files changed, 40 insertions(+), 50 deletions(-) diff --git a/Plugins.json b/Plugins.json index 9e0d9b8ab..58f527968 100644 --- a/Plugins.json +++ b/Plugins.json @@ -623,7 +623,7 @@ }, { "Name": "ChattyBridge", - "Version": "1.0.1.2", + "Version": "1.0.1.3", "Author": "少司命", "Description": { "en-US": "ChattyBridge", @@ -2669,14 +2669,14 @@ "Author": "z枳", "Description": { "en-US": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "de-DE": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "it-IT": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "fr-FR": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "es-ES": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "ru-RU": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "zh-CN": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "pt-BR": "Player management, provides to modify any player information, allows players to back up, roll back, etc.", - "pl-PL": "Player management, provides to modify any player information, allows players to back up, roll back, etc." + "de-DE": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "it-IT": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "fr-FR": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "es-ES": "Gestión de jugadores, que brinda la posibilidad de modificar cualquier información del jugador, permitiéndoles realizar copias de seguridad, retroceder, etc.", + "ru-RU": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "zh-CN": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "pt-BR": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作", + "pl-PL": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作" }, "AssemblyName": "ZHIPlayerManager", "Path": "ZHIPlayerManager.dll", diff --git a/src/BuildMaster/i18n/template.pot b/src/BuildMaster/i18n/template.pot index 4724488ab..36b482c15 100644 --- a/src/BuildMaster/i18n/template.pot +++ b/src/BuildMaster/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: BuildMaster\n" -"POT-Creation-Date: 2025-01-08 13:15:35+0000\n" -"PO-Revision-Date: 2025-01-08 13:15:35+0000\n" +"POT-Creation-Date: 2025-01-22 17:42:12+0000\n" +"PO-Revision-Date: 2025-01-22 17:42:12+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -322,7 +322,6 @@ msgstr "" msgid "成功设置房间(id:{0}) 的评分时间为{1}秒" msgstr "" -#: ../../BuildPlayer.cs:69 #: ../../MainPlugin.cs:353 #: ../../MainPlugin.cs:378 #: ../../MainPlugin.cs:403 @@ -338,6 +337,7 @@ msgstr "" #: ../../MainPlugin.cs:668 #: ../../MainPlugin.cs:692 #: ../../MainPlugin.cs:756 +#: ../../BuildPlayer.cs:69 msgid "房间不存在" msgstr "" @@ -451,12 +451,12 @@ msgstr "" msgid "点未选取完毕" msgstr "" -#: ../../BuildPlayer.cs:56 -#: ../../BuildPlayer.cs:78 #: ../../MainPlugin.cs:774 #: ../../MainPlugin.cs:800 #: ../../MainPlugin.cs:805 #: ../../MainPlugin.cs:861 +#: ../../BuildPlayer.cs:56 +#: ../../BuildPlayer.cs:78 msgid "玩家 " msgstr "" diff --git a/src/Challenger/i18n/template.pot b/src/Challenger/i18n/template.pot index 9f167f1ad..374d9f54a 100644 --- a/src/Challenger/i18n/template.pot +++ b/src/Challenger/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Challenger\n" -"POT-Creation-Date: 2025-01-08 13:15:39+0000\n" -"PO-Revision-Date: 2025-01-08 13:15:39+0000\n" +"POT-Creation-Date: 2025-01-22 17:42:16+0000\n" +"PO-Revision-Date: 2025-01-22 17:42:16+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -403,8 +403,8 @@ msgstr "" msgid "冲刺类饰品冷却完成" msgstr "" -#: ../../Challenger.CNPCs/Skeletron.cs:164 #: ../../Challenger.CNPCs/EaterofWorldsHead.cs:39 +#: ../../Challenger.CNPCs/Skeletron.cs:164 msgid "创死你" msgstr "" diff --git a/src/ChattyBridge/i18n/template.pot b/src/ChattyBridge/i18n/template.pot index 2445d94f2..cfdd44d76 100644 --- a/src/ChattyBridge/i18n/template.pot +++ b/src/ChattyBridge/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ChattyBridge\n" -"POT-Creation-Date: 2025-01-11 17:27:41+0000\n" -"PO-Revision-Date: 2025-01-11 17:27:41+0000\n" +"POT-Creation-Date: 2025-01-22 17:42:17+0000\n" +"PO-Revision-Date: 2025-01-22 17:42:17+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -10,25 +10,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: GetText.NET Extractor\n" -#: ../../Plugin.cs:120 +#: ../../Plugin.cs:115 #, csharp-format msgid "" "[聊天桥] 信息发送失败，目标地址:{0}\n" "错误信息:{1}" msgstr "" -#: ../../Plugin.cs:89 +#: ../../Plugin.cs:86 #, csharp-format msgid "[聊天桥] 接收到未知类型:{0}" msgstr "" -#: ../../Plugin.cs:144 -#, csharp-format -msgid "[聊天桥] 目标服务器处理请求出错:{0}!" -msgstr "" - -#: ../../Plugin.cs:141 -#, csharp-format -msgid "[聊天桥] 访问目标服务器验证失败:{0},请检查你的令牌是否配置正确!" -msgstr "" - diff --git a/src/HouseRegion/i18n/template.pot b/src/HouseRegion/i18n/template.pot index 1eaec30b6..c8b9077b0 100644 --- a/src/HouseRegion/i18n/template.pot +++ b/src/HouseRegion/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: HouseRegion\n" -"POT-Creation-Date: 2025-01-09 09:34:00+0000\n" -"PO-Revision-Date: 2025-01-09 09:34:00+0000\n" +"POT-Creation-Date: 2025-01-22 17:42:39+0000\n" +"PO-Revision-Date: 2025-01-22 17:42:39+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -324,10 +324,10 @@ msgid "房屋插件错误调用事件时出错:" msgstr "" #: ../../PacketReceive.cs:215 -#: ../../Utils.cs:90 #: ../../Plugin.cs:637 #: ../../Plugin.cs:642 #: ../../Plugin.cs:648 +#: ../../Utils.cs:90 msgid "房屋插件错误超标错误:" msgstr "" diff --git a/src/ModifyWeapons/i18n/template.pot b/src/ModifyWeapons/i18n/template.pot index d7c7afa6a..0bd7af0c8 100644 --- a/src/ModifyWeapons/i18n/template.pot +++ b/src/ModifyWeapons/i18n/template.pot @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ModifyWeapons\n" -"POT-Creation-Date: 2025-01-08 13:16:07+0000\n" -"PO-Revision-Date: 2025-01-08 13:16:07+0000\n" +"POT-Creation-Date: 2025-01-22 17:42:46+0000\n" +"PO-Revision-Date: 2025-01-22 17:42:46+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -276,11 +276,11 @@ msgid "" "二.使用经济类[c/4C95DD:指令][c/86F06E:背包有]修改物品\n" msgstr "" -#: ../../ModifyWeapons.cs:352 #: ../../Commands.cs:967 #: ../../Commands.cs:1130 #: ../../Commands.cs:1398 #: ../../Commands.cs:1473 +#: ../../ModifyWeapons.cs:352 msgid "伤害" msgstr "" @@ -331,11 +331,11 @@ msgstr "" msgid "公用武器数据优先级 ＞ 给物品指令数据" msgstr "" -#: ../../ModifyWeapons.cs:362 #: ../../Commands.cs:1005 #: ../../Commands.cs:1168 #: ../../Commands.cs:1400 #: ../../Commands.cs:1483 +#: ../../ModifyWeapons.cs:362 msgid "击退" msgstr "" @@ -350,10 +350,10 @@ msgid "" "击退[c/F79361:kb] 用速[c/74E55D:ut] 攻速[c/F7B661:ua] 射速[c/F7F261:ss] \n" msgstr "" -#: ../../ModifyWeapons.cs:347 #: ../../Commands.cs:985 #: ../../Commands.cs:1148 #: ../../Commands.cs:1468 +#: ../../ModifyWeapons.cs:347 msgid "前缀" msgstr "" @@ -371,27 +371,27 @@ msgstr "" msgid "发2次:[c/91DFBB:建数据>发物品]" msgstr "" -#: ../../ModifyWeapons.cs:392 #: ../../Commands.cs:1070 #: ../../Commands.cs:1233 #: ../../Commands.cs:1406 #: ../../Commands.cs:1513 +#: ../../ModifyWeapons.cs:392 msgid "发射器" msgstr "" -#: ../../ModifyWeapons.cs:357 #: ../../Commands.cs:995 #: ../../Commands.cs:1158 #: ../../Commands.cs:1399 #: ../../Commands.cs:1478 +#: ../../ModifyWeapons.cs:357 msgid "大小" msgstr "" -#: ../../ModifyWeapons.cs:382 #: ../../Commands.cs:1046 #: ../../Commands.cs:1209 #: ../../Commands.cs:1404 #: ../../Commands.cs:1503 +#: ../../ModifyWeapons.cs:382 msgid "射速" msgstr "" @@ -456,11 +456,11 @@ msgstr "" msgid "已更新玩家 [c/2F99D7:{0}] 的[c/92B9D4:{1}]" msgstr "" -#: ../../ModifyWeapons.cs:377 #: ../../Commands.cs:1035 #: ../../Commands.cs:1198 #: ../../Commands.cs:1403 #: ../../Commands.cs:1498 +#: ../../ModifyWeapons.cs:377 msgid "弹幕" msgstr "" @@ -468,11 +468,11 @@ msgstr "" msgid "弹幕[c/A3E295:sh] 弹药[c/91DFBB:m] 发射器[c/5264D9:aa] 颜色[c/5264D9:hc]" msgstr "" -#: ../../ModifyWeapons.cs:387 #: ../../Commands.cs:1058 #: ../../Commands.cs:1221 #: ../../Commands.cs:1405 #: ../../Commands.cs:1508 +#: ../../ModifyWeapons.cs:387 msgid "弹药" msgstr "" @@ -508,11 +508,11 @@ msgstr "" msgid "指令正确格式：[c/FFF540:/mw auto 1 或 0]" msgstr "" -#: ../../ModifyWeapons.cs:372 #: ../../Commands.cs:1025 #: ../../Commands.cs:1188 #: ../../Commands.cs:1402 #: ../../Commands.cs:1493 +#: ../../ModifyWeapons.cs:372 msgid "攻速" msgstr "" @@ -520,18 +520,18 @@ msgstr "" msgid "攻速相关:影响所有[c/EAF836:近战]越小挥舞间隔越快" msgstr "" -#: ../../ModifyWeapons.cs:342 #: ../../Commands.cs:976 #: ../../Commands.cs:1139 #: ../../Commands.cs:1397 #: ../../Commands.cs:1463 +#: ../../ModifyWeapons.cs:342 msgid "数量" msgstr "" -#: ../../ModifyWeapons.cs:158 -#: ../../ModifyWeapons.cs:331 #: ../../Commands.cs:1389 #: ../../Commands.cs:1452 +#: ../../ModifyWeapons.cs:158 +#: ../../ModifyWeapons.cs:331 msgid "无" msgstr "" @@ -599,11 +599,11 @@ msgstr "" msgid "玩家 [{0}] 已[c/92C5EC:启用]进服重读功能。" msgstr "" -#: ../../ModifyWeapons.cs:367 #: ../../Commands.cs:1015 #: ../../Commands.cs:1178 #: ../../Commands.cs:1401 #: ../../Commands.cs:1488 +#: ../../ModifyWeapons.cs:367 msgid "用速" msgstr "" @@ -683,10 +683,10 @@ msgstr "" msgid "除了[c/DADEA0:/mw up]其他都会还原数值再修改" msgstr "" -#: ../../ModifyWeapons.cs:397 #: ../../Commands.cs:1246 #: ../../Commands.cs:1407 #: ../../Commands.cs:1518 +#: ../../ModifyWeapons.cs:397 msgid "颜色" msgstr ""