add:TrCDK

Plugin.sln

@@ -282,6 +282,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoClassificationQuickStac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGen", "src\SourceGen\SourceGen.csproj", "{E5E60819-4B13-4982-B345-358A4DBE9D3B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrCDK", "src\TrCDK\TrCDK.csproj", "{D06CC8C7-7B77-428B-B5BA-A690C17DE382}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1386,6 +1388,14 @@ Global
 		{E5E60819-4B13-4982-B345-358A4DBE9D3B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5E60819-4B13-4982-B345-358A4DBE9D3B}.Release|x64.ActiveCfg = Release|Any CPU
 		{E5E60819-4B13-4982-B345-358A4DBE9D3B}.Release|x64.Build.0 = Release|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Debug|x64.Build.0 = Debug|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Release|x64.ActiveCfg = Release|Any CPU
+		{D06CC8C7-7B77-428B-B5BA-A690C17DE382}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/EssentialsPlus/Db/TpAllowManager.cs

@@ -48,30 +48,23 @@ public bool ToggleTpAllow(TSPlayer player)
 
             if (existing == null)
             {
-                newState = true;
+                // 默认允许
+                newState = false;
                 this.TpAllows.Add(new TpAllow(player.Name, newState));
-
-                if (this.db.Query("INSERT OR REPLACE INTO TpAllows VALUES (@0, @1)",
-                    player.Name, newState ? 1 : 0) > 0)
-                {
-                    player.TPAllow = newState;
-                    return true;
-                }
-                return false;
             }
             else
             {
                 newState = !existing.IsEnabled;
                 existing.IsEnabled = newState;
+            }
 
-                if (this.db.Query("UPDATE TpAllows SET IsEnabled = @0 WHERE Name = @1",
-                    newState ? 1 : 0, player.Name) > 0)
-                {
-                    player.TPAllow = newState;
-                    return true;
-                }
-                return false;
+            if (this.db.Query("REPLACE INTO TpAllows VALUES (@0, @1);",
+                player.Name, newState ? 1 : 0) > 0)
+            {
+                player.TPAllow = newState;
+                return true;
             }
+            return false;
         }
         catch (Exception ex)
         {
@@ -136,12 +129,22 @@ public bool IsTpAllowed(TSPlayer player)
                 player.TPAllow = isEnabled;
                 return isEnabled;
             }
+
+            // 未找到记录时，默认允许传送并添加记录
+            var defaultAllowed = true;
+            this.TpAllows.Add(new TpAllow(player.Name, defaultAllowed));
+            this.db.Query("INSERT INTO TpAllows (Name, IsEnabled) VALUES (@0, @1)",
+                player.Name, defaultAllowed ? 1 : 0);
+            player.TPAllow = defaultAllowed;
+            return defaultAllowed;
         }
         catch (Exception ex)
         {
             TShock.Log.Error($"查询玩家 {player.Name} 的传送权限时发生错误: {ex}");
         }
-        player.TPAllow = false;
-        return false;
+
+        // 异常情况下保持默认允许（可选，根据需求决定）
+        player.TPAllow = true;
+        return true;
     }
 }

src/EssentialsPlus/EssentialsPlus.cs

@@ -24,7 +24,7 @@ public class EssentialsPlus : LazyPlugin
     public override string Description => GetString("增强版Essentials");
 
     public override string Name => System.Reflection.Assembly.GetExecutingAssembly().GetName().Name!;
-    public override Version Version => new Version(1, 0, 9);
+    public override Version Version => new Version(1, 1, 0);
 
 
     public EssentialsPlus(Main game)

src/EssentialsPlus/README.md

@@ -75,6 +75,8 @@
 ```
 
 ## 更新日志
+### v1.1.0
+- Tpallow默认允许传送
 ### v1.0.9
 - 数据库记录玩家tpallow状态
 ### v1.0.7

src/LazyAPI/Commands/FlexibleCommand.cs

@@ -1,32 +1,38 @@
 using MonoMod.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
 using TShockAPI;
 
 namespace LazyAPI.Commands;
 internal class FlexibleCommand : CommandBase
 {
     private readonly CommandParser.Parser[] argParsers;
+    private readonly (CommandParser.Parser, object?)[] defaultParsers;
     private readonly FastReflectionHelper.FastInvoker method;
 
     public FlexibleCommand(MethodInfo method, string infoPrefix) : base(method)
     {
         var param = method.GetParameters();
         var ap = new List<CommandParser.Parser>();
+        var dp = new List<(CommandParser.Parser, object?)>();
         var sb = new StringBuilder();
         sb.Append(infoPrefix);
 
         foreach (var p in param.Skip(1))
         {
-            ap.Add(CommandParser.GetParser(p.ParameterType));
-            sb.Append($"<{p.Name}: {CommandParser.GetFriendlyName(p.ParameterType)}> ");
+            if (p.IsOptional)
+            {
+                dp.Add((CommandParser.GetParser(p.ParameterType), p.DefaultValue));
+                sb.Append(@$"[{p.Name}：{CommandParser.GetFriendlyName(p.ParameterType)}] ");
+            }
+            else
+            {
+                ap.Add(CommandParser.GetParser(p.ParameterType));
+                sb.Append($"<{p.Name}：{CommandParser.GetFriendlyName(p.ParameterType)}> ");
+            }
         }
-
         this.argParsers = [.. ap];
+        this.defaultParsers = [.. dp];
         this.info = sb.ToString();
         this.method = method.GetFastInvoker();
     }
@@ -35,19 +41,35 @@ public override ParseResult TryParse(CommandArgs args, int current)
     {
         var p = args.Parameters;
         var n = this.argParsers.Length;
+        var d = this.defaultParsers.Length;
         if (p.Count < n + current)
         {
             return this.GetResult(Math.Abs(n + current - p.Count));
         }
 
-        var a = new object?[n + 1];
+        var a = new object?[n + d + 1];
         a[0] = args;
         var unmatched = this.argParsers.Where((t, i) => !t(p[current + i], out a[i + 1])).Count();
         if (unmatched != 0)
         {
             return this.GetResult(unmatched);
         }
-
+        if (this.defaultParsers.Where((t, i) =>
+        {
+            var (k, v) = t;
+            if (p.Count <= n + i + 1)
+            {
+                a[n + i + 1] = v;
+                return false;
+            }
+            else
+            {
+                return !k(p[current + n + i], out a[n + i + 1]);
+            }
+        }).Any())
+        {
+            return this.GetResult(0);
+        }
         if (this.CheckPlayer(args.Player))
         {
             this.method(null, a);

src/LazyAPI/Extensions/TSPlayerExtension.cs

@@ -26,6 +26,27 @@ public static void SendPlayerSlot(this TSPlayer player, int slot)
         player.SendData(PacketTypes.PlayerSlot, "", slot);
     }
 
+    public static void ExecCommand(this TSPlayer player, string cmd)
+    {
+        try
+        {
+            player.tempGroup = new SuperAdminGroup();
+            TShockAPI.Commands.HandleCommand(player, cmd.SFormat(player.Name));
+        }
+        finally
+        {
+            player.tempGroup = null;
+        }
+    }
+
+    public static void ExecCommand(this TSPlayer player, IEnumerable<string> cmds)
+    {
+        foreach (var cmd in cmds)
+        {
+            player.ExecCommand(cmd);
+        }
+    }
+
     public static Dictionary<string, bool> GetProgress(this TSPlayer Player)
     {
         return GameProgress.DefaultProgressNames

src/LazyAPI/PluginContainer.cs

@@ -10,7 +10,7 @@ public class PluginContainer : LazyPlugin
 {
     public override string Author => "cc004 & members of UnrealMultiple";
 
-    public override Version Version => new Version(1, 0, 2, 1);
+    public override Version Version => new Version(1, 0, 2, 2);
 
     public PluginContainer(Main game) : base(game) { }
     public override void Initialize()

src/TrCDK/Command.cs

@@ -0,0 +1,166 @@
+using LazyAPI.Attributes;
+using LazyAPI.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TShockAPI;
+
+namespace TrCDK;
+
+[Command("cdk")]
+[Permissions("cdk.use")]
+public class Command
+{
+    [Alias("give")]
+    [Permissions("cdk.give")]
+    public static void Give(CommandArgs args, TSPlayer? player, string cmd)
+    {
+        if(player == null)
+        {
+            args.Player.SendErrorMessage(GetString("[c/ffd700:玩家不存在]"));
+            return;
+        }
+        var cmds = cmd.Split(',');
+        if (cmds.Length > 0)
+        {
+            args.Player.ExecCommand(cmds);
+            args.Player.SendSuccessMessage(GetString($"[c/ffd700:已给予玩家 {player.Name} CDK奖励]"));
+        }
+        else
+        {
+            args.Player.SendErrorMessage(GetString("[c/ffd700:指令不能为空]"));
+        }
+    }
+
+    [Alias("update")]
+    [Flexible]
+    [Permissions("cdk.update")]
+    public static void Update(CommandArgs args, string cdkname, int usetime, long utiltime, string grouplimit = "", string playerlimit = "", string cmds = "")
+    {
+        var cdkData = CDK.GetData(cdkname);
+        if (cdkData == null)
+        {
+            args.Player.SendErrorMessage(GetString("[c/ffd700:CDK不存在]"));
+            return;
+        }
+        CDK.Update(cdkname, usetime, utiltime, grouplimit, playerlimit, cdkData.Used, cmds);
+        args.Player.SendSuccessMessage(GetString("[c/ffd700:CDK更新成功]"));
+    }
+
+    [Alias("del")]
+    [Permissions("cdk.del")]
+    public static void Delete(CommandArgs args, string cdkname)
+    {
+        if (CDK.GetData(cdkname) == null)
+        {
+            args.Player.SendErrorMessage(GetString("[c/ffd700:CDK不存在]"));
+            return;
+        }
+        CDK.DelCDK(cdkname);
+        args.Player.SendSuccessMessage(GetString("[c/ffd700:CDK删除成功]"));
+    }
+
+    [Alias("add")]
+    [Flexible]
+    [Permissions("cdk.add")]
+    public static void Add(CommandArgs args, string cdkname, int usetime, long utiltime, string cmds, string grouplimit = "", string playerlimit = "")
+    {
+        if (CDK.Insert(cdkname, usetime, utiltime, grouplimit, playerlimit, cmds))
+        {
+            args.Player.SendSuccessMessage(GetString("[c/ffd700:CDK添加成功]"));
+        }
+        else
+        {
+            args.Player.SendErrorMessage(GetString("[c/ffd700:CDK添加失败]"));
+        }
+    }
+
+    [Alias("list")]
+    [Permissions("cdk.list")]
+    public static void List(CommandArgs args)
+    {
+        var cdkList = CDK.GetAllData();
+        if (cdkList.Length == 0)
+        {
+            args.Player.SendInfoMessage(GetString("[c/ffd700:没有可用的CDK]"));
+            return;
+        }
+        var sb = new StringBuilder();
+        sb.AppendLine(GetString("[c/ffd700:当前可用的CDK列表]"));
+        foreach (var cdk in cdkList)
+        {
+            sb.Append(GetString($"[c/ffd700:{cdk.Name}] [c/00FF00:剩余使用次数: {cdk.Usetime}] [c/ffd700:过期时间: {new DateTime(cdk.Utiltime).ToLocalTime()}] "));
+            if(cdk.Playerlimit != "")
+            {
+                sb.Append(GetString($"[c/ffd700:玩家限制: {cdk.Playerlimit}] "));
+            }
+            if(cdk.Grouplimit != "")
+            {
+                sb.Append(GetString($"[c/ffd700:组限制: {cdk.Grouplimit}] "));
+            }
+            if(cdk.Cmds != "")
+            {
+                sb.Append(GetString($"[c/ffd700:指令: {cdk.Cmds}] "));
+            }
+            if(cdk.Used != "")
+            {
+                sb.Append(GetString($"[c/ffd700:已使用玩家: {cdk.Used}] "));
+            }
+            sb.AppendLine();
+        }
+        args.Player.SendInfoMessage(sb.ToString().Trim());
+    }
+
+    [Alias("use")]
+    [RealPlayer]
+    public static void Use(CommandArgs args, string cdk)
+    {
+        var cdkData = CDK.GetData(cdk);
+        if (cdkData == null)
+        {
+            args.Player.SendInfoMessage(GetString("[c/ffd700:CDK不存在或已失效]"));
+            return;
+        }
+
+        if (cdkData.Playerlimit != "")
+        {
+            if (!cdkData.Playerlimit.Contains(args.Player.Name))
+            {
+                args.Player.SendInfoMessage(GetString("[c/ffd700:你不在该CDK的领取名单中]"));
+                return;
+            }
+        }
+        if (cdkData.Grouplimit != "")
+        {
+            if (!cdkData.Grouplimit.Contains(args.Player.Group.Name))
+            {
+                args.Player.SendInfoMessage(GetString("[c/ffd700:你所在的组不能领取该CDK]"));
+                return;
+            }
+        }
+        if (cdkData.Usetime < 1)
+        {
+            args.Player.SendInfoMessage(GetString("[c/ffd700:你手慢了, 该CDK已经被领完]"));
+            return;
+        }
+        var time2 = Convert.ToDateTime(DateTime.Now.ToString()).Ticks;
+        var min = (cdkData.Utiltime - time2) / 10000000;
+        if (min <= 0)
+        {
+            args.Player.SendInfoMessage(GetString("[c/ffd700:你来晚了, 该CDK已经过期了]"));
+            return;
+        }
+        if (cdkData.Used.Contains(args.Player.Name))
+        {
+            args.Player.SendInfoMessage(GetString("[c/ffd700:已经领取过了，不能太贪心哦]"));
+            return;
+        }
+        var strcmd = cdkData.Cmds.Replace("[plr]", args.Player.Name);
+        var cmds = strcmd.Split(',');
+        args.Player.ExecCommand(cmds);
+        CDK.Update(cdkData.Name, cdkData.Usetime - 1, cdkData.Utiltime, cdkData.Grouplimit, cdkData.Playerlimit, (cdkData.Used == "") ? args.Player.Name : cdkData.Used + "," + args.Player.Name, cdkData.Cmds);
+        args.Player.SendSuccessMessage(GetString("[c/ffd700:CDK兑换成功！]"));
+    }
+}