com.xd.sdk.common 7.2.1-alpha.3 → 7.2.1-alpha.4

package/Editor/Steam/SteamBuildProcessor.cs

@@ -1,3 +1,4 @@
+#if XD_STEAM_SUPPORT
 using System.IO;
 using UnityEngine;
 using UnityEditor;
@@ -18,7 +19,7 @@ namespace XD.SDK.Common.Internal.Standalone.Editor {
             string appIdTxt = "steam_appid.txt";
             string appIdTxtPath = Path.Combine(Application.dataPath, "..", appIdTxt);
             if (!File.Exists(appIdTxtPath)) {
-                Debug.LogError($"请将 steam_appid.txt 放置在工程根目录下。");
+                Debug.LogWarning($"请将 steam_appid.txt 放置在工程根目录下。");
             }
 
             string outPath = report.summary.outputPath;
@@ -32,4 +33,5 @@ namespace XD.SDK.Common.Internal.Standalone.Editor {
             }
         }
     }
-}
+}
+#endif

package/Plugins/Android/libs/{XDGTapTapWrapperInternal_7.2.0.aar.meta → XDGTapSdkCompat_7.3.0.aar.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b0d403d67c154f328438456187fd373
+guid: 97d63cf2d3fbf4b00bd093fe6b1f47b5
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

package/Plugins/iOS/XDCommonSDK.framework/Headers/XDVersion.h

@@ -7,4 +7,4 @@
 
 #define XDSDK_VERSION @"7.3.0"
 #define XDSDK_VERSION_CODE @"7030000"
-// HASH e0ae45d9
+// HASH 12db4772

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapAchievementCallback.h.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapAchievementWrapper.h.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 51f07f082b24844499ad4befed052a03
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapCloudSaveCallback.h.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapCloudSaveWrapper.h.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 486d7db17e2714320b40dde2a8ced632
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapMomentDelegate.h.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8ca9ef6c0b35d4f40af51a70daf0dcab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDGTapTapMomentWrapper.h.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDTapSDK4WrapperSDK.h

@@ -17,7 +17,7 @@ FOUNDATION_EXPORT const unsigned char XDTapSDK4WrapperSDKVersionString[];
 
 #define XDGTapSDK4_VERSION @"7.3.0"
 #define XDGTapSDK4_VERSION_CODE @"7030000"
-// HASH e0ae45d9
+// HASH 12db4772
 
 // 对外导出的协议和封装类
 // Achievement

package/Resources/Prefabs/GeneralAgreementAlert.prefab

@@ -133,7 +133,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: cb7e1a0e9ae57274b80858a808d7c9ba, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 0.13333334, g: 0.13333334, b: 0.13333334, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -187,9 +187,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8115389968904905495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 400, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 400, y: -348}
   m_SizeDelta: {x: 700, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &6136117534961052962

package/Resources/Prefabs/XDSDKUI.prefab

@@ -87,6 +87,7 @@ GameObject:
   - component: {fileID: 223190507069427674}
   - component: {fileID: 114453665955884244}
   - component: {fileID: 114536875208541376}
+  - component: {fileID: 1723631138956368394}
   m_Layer: 5
   m_Name: XDSDKUI
   m_TagString: Untagged
@@ -180,6 +181,18 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!114 &1723631138956368394
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810664746418960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c91453437c3342b99c78c23bcc9e028f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &6203735995377905587
 GameObject:
   m_ObjectHideFlags: 0

package/Runtime/Internal/IXDGCommon.Extended.cs

@@ -13,10 +13,6 @@ namespace XD.SDK.Common.Internal
 
         void DisableAgreementUI();
 
-        void PreloadWebPage(string url);
-
-        void OpenWebPage(string url, Action<WebActionEnum, Dictionary<string, object>> callback);
-
         bool IsSteamInitialized();
     }
 }

package/Runtime/Internal/Mobile/CommonFeaturesImpl.cs

@@ -229,6 +229,26 @@ namespace XD.SDK.Common.Internal.Mobile
             });
         }
 
+        public string GetPackageType()
+        {
+            string packageType = XDGPackageType.PackageTypeDefault;
+#if UNITY_ANDROID
+            using (var commonBridgeClass = new AndroidJavaClass(BridgeConstants.Common.BridgeStaticImpl))
+            {
+                packageType = commonBridgeClass.CallStatic<string>("getPackageType");
+            }
+#elif UNITY_IOS
+            IntPtr ptr = XDCommonBridgeGetPackageType();
+            packageType = Marshal.PtrToStringAnsi(ptr);
+#endif
+            return packageType;
+        }
+        
+#if UNITY_IOS
+        [DllImport("__Internal")]
+        private static extern IntPtr XDCommonBridgeGetPackageType();
+#endif
+
         public bool IsSteamInitialized()
         {
             return false;

package/Runtime/Internal/Standalone/CommonFeaturesImpl.cs

@@ -104,9 +104,19 @@ namespace XD.SDK.Common.Internal.Standalone
 #endif
         }
 
+        public string GetPackageType()
+        {
+            if (SteamUtils.IsSDKSupported)
+            {
+                return XDGPackageType.PackageTypePCSteam;
+            }
+
+            return ConfigModule.UsingTapPC ? XDGPackageType.PackageTypePCTapTap : XDGPackageType.PackageTypePCNormal;
+        }
+
         public bool IsSteamInitialized()
         {
-            return SteamWrapper.Initialized();
+            return SteamUtils.IsSDKSupported;
         }
 
         public void DisableAgreementUI()

package/Runtime/Internal/Standalone/Steam/SteamManager.cs

@@ -1,3 +1,4 @@
+#if XD_STEAM_SUPPORT
 // The SteamManager is designed to work with Steamworks.NET
 // This file is released into the public domain.
 // Where that dedication is not recognized you are granted a perpetual,
@@ -319,7 +320,11 @@ class SteamManager : MonoBehaviour {
         {
             var json = File.ReadAllText(configPath);
             var jsonObject = JObject.Parse(json);
-            var steamIDRaw = jsonObject["steam_id"]?.ToString();
+            var steamIDRaw = jsonObject["steam_appid"]?.ToString();
+            if (string.IsNullOrEmpty(steamIDRaw))
+            {
+	            steamIDRaw = jsonObject["steam_id"]?.ToString();
+            }
             
             ulong steamIDValue = 0;
             if (!string.IsNullOrEmpty(steamIDRaw) && !ulong.TryParse(steamIDRaw, out steamIDValue))
@@ -357,4 +362,5 @@ class SteamManager : MonoBehaviour {
 		}
 	}
 #endif // !DISABLESTEAMWORKS
-}
+}
+#endif // XD_STEAM_SUPPORT

package/Runtime/Internal/Standalone/Steam/SteamUtils.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace XD.SDK.Common.Internal.Standalone
+{
+    /// <summary>
+    /// Steam SDK 封装接口
+    /// </summary>
+    public interface ISteamSDKWrapper
+    {
+        Task<string> GetAuthTicket();
+        string GetSteamId();
+        string GetSteamLanguage();
+        Task<string> GetMicroTxn(ulong orderId);
+        string GetSteamCountry();
+        bool IsInitialized();
+    }
+
+    public class SteamUtils
+    {
+        private static readonly Lazy<SteamUtils> _instance = new Lazy<SteamUtils>(() => new SteamUtils());
+        public static SteamUtils Instance => _instance.Value;
+
+        private SteamUtils()
+        {
+        }
+
+        private static ISteamSDKWrapper WrapperInstance { get; set; }
+
+        static SteamUtils()
+        {
+            Type interfaceType = typeof(ISteamSDKWrapper);
+            Type steamWrapperType = AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(assembly => assembly.GetTypes())
+                .FirstOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
+            if (steamWrapperType != null)
+            {
+                WrapperInstance = Activator.CreateInstance(steamWrapperType) as ISteamSDKWrapper;
+            }
+        }
+
+        public Task<string> GetAuthTicket()
+        {
+            return IsInitialized() ? WrapperInstance.GetAuthTicket() : Task.FromResult(string.Empty);
+        }
+
+        public string GetSteamId()
+        {
+            return IsInitialized() ? WrapperInstance.GetSteamId() : string.Empty;
+        }
+
+        public string GetSteamLanguage()
+        {
+            return IsInitialized() ? WrapperInstance.GetSteamLanguage() : string.Empty;
+        }
+
+        public Task<string> GetMicroTxn(ulong orderId)
+        {
+            return IsInitialized() ? WrapperInstance.GetMicroTxn(orderId) : Task.FromResult(string.Empty);
+        }
+
+        public string GetSteamCountry()
+        {
+            return IsInitialized() ? WrapperInstance.GetSteamCountry() : string.Empty;
+        }
+
+        public bool IsInitialized()
+        {
+            return WrapperInstance != null && WrapperInstance.IsInitialized();
+        }
+
+        public static bool IsSDKSupported => Instance.IsInitialized();
+    }
+}

package/Runtime/Internal/Standalone/Steam/SteamUtils.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6c8ea028a94d432bb5d319082e7da902
+timeCreated: 1766043372

package/Runtime/Internal/Standalone/Steam/SteamWrapper.cs

@@ -1,30 +1,24 @@
+#if XD_STEAM_SUPPORT
 #if UNITY_EDITOR || UNITY_STANDALONE
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-#if !UNITY_IOS && !UNITY_ANDROID
 using Steamworks;
-#endif
 
 namespace XD.SDK.Common.Internal.Standalone
 {
-    public class SteamWrapper
+    public class SteamWrapper : ISteamSDKWrapper
     {
-        private static readonly Lazy<SteamWrapper> lazyInstance = new Lazy<SteamWrapper>(() => new SteamWrapper());
-#if !UNITY_IOS && !UNITY_ANDROID
         private readonly Callback<GetAuthSessionTicketResponse_t> getAuthSessionTicketResponseCallback;
         private readonly ConcurrentDictionary<HAuthTicket, Tuple<TaskCompletionSource<string>, string>> tickTasks;
 
         private readonly Callback<MicroTxnAuthorizationResponse_t> mircoTxnAuthorizationCallback;
         private readonly ConcurrentDictionary<ulong, TaskCompletionSource<string>> microTxnTasks;
-#endif
-        public static SteamWrapper Instance => lazyInstance.Value;
 
-        private SteamWrapper()
+        public SteamWrapper()
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             tickTasks = new ConcurrentDictionary<HAuthTicket, Tuple<TaskCompletionSource<string>, string>>();
 
             getAuthSessionTicketResponseCallback = Callback<GetAuthSessionTicketResponse_t>.Create((GetAuthSessionTicketResponse_t pCallback) =>
@@ -61,10 +55,9 @@ namespace XD.SDK.Common.Internal.Standalone
                     }
                 }
             });
-#endif
         }
 
-        public static bool Initialized()
+        private static bool Initialized()
         {
             return SteamManager.Initialized;
         }
@@ -79,7 +72,6 @@ namespace XD.SDK.Common.Internal.Standalone
         
         public Task<string> GetAuthTicket()
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             EnsureInitialized();
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
 
@@ -88,11 +80,8 @@ namespace XD.SDK.Common.Internal.Standalone
             string ticket = BitConverter.ToString(data, 0, (int)ticketLength)
                 .Replace("-", string.Empty);
             tickTasks.TryAdd(hTicket, new Tuple<TaskCompletionSource<string>, string>(tcs, ticket));
-            
+
             return tcs.Task;
-#else
-            throw new Exception("Steam is not supported on iOS/Android platform.");
-#endif
         }
 
         /// <summary>
@@ -102,19 +91,14 @@ namespace XD.SDK.Common.Internal.Standalone
         /// <returns></returns>
         public Task<string> GetMicroTxn(ulong orderId)
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             EnsureInitialized();
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
             microTxnTasks.TryAdd(orderId, tcs);
             return tcs.Task;
-#else
-            throw new Exception("Steam is not supported on iOS/Android platform.");
-#endif
         }
 
         public string GetSteamId()
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             EnsureInitialized();
             try
             {
@@ -126,24 +110,16 @@ namespace XD.SDK.Common.Internal.Standalone
                 XDGLogger.Error("当前开启 XD_STEAM_SUPPORT，但没有 Steam 环境", XDGLoggerTag.Common);
                 return null;
             }
-#else
-            throw new Exception("Steam is not supported on iOS/Android platform.");
-#endif
         }
 
         public string GetSteamLanguage()
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             EnsureInitialized();
             return SteamApps.GetCurrentGameLanguage();
-#else
-            throw new Exception("Steam is not supported on iOS/Android platform.");
-#endif
         }
 
         public string GetSteamCountry()
         {
-#if !UNITY_IOS && !UNITY_ANDROID
             if (!Initialized())
             {
                 return null;
@@ -156,11 +132,14 @@ namespace XD.SDK.Common.Internal.Standalone
             {
                 return null;
             }
-#else
-            throw new Exception("Steam is not supported on iOS/Android platform.");
-#endif
+        }
+
+        public bool IsInitialized()
+        {
+            return Initialized();
         }
     }
 }
 
+#endif
 #endif

package/Runtime/Internal/Standalone/UI/Base/UIResolutionAdapter.cs

@@ -0,0 +1 @@
+using UnityEngine;
    [RequireComponent(typeof(CanvasScaler))]
    public class UIResolutionAdapter : MonoBehaviour
    {
        private static Vector2 _globalTargetResolution = new Vector2(1920, 1080);
        private static bool _isConfigLoaded;
        private CanvasScaler scaler;
        private void Awake()
        {
            LoadConfigOnce();
            scaler = GetComponent<CanvasScaler>();
            Adapt();
        }
        void OnRectTransformDimensionsChange()
        {
            if (!Application.isPlaying)
            {
                _isConfigLoaded = false;
                LoadConfigOnce();
            }
            Adapt();
        }
        // --- 核心适配逻辑 ---
        public void Adapt()
        {
            if (scaler == null) scaler = GetComponent<CanvasScaler>();
            if (scaler == null) return;
            scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
            float maxVal = Mathf.Max(_globalTargetResolution.x, _globalTargetResolution.y);
            float minVal = Mathf.Min(_globalTargetResolution.x, _globalTargetResolution.y);
            float screenRatio = (float)Screen.width / Screen.height;
            if (screenRatio > 1)
            {
                scaler.referenceResolution = new Vector2(maxVal, minVal);
                scaler.matchWidthOrHeight = 1.0f;
            }
            else
            {
                scaler.referenceResolution = new Vector2(minVal, maxVal);
                scaler.matchWidthOrHeight = 0.0f;
            }
        }
        private static void LoadConfigOnce()
        {
            if (_isConfigLoaded) return;
            _isConfigLoaded = true;
            string filePath = Path.Combine(Application.streamingAssetsPath, "XDConfig.json");
            try
            {
                if (File.Exists(filePath))
                {
                    var jsonContent = File.ReadAllText(filePath);
                    var match = Regex.Match(jsonContent, "\"ui_resolution\"\\s*:\\s*\\[\\s*(\\d+)\\s*,\\s*(\\d+)\\s*\\]");
                    if (!match.Success) return;
                    var w = float.Parse(match.Groups[1].Value);
                    var h = float.Parse(match.Groups[2].Value);
                    _globalTargetResolution = new Vector2(w, h);
                    Debug.Log($"[XDSDK] UI配置已加载: {_globalTargetResolution}");
                }
                else
                {
                    Debug.LogWarning($"[XDSDK] 找不到配置文件: {filePath}，使用默认分辨率 {_globalTargetResolution}");
                }
            }
            catch (System.Exception e)
            {
                Debug.LogError($"[XDSDK] 读取配置文件失败: {e.Message}");
            }
        }
    }

package/Runtime/Internal/Standalone/UI/Base/UIResolutionAdapter.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c91453437c3342b99c78c23bcc9e028f
+timeCreated: 1766392280

package/Runtime/Internal/XDGCommonInternal.cs

@@ -72,6 +72,11 @@ namespace XD.SDK.Common.Internal
         {
             platformWrapper.OpenWebPage(url, callback);
         }
+        
+        public static string GetPackageType()
+        {
+            return platformWrapper.GetPackageType();
+        }
 
         #endregion
 

package/Runtime/Public/XDGCommon.cs

@@ -86,5 +86,26 @@ namespace XD.SDK.Common
         {
             XDGCommonInternal.OpenWebPage(url, callback);
         }
+        /// <summary>
+        /// 获取包体类型
+        /// Tips: 在 PNSDK 环境下不可用
+        ///
+        /// 在 PC 上
+        /// 1. 当 Steam SDK 启用时，优先返回 XDGPackageType.PackageTypePCSteam
+        /// 2. 当 TapTap 平台启用时，返回 XDGPackageType.PackageTypePCTapTap
+        /// 3. 否则返回默认 XDGPackageType.PackageTypePCNormal
+        ///
+        /// 在 Android 上
+        /// 如果是 GooglePlay 包体，则返回 XDGPackageType.PackageTypeAndroidGooglePlay
+        /// 如果不是则返回 XDGPackageType.PackageTypeAndroidNormal
+        ///
+        /// 在 iOS 上
+        /// 固定返回 XDGPackageType.PackageTypeAppStore
+        /// </summary>
+        /// <returns>包体类型</returns>
+        public static string GetPackageType()
+        {
+            return XDGCommonInternal.GetPackageType();
+        }
     }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.common",
   "displayName": "XDGSDK Common",
-  "version": "7.2.1-alpha.3",
+  "version": "7.2.1-alpha.4",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.foundation": "7.2.1-alpha.3"
+    "com.xd.sdk.foundation": "7.2.1-alpha.4"
   }
 }

package/Plugins/Android/libs/XDTapTapWrapper_7.2.0.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 082d115a60bee4bccb8d6de4cdafc8ee
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: