com.taptap.sdk.core 4.7.0-alpha.14 → 4.7.1

package/Mobile/Editor/NativeDependencies.xml

@@ -3,14 +3,13 @@
   <androidPackages>
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
-      <repository>https://nexus.xmxdev.com/repository/maven-public</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.7.0-alpha.14"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.7.0"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapCoreSDK" version="~> 4.5.5" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.7.1" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Resources/TapMessage.prefab

@@ -133,7 +133,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0.5, y: 100}
-  m_SizeDelta: {x: 400, y: 100}
+  m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6224477040733538127
 GameObject:
@@ -172,8 +172,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50}
-  m_SizeDelta: {x: 420, y: 120}
+  m_AnchoredPosition: {x: 0, y: -20}
+  m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6150942826548885810
 CanvasRenderer:
@@ -202,7 +202,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4b23b6267c9a94d64b94d18ac0f19754, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 121fadaa5f515439bb5fa46c7f9d2c2c, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -286,8 +286,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 210, y: -50}
-  m_SizeDelta: {x: 330, y: 60}
+  m_AnchoredPosition: {x: 100, y: -20}
+  m_SizeDelta: {x: 180, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6511217540227465427
 CanvasRenderer:
@@ -317,8 +317,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
+    m_Font: {fileID: 12800000, guid: c76570f7b9a4942ae84d6491f2669330, type: 3}
+    m_FontSize: 11
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0

package/Runtime/Public/DataStorage.cs

@@ -16,7 +16,8 @@ namespace TapSDK.Core
         {
             string storageKey = GenerateStorageKey(key);
             SaveStringToCache(storageKey, value);
-            PlayerPrefs.SetString(storageKey, EncodeString(value));
+            string encodeValue = EncodeString(value);
+            PlayerPrefs.SetString(storageKey, encodeValue);
         }
 
         public static string LoadString(string key)
@@ -29,10 +30,12 @@ namespace TapSDK.Core
             }
             value = PlayerPrefs.HasKey(storageKey) ? DecodeString(PlayerPrefs.GetString(storageKey)) : null;
             // 尝试从本地获取旧版本数据
-            if (value == null){
+            if (value == null)
+            {
                 value = PlayerPrefs.HasKey(key) ? DecodeString(PlayerPrefs.GetString(key)) : null;
                 // 旧版本存在有效数据时，转储为新的 storageKey
-                if (value != null) {
+                if (value != null)
+                {
                     PlayerPrefs.SetString(storageKey, EncodeString(value));
                     PlayerPrefs.DeleteKey(key);
                 }
@@ -44,6 +47,15 @@ namespace TapSDK.Core
             return value;
         }
 
+        public static void RemoveCacheKey(string key)
+        {
+            if (!string.IsNullOrEmpty(key))
+            {
+                PlayerPrefs.DeleteKey(key);
+                PlayerPrefs.DeleteKey(GenerateStorageKey(key));
+            }
+        }
+
         private static void SaveStringToCache(string key, string value)
         {
             if (dataCache == null)

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.7.0-alpha.14";
+        public static readonly string Version = "4.7.1";
         
         public static string SDKPlatform = "TapSDK-Unity";
 

package/Standalone/Runtime/Internal/TapClientBridge.cs

@@ -22,28 +22,30 @@ namespace TapSDK.Core.Standalone.Internal
         // 已安装 TapTap，游戏未通过 TapTap 启动
         NotLaunchedByPlatform = 3,
 
+        // 平台版本不匹配，请引导用户升级 TapTap 与游戏至最新版本，再重新运行游戏
+        PlatformVersionMismatch = 4,
+
         // SDK 本地执行时未知错误
-        Unknown = -1,
-        // SDK 本地执行时超时
-        Timeout = -2,
+        Unknown = -1
+
     };
 
     internal enum TapEventID
     {
-        Unknown = 0,
+        AuthorizeFinished_internal = 2001,
 
-        // [1, 2000), reserved for TapTap platform events
-        SystemStateChanged = 1,
+        AuthorizeFinished = 2002,
 
-        // [2001, 4000), reserved for TapTap user events
-        AuthorizeFinished = 2001,
+        // [4001, 6000), reserved for TapTap ownership events
+        GamePlayableStatusChanged = 4001,
+        DLCPlayableStatusChanged = 4002,
     };
 
     // 系统事件类型
     internal enum SystemState
     {
-        kSystemState_Unknown = 0,            // 未知
-        kSystemState_PlatformExit = 1,          // 平台退出
+        kSystemState_Unknown = 0, // 未知
+        kSystemState_PlatformExit = 1, // 平台退出
     };
 
     // 是否触发授权的返回结果
@@ -67,162 +69,242 @@ namespace TapSDK.Core.Standalone.Internal
     {
 
 #if UNITY_STANDALONE_WIN
-  public const string DLL_NAME = "taptap_api";
+        public const string DLL_NAME = "taptap_api";
 #endif
 
 #if UNITY_STANDALONE_WIN
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern bool TapSDK_RestartAppIfNecessary([MarshalAs( UnmanagedType.LPStr )]string clientId);
-
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern int TapSDK_Init(StringBuilder errMsg, [MarshalAs( UnmanagedType.LPStr )]string pubKey);
-
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.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);
-  
-  // 系统状态返回结果结构体
-   [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    internal struct SystemStateResponse
-    {
-        public SystemState state; // 枚举直接映射
-    }
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool TapSDK_RestartAppIfNecessary([MarshalAs(UnmanagedType.LPStr)] string clientId);
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern void TapSDK_RegisterCallback(int callbackId, IntPtr callback);
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int TapSDK_Init(StringBuilder errMsg, [MarshalAs(UnmanagedType.LPStr)] string pubKey);
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.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_Shutdown();
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern void TapSDK_UnregisterCallback(int callbackId, IntPtr callback);
+        // 定义与 C 兼容的委托
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate void CallbackDelegate(int id, IntPtr userData);
 
+        // 系统状态返回结果结构体
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        internal struct SystemStateResponse
+        {
+            public SystemState state; // 枚举直接映射
+        }
 
-  // 登录相关接口
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void TapSDK_RegisterCallback(int callbackId, IntPtr callback);
 
-  // 授权返回结果结构体
-   [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct AuthorizeFinishedResponse
-    {
-        public int is_cancel ; // 是否取消
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void TapSDK_RunCallbacks();
 
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
-        public string callback_uri; // 256 字节的 C 端字符串
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern void TapSDK_UnregisterCallback(int callbackId, IntPtr callback);
 
-    }
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern bool TapUser_GetOpenID(StringBuilder openId);
+        // 登录相关接口
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern bool TapSDK_GetClientID(StringBuilder clientId);
+        // 授权返回结果结构体
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        public struct AuthorizeFinishedResponse
+        {
+            public int is_cancel; // 是否取消
 
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
+            public string callback_uri; // 256 字节的 C 端字符串
 
-  [global::System.Runtime.InteropServices.DllImport(TapClientBridge.DLL_NAME, CharSet =CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
-  internal static extern int TapUser_AsyncAuthorize([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 bool TapUser_GetOpenID(StringBuilder openId);
 
-   // 初始化检查
-   internal static TapSDKInitResult CheckInitState(out string errMessage, string key)
-    {
-        StringBuilder errMsgBuffer = new StringBuilder(1024); // 分配 1024 字节缓冲区
-        int result = TapSDK_Init(errMsgBuffer, key);
-        errMessage = errMsgBuffer.ToString();
-        TapLogger.Debug("CheckInitState result = " + result);
-        return (TapSDKInitResult)result;
-    }
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool TapSDK_GetClientID(StringBuilder clientId);
 
-    // 预防 GC 回收的静态变量
-       private static CallbackDelegate _callbackInstance ;
-
-       private static CallbackDelegate _userCallbackInstance ;
-
-    // 提供 C# 端的注册方法
-    /*  授权 callback 实现示例：
-     void MyCallback(TapCallbackID id, IntPtr userData){
-        AuthorizeFinishedResponse response = Marshal.PtrToStructure<AuthorizeFinishedResponse>(userData);
-     }
-       系统状态 callback 实现示例：
-     void SystemStateCallback(TapCallbackID id, IntPtr state){
-        SystemStateResponse response = Marshal.PtrToStructure<SystemStateResponse>(userData);
-     }
-    */
-    internal static void RegisterCallback(TapEventID eventID, CallbackDelegate callback)
-    {
-       
-        IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
-        switch (eventID)
+
+        [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
         {
-            case TapEventID.AuthorizeFinished:
-                if (_userCallbackInstance != null)
-                {
-                    UnRegisterCallback(eventID, _userCallbackInstance);
-                }
-                _userCallbackInstance = callback;
-                break;
-            case TapEventID.SystemStateChanged:
-                if (_callbackInstance != null)
-                {
-                    UnRegisterCallback(eventID, _callbackInstance);
-                }
-                _callbackInstance = callback; // 防止被 GC 回收 
-                break;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+            public string dlc_id; // DLC ID
+
+            public byte is_playable; // 是否可玩，当用户购买 DLC （外置 DLC 为购买且下载完成后），此值返回 true。其他情况返回 false
+
         }
-        
-        TapSDK_RegisterCallback((int)eventID, funcPtr);
-    }
 
-    // 移除回调
-    internal static void UnRegisterCallback(TapEventID eventID,CallbackDelegate callback)
-    {
-        
-        IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
-        switch (eventID)
+        // 初始化检查
+        internal static int CheckInitState(out string errMessage, string key)
         {
-            case TapEventID.AuthorizeFinished:
-                _userCallbackInstance = null;
-                break;
-            case TapEventID.SystemStateChanged:
-                _callbackInstance = null;
-                break; 
+            StringBuilder errMsgBuffer = new StringBuilder(1024); // 分配 1024 字节缓冲区
+            int result = TapSDK_Init(errMsgBuffer, key);
+            errMessage = errMsgBuffer.ToString();
+            TapLogger.Debug("CheckInitState result = " + result);
+            return result;
         }
-        TapLogger.Debug("start remove delegate ptr " + funcPtr);
-        TapSDK_UnregisterCallback((int) eventID, funcPtr);
-    }
-   
-    internal static AuthorizeResult LoginWithScopes(string[] scopeStrings, string responseType, string redirectUri, 
-    string codeChallenge, string state, string codeChallengeMethod, string versonCode, string sdkUa, string info) {
-        try
+
+        // 预防 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)
         {
-            TapLogger.Debug("login start ==== "+ string.Join(",", scopeStrings));
-            int result = TapUser_AsyncAuthorize(string.Join(",", scopeStrings), responseType, redirectUri, 
- codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
-            TapLogger.Debug("login end === " + result);
-            return (AuthorizeResult)result;
-        }catch(Exception ex){
-            TapLogger.Debug("login crash = " + ex.StackTrace);
-            return AuthorizeResult.UNKNOWN;
+
+            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 bool GetTapUserOpenId(out string openId){
-        StringBuilder openIdBuffer = new StringBuilder(256); // 分配一个足够大的缓冲区
-        bool success =  TapUser_GetOpenID(openIdBuffer);  // 调用 C 函数
-        openId =  openIdBuffer.ToString();
-        return success;
-    }
+        // 移除回调
+        internal static void UnRegisterCallback(TapEventID eventID, CallbackDelegate callback)
+        {
 
-     internal static bool GetClientId(out string clientId){
-        StringBuilder clientIDBuffer = new StringBuilder(256); // 分配一个足够大的缓冲区
-         bool success = TapSDK_GetClientID(clientIDBuffer);  // 调用 C 函数
-         clientId = clientIDBuffer.ToString();
-        return success;  
-    }
+            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
+            {
+                TapLogger.Debug("login start ==== " + string.Join(",", scopeStrings));
+                int result = TapUser_AsyncAuthorize_internal(string.Join(",", scopeStrings), responseType, redirectUri,
+     codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
+                TapLogger.Debug("login end === " + result);
+                return (AuthorizeResult)result;
+            }
+            catch (Exception ex)
+            {
+                TapLogger.Debug("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)
+            {
+                TapLogger.Debug("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 函数
+            openId = openIdBuffer.ToString();
+            return success;
+        }
+
+        internal static bool GetClientId(out string clientId)
+        {
+            StringBuilder clientIDBuffer = new StringBuilder(256); // 分配一个足够大的缓冲区
+            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)
+        {
+            return TapDLC_ShowStore(skuId);
+        }
+
+        internal static bool HasLicense()
+        {
+            return TapApps_IsOwned();
+        }
 
 #endif
     }

package/Standalone/Runtime/Internal/UI/TapClientConnectTipController.cs

@@ -29,16 +29,16 @@ namespace TapSDK.Core.Standalone.Internal {
             okButton.onClick.AddListener(OnOKButtonClicked);
         }
 
-        internal void Show(TapSDKInitResult errorType)
+        internal void Show(int errorType)
         {
-            if (errorType == TapSDKInitResult.NoPlatform){
+            if (errorType == (int)TapSDKInitResult.NoPlatform){
                 tipText.text = "获取游戏信息失败，请下载 TapTap 客户端后重新启动游戏";
-            }else if (errorType == TapSDKInitResult.NotLaunchedByPlatform){
+            }else if (errorType == (int)TapSDKInitResult.NotLaunchedByPlatform){
                 tipText.text = "获取游戏信息失败，请从 TapTap 客户端重新启动游戏";
-            }else if (errorType == TapSDKInitResult.Unknown){
+            }else if (errorType == (int)TapSDKInitResult.Unknown){
                 tipText.text = "本地发生未知错误，请从 TapTap 客户端重新启动游戏";
-            }else if (errorType == TapSDKInitResult.Timeout){
-                tipText.text = "获取游戏信息超时，请从 TapTap 客户端重新启动游戏";                  
+            }else if (errorType == (int)TapSDKInitResult.PlatformVersionMismatch){
+                tipText.text = "客户端版本不匹配，请将 TapTap 客户端升级到最新版本";                  
             }else {
                 tipText.text = "发生未知错误，请从 TapTap 客户端重新启动游戏";
             }

package/Standalone/Runtime/Public/TapClientStandalone.cs

@@ -36,13 +36,13 @@ namespace TapSDK.Core.Standalone
             if (isRuningIsLaunchedFromTapTapPC)
             {
                 UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请勿重复调用", UIManager.GeneralToastLevel.Error);
-                TapLogger.Error("IsLaunchedFromTapTapPC 正在执行，请勿重复调用");
+                Log( true,"IsLaunchedFromTapTapPC 正在执行，请勿重复调用");
                 return false;
             }
             // 多次执行时返回上一次结果
             if (lastIsLaunchedFromTapTapPCResult != -1)
             {
-                TapLogger.Debug("IsLaunchedFromTapTapPC duplicate invoke return " + lastIsLaunchedFromTapTapPCResult);
+                Log( false,"IsLaunchedFromTapTapPC duplicate invoke return " + lastIsLaunchedFromTapTapPCResult);
                 return lastIsLaunchedFromTapTapPCResult > 0;
             }
 
@@ -51,7 +51,7 @@ namespace TapSDK.Core.Standalone
             if (coreOptions == null)
             {
                 UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 调用必须在初始化之后", UIManager.GeneralToastLevel.Error);
-                TapLogger.Error("IsLaunchedFromTapTapPC 调用必须在初始化之后");
+                Log( true,"IsLaunchedFromTapTapPC 调用必须在初始化之后");
                 return false;
             }
             string clientId = coreOptions.clientId;
@@ -59,7 +59,7 @@ namespace TapSDK.Core.Standalone
             if (string.IsNullOrEmpty(clientId) || string.IsNullOrEmpty(pubKey))
             {
                 UIManager.Instance.OpenToast("clientId 及 TapPubKey 参数都不能为空, clientId =" + clientId + ", TapPubKey = " + pubKey, UIManager.GeneralToastLevel.Error);
-                TapLogger.Error("clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey);
+                Log( true,"clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey);
                 return false;
             }
             isRuningIsLaunchedFromTapTapPC = true;
@@ -68,27 +68,28 @@ namespace TapSDK.Core.Standalone
             TapCoreTracker.Instance.TrackStart(TapCoreTracker.METHOD_LAUNCHER, sessionId);
             try
             {
-                TapInitResult result = await RunClientBridgeMethodWithTimeout(clientId, pubKey);
+                TapInitResult result = await RunClientBridgeMethod(clientId, pubKey);
+                Log(false, "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);
-                    TapLogger.Debug("IsLaunchedFromTapTapPC Quit game");
+                    Log( false,"IsLaunchedFromTapTapPC Quit game");
                     Application.Quit();
                     return false;
                 }
                 else
                 {
-                    if (result.result == TapSDKInitResult.OK)
+                    if (result.result == (int)TapSDKInitResult.OK)
                     {
                         string currentClientId;
                         bool isFetchClientIdSuccess = TapClientBridge.GetClientId(out currentClientId);
-                        TapLogger.Debug("IsLaunchedFromTapTapPC get  clientId = " + currentClientId);
+                        Log( false,"IsLaunchedFromTapTapPC get  clientId = " + currentClientId, false);
                         if (isFetchClientIdSuccess && !string.IsNullOrEmpty(currentClientId) && currentClientId != clientId)
                         {
                             UIManager.Instance.OpenToast("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致", UIManager.GeneralToastLevel.Error);
-                            TapLogger.Error("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
+                            Log( true,"SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
                             TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, -1, "SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
                             lastIsLaunchedFromTapTapPCResult = 0;
                             return false;
@@ -97,17 +98,17 @@ namespace TapSDK.Core.Standalone
                         bool fetchOpenIdSuccess = TapClientBridge.GetTapUserOpenId(out openId);
                         if (fetchOpenIdSuccess)
                         {
-                            TapLogger.Debug("IsLaunchedFromTapTapPC get  openId = " + openId);
+                            Log( false,"IsLaunchedFromTapTapPC get  openId = " + openId, false);
                             EventManager.TriggerEvent(EventManager.IsLaunchedFromTapTapPCFinished, openId);
                         }
                         else
                         {
-                            TapLogger.Debug("IsLaunchedFromTapTapPC get  openId failed");
+                            Log( false,"IsLaunchedFromTapTapPC get  openId failed");
                         }
                         lastIsLaunchedFromTapTapPCResult = 1;
                         TapClientBridgePoll.StartUp();
                         TapCoreTracker.Instance.TrackSuccess(TapCoreTracker.METHOD_LAUNCHER, sessionId, TapCoreTracker.SUCCESS_TYPE_INIT);
-                        TapLogger.Debug("IsLaunchedFromTapTapPC check success");
+                        Log( false,"IsLaunchedFromTapTapPC check success");
                         return true;
                     }
                     else
@@ -115,7 +116,7 @@ namespace TapSDK.Core.Standalone
 
                         TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)result.result, result.errorMsg ?? "");
                         lastIsLaunchedFromTapTapPCResult = 0;
-                        TapLogger.Debug("IsLaunchedFromTapTapPC show TapClient tip Pannel " + result.result + " , error = " + result.errorMsg);
+                        Log( false,"IsLaunchedFromTapTapPC show TapClient tip Pannel " + result.result + " , error = " + result.errorMsg);
                         string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
                         if (Resources.Load<GameObject>(tipPannelPath) != null)
                         {
@@ -126,46 +127,32 @@ namespace TapSDK.Core.Standalone
                     }
                 }
             }
-            catch (TimeoutException e)
-            {
-                lastIsLaunchedFromTapTapPCResult = 0;
-                TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)TapSDKInitResult.Timeout, e.Message ?? "");
-
-                TapLogger.Debug("IsLaunchedFromTapTapPC check timeout");
-                string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
-                if (Resources.Load<GameObject>(tipPannelPath) != null)
-                {
-                    var pannel = UIManager.Instance.OpenUI<TapClientConnectTipController>(tipPannelPath);
-                    pannel.Show(TapSDKInitResult.Timeout);
-                }
-                return false;
-            }
             catch (Exception e)
             {
                 lastIsLaunchedFromTapTapPCResult = 0;
                 TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)TapSDKInitResult.Unknown, e.Message ?? "");
 
-                TapLogger.Debug("IsLaunchedFromTapTapPC check exception = " + e.Message + " \n" + e.StackTrace);
+                Log( false,"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);
-                    pannel.Show(TapSDKInitResult.Unknown);
+                    pannel.Show((int)TapSDKInitResult.Unknown);
                 }
                 return false;
             }
         }
 
-        private static async Task<TapInitResult> RunClientBridgeMethodWithTimeout(string clientId, string pubKey)
+        private static async Task<TapInitResult> RunClientBridgeMethod(string clientId, string pubKey)
         {
             TaskCompletionSource<TapInitResult> task = new TaskCompletionSource<TapInitResult>();
             try
             {
-                TapInitResult result = await ExecuteWithTimeoutAsync(() =>
+                await Task.Run(() =>
                 {
+                    Log(false, "check startupWithClientBridge start thread = " + Thread.CurrentThread.ManagedThreadId);
                     bool needQuitGame = TapClientBridge.TapSDK_RestartAppIfNecessary(clientId);
-                    TapLogger.Debug("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = " + needQuitGame);
-                    TapLogger.Debug("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary finished " );
+                    Log( false,"RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = " + needQuitGame);
                     if (needQuitGame)
                     {
                         tapInitResult = new TapInitResult(needQuitGame);
@@ -173,53 +160,22 @@ namespace TapSDK.Core.Standalone
                     else
                     {
                         string outputError;
-                        TapSDKInitResult tapSDKInitResult = TapClientBridge.CheckInitState(out outputError, pubKey);
-                        TapLogger.Debug("RunClientBridgeMethodWithTimeout invoke  CheckInitState result = " + tapSDKInitResult + ", error = " + outputError);
+                        int tapSDKInitResult = TapClientBridge.CheckInitState(out outputError, pubKey);
+                        Log( false,"RunClientBridgeMethodWithTimeout invoke  CheckInitState result = " + tapSDKInitResult + ", error = " + outputError);
                         tapInitResult = new TapInitResult(tapSDKInitResult, outputError);
                     }
-                    return tapInitResult;
-                }, TimeSpan.FromSeconds(5));
-                task.TrySetResult(tapInitResult);
+                    task.TrySetResult(tapInitResult);
+                });
 
             }
-            catch (TimeoutException ex)
-            {
-                TapLogger.Debug("RunClientBridgeMethodWithTimeout invoke  CheckInitState 方法执行超时！");
-                task.TrySetException(ex);
-            }
             catch (Exception ex)
             {
-                TapLogger.Debug("RunClientBridgeMethodWithTimeout invoke C 方法出错！" + ex.Message);
+                Log( false,"RunClientBridgeMethodWithTimeout invoke C 方法出错！" + ex.Message);
                 task.TrySetException(ex);
             }
             return await task.Task;
         }
 
-        /// <summary>
-        /// 在 IO 线程执行 C 方法，超时 5 秒后切回主线程
-        /// </summary>
-        private static async Task<T> ExecuteWithTimeoutAsync<T>(Func<T> cMethod, TimeSpan timeout)
-        {
-            using (var cts = new CancellationTokenSource())
-            {
-                Task<T> ioTask = Task.Run(cMethod); // 在后台线程执行 C 方法
-                Task delayTask = Task.Delay(timeout); // 超时任务
-
-                Task completedTask = await Task.WhenAny(ioTask, delayTask);
-
-                if (completedTask == delayTask)
-                {
-                    cts.Cancel(); // 取消 C 方法任务
-                    throw new TimeoutException("C 方法执行超时！");
-                }
-                else
-                {
-                    cts.Cancel();
-                    return await ioTask;
-                }
-            }
-        }
-
         /// <summary>
         /// 是否需要从启动器登录
         /// </summary>
@@ -240,19 +196,19 @@ namespace TapSDK.Core.Standalone
             if (lastIsLaunchedFromTapTapPCResult == -1)
             {
                 // UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请在完成后调用授权接口", UIManager.GeneralToastLevel.Error);
-                TapLogger.Error(" login must be invoked after IsLaunchedFromTapTapPC success");
+                Log( true," login must be invoked after IsLaunchedFromTapTapPC success");
                 throw new Exception("login must be invoked after IsLaunchedFromTapTapPC success");
             }
-            TapLogger.Debug("LoginWithScopes start login by tapclient thread = " + Thread.CurrentThread.ManagedThreadId);
+            Log( false,"LoginWithScopes start login by tapclient thread = " + Thread.CurrentThread.ManagedThreadId);
             try
             {
-                TapClientBridge.RegisterCallback(TapEventID.AuthorizeFinished, loginCallbackDelegate);
-                AuthorizeResult authorizeResult = TapClientBridge.LoginWithScopes(scopes, responseType, redirectUri,
+                TapClientBridge.RegisterCallback(TapEventID.AuthorizeFinished_internal, loginCallbackDelegate);
+                AuthorizeResult authorizeResult = TapClientBridge.LoginWithScopesInternal(scopes, responseType, redirectUri,
      codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
-                TapLogger.Debug("LoginWithScopes start result = " + authorizeResult);
+                Log( false,"LoginWithScopes start result = " + authorizeResult);
                 if (authorizeResult != AuthorizeResult.OK)
                 {
-                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished,loginCallbackDelegate);
+                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
                     return false;
                 }
                 else
@@ -264,8 +220,8 @@ namespace TapSDK.Core.Standalone
             }
             catch (Exception ex)
             {
-                TapLogger.Debug("LoginWithScopes start login by tapclient error = " + ex.Message);
-                TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished,loginCallbackDelegate);
+                Log( false,"LoginWithScopes start login by tapclient error = " + ex.Message);
+                TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
                 return false;
             }
 
@@ -275,30 +231,139 @@ namespace TapSDK.Core.Standalone
         [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
         static void loginCallbackDelegate(int id, IntPtr userData)
         {
-            TapLogger.Debug("LoginWithScopes recevie callback " + id);
-            if (id == (int)TapEventID.AuthorizeFinished)
+            Log( false,"LoginWithScopes recevie callback " + id);
+            if (id == (int)TapEventID.AuthorizeFinished_internal)
             {
-                TapLogger.Debug("LoginWithScopes callback thread = " + Thread.CurrentThread.ManagedThreadId);
+                Log( false,"LoginWithScopes callback thread = " + Thread.CurrentThread.ManagedThreadId);
                 TapClientBridge.AuthorizeFinishedResponse response = Marshal.PtrToStructure<TapClientBridge.AuthorizeFinishedResponse>(userData);
-                TapLogger.Debug("LoginWithScopes callback = " + response.is_cancel + " uri = " + response.callback_uri);
+                Log( false,"LoginWithScopes callback = " + response.is_cancel + " uri = " + response.callback_uri);
                 if (currentLoginCallback != null)
                 {
                     currentLoginCallback(response.is_cancel != 0, response.callback_uri);
-                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished,loginCallbackDelegate);
+                    TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
                     currentLoginCallback = null;
                 }
             }
         }
+        
+         // 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");
+            }
+            Log(false, "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)
+        {
+            Log(false, "queryDlC recevie callback " + id);
+            if (currentDlcDelegate != null)
+            {
+                TapClientBridge.DLCPlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.DLCPlayableStatusChangedResponse>(userData);
+                Log(false, "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)
+        {
+            Log(false, "License recevie callback " + id);
+            if (currentLicenseDelegate != null)
+            {
+                TapClientBridge.GamePlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.GamePlayableStatusChangedResponse>(userData);
+                Log(false, "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");
+            }
+            return TapClientBridge.HasLicense();
+        }
+
+
+        private static void Log(bool isError, string data, bool alwaysShow = true)
+        {
+            if (!string.IsNullOrEmpty(data))
+            {
+                if (TapLogger.LogDelegate != null)
+                {
+                    if (isError)
+                    {
+                        TapLogger.Error(data);
+                    }
+                    else
+                    {
+                        TapLogger.Debug(data);
+                    }
+
+                }
+                else
+                {
+                    if (alwaysShow || TapTapSDK.taptapSdkOptions.enableLog)
+                    {
+                        if (isError)
+                        {
+                            UnityEngine.Debug.LogErrorFormat($"[TapSDK] ERROR: {data}");
+                        }
+                        else
+                        {
+                            UnityEngine.Debug.LogFormat($"[TapSDK] INFO: {data}");
+                        }
+                    }
+                }
+            }
+        }
 
         // 初始化校验结果
         private class TapInitResult
         {
-            internal TapSDKInitResult result;
+            internal int result;
             internal string errorMsg;
 
             internal bool needQuitGame = false;
 
-            public TapInitResult(TapSDKInitResult result, string errorMsg)
+            public TapInitResult(int result, string errorMsg)
             {
                 this.result = result;
                 this.errorMsg = errorMsg;

package/link.xml

@@ -0,0 +1,4 @@
+<linker>
+  <assembly fullname="TapSDK.Core.Runtime" preserve="all" />
+  <assembly fullname="TapSDK.Core.Mobile.Runtime" preserve="all" />
+</linker>

package/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7dbdaf3a91ea44d24a51131f915db17b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.sdk.core",
   "displayName": "TapTapSDK Core",
   "description": "TapTapSDK Core",
-  "version": "4.7.0-alpha.14",
+  "version": "4.7.1",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {