修改 GetUserId合并到User类

WYH2004-MC · Oct 12, 2024 · f1733f1 · f1733f1
1 parent 3f384a9
commit f1733f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/GUI/ShowVersionInfo.cs b/GUI/ShowVersionInfo.cs
@@ -34,7 +34,7 @@ public static void OnGUI()
             $"Data Version: {Singleton<SystemConfig>.Instance.config.dataVersionInfo.versionNo.versionString} {Singleton<SystemConfig>.Instance.config.dataVersionInfo.versionNo.releaseNoAlphabet}");
         VersionText.AppendLine($"Current Title Server: {Server.GetTitleServerUri()}");
         VersionText.AppendLine($"Keychip: {AMDaemon.System.KeychipId}");
-        VersionText.AppendLine($"UserId: {GetUserId.Get(0L)} | {GetUserId.Get(1L)}");
+        VersionText.AppendLine($"UserId: {User.GetUserIdString(0L)} | {User.GetUserIdString(1L)}");
         if (SinmaiAssist.config.ModSetting.SafeMode)
             VersionText.AppendLine("Safe Mode");
         UnityEngine.GUI.Label(new Rect(10+2, 40+2, 500, 30), VersionText.ToString(), TextShadow);

diff --git a/Sinmai-Assist.csproj b/Sinmai-Assist.csproj
@@ -514,7 +514,6 @@
     <Compile Include="Utils\CipherAES.cs" />
     <Compile Include="Common\InputManager.cs" />
     <Compile Include="Utils\GameMessageManager.cs" />
-    <Compile Include="Utils\GetUserId.cs" />
     <Compile Include="Utils\Keyboard.cs" />
     <Compile Include="Utils\Server.cs" />
     <Compile Include="Utils\User.cs" />

diff --git a/Utils/GetUserId.cs b/Utils/GetUserId.cs
diff --git a/Utils/User.cs b/Utils/User.cs
@@ -1,10 +1,13 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using MAI2.Util;
+using MAI2System;
 using Manager;
 using MelonLoader.TinyJSON;
 using Net.VO.Mai2;
+using Path = System.IO.Path;
 
 namespace SinmaiAssist.Utils;
 
@@ -86,11 +89,23 @@ public static string GetFavoriteList(UserData userData)
         list += "}]";
         return list;
     }
-    
+
     public static UserData GetUserData(long index)
     {
         return Singleton<UserDataManager>.Instance.GetUserData(index);
     }
+
+    public static string GetUserIdString(long index)
+    {
+        // 通过方法调用来获取常量值
+        var guestUserIdBase = GetGuestUserIDBase();
+        var userId = Singleton<UserDataManager>.Instance.GetUserData(index).Detail.UserID;
+        return userId == guestUserIdBase ? "Guest" : userId.ToString();
+    }
 
-
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static ulong GetGuestUserIDBase()
+    {
+        return ConstParameter.GuestUserIDBase;
+    }
 }