com.taptap.sdk.core 4.6.0-beta.1 → 4.6.1-alpha.13

package/Mobile/Editor/NativeDependencies.xml

@@ -3,13 +3,14 @@
   <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.6.0-beta.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.6.1-alpha.13"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapCoreSDK" version="~> 4.5.2" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.5.5" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapCoreMobile.cs

@@ -67,5 +67,10 @@ namespace TapSDK.Core.Mobile
                 .Args("language", (int)language)
                 .CommandBuilder());
         }
+
+        public Task<bool> IsLaunchedFromTapTapPC()
+        {
+            return Task.FromResult(false);
+        }
     }
 }

package/Mobile/Runtime/TapEventMobile.cs

@@ -258,6 +258,27 @@ namespace TapSDK.Core.Mobile
             IOSNativeWrapper.RegisterDynamicProperties(callback);
 #else
             AndroidNativeWrapper.RegisterDynamicProperties(callback);
+#endif
+        }
+
+        public void SetOAID(string value)
+        {
+            Debug.Log("TapEventMobile SetOAID" + value);
+#if UNITY_ANDROID
+            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
+                .Method("setOAID")
+                .Args("oaid", value)
+                .CommandBuilder());            
+#endif
+        }
+
+        public void LogDeviceLoginEvent()
+        {
+            Debug.Log("TapEventMobile LogDeviceLoginEvent");
+#if UNITY_ANDROID
+            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
+                .Method("logDeviceLoginEvent")
+                .CommandBuilder());            
 #endif
         }
     }

package/Runtime/Internal/Platform/ITapCorePlatform.cs

@@ -8,5 +8,7 @@ namespace TapSDK.Core.Internal {
         void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions);
         
         void UpdateLanguage(TapTapLanguageType language);
+
+        Task<bool> IsLaunchedFromTapTapPC();
     }
 }

package/Runtime/Internal/Platform/ITapEventPlatform.cs

@@ -33,5 +33,9 @@ namespace TapSDK.Core.Internal {
         void LogChargeEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string properties);
     
         void RegisterDynamicProperties(Func<string> callback);
+
+        void SetOAID(string value);
+        
+        void LogDeviceLoginEvent();
     }
 }

package/Runtime/Internal/Utils/BridgeUtils.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace TapSDK.Core.Internal.Utils {
@@ -12,18 +13,135 @@ namespace TapSDK.Core.Internal.Utils {
             Application.platform == RuntimePlatform.LinuxPlayer;
 
         public static object CreateBridgeImplementation(Type interfaceType, string startWith) {
+            Debug.Log($"[TapTap] 开始查找实现类: interfaceType={interfaceType.FullName}, startWith={startWith}, 当前平台={Application.platform}");
+            
             // 跳过初始化直接使用 TapLoom会在子线程被TapSDK.Core.BridgeCallback.Invoke 初始化
             TapLoom.Initialize();
-            Type bridgeImplementationType = AppDomain.CurrentDomain.GetAssemblies()
-                .Where(asssembly => asssembly.GetName().FullName.StartsWith(startWith))
-                .SelectMany(assembly => assembly.GetTypes())
-                .SingleOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
-            if (bridgeImplementationType == null){
-                Debug.LogWarningFormat(
-                    $"[TapTap] TapSDK Can't find bridge implementation for {interfaceType} on platform {Application.platform}.");
+            
+            // 获取所有程序集
+            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            Debug.Log($"[TapTap] 已加载的程序集总数: {allAssemblies.Length}");
+            
+            // 查找以 startWith 开头的程序集
+            var matchingAssemblies = allAssemblies
+                .Where(assembly => assembly.GetName().FullName.StartsWith(startWith))
+                .ToList();
+            
+            Debug.Log($"[TapTap] 找到匹配 '{startWith}' 的程序集数量: {matchingAssemblies.Count}");
+            
+            // 打印匹配的程序集名称
+            foreach (var assembly in matchingAssemblies) {
+                Debug.Log($"[TapTap] 匹配的程序集: {assembly.GetName().FullName}");
+            }
+            
+            // 如果没有找到匹配的程序集，打印所有TapSDK相关的程序集
+            if (matchingAssemblies.Count == 0) {
+                var tapAssemblies = allAssemblies
+                    .Where(assembly => assembly.GetName().FullName.Contains("TapSDK") || 
+                                      assembly.GetName().FullName.Contains("TapTap"))
+                    .ToList();
+                
+                Debug.Log($"[TapTap] 未找到匹配的程序集，但找到 {tapAssemblies.Count} 个相关程序集:");
+                foreach (var assembly in tapAssemblies) {
+                    Debug.Log($"[TapTap]  - {assembly.GetName().FullName}");
+                }
+            }
+            
+            // 从匹配的程序集中查找实现指定接口的类
+            List<Type> allCandidateTypes = new List<Type>();
+            foreach (var assembly in matchingAssemblies) {
+                try {
+                    var types = assembly.GetTypes()
+                        .Where(type => type.IsClass && interfaceType.IsAssignableFrom(type))
+                        .ToList();
+                    
+                    Debug.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现 {interfaceType.Name} 的类");
+                    
+                    foreach (var type in types) {
+                        Debug.Log($"[TapTap]  - {type.FullName} (IsPublic: {type.IsPublic}, IsAbstract: {type.IsAbstract})");
+                        allCandidateTypes.Add(type);
+                    }
+                }
+                catch (Exception ex) {
+                    Debug.LogError($"[TapTap] 获取程序集 {assembly.GetName().Name} 中的类型时出错: {ex.Message}");
+                }
+            }
+            
+            // 使用原始逻辑查找实现类
+            Type bridgeImplementationType = null;
+            try {
+                bridgeImplementationType = matchingAssemblies
+                    .SelectMany(assembly => {
+                        try {
+                            return assembly.GetTypes();
+                        } catch {
+                            return Type.EmptyTypes;
+                        }
+                    })
+                    .SingleOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
+                
+                Debug.Log($"[TapTap] SingleOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
+                
+                // 如果使用 SingleOrDefault 没找到，尝试使用 FirstOrDefault
+                if (bridgeImplementationType == null && allCandidateTypes.Count > 0) {
+                    Debug.Log($"[TapTap] SingleOrDefault 未找到实现，但有 {allCandidateTypes.Count} 个候选类型，尝试使用 FirstOrDefault");
+                    bridgeImplementationType = allCandidateTypes.FirstOrDefault();
+                    Debug.Log($"[TapTap] FirstOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
+                }
+                
+                // 如果找到多个实现，可能是 SingleOrDefault 失败的原因
+                if (allCandidateTypes.Count > 1) {
+                    Debug.LogWarning($"[TapTap] 找到多个实现 {interfaceType.Name} 的类，这可能导致 SingleOrDefault 返回 null");
+                    foreach (var type in allCandidateTypes) {
+                        Debug.LogWarning($"[TapTap]  - {type.FullName}");
+                    }
+                }
+            }
+            catch (Exception ex) {
+                Debug.LogError($"[TapTap] 在查找实现类时发生异常: {ex.Message}\n{ex.StackTrace}");
+            }
+            
+            if (bridgeImplementationType == null) {
+                Debug.LogWarning($"[TapTap] TapSDK 无法为 {interfaceType} 找到平台 {Application.platform} 上的实现类。");
+                
+                // 尝试在所有程序集中查找实现（不限制命名空间前缀）
+                if (matchingAssemblies.Count == 0) {
+                    Debug.Log("[TapTap] 尝试在所有程序集中查找实现...");
+                    List<Type> implementationsInAllAssemblies = new List<Type>();
+                    
+                    foreach (var assembly in allAssemblies) {
+                        try {
+                            var types = assembly.GetTypes()
+                                .Where(type => type.IsClass && !type.IsAbstract && interfaceType.IsAssignableFrom(type))
+                                .ToList();
+                            
+                            if (types.Count > 0) {
+                                Debug.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现");
+                                implementationsInAllAssemblies.AddRange(types);
+                            }
+                        }
+                        catch { /* 忽略错误 */ }
+                    }
+                    
+                    if (implementationsInAllAssemblies.Count > 0) {
+                        Debug.Log($"[TapTap] 在所有程序集中找到 {implementationsInAllAssemblies.Count} 个实现:");
+                        foreach (var type in implementationsInAllAssemblies) {
+                            Debug.Log($"[TapTap]  - {type.FullName} (在程序集 {type.Assembly.GetName().Name} 中)");
+                        }
+                    }
+                }
+                
+                return null;
+            }
+            
+            try {
+                Debug.Log($"[TapTap] 创建 {bridgeImplementationType.FullName} 的实例");
+                return Activator.CreateInstance(bridgeImplementationType);
+            }
+            catch (Exception ex) {
+                Debug.LogError($"[TapTap] 创建实例时出错: {ex.Message}");
                 return null;
             }
-            return Activator.CreateInstance(bridgeImplementationType);
         }
     }
 }

package/Runtime/Internal/Utils/EventManager.cs

@@ -10,6 +10,8 @@ namespace TapSDK.Core.Internal.Utils
         public const string OnApplicationQuit = "OnApplicationQuit";
 
         public const string OnComplianceUserChanged = "OnComplianceUserChanged";
+
+        public const string IsLaunchedFromTapTapPCFinished = "IsLaunchedFromTapTapPCFinished";
         private Dictionary<string, Action<object>> eventRegistries = new Dictionary<string, Action<object>>();
         
         public static void AddListener(string eventName, Action<object> listener) {

package/Runtime/Public/TapTapEvent.cs

@@ -89,5 +89,12 @@ namespace TapSDK.Core {
             platformWrapper?.RegisterDynamicProperties(callback);
         }
 
+        public static void SetOAID(string value){
+            platformWrapper?.SetOAID(value);
+        }
+        
+        public static void LogDeviceLoginEvent(){
+            platformWrapper?.LogDeviceLoginEvent();
+        }
     }
 }

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.6.0-beta.1";
+        public static readonly string Version = "4.6.1-alpha.13";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -89,6 +89,12 @@ namespace TapSDK.Core {
         public static void UpdateLanguage(TapTapLanguageType language){
             platformWrapper?.UpdateLanguage(language);
         }
+        
+        // 是否通过 PC 启动器唤起游戏
+        public static Task<bool> IsLaunchedFromTapTapPC()
+        {
+            return platformWrapper?.IsLaunchedFromTapTapPC();
+        }
 
         private static Type[] GetInitTypeList(){
             Type interfaceType = typeof(IInitTask);

package/Runtime/Public/TapTapSdkOptions.cs

@@ -45,6 +45,10 @@ namespace TapSDK.Core
         /// </summary>
         public string clientToken;
         /// <summary>
+        /// PC 客户端公钥
+        /// </summary>
+        public string clientPublicKey;
+        /// <summary>
         /// 地区，CN 为国内，Overseas 为海外
         /// </summary>
         public TapTapRegionType region = TapTapRegionType.CN;
@@ -89,6 +93,16 @@ namespace TapSDK.Core
         /// </summary>
         public bool enableLog = false;
 
+        /// <summary>
+        /// 是否禁用 OAID 反射
+        /// </summary>
+        public bool disableReflectionOAID = true;
+
+        /// <summary>
+        /// 是否即用禁用自动上报设备登录事件
+        /// </summary>
+        public bool disableAutoLogDeviceLogin = false;
+
         /// <summary>
         /// 屏幕方向：0-竖屏 1-横屏
         /// </summary>

package/Standalone/Plugins/x86_64/taptap_api.dll.meta

@@ -0,0 +1,52 @@
+fileFormatVersion: 2
+guid: b6f09ef7ffe9442c3a59f378a3a15005
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+        DefaultValueInitialized: true
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: