com.taptap.sdk.core 4.9.2 → 4.9.4

package/Mobile/Editor/NativeDependencies.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <dependencies>
   <androidPackages>
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.4" />
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.2"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.4" />
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapCoreMobile.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 using TapSDK.Core.Internal;
+using TapSDK.Core.Internal.Log;
 using TapSDK.Core.Internal.Utils;
-using System.Collections.Generic;
 using UnityEngine;
-using Newtonsoft.Json;
-using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core.Mobile
 {
@@ -44,32 +44,48 @@ namespace TapSDK.Core.Mobile
             TapLog.Log("TapCoreMobile SDK inited");
             SetPlatformAndVersion(TapTapSDK.SDKPlatform, TapTapSDK.Version);
             string coreOptionsJson = JsonUtility.ToJson(coreOption);
-            string[] otherOptionsJson = otherOptions.Select(option => JsonConvert.SerializeObject(option)).ToArray();
-            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
-                .Method("init")
-                .Args("coreOption", coreOptionsJson)
-                .Args("otherOptions", otherOptionsJson)
-                .CommandBuilder());
+            string[] otherOptionsJson = otherOptions
+                .Select(option => JsonConvert.SerializeObject(option))
+                .ToArray();
+            Bridge.CallHandler(
+                EngineBridgeInitializer
+                    .GetBridgeServer()
+                    .Method("init")
+                    .Args("coreOption", coreOptionsJson)
+                    .Args("otherOptions", otherOptionsJson)
+                    .CommandBuilder()
+            );
         }
 
         private void SetPlatformAndVersion(string platform, string version)
         {
-            TapLog.Log("TapCoreMobile SetPlatformAndVersion called with platform: " + platform + " and version: " + version);
-            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
-                .Method("setPlatformAndVersion")
-                .Args("platform", TapTapSDK.SDKPlatform)
-                .Args("version", TapTapSDK.Version)
-                .CommandBuilder());
+            TapLog.Log(
+                "TapCoreMobile SetPlatformAndVersion called with platform: "
+                    + platform
+                    + " and version: "
+                    + version
+            );
+            Bridge.CallHandler(
+                EngineBridgeInitializer
+                    .GetBridgeServer()
+                    .Method("setPlatformAndVersion")
+                    .Args("platform", TapTapSDK.SDKPlatform)
+                    .Args("version", TapTapSDK.Version)
+                    .CommandBuilder()
+            );
             SetSDKArtifact("Unity");
         }
 
         private void SetSDKArtifact(string value)
         {
             TapLog.Log("TapCoreMobile SetSDKArtifact called with value: " + value);
-            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
-                .Method("setSDKArtifact")
-                .Args("artifact", "Unity")
-                .CommandBuilder());
+            Bridge.CallHandler(
+                EngineBridgeInitializer
+                    .GetBridgeServer()
+                    .Method("setSDKArtifact")
+                    .Args("artifact", "Unity")
+                    .CommandBuilder()
+            );
         }
 
         public void Init(TapTapSdkOptions coreOption)
@@ -80,15 +96,42 @@ namespace TapSDK.Core.Mobile
         public void UpdateLanguage(TapTapLanguageType language)
         {
             TapLog.Log("TapCoreMobile UpdateLanguage language: " + language);
-            Bridge.CallHandler(EngineBridgeInitializer.GetBridgeServer()
-                .Method("updateLanguage")
-                .Args("language", (int)language)
-                .CommandBuilder());
+            Bridge.CallHandler(
+                EngineBridgeInitializer
+                    .GetBridgeServer()
+                    .Method("updateLanguage")
+                    .Args("language", (int)language)
+                    .CommandBuilder()
+            );
         }
 
         public Task<bool> IsLaunchedFromTapTapPC()
         {
             return Task.FromResult(false);
         }
+
+        public void SendOpenLog(
+            string project,
+            string version,
+            string action,
+            Dictionary<string, string> properties
+        )
+        {
+            if (properties == null)
+            {
+                properties = new Dictionary<string, string>();
+            }
+            string propertiesJson = JsonConvert.SerializeObject(properties);
+            Bridge.CallHandler(
+                EngineBridgeInitializer
+                    .GetBridgeServer()
+                    .Method("sendOpenLog")
+                    .Args("project", project)
+                    .Args("version", version)
+                    .Args("action", action)
+                    .Args("properties", propertiesJson)
+                    .CommandBuilder()
+            );
+        }
     }
-}
+}

package/Resources/Fonts/tapsdk_shader.shader

@@ -0,0 +1,127 @@
+// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
+
+Shader "TapSDK/Default"
+{
+    Properties
+    {
+        [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
+        _Color ("Tint", Color) = (1,1,1,1)
+
+        _StencilComp ("Stencil Comparison", Float) = 8
+        _Stencil ("Stencil ID", Float) = 0
+        _StencilOp ("Stencil Operation", Float) = 0
+        _StencilWriteMask ("Stencil Write Mask", Float) = 255
+        _StencilReadMask ("Stencil Read Mask", Float) = 255
+
+        _ColorMask ("Color Mask", Float) = 15
+
+        [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
+    }
+
+    SubShader
+    {
+        Tags
+        {
+            "Queue"="Transparent"
+            "IgnoreProjector"="True"
+            "RenderType"="Transparent"
+            "PreviewType"="Plane"
+            "CanUseSpriteAtlas"="True"
+        }
+
+        Stencil
+        {
+            Ref [_Stencil]
+            Comp [_StencilComp]
+            Pass [_StencilOp]
+            ReadMask [_StencilReadMask]
+            WriteMask [_StencilWriteMask]
+        }
+
+        Cull Off
+        Lighting Off
+        ZWrite Off
+        ZTest [unity_GUIZTestMode]
+        Blend SrcAlpha OneMinusSrcAlpha
+        ColorMask [_ColorMask]
+
+        Pass
+        {
+            Name "Default"
+        CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #pragma target 2.0
+
+            #include "UnityCG.cginc"
+            #include "UnityUI.cginc"
+
+            #pragma multi_compile_local _ UNITY_UI_CLIP_RECT
+            #pragma multi_compile_local _ UNITY_UI_ALPHACLIP
+
+            struct appdata_t
+            {
+                float4 vertex   : POSITION;
+                float4 color    : COLOR;
+                float2 texcoord : TEXCOORD0;
+                UNITY_VERTEX_INPUT_INSTANCE_ID
+            };
+
+            struct v2f
+            {
+                float4 vertex   : SV_POSITION;
+                fixed4 color    : COLOR;
+                float2 texcoord  : TEXCOORD0;
+                float4 worldPosition : TEXCOORD1;
+                float4  mask : TEXCOORD2;
+                UNITY_VERTEX_OUTPUT_STEREO
+            };
+
+            sampler2D _MainTex;
+            fixed4 _Color;
+            fixed4 _TextureSampleAdd;
+            float4 _ClipRect;
+            float4 _MainTex_ST;
+            float _UIMaskSoftnessX;
+            float _UIMaskSoftnessY;
+
+            v2f vert(appdata_t v)
+            {
+                v2f OUT;
+                UNITY_SETUP_INSTANCE_ID(v);
+                UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+                float4 vPosition = UnityObjectToClipPos(v.vertex);
+                OUT.worldPosition = v.vertex;
+                OUT.vertex = vPosition;
+
+                float2 pixelSize = vPosition.w;
+                pixelSize /= float2(1, 1) * abs(mul((float2x2)UNITY_MATRIX_P, _ScreenParams.xy));
+
+                float4 clampedRect = clamp(_ClipRect, -2e10, 2e10);
+                float2 maskUV = (v.vertex.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy);
+                OUT.texcoord = TRANSFORM_TEX(v.texcoord.xy, _MainTex);
+                OUT.mask = float4(v.vertex.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy)));
+
+                OUT.color = v.color * _Color;
+                return OUT;
+            }
+
+            fixed4 frag(v2f IN) : SV_Target
+            {
+                half4 color = IN.color * (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd);
+
+                #ifdef UNITY_UI_CLIP_RECT
+                half2 m = saturate((_ClipRect.zw - _ClipRect.xy - abs(IN.mask.xy)) * IN.mask.zw);
+                color.a *= m.x * m.y;
+                #endif
+
+                #ifdef UNITY_UI_ALPHACLIP
+                clip (color.a - 0.001);
+                #endif
+
+                return color;
+            }
+        ENDCG
+        }
+    }
+}

package/Resources/Fonts/tapsdk_shader.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b3c067c0e17de4e4c877649ed2d40608
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Resources/Fonts/tapsdk_text_material.mat

@@ -0,0 +1,97 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: tapsdk_text_material
+  m_Shader: {fileID: 4800000, guid: b3c067c0e17de4e4c877649ed2d40608, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FaceTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _CullMode: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DiffusePower: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _MaskSoftnessX: 0
+    - _MaskSoftnessY: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _VertexOffsetX: 0
+    - _VertexOffsetY: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

package/Resources/Fonts/tapsdk_text_material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 72783176f276841b3b4560e3ea828263
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Internal/Platform/ITapCorePlatform.cs

@@ -1,14 +1,24 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace TapSDK.Core.Internal {
-    public interface ITapCorePlatform {
+namespace TapSDK.Core.Internal
+{
+    public interface ITapCorePlatform
+    {
         void Init(TapTapSdkOptions config);
 
         void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions);
-        
+
         void UpdateLanguage(TapTapLanguageType language);
 
         Task<bool> IsLaunchedFromTapTapPC();
+
+        void SendOpenLog(
+            string project,
+            string version,
+            string action,
+            Dictionary<string, string> properties
+        );
     }
-}
+}

package/Runtime/Internal/Utils/TapLoom.cs

@@ -1,9 +1,9 @@
-using UnityEngine;
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System;
-using System.Threading;
 using System.Linq;
+using System.Threading;
+using UnityEngine;
 
 namespace TapSDK.Core.Internal.Utils
 {
@@ -42,7 +42,6 @@ namespace TapSDK.Core.Internal.Utils
         {
             if (!initialized)
             {
-
                 if (!Application.isPlaying)
                     return;
                 initialized = true;
@@ -50,15 +49,16 @@ namespace TapSDK.Core.Internal.Utils
                 DontDestroyOnLoad(g);
                 _current = g.AddComponent<TapLoom>();
             }
-
         }
 
         private List<Action> _actions = new List<Action>();
+
         public struct DelayedQueueItem
         {
             public float time;
             public Action action;
         }
+
         private List<DelayedQueueItem> _delayed = new List<DelayedQueueItem>();
 
         List<DelayedQueueItem> _currentDelayed = new List<DelayedQueueItem>();
@@ -67,20 +67,26 @@ namespace TapSDK.Core.Internal.Utils
         {
             QueueOnMainThread(action, 0f);
         }
+
         public static void QueueOnMainThread(Action action, float time)
         {
             if (time != 0)
             {
                 lock (Current._delayed)
                 {
-                    Current._delayed.Add(new DelayedQueueItem { time = Time.time, action = action });
+                    Current._delayed.Add(
+                        new DelayedQueueItem { time = Time.time, action = action }
+                    );
                 }
             }
             else
             {
-                lock (Current._actions)
+                if (Current != null && Current._actions != null)
                 {
-                    Current._actions.Add(action);
+                    lock (Current._actions)
+                    {
+                        Current._actions.Add(action);
+                    }
                 }
             }
         }
@@ -167,37 +173,27 @@ namespace TapSDK.Core.Internal.Utils
             {
                 ((Action)action)();
             }
-            catch
-            {
-            }
+            catch { }
             finally
             {
                 Interlocked.Decrement(ref numThreads);
             }
-
         }
 
-
         void OnDisable()
         {
             if (_current == this)
             {
-
                 _current = null;
             }
         }
 
-
-
-        // Use this for initialization  
-        void Start()
-        {
-
-        }
+        // Use this for initialization
+        void Start() { }
 
         List<Action> _currentActions = new List<Action>();
 
-        // Update is called once per frame  
+        // Update is called once per frame
         void Update()
         {
             lock (_actions)
@@ -223,19 +219,23 @@ namespace TapSDK.Core.Internal.Utils
             }
         }
 
-        private void OnApplicationPause(bool pauseStatus) {
-             if (pauseStatus && isPause == false) {
+        private void OnApplicationPause(bool pauseStatus)
+        {
+            if (pauseStatus && isPause == false)
+            {
                 isPause = true;
                 EventManager.TriggerEvent(EventManager.OnApplicationPause, true);
             }
-            else if (!pauseStatus && isPause) {
+            else if (!pauseStatus && isPause)
+            {
                 isPause = false;
                 EventManager.TriggerEvent(EventManager.OnApplicationPause, false);
             }
         }
 
-         private void OnApplicationQuit(){
+        private void OnApplicationQuit()
+        {
             EventManager.TriggerEvent(EventManager.OnApplicationQuit, true);
         }
     }
-}
+}

package/Runtime/Public/DataStorage.cs

@@ -13,6 +13,9 @@ namespace TapSDK.Core
     {
         private static Dictionary<string, string> dataCache;
         private static byte[] Keys = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+
+        // 缓存 MacAddress，避免多次获取
+        private static string cachedMacAddress;
         public static void SaveString(string key, string value)
         {
             string storageKey = GenerateStorageKey(key);
@@ -135,6 +138,10 @@ namespace TapSDK.Core
 
         private static string GetMacAddress()
         {
+            if (!string.IsNullOrEmpty(cachedMacAddress))
+            {
+                return cachedMacAddress;
+            }
             string physicalAddress = "FFFFFFFFFFFF";
             if (Platform.IsAndroid() || Platform.IsIOS())
             {
@@ -159,6 +166,7 @@ namespace TapSDK.Core
                     };
                 }
             }
+            cachedMacAddress = physicalAddress;
             return physicalAddress;
         }
 

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.9.2";
+        public static readonly string Version = "4.9.3";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -38,12 +38,11 @@ namespace TapSDK.Core {
         {
             if (coreOption == null)
                 throw new ArgumentException("[TapSDK] options is null!");
-
             TapTapSDK.taptapSdkOptions = coreOption;
             TapLog.Enabled = coreOption.enableLog;
             platformWrapper?.Init(coreOption);
-
             // 初始化各个模块
+
             Type[] initTaskTypes = GetInitTypeList();
             if (initTaskTypes != null)
             {
@@ -60,6 +59,7 @@ namespace TapSDK.Core {
                 }
             }
             TapTapEvent.Init(HandleEventOptions(coreOption));
+
         }
 
         public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
@@ -72,7 +72,6 @@ namespace TapSDK.Core {
             platformWrapper?.Init(coreOption, otherOptions);
 
 
-
             Type[] initTaskTypes = GetInitTypeList();
             if (initTaskTypes != null)
             {
@@ -120,8 +119,34 @@ namespace TapSDK.Core {
                     tapEventOptions.enableAutoIAPEvent = coreOption.enableAutoIAPEvent;
                     tapEventOptions.overrideBuiltInParameters = coreOption.overrideBuiltInParameters;
                     tapEventOptions.propertiesJson = coreOption.propertiesJson;
+                    tapEventOptions.caid = coreOption.caid;
+                    tapEventOptions.enableAdvertiserIDCollection = coreOption.enableAdvertiserIDCollection;
+                    tapEventOptions.oaidCert = coreOption.oaidCert;
+                    tapEventOptions.disableReflectionOAID = coreOption.disableReflectionOAID;
                 }
             }
+            else
+            {
+                if (
+                    string.IsNullOrEmpty(tapEventOptions.caid)
+                    && !string.IsNullOrEmpty(coreOption.caid)
+                )
+                {
+                    tapEventOptions.caid = coreOption.caid;
+                }
+                tapEventOptions.enableAdvertiserIDCollection =
+                    tapEventOptions.enableAdvertiserIDCollection || coreOption.enableAdvertiserIDCollection;
+
+                if (
+                    string.IsNullOrEmpty(tapEventOptions.oaidCert)
+                    && !string.IsNullOrEmpty(coreOption.oaidCert)
+                )
+                {
+                    tapEventOptions.oaidCert = coreOption.oaidCert;
+                }
+                tapEventOptions.disableReflectionOAID =
+                    tapEventOptions.disableReflectionOAID && coreOption.disableReflectionOAID;
+            }
             return tapEventOptions;
         }
 
@@ -147,5 +172,15 @@ namespace TapSDK.Core {
             return initTaskTypes;
         }
 
+        public static void SendOpenLog(
+            string project,
+            string version,
+            string action,
+            Dictionary<string, string> properties = null
+        )
+            {
+                platformWrapper.SendOpenLog(project, version, action, properties);
+        }
+
     }
 }

package/Runtime/Public/TapTapSdkOptions.cs

@@ -74,6 +74,7 @@ namespace TapSDK.Core
         /// <summary>
         /// CAID，仅国内 iOS
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")] 
         public string caid = null;
         /// <summary>
         /// 是否能够覆盖内置参数，默认为 false
@@ -83,6 +84,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 是否开启广告商 ID 收集，默认为 false
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")] 
         public bool enableAdvertiserIDCollection = false;
         /// <summary>
         /// 是否开启自动上报 IAP 事件
@@ -92,6 +94,7 @@ namespace TapSDK.Core
         /// <summary>
         /// OAID证书, 仅 Android，用于上报 OAID 仅 [TapTapRegion.CN] 生效
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")]
         public string oaidCert = null;
         /// <summary>
         /// 是否开启日志，Release 版本请设置为 false
@@ -101,6 +104,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 是否禁用 OAID 反射
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")]
         public bool disableReflectionOAID = true;
 
         /// <summary>
@@ -156,6 +160,26 @@ namespace TapSDK.Core
         /// </summary>
         public bool disableAutoLogDeviceLogin = false;
 
+        /// <summary>
+        /// CAID，仅国内 iOS
+        /// </summary>
+        public string caid = null;
+
+        /// <summary>
+        /// 是否开启广告商 ID 收集，默认为 false
+        /// </summary>
+        public bool enableAdvertiserIDCollection = false;
+
+        /// <summary>
+        /// OAID证书, 仅 Android，用于上报 OAID 仅 [TapTapRegion.CN] 生效
+        /// </summary>
+        public string oaidCert = null;
+
+        /// <summary>
+        /// 是否禁用 OAID 反射
+        /// </summary>
+        public bool disableReflectionOAID = true;
+
         [JsonProperty("moduleName")]
         private string _moduleName = "TapTapEvent";
         [JsonIgnore]

package/Standalone/Runtime/Internal/DeviceInfo.cs

@@ -11,6 +11,11 @@ namespace TapSDK.Core.Standalone.Internal
 {
   public class DeviceInfo
   {
+    // 缓存网卡地址列表，避免多次调用
+    private static string cachedMacAddressList;
+
+    // 缓存网卡地址，避免多次调用
+    private static string cachedFristMacAddress;
 
 #if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
     [DllImport("TapDBDeviceInfo", CallingConvention = CallingConvention.Cdecl)]
@@ -68,6 +73,15 @@ namespace TapSDK.Core.Standalone.Internal
 
     public static void GetMacAddress(out string macAddressList, out string firstMacAddress)
     {
+        if (
+            !string.IsNullOrEmpty(cachedMacAddressList)
+            && !string.IsNullOrEmpty(cachedFristMacAddress)
+        )
+        {
+            macAddressList = cachedMacAddressList;
+            firstMacAddress = cachedFristMacAddress;
+            return;
+        }
       List<string> mac_addrs = new List<string>();
 
       try
@@ -92,6 +106,9 @@ namespace TapSDK.Core.Standalone.Internal
       }
       macAddressList = $"[{string.Join(",", mac_addrs)}]";
       firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;
+      
+      cachedMacAddressList = macAddressList;
+      cachedFristMacAddress = firstMacAddress;
     }
 
     private static string toMd5(string data)

package/Standalone/Runtime/Internal/Http/TapHttp.cs

@@ -11,6 +11,7 @@ namespace TapSDK.Core.Standalone.Internal.Http
     using System.Threading.Tasks;
     using Newtonsoft.Json;
     using TapSDK.Core.Internal.Log;
+    using UnityEngine;
 
     public class TapHttp
     {
@@ -391,47 +392,9 @@ namespace TapSDK.Core.Standalone.Internal.Http
         }
 
         // 判断网络连接状态
-        private bool CheckNetworkConnection(){
-            try {
-                var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
-
-                foreach (var netInterface in networkInterfaces)
-                {
-                    // 忽略虚拟网卡
-                    if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Loopback || 
-                        netInterface.NetworkInterfaceType == NetworkInterfaceType.Tunnel)
-                    {
-                        continue;
-                    }
-
-                    // 检查是否有网络连接
-                    if (netInterface.OperationalStatus == OperationalStatus.Up)
-                    {
-                        // 检查是否有有效的 IPv4 地址
-                        var ipProperties = netInterface.GetIPProperties();
-                        var ipv4Address = ipProperties.UnicastAddresses.FirstOrDefault(ip => ip.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork);
-
-                        if (ipv4Address != null)
-                        {
-                            // 有有效的 IP 地址，则说明已连接到网络
-                            if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Ethernet)
-                            {
-                                return true; // 有线连接
-                            }
-                            else if (netInterface.NetworkInterfaceType == NetworkInterfaceType.Wireless80211)
-                            {
-                                return true; // 无线连接
-                            }
-                        }
-                    }
-                }
-
-                return false; // 无连接
-            }catch(Exception e){
-                TapLog.Log("checkout network connected error = " + e);
-                // 发生异常时，当做有网处理
-                return true;
-            }
+        private bool CheckNetworkConnection()
+        {
+            return Application.internetReachability != NetworkReachability.NotReachable;
         }
     }
 }

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

@@ -17,16 +17,20 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
     public class TapOpenlogStandalone
     {
         public static string openid = "";
-        private static readonly Dictionary<string, string> generalParameter = new Dictionary<string, string>();
-        private static readonly Dictionary<string, System.Object> openlogStartParameter = new Dictionary<string, System.Object>();
+        private static readonly Dictionary<string, string> generalParameter =
+            new Dictionary<string, string>();
+        private static readonly Dictionary<string, System.Object> openlogStartParameter =
+            new Dictionary<string, System.Object>();
         private readonly string sdkProjectName;
         private readonly string sdkProjectVersion;
         private static readonly bool isRND = false;
         private static readonly TapLog log = new TapLog(module: "Openlog");
 #if UNITY_STANDALONE
-        private static readonly CommonVariablesGetter commonVariablesGetter = new CommonVariablesGetter(GetCommonVariables);
+        private static readonly CommonVariablesGetter commonVariablesGetter =
+            new CommonVariablesGetter(GetCommonVariables);
         private static readonly FreeStringCallback freeString = new FreeStringCallback(FreeString);
 #endif
+
         public static void Init()
         {
 #if UNITY_STANDALONE
@@ -58,28 +62,37 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
         private static void BindWindowChange()
         {
 #if UNITY_STANDALONE
-            EventManager.AddListener(EventManager.OnApplicationPause, (isPause) =>
-            {
-                var isPauseBool = (bool)isPause;
-                if (isPauseBool)
+            EventManager.AddListener(
+                EventManager.OnApplicationPause,
+                (isPause) =>
+                {
+                    var isPauseBool = (bool)isPause;
+                    if (isPauseBool)
+                    {
+                        TdkOnBackground();
+                    }
+                    else
+                    {
+                        TdkOnForeground();
+                    }
+                }
+            );
+
+            EventManager.AddListener(
+                EventManager.OnApplicationQuit,
+                (quit) =>
                 {
-                    TdkOnBackground();
+                    TdkOnAppStopped();
                 }
-                else
+            );
+            EventManager.AddListener(
+                EventManager.OnComplianceUserChanged,
+                (userInfo) =>
                 {
-                    TdkOnForeground();
+                    TdkSetExtraAppDurationParams(userInfo.ToString());
                 }
-            });
-
-            EventManager.AddListener(EventManager.OnApplicationQuit, (quit) =>
-            {
-                TdkOnAppStopped();
-            });
-            EventManager.AddListener(EventManager.OnComplianceUserChanged, (userInfo) => 
-            {
-                TdkSetExtraAppDurationParams(userInfo.ToString());
-            });
-#endif            
+            );
+#endif
         }
 
         public TapOpenlogStandalone(string sdkProjectName, string sdkProjectVersion)
@@ -88,10 +101,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             this.sdkProjectVersion = sdkProjectVersion;
         }
 
-        public void LogBusiness(
-            string action,
-            Dictionary<string, string> properties = null
-        )
+        public void LogBusiness(string action, Dictionary<string, string> properties = null)
         {
 #if UNITY_STANDALONE
             if (properties == null)
@@ -106,13 +116,13 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
 #endif
         }
 
-        public void LogTechnology(
-            string action,
-            Dictionary<string, string> properties = null
-        )
+        public void LogTechnology(string action, Dictionary<string, string> properties = null)
         {
 #if UNITY_STANDALONE
-            if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN && !"TapPayment".Equals(sdkProjectName))
+            if (
+                TapCoreStandalone.coreOptions.region == TapTapRegionType.CN
+                && !"TapPayment".Equals(sdkProjectName)
+            )
             {
                 // 国内非支付SDK不上报技术日志
                 return;
@@ -138,16 +148,26 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             }
             else
             {
-                openlogStartParameter[TapOpenlogStartParamConstants.PARAM_REGION] = TapCoreStandalone.coreOptions.region;
+                openlogStartParameter[TapOpenlogStartParamConstants.PARAM_REGION] =
+                    TapCoreStandalone.coreOptions.region;
             }
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_TO_CONSOLE] = 1;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_LOG_LEVEL] = 1;
             string openLogDirPath = Path.Combine(Application.persistentDataPath, "OpenlogData");
-            if (TapTapSDK.taptapSdkOptions != null && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)){
-                openLogDirPath = Path.Combine(Application.persistentDataPath, "OpenlogData_" + TapTapSDK.taptapSdkOptions.clientId);
-                if( !Directory.Exists(openLogDirPath)){
+            if (
+                TapTapSDK.taptapSdkOptions != null
+                && !string.IsNullOrEmpty(TapTapSDK.taptapSdkOptions.clientId)
+            )
+            {
+                openLogDirPath = Path.Combine(
+                    Application.persistentDataPath,
+                    "OpenlogData_" + TapTapSDK.taptapSdkOptions.clientId
+                );
+                if (!Directory.Exists(openLogDirPath))
+                {
                     string oldPath = Path.Combine(Application.persistentDataPath, "OpenlogData");
-                    if(Directory.Exists(oldPath)){
+                    if (Directory.Exists(oldPath))
+                    {
                         Directory.Move(oldPath, openLogDirPath);
                     }
                 }
@@ -155,20 +175,26 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_DATA_DIR] = openLogDirPath;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_ENV] = "local";
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_PLATFORM] = "PC";
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_UA] = TapHttpUtils.GenerateUserAgent();
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_ID] = TapCoreStandalone.coreOptions.clientId;
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_TOKEN] = TapCoreStandalone.coreOptions.clientToken;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_UA] =
+                TapHttpUtils.GenerateUserAgent();
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_ID] = TapCoreStandalone
+                .coreOptions
+                .clientId;
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_CLIENT_TOKEN] =
+                TapCoreStandalone.coreOptions.clientToken;
             openlogStartParameter[TapOpenlogStartParamConstants.PARAM_COMMON] = generalParameter;
-            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_APP_DURATION] = new Dictionary<string, string>()
-            {
-                {TapOpenlogParamConstants.PARAM_TAPSDK_VERSION, TapTapSDK.Version}
-            };
+            openlogStartParameter[TapOpenlogStartParamConstants.PARAM_APP_DURATION] =
+                new Dictionary<string, string>()
+                {
+                    { TapOpenlogParamConstants.PARAM_TAPSDK_VERSION, TapTapSDK.Version },
+                };
         }
 
         private static void InitGeneralParameter()
         {
             // 应用包名
-            generalParameter[TapOpenlogParamConstants.PARAM_APP_PACKAGE_NAME] = Application.identifier;
+            generalParameter[TapOpenlogParamConstants.PARAM_APP_PACKAGE_NAME] =
+                Application.identifier;
             // 应用版本字符串
             generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION] = Application.version;
             // 应用版本（数字）
@@ -176,7 +202,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 固定一个枚举值: TapSDK
             generalParameter[TapOpenlogParamConstants.PARAM_PN] = "TapSDK";
             // SDK生成的设备唯一标识
-            generalParameter[TapOpenlogParamConstants.PARAM_DEVICE_ID] = SystemInfo.deviceUniqueIdentifier;
+            generalParameter[TapOpenlogParamConstants.PARAM_DEVICE_ID] =
+                SystemInfo.deviceUniqueIdentifier;
             // SDK生成的设备一次安装的唯一标识
             generalParameter[TapOpenlogParamConstants.PARAM_INSTALL_UUID] = Identity.InstallationId;
             // 设备品牌，eg: Xiaomi
@@ -188,13 +215,16 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 支持 CPU 架构，eg：arm64-v8a
             generalParameter[TapOpenlogParamConstants.PARAM_CPU_ABIS] = "";
             // 设备操作系统
-            generalParameter[TapOpenlogParamConstants.PARAM_OS] = SystemInfo.operatingSystemFamily.ToString();
+            generalParameter[TapOpenlogParamConstants.PARAM_OS] =
+                SystemInfo.operatingSystemFamily.ToString();
             // 设备操作系统版本
             generalParameter[TapOpenlogParamConstants.PARAM_SV] = SystemInfo.operatingSystem;
             // 物理设备真实屏幕分辨率宽
-            generalParameter[TapOpenlogParamConstants.PARAM_WIDTH] = Screen.currentResolution.width.ToString();
+            generalParameter[TapOpenlogParamConstants.PARAM_WIDTH] =
+                Screen.currentResolution.width.ToString();
             // 物理设备真实屏幕分辨率高
-            generalParameter[TapOpenlogParamConstants.PARAM_HEIGHT] = Screen.currentResolution.height.ToString();
+            generalParameter[TapOpenlogParamConstants.PARAM_HEIGHT] =
+                Screen.currentResolution.height.ToString();
             // 设备总存储空间（磁盘），单位B
             generalParameter[TapOpenlogParamConstants.PARAM_TOTAL_ROM] = "";
             // 设备总内存，单位B
@@ -202,7 +232,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 芯片型号，eg：Qualcomm Technologies, Inc SM7250
             generalParameter[TapOpenlogParamConstants.PARAM_HARDWARE] = SystemInfo.processorType;
             // SDK设置的地区，例如 zh_CN
-            generalParameter[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = TapLocalizeManager.GetCurrentLanguageString();
+            generalParameter[TapOpenlogParamConstants.PARAM_SDK_LOCALE] =
+                TapLocalizeManager.GetCurrentLanguageString();
             // taptap的用户ID的外显ID（加密）
             generalParameter[TapOpenlogParamConstants.PARAM_OPEN_ID] = openid;
         }
@@ -227,8 +258,29 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 网络类型，eg：wifi, mobile
             props[TapOpenlogParamConstants.PARAM_NETWORK_TYPE] = "";
             // SDK设置的地区，例如 zh_CN
-            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = TapLocalizeManager.GetCurrentLanguageString();
+            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] =
+                TapLocalizeManager.GetCurrentLanguageString();
             return props;
         }
+
+        internal static void LogBusiness(
+            string sdkProjectName,
+            string sdkProjectVersion,
+            string action,
+            Dictionary<string, string> properties = null
+        )
+        {
+#if UNITY_STANDALONE
+            if (properties == null)
+            {
+                properties = new Dictionary<string, string>();
+            }
+            properties[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
+            properties[TapOpenlogParamConstants.PARAM_TAPSDK_VERSION] = sdkProjectVersion;
+            properties[TapOpenlogParamConstants.PARAM_ACTION] = action;
+            string propertiesStr = JsonConvert.SerializeObject(properties);
+            TdkOpenLog("tapsdk", propertiesStr);
+#endif
+        }
     }
-}
+}

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

@@ -5,11 +5,12 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
 {
     internal class TapOpenlogWrapper
     {
-
 #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
         internal const string DllName = "tapsdkcore";
 #elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
         internal const string DllName = "libtapsdkcorecpp";
+#elif UNITY_STANDALONE_LINUX || UNITY_EDITOR_LINUX
+        internal const string DllName = "libtapsdkcorecpp";
 #endif
 
         /**
@@ -68,7 +69,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
          * 成功返回 0，失败返回 -1
          */
         [DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int TdkOnAppStarted(string cfg, CommonVariablesGetter commonVariablesGetter, FreeStringCallback freeString);
+        internal static extern int TdkOnAppStarted(string cfg, CommonVariablesGetter commonVariablesGetter,
+            FreeStringCallback freeString);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         internal delegate IntPtr CommonVariablesGetter();

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -238,7 +238,17 @@ namespace TapSDK.Core.Standalone
             throw new System.NotImplementedException();
 #endif
         }
-    }
+
+        public void SendOpenLog(
+            string project,
+            string version,
+            string action,
+            Dictionary<string, string> properties
+        )
+        {
+            TapOpenlogStandalone.LogBusiness(project, version, action, properties);
+        }
+ }
 
 
     public interface IOpenIDProvider

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: aa2f8b129fc4c46ca9a18b1f4e61ee57
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -1,11 +1,8 @@
 {
-    "name": "com.taptap.sdk.core",
-    "displayName": "TapTapSDK Core",
-    "description": "TapTapSDK Core",
-    "version": "4.9.2",
-    "unity": "2019.4",
-    "license": "MIT",
-    "dependencies": {
-        "com.google.external-dependency-manager": "1.2.179"
-    }
+  "name": "com.taptap.sdk.core",
+  "displayName": "TapTapSDK Core",
+  "description": "TapTapSDK Core",
+  "version": "4.9.4",
+  "unity": "2020.3.0f1",
+  "license": "MIT"
 }