com.taptap.sdk.core 4.9.5-beta.1 → 4.9.5

package/Mobile/Editor/NativeDependencies.xml

@@ -4,12 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.4" />
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.5" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.4" />
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.5" />
   </iosPods>
 </dependencies>

package/Runtime/Internal/Platform/ITapCorePlatform.cs

@@ -20,5 +20,11 @@ namespace TapSDK.Core.Internal
             string action,
             Dictionary<string, string> properties
         );
+
+#if UNITY_STANDALONE_WIN
+        void RegisterTapTapPCStateChangeListener(Action<int> action);
+
+        void UnRegisterTapTapPCStateChangeListener(Action<int> action);
+#endif
     }
 }

package/Runtime/Public/TapTapPCState.cs

@@ -0,0 +1,12 @@
+namespace TapSDK.Core
+{
+#if UNITY_STANDALONE_WIN
+    public class TapTapPCState
+    {
+        public const int ONLINE = 1;
+        public const int OFFLINE = 2;
+
+        public const int SHUTDOWN = 3;
+    }
+#endif
+}

package/Runtime/Public/TapTapPCState.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 03b213fad1790bd4fb52fed89737b23f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Public/TapTapSDK.cs

@@ -162,6 +162,26 @@ namespace TapSDK.Core {
             return platformWrapper?.IsLaunchedFromTapTapPC();
         }
 
+#if UNITY_STANDALONE_WIN
+        /// <summary>
+        /// 注册 TapTap PC 客户端运行状态监听
+        /// </summary>
+        /// <param name="action">监听回调</param>
+        public static void RegisterTapTapPCStateChangeListener(Action<int> action)
+        {
+            platformWrapper?.RegisterTapTapPCStateChangeListener(action);
+        }
+
+        /// <summary>
+        /// 移除 TapTap PC 客户端运行状态监听
+        /// </summary>
+        /// <param name="action">监听回调</param>
+        public static void UnRegisterTapTapPCStateChangeListener(Action<int> action)
+        {
+            platformWrapper?.UnRegisterTapTapPCStateChangeListener(action);
+        }
+#endif
+
         private static Type[] GetInitTypeList(){
             Type interfaceType = typeof(IInitTask);
             Type[] initTaskTypes = AppDomain.CurrentDomain.GetAssemblies()

package/Standalone/Runtime/Internal/Openlog/TapOpenlogStandalone.cs

@@ -36,6 +36,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
 #if UNITY_STANDALONE
             InitGeneralParameter();
             InitOpenlogStartParameter();
+            // c++ 初始化前设置日志等级，避免初始化日志直接输出
+            TdkSetLogLevel(1, TapCoreStandalone.coreOptions.enableLog ? 1 : 0);
             string openlogStartStr = JsonConvert.SerializeObject(openlogStartParameter);
             int result = TdkOnAppStarted(openlogStartStr, commonVariablesGetter, freeString);
             BindWindowChange();
@@ -151,7 +153,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
                 openlogStartParameter[TapOpenlogStartParamConstants.PARAM_REGION] =
                     TapCoreStandalone.coreOptions.region;
             }
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_TO_CONSOLE] = 1;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_TO_CONSOLE] =
+                TapCoreStandalone.coreOptions.enableLog ? 1 : 0;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_LEVEL] = 1;
             string openLogDirPath = Path.Combine(Application.persistentDataPath, "OpenlogData");
             if (

package/Standalone/Runtime/Internal/TapClientBridge.cs

@@ -1,25 +1,21 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using UnityEngine;
 using System.Runtime.InteropServices;
 using System.Text;
 using TapSDK.Core.Internal.Log;
 
-
-
 namespace TapSDK.Core.Standalone.Internal
 {
-
     internal enum TapSDKInitResult
     {
         // 初始化成功
         OK = 0,
+
         // 其他错误
         FailedGeneric = 1,
+
         // 未找到 TapTap，用户可能未安装，请引导用户下载安装 TapTap
         NoPlatform = 2,
+
         // 已安装 TapTap，游戏未通过 TapTap 启动
         NotLaunchedByPlatform = 3,
 
@@ -27,65 +23,54 @@ namespace TapSDK.Core.Standalone.Internal
         PlatformVersionMismatch = 4,
 
         // SDK 本地执行时未知错误
-        Unknown = -1
-
+        Unknown = -1,
     };
 
     internal enum TapEventID
     {
-        AuthorizeFinished_internal = 2001,
-
-        AuthorizeFinished = 2002,
-
-        // [4001, 6000), reserved for TapTap ownership events
-        GamePlayableStatusChanged = 4001,
-        DLCPlayableStatusChanged = 4002,
-    };
+        SystemStateChanged = 1, // TapTap 客户端运行状态事件监听
+    }
 
     // 系统事件类型
     internal enum SystemState
     {
-        kSystemState_Unknown = 0, // 未知
-        kSystemState_PlatformExit = 1, // 平台退出
+        Unknown = 0, // 未知
+        Online = 1, // 在线
+        Offline = 2, // 离线
+        Shutdown = 3, // 退出
     };
 
-    // 是否触发授权的返回结果
-    internal enum AuthorizeResult
+    // 授权返回结果结构体
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    internal struct SystemStateResponse
     {
-        UNKNOWN = 0, // 未知
-        OK = 1, // 成功触发授权
-        FAILED = 2, // 授权失败
-    };
-
-    // 完成授权后的返回结果
-    internal enum Result
-    {
-        kResult_OK = 0,
-        kResult_Failed = 1,
-        kResult_Canceled = 2,
-    };
-
+        public int state; // 运行状态
+    }
 
     public class TapClientBridge
     {
-
 #if UNITY_STANDALONE_WIN
         public const string DLL_NAME = "taptap_api";
 #endif
 
 #if UNITY_STANDALONE_WIN
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern bool TapSDK_RestartAppIfNecessary([MarshalAs(UnmanagedType.LPStr)] string clientId);
+        internal static extern bool TapSDK_RestartAppIfNecessary(
+            [MarshalAs(UnmanagedType.LPStr)] string clientId
+        );
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int TapSDK_Init(StringBuilder errMsg, [MarshalAs(UnmanagedType.LPStr)] string pubKey);
+        internal static extern int TapSDK_Init(
+            StringBuilder errMsg,
+            [MarshalAs(UnmanagedType.LPStr)] string pubKey
+        );
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void TapSDK_Shutdown();
 
         // 定义与 C 兼容的委托
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        internal delegate void CallbackDelegate(int id, IntPtr userData);
+        public delegate void CallbackDelegate(int id, IntPtr userData);
 
         // 系统状态返回结果结构体
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
@@ -95,27 +80,13 @@ namespace TapSDK.Core.Standalone.Internal
         }
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void TapSDK_RegisterCallback(int callbackId, IntPtr callback);
+        public static extern void TapSDK_RegisterCallback(int callbackId, IntPtr callback);
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void TapSDK_RunCallbacks();
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void TapSDK_UnregisterCallback(int callbackId, IntPtr callback);
-
-
-        // 登录相关接口
-
-        // 授权返回结果结构体
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-        public struct AuthorizeFinishedResponse
-        {
-            public int is_cancel; // 是否取消
-
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
-            public string callback_uri; // 256 字节的 C 端字符串
-
-        }
+        public static extern void TapSDK_UnregisterCallback(int callbackId, IntPtr callback);
 
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
         internal static extern bool TapUser_GetOpenID(StringBuilder openId);
@@ -123,46 +94,6 @@ namespace TapSDK.Core.Standalone.Internal
         [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
         internal static extern bool TapSDK_GetClientID(StringBuilder clientId);
 
-
-        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int TapUser_AsyncAuthorize_internal([MarshalAs(UnmanagedType.LPStr)] string scopeStrings, [MarshalAs(UnmanagedType.LPStr)] string responseType,
-        [MarshalAs(UnmanagedType.LPStr)] string redirectUri, [MarshalAs(UnmanagedType.LPStr)] string codeChallenge, [MarshalAs(UnmanagedType.LPStr)] string state,
-        [MarshalAs(UnmanagedType.LPStr)] string codeChallengeMethod, [MarshalAs(UnmanagedType.LPStr)] string versonCode, [MarshalAs(UnmanagedType.LPStr)] string sdkUa, [MarshalAs(UnmanagedType.LPStr)] string info);
-
-        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int TapUser_AsyncAuthorize([MarshalAs(UnmanagedType.LPStr)] string scopeStrings);
-
-        // DLC 接口
-        // 检查是否拥有当前游戏
-        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern bool TapApps_IsOwned();
-
-        // 游戏本体可玩状态变更事件响应结构体
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-        public struct GamePlayableStatusChangedResponse
-        {
-            public byte is_playable;            // 游戏本体是否可玩
-        };
-
-        // 显示指定 DLC 的商店页面
-        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern bool TapDLC_ShowStore([MarshalAs(UnmanagedType.LPStr)] string dlcId);
-
-        // 查询用户是否拥有指定的 DLC
-        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern bool TapDLC_IsOwned([MarshalAs(UnmanagedType.LPStr)] string dlcId);
-
-        // DLC 授权完成响应结果
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-        public struct DLCPlayableStatusChangedResponse
-        {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string dlc_id; // DLC ID
-
-            public byte is_playable; // 是否可玩，当用户购买 DLC （外置 DLC 为购买且下载完成后），此值返回 true。其他情况返回 false
-
-        }
-
         // 初始化检查
         internal static int CheckInitState(out string errMessage, string key)
         {
@@ -173,113 +104,10 @@ namespace TapSDK.Core.Standalone.Internal
             return result;
         }
 
-        // 预防 GC 回收的静态变量
-        private static CallbackDelegate _dlcCallbackInstance;
-
-        private static CallbackDelegate _userCallbackInternalInstance;
-
-        private static CallbackDelegate _userCallbackInstance;
-
-        private static CallbackDelegate _licenseCallbackInstance;
-        internal static void RegisterCallback(TapEventID eventID, CallbackDelegate callback)
-        {
-
-            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
-            switch (eventID)
-            {
-                case TapEventID.DLCPlayableStatusChanged:
-                    if (_dlcCallbackInstance != null)
-                    {
-                        UnRegisterCallback(eventID, _dlcCallbackInstance);
-                    }
-                    _dlcCallbackInstance = callback;
-                    break;
-                case TapEventID.GamePlayableStatusChanged:
-                    if (_licenseCallbackInstance != null)
-                    {
-                        UnRegisterCallback(eventID, _licenseCallbackInstance);
-                    }
-                    _licenseCallbackInstance = callback;
-                    break;
-                case TapEventID.AuthorizeFinished_internal:
-                    if (_userCallbackInternalInstance != null)
-                    {
-                        UnRegisterCallback(eventID, _userCallbackInternalInstance);
-                    }
-                    _userCallbackInternalInstance = callback;
-                    break;
-                case TapEventID.AuthorizeFinished:
-                    if (_userCallbackInstance != null)
-                    {
-                        UnRegisterCallback(eventID, _userCallbackInstance);
-                    }
-                    _userCallbackInstance = callback;
-                    break;
-            }
-
-            TapSDK_RegisterCallback((int)eventID, funcPtr);
-        }
-
-        // 移除回调
-        internal static void UnRegisterCallback(TapEventID eventID, CallbackDelegate callback)
-        {
-
-            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
-            switch (eventID)
-            {
-                case TapEventID.DLCPlayableStatusChanged:
-                    _dlcCallbackInstance = null;
-                    break;
-                case TapEventID.GamePlayableStatusChanged:
-                    _licenseCallbackInstance = null;
-                    break;
-                case TapEventID.AuthorizeFinished_internal:
-                    _userCallbackInternalInstance = null;
-                    break;
-                case TapEventID.AuthorizeFinished:
-                    _userCallbackInstance = null;
-                    break;
-            }
-
-            TapSDK_UnregisterCallback((int)eventID, funcPtr);
-        }
-
-        internal static AuthorizeResult LoginWithScopesInternal(string[] scopeStrings, string responseType, string redirectUri,
-        string codeChallenge, string state, string codeChallengeMethod, string versonCode, string sdkUa, string info)
-        {
-            try
-            {
-                TapLog.Log("login start ==== " + string.Join(",", scopeStrings));
-                int result = TapUser_AsyncAuthorize_internal(string.Join(",", scopeStrings), responseType, redirectUri,
-     codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
-                TapLog.Log("login end === " + result);
-                return (AuthorizeResult)result;
-            }
-            catch (Exception ex)
-            {
-                TapLog.Log("login crash = " + ex.StackTrace);
-                return AuthorizeResult.UNKNOWN;
-            }
-        }
-
-        internal static AuthorizeResult LoginWithScopes(string[] scopeStrings)
-        {
-            try
-            {
-                int result = TapUser_AsyncAuthorize(string.Join(",", scopeStrings));
-                return (AuthorizeResult)result;
-            }
-            catch (Exception ex)
-            {
-                TapLog.Log("login crash = " + ex.Message);
-                return AuthorizeResult.UNKNOWN;
-            }
-        }
-
         internal static bool GetTapUserOpenId(out string openId)
         {
             StringBuilder openIdBuffer = new StringBuilder(256); // 分配一个足够大的缓冲区
-            bool success = TapUser_GetOpenID(openIdBuffer);  // 调用 C 函数
+            bool success = TapUser_GetOpenID(openIdBuffer); // 调用 C 函数
             openId = openIdBuffer.ToString();
             return success;
         }
@@ -287,29 +115,29 @@ namespace TapSDK.Core.Standalone.Internal
         internal static bool GetClientId(out string clientId)
         {
             StringBuilder clientIDBuffer = new StringBuilder(256); // 分配一个足够大的缓冲区
-            bool success = TapSDK_GetClientID(clientIDBuffer);  // 调用 C 函数
+            bool success = TapSDK_GetClientID(clientIDBuffer); // 调用 C 函数
             clientId = clientIDBuffer.ToString();
             return success;
         }
-    
-        internal static bool QueryDLC(string skuId)
-        {
-            return TapDLC_IsOwned(skuId);
-        }
 
-        internal static bool ShowDLCStore(string skuId)
+        private static CallbackDelegate _systemStateCallbackInstance;
+        internal static void RegisterSystemStateCallback(CallbackDelegate callback)
         {
-            return TapDLC_ShowStore(skuId);
+            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
+            if (_systemStateCallbackInstance != null)
+            {
+                UnRegisterSystemStateCallback(_systemStateCallbackInstance);
+            }
+            _systemStateCallbackInstance = callback;
+            TapSDK_RegisterCallback((int)TapEventID.SystemStateChanged, funcPtr);
         }
 
-        internal static bool HasLicense()
+        internal static void UnRegisterSystemStateCallback(CallbackDelegate callback)
         {
-            return TapApps_IsOwned();
+            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
+            TapSDK_UnregisterCallback((int)TapEventID.SystemStateChanged, funcPtr);
+            _systemStateCallbackInstance = null;
         }
-
 #endif
     }
-
-
-
-}
+}

package/Standalone/Runtime/Public/TapClientStandalone.cs

@@ -1,23 +1,21 @@
-using UnityEngine;
-using System.Threading.Tasks;
-using TapSDK.Core.Internal.Utils;
-using TapSDK.Core.Standalone.Internal;
-using TapSDK.UI;
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using TapSDK.Core.Standalone.Internal.Openlog;
 using System.Threading;
+using System.Threading.Tasks;
 using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Internal.Utils;
+using TapSDK.Core.Standalone.Internal;
+using TapSDK.Core.Standalone.Internal.Openlog;
+using TapSDK.UI;
 using UnityEditor;
-
-
+using UnityEngine;
 
 namespace TapSDK.Core.Standalone
 {
 #if UNITY_STANDALONE_WIN
     public class TapClientStandalone
     {
-
         // 是否是渠道服游戏包
         private static bool isChannelPackage = false;
 
@@ -25,7 +23,6 @@ namespace TapSDK.Core.Standalone
         private static int lastIsLaunchedFromTapTapPCResult = -1;
         private static bool isRuningIsLaunchedFromTapTapPC = false;
 
-
         // 当为渠道游戏包时，与启动器的初始化校验结果
         private static TapInitResult tapInitResult;
 
@@ -37,14 +34,20 @@ namespace TapSDK.Core.Standalone
             // 正在执行中
             if (isRuningIsLaunchedFromTapTapPC)
             {
-                UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请勿重复调用", UIManager.GeneralToastLevel.Error);
+                UIManager.Instance.OpenToast(
+                    "IsLaunchedFromTapTapPC 正在执行，请勿重复调用",
+                    UIManager.GeneralToastLevel.Error
+                );
                 TapLog.Error("IsLaunchedFromTapTapPC 正在执行，请勿重复调用");
                 return false;
             }
             // 多次执行时返回上一次结果
             if (lastIsLaunchedFromTapTapPCResult != -1)
             {
-                TapLog.Log("IsLaunchedFromTapTapPC duplicate invoke return " + lastIsLaunchedFromTapTapPCResult);
+                TapLog.Log(
+                    "IsLaunchedFromTapTapPC duplicate invoke return "
+                        + lastIsLaunchedFromTapTapPCResult
+                );
                 return lastIsLaunchedFromTapTapPCResult > 0;
             }
 
@@ -52,7 +55,10 @@ namespace TapSDK.Core.Standalone
             TapTapSdkOptions coreOptions = TapCoreStandalone.coreOptions;
             if (coreOptions == null)
             {
-                UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 调用必须在初始化之后", UIManager.GeneralToastLevel.Error);
+                UIManager.Instance.OpenToast(
+                    "IsLaunchedFromTapTapPC 调用必须在初始化之后",
+                    UIManager.GeneralToastLevel.Error
+                );
                 TapLog.Error("IsLaunchedFromTapTapPC 调用必须在初始化之后");
                 return false;
             }
@@ -60,8 +66,16 @@ namespace TapSDK.Core.Standalone
             string pubKey = coreOptions.clientPublicKey;
             if (string.IsNullOrEmpty(clientId) || string.IsNullOrEmpty(pubKey))
             {
-                UIManager.Instance.OpenToast("clientId 及 TapPubKey 参数都不能为空, clientId =" + clientId + ", TapPubKey = " + pubKey, UIManager.GeneralToastLevel.Error);
-                TapLog.Error("clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey);
+                UIManager.Instance.OpenToast(
+                    "clientId 及 TapPubKey 参数都不能为空, clientId ="
+                        + clientId
+                        + ", TapPubKey = "
+                        + pubKey,
+                    UIManager.GeneralToastLevel.Error
+                );
+                TapLog.Error(
+                    "clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey
+                );
                 return false;
             }
             isRuningIsLaunchedFromTapTapPC = true;
@@ -71,12 +85,19 @@ namespace TapSDK.Core.Standalone
             try
             {
                 TapInitResult result = await RunClientBridgeMethod(clientId, pubKey);
-                TapLog.Log("check startupWithClientBridge finished thread = " + Thread.CurrentThread.ManagedThreadId);
+                TapLog.Log(
+                    "check startupWithClientBridge finished thread = "
+                        + Thread.CurrentThread.ManagedThreadId
+                );
                 isRuningIsLaunchedFromTapTapPC = false;
                 if (result.needQuitGame)
                 {
                     lastIsLaunchedFromTapTapPCResult = 0;
-                    TapCoreTracker.Instance.TrackSuccess(TapCoreTracker.METHOD_LAUNCHER, sessionId, TapCoreTracker.SUCCESS_TYPE_RESTART);
+                    TapCoreTracker.Instance.TrackSuccess(
+                        TapCoreTracker.METHOD_LAUNCHER,
+                        sessionId,
+                        TapCoreTracker.SUCCESS_TYPE_RESTART
+                    );
                     TapLog.Log("IsLaunchedFromTapTapPC Quit game");
 #if UNITY_EDITOR
                     TapLog.Log(
@@ -94,13 +115,41 @@ namespace TapSDK.Core.Standalone
                     if (result.result == (int)TapSDKInitResult.OK)
                     {
                         string currentClientId;
-                        bool isFetchClientIdSuccess = TapClientBridge.GetClientId(out currentClientId);
+                        bool isFetchClientIdSuccess = TapClientBridge.GetClientId(
+                            out currentClientId
+                        );
                         TapLog.Log("IsLaunchedFromTapTapPC get  clientId = " + currentClientId);
-                        if (isFetchClientIdSuccess && !string.IsNullOrEmpty(currentClientId) && currentClientId != clientId)
+                        if (
+                            isFetchClientIdSuccess
+                            && !string.IsNullOrEmpty(currentClientId)
+                            && currentClientId != clientId
+                        )
                         {
-                            UIManager.Instance.OpenToast("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致", UIManager.GeneralToastLevel.Error);
-                            TapLog.Error("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
-                            TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, -1, "SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
+                            UIManager.Instance.OpenToast(
+                                "SDK 中配置的 clientId = "
+                                    + clientId
+                                    + "与 Tap 启动器中"
+                                    + currentClientId
+                                    + "不一致",
+                                UIManager.GeneralToastLevel.Error
+                            );
+                            TapLog.Error(
+                                "SDK 中配置的 clientId = "
+                                    + clientId
+                                    + "与 Tap 启动器中"
+                                    + currentClientId
+                                    + "不一致"
+                            );
+                            TapCoreTracker.Instance.TrackFailure(
+                                TapCoreTracker.METHOD_LAUNCHER,
+                                sessionId,
+                                -1,
+                                "SDK 中配置的 clientId = "
+                                    + clientId
+                                    + "与 Tap 启动器中"
+                                    + currentClientId
+                                    + "不一致"
+                            );
                             lastIsLaunchedFromTapTapPCResult = 0;
                             return false;
                         }
@@ -109,7 +158,10 @@ namespace TapSDK.Core.Standalone
                         if (fetchOpenIdSuccess)
                         {
                             TapLog.Log("IsLaunchedFromTapTapPC get  openId = " + openId);
-                            EventManager.TriggerEvent(EventManager.IsLaunchedFromTapTapPCFinished, openId);
+                            EventManager.TriggerEvent(
+                                EventManager.IsLaunchedFromTapTapPCFinished,
+                                openId
+                            );
                         }
                         else
                         {
@@ -117,20 +169,45 @@ namespace TapSDK.Core.Standalone
                         }
                         lastIsLaunchedFromTapTapPCResult = 1;
                         TapClientBridgePoll.StartUp();
-                        TapCoreTracker.Instance.TrackSuccess(TapCoreTracker.METHOD_LAUNCHER, sessionId, TapCoreTracker.SUCCESS_TYPE_INIT);
+                        TapCoreTracker.Instance.TrackSuccess(
+                            TapCoreTracker.METHOD_LAUNCHER,
+                            sessionId,
+                            TapCoreTracker.SUCCESS_TYPE_INIT
+                        );
                         TapLog.Log("IsLaunchedFromTapTapPC check success");
+                        // 如果开发者已经注册了监听客户端运行状态，此时添加对应回调
+                        if (
+                            taptapPCStateChangeListeners != null
+                            && taptapPCStateChangeListeners.Count > 0
+                            && !hasRegisterSystemListener
+                        )
+                        {
+                            TapClientBridge.RegisterSystemStateCallback(TapTapPCStateDelegate);
+                            hasRegisterSystemListener = true;
+                        }
                         return true;
                     }
                     else
                     {
-
-                        TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)result.result, result.errorMsg ?? "");
+                        TapCoreTracker.Instance.TrackFailure(
+                            TapCoreTracker.METHOD_LAUNCHER,
+                            sessionId,
+                            (int)result.result,
+                            result.errorMsg ?? ""
+                        );
                         lastIsLaunchedFromTapTapPCResult = 0;
-                        TapLog.Log("IsLaunchedFromTapTapPC show TapClient tip Pannel " + result.result + " , error = " + result.errorMsg);
+                        TapLog.Log(
+                            "IsLaunchedFromTapTapPC show TapClient tip Pannel "
+                                + result.result
+                                + " , error = "
+                                + result.errorMsg
+                        );
                         string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
                         if (Resources.Load<GameObject>(tipPannelPath) != null)
                         {
-                            var pannel = UIManager.Instance.OpenUI<TapClientConnectTipController>(tipPannelPath);
+                            var pannel = UIManager.Instance.OpenUI<TapClientConnectTipController>(
+                                tipPannelPath
+                            );
                             pannel.Show(result.result);
                         }
                         return false;
@@ -140,30 +217,50 @@ namespace TapSDK.Core.Standalone
             catch (Exception e)
             {
                 lastIsLaunchedFromTapTapPCResult = 0;
-                TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)TapSDKInitResult.Unknown, e.Message ?? "");
-
-                TapLog.Log("IsLaunchedFromTapTapPC check exception = " + e.Message + " \n" + e.StackTrace);
+                TapCoreTracker.Instance.TrackFailure(
+                    TapCoreTracker.METHOD_LAUNCHER,
+                    sessionId,
+                    (int)TapSDKInitResult.Unknown,
+                    e.Message ?? ""
+                );
+
+                TapLog.Log(
+                    "IsLaunchedFromTapTapPC check exception = " + e.Message + " \n" + e.StackTrace
+                );
                 string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
                 if (Resources.Load<GameObject>(tipPannelPath) != null)
                 {
-                    var pannel = UIManager.Instance.OpenUI<TapClientConnectTipController>(tipPannelPath);
+                    var pannel = UIManager.Instance.OpenUI<TapClientConnectTipController>(
+                        tipPannelPath
+                    );
                     pannel.Show((int)TapSDKInitResult.Unknown);
                 }
                 return false;
             }
         }
 
-        private static async Task<TapInitResult> RunClientBridgeMethod(string clientId, string pubKey)
+        private static async Task<TapInitResult> RunClientBridgeMethod(
+            string clientId,
+            string pubKey
+        )
         {
             TaskCompletionSource<TapInitResult> task = new TaskCompletionSource<TapInitResult>();
             try
             {
                 await Task.Run(() =>
                 {
-                    TapLog.Log( "check startupWithClientBridge start thread = " + Thread.CurrentThread.ManagedThreadId);
+                    TapLog.Log(
+                        "check startupWithClientBridge start thread = "
+                            + Thread.CurrentThread.ManagedThreadId
+                    );
                     bool needQuitGame = TapClientBridge.TapSDK_RestartAppIfNecessary(clientId);
-                    TapLog.Log("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = " + needQuitGame);
-                    TapLog.Log("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary finished " );
+                    TapLog.Log(
+                        "RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = "
+                            + needQuitGame
+                    );
+                    TapLog.Log(
+                        "RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary finished "
+                    );
                     if (needQuitGame)
                     {
                         tapInitResult = new TapInitResult(needQuitGame);
@@ -171,13 +268,20 @@ namespace TapSDK.Core.Standalone
                     else
                     {
                         string outputError;
-                        int tapSDKInitResult = TapClientBridge.CheckInitState(out outputError, pubKey);
-                        TapLog.Log("RunClientBridgeMethodWithTimeout invoke  CheckInitState result = " + tapSDKInitResult + ", error = " + outputError);
+                        int tapSDKInitResult = TapClientBridge.CheckInitState(
+                            out outputError,
+                            pubKey
+                        );
+                        TapLog.Log(
+                            "RunClientBridgeMethodWithTimeout invoke  CheckInitState result = "
+                                + tapSDKInitResult
+                                + ", error = "
+                                + outputError
+                        );
                         tapInitResult = new TapInitResult(tapSDKInitResult, outputError);
                     }
                     task.TrySetResult(tapInitResult);
                 });
-
             }
             catch (Exception ex)
             {
@@ -195,148 +299,61 @@ namespace TapSDK.Core.Standalone
             return isChannelPackage;
         }
 
-        public static bool isPassedInLaunchedFromTapTapPCCheck(){
+        public static bool isPassedInLaunchedFromTapTapPCCheck()
+        {
             return lastIsLaunchedFromTapTapPCResult > 0;
         }
 
-
-        private static Action<bool, string> currentLoginCallback;
-
+        private static HashSet<Action<int>> taptapPCStateChangeListeners;
+        private static volatile bool hasRegisterSystemListener = false;
         /// <summary>
-        /// 发起登录授权
+        /// 设置 TapPC 客户端状态监听
         /// </summary>
-        public static bool StartLoginWithScopes(string[] scopes, string responseType, string redirectUri,
-    string codeChallenge, string state, string codeChallengeMethod, string versonCode, string sdkUa, string info, Action<bool, string> callback)
+        internal static void RegisterTapTapPCStateChangeListener(Action<int> action)
         {
-            if (lastIsLaunchedFromTapTapPCResult == -1)
+            if (taptapPCStateChangeListeners == null)
             {
-                // UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请在完成后调用授权接口", UIManager.GeneralToastLevel.Error);
-                TapLog.Error(" login must be invoked after IsLaunchedFromTapTapPC success");
-                throw new Exception("login must be invoked after IsLaunchedFromTapTapPC success");
+                taptapPCStateChangeListeners = new HashSet<Action<int>>();
             }
-            TapLog.Log("LoginWithScopes start login by tapclient thread = " + Thread.CurrentThread.ManagedThreadId);
-            try
+            taptapPCStateChangeListeners.Add(action);
+            if (isPassedInLaunchedFromTapTapPCCheck() && !hasRegisterSystemListener)
             {
-                TapClientBridge.RegisterCallback(TapEventID.AuthorizeFinished_internal, loginCallbackDelegate);
-                AuthorizeResult authorizeResult = TapClientBridge.LoginWithScopesInternal(scopes, responseType, redirectUri,
-     codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
-                TapLog.Log("LoginWithScopes start result = " + authorizeResult);
-                if (authorizeResult != AuthorizeResult.OK)
-                {
-                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
-                    return false;
-                }
-                else
-                {
-                    currentLoginCallback = callback;
-                    return true;
-                }
-
+                TapClientBridge.RegisterSystemStateCallback(TapTapPCStateDelegate);
+                hasRegisterSystemListener = true;
             }
-            catch (Exception ex)
-            {
-                TapLog.Log("LoginWithScopes start login by tapclient error = " + ex.Message);
-                TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
-                return false;
-            }
-
         }
 
-
-        [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
-        static void loginCallbackDelegate(int id, IntPtr userData)
+        internal static void UnRegisterTapTapPCStateChangeListener(Action<int> action)
         {
-            TapLog.Log("LoginWithScopes recevie callback " + id);
-            if (id == (int)TapEventID.AuthorizeFinished_internal)
+            if (taptapPCStateChangeListeners != null && taptapPCStateChangeListeners.Count > 0)
             {
-                TapLog.Log("LoginWithScopes callback thread = " + Thread.CurrentThread.ManagedThreadId);
-                TapClientBridge.AuthorizeFinishedResponse response = Marshal.PtrToStructure<TapClientBridge.AuthorizeFinishedResponse>(userData);
-                TapLog.Log("LoginWithScopes callback = " + response.is_cancel + " uri = " + response.callback_uri);
-                if (currentLoginCallback != null)
+                taptapPCStateChangeListeners.Remove(action);
+                if (taptapPCStateChangeListeners.Count == 0)
                 {
-                    currentLoginCallback(response.is_cancel != 0, response.callback_uri);
-                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
-                    currentLoginCallback = null;
+                    TapClientBridge.UnRegisterSystemStateCallback(TapTapPCStateDelegate);
+                    hasRegisterSystemListener = false;
                 }
             }
         }
-        
-         // DLC 相关功能
-        private static Action<string, bool> currentDlcDelegate;
-        private static Action<bool> currentLicenseDelegate;
-
-        /// 查询是否购买 DLC , 未调用 isLaunchFromPC 会抛异常
-        public static bool QueryDLC(string skuId)
-        {
-            if (lastIsLaunchedFromTapTapPCResult != 1)
-            {
-                throw new Exception("queryDLC must be invoked after IsLaunchedFromTapTapPC success");
-            }
-            bool success = TapClientBridge.QueryDLC(skuId);
-            return success;
-        }
-
-        /// 跳转到 TapTap 客户端 DLC 购买页面 , 未调用 isLaunchFromPC 会抛异常
-        public static bool ShowStore(string skuId)
-        {
-            if (lastIsLaunchedFromTapTapPCResult != 1)
-            {
-                throw new Exception("purchaseDLC must be invoked after IsLaunchedFromTapTapPC success");
-            }
-            TapLog.Log("purchaseDLC start = " + skuId);
-            return TapClientBridge.TapDLC_ShowStore(skuId);
-        }
-
-        /// 注册 DLC 购买状态变更回调，包括购买成功和退款
-        public static void RegisterDLCOwnedCallback(Action<string, bool> dlcDelegate)
-        {
-            currentDlcDelegate = dlcDelegate;
-            TapClientBridge.RegisterCallback(TapEventID.DLCPlayableStatusChanged, DLCCallbackDelegate);
-        }
 
-        /// DLC 回调
         [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
-        static void DLCCallbackDelegate(int id, IntPtr userData)
+        static void TapTapPCStateDelegate(int id, IntPtr userData)
         {
-            TapLog.Log("queryDlC recevie callback " + id);
-            if (currentDlcDelegate != null)
+            if (id == (int)TapEventID.SystemStateChanged)
             {
-                TapClientBridge.DLCPlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.DLCPlayableStatusChangedResponse>(userData);
-                TapLog.Log("queryDlC callback =  " + response.dlc_id + " isOwn = " + response.is_playable);
-                currentDlcDelegate(response.dlc_id, response.is_playable != 0);
-            }
-        }
-
-         /// 注册 License 购买状态变更回调，包括购买成功和退款
-        public static void RegisterLicenseCallback(Action<bool> licensecDelegate)
-        {
-            currentLicenseDelegate = licensecDelegate;
-            TapClientBridge.RegisterCallback(TapEventID.GamePlayableStatusChanged, LicenseCallbackDelegate);
-        }
-
-        /// License 回调
-        [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
-        static void LicenseCallbackDelegate(int id, IntPtr userData)
-        {
-            TapLog.Log("License recevie callback " + id);
-            if (currentLicenseDelegate != null)
-            {
-                TapClientBridge.GamePlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.GamePlayableStatusChangedResponse>(userData);
-                TapLog.Log("License callback  isOwn changed " + response.is_playable );
-                currentLicenseDelegate(response.is_playable != 0);
-            }
-        }
-
-        public static bool HasLicense()
-        {
-            if (lastIsLaunchedFromTapTapPCResult != 1)
-            {
-                throw new Exception("checkLicense must be invoked after IsLaunchedFromTapTapPC success");
+                SystemStateResponse response = Marshal.PtrToStructure<SystemStateResponse>(
+                    userData
+                );
+                if (taptapPCStateChangeListeners != null)
+                {
+                    foreach (var listener in taptapPCStateChangeListeners)
+                    {
+                        listener(response.state);
+                    }
+                }
             }
-            return TapClientBridge.HasLicense();
         }
 
-
         // 初始化校验结果
         private class TapInitResult
         {

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -248,6 +248,18 @@ namespace TapSDK.Core.Standalone
         {
             TapOpenlogStandalone.LogBusiness(project, version, action, properties);
         }
+
+#if UNITY_STANDALONE_WIN
+        public void RegisterTapTapPCStateChangeListener(Action<int> action)
+        {
+            TapClientStandalone.RegisterTapTapPCStateChangeListener(action);
+        }
+
+        public void UnRegisterTapTapPCStateChangeListener(Action<int> action)
+        {
+            TapClientStandalone.UnRegisterTapTapPCStateChangeListener(action);
+        }
+#endif
  }
 
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.sdk.core",
   "displayName": "TapTapSDK Core",
   "description": "TapTapSDK Core",
-  "version": "4.9.5-beta.1",
+  "version": "4.9.5",
   "unity": "2019.4",
   "license": "MIT"
 }