com.xd.sdk.common 7.1.2 → 7.2.1-alpha

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

@@ -0,0 +1,107 @@
+#if UNITY_EDITOR || UNITY_STANDALONE
+using UnityEngine;
+
+namespace XD.SDK.Common.Internal.Standalone
+{
+    /// <summary>
+    /// 提供 Common 模块内部统一使用的 UI 材质访问接口。
+    /// 默认会优先根据当前 ColorSpace 选择对应的材质，如果找不到 Linear 版本则回退到 Gamma 版本。
+    /// 实际材质文件放在任意包的 Resources/Shaders/UI 目录下即可（例如 Common 或 BuildTools），
+    /// 但路径必须保持与常量中定义的一致。
+    /// </summary>
+    public static class XDGCommonUIResources
+    {
+        // 贴图渲染用的默认 UI 材质
+        private const string SpriteGammaPath = "Shaders/UI/UI_Default-Gamma";
+        private const string SpriteLinearPath = "Shaders/UI/UI_Default-Linear";
+
+        // 蒙版用的默认 UI 材质
+        private const string MaskGammaPath = "Shaders/UI/UI_Default-Mask";
+        private const string MaskLinearPath = "Shaders/UI/UI_Default-Mask-Linear";
+
+        private static Material spriteGamma;
+        private static Material spriteLinear;
+
+        private static Material maskGamma;
+        private static Material maskLinear;
+
+        /// <summary>
+        /// 获取当前 ColorSpace 下推荐使用的 UI Sprite 材质。
+        /// </summary>
+        public static Material GetDefaultSpriteMaterial()
+        {
+            if (QualitySettings.activeColorSpace == ColorSpace.Linear)
+            {
+                if (spriteLinear == null)
+                {
+                    spriteLinear = LoadMaterialWithFallback(SpriteLinearPath, SpriteGammaPath, "Sprite Linear");
+                }
+
+                if (spriteLinear != null)
+                {
+                    return spriteLinear;
+                }
+            }
+
+            if (spriteGamma == null)
+            {
+                spriteGamma = LoadMaterial(SpriteGammaPath, "Sprite Gamma");
+            }
+
+            return spriteGamma;
+        }
+
+        /// <summary>
+        /// 获取当前 ColorSpace 下推荐使用的 UI Mask 材质。
+        /// </summary>
+        internal static Material GetDefaultMaskMaterial()
+        {
+            if (QualitySettings.activeColorSpace == ColorSpace.Linear)
+            {
+                if (maskLinear == null)
+                {
+                    maskLinear = LoadMaterialWithFallback(MaskLinearPath, MaskGammaPath, "Mask Linear");
+                }
+
+                if (maskLinear != null)
+                {
+                    return maskLinear;
+                }
+            }
+
+            if (maskGamma == null)
+            {
+                maskGamma = LoadMaterial(MaskGammaPath, "Mask Gamma");
+            }
+
+            return maskGamma;
+        }
+
+        private static Material LoadMaterialWithFallback(string primaryPath, string fallbackPath, string label)
+        {
+            Material material = LoadMaterial(primaryPath, label);
+            if (material != null)
+            {
+                return material;
+            }
+
+            return LoadMaterial(fallbackPath, label + " Fallback");
+        }
+
+        private static Material LoadMaterial(string path, string label)
+        {
+            Material material = Resources.Load<Material>(path);
+            if (material == null)
+            {
+                Debug.LogWarning(
+                    "[XDGCommonUIResources] 未找到 UI 材质: \"" + label +
+                    "\"，Resources 路径: \"" + path + "\"");
+            }
+
+            return material;
+        }
+    }
+}
+#endif
+
+

package/Runtime/Internal/Standalone/{Steam/SteamUtils.cs.meta → UI/Base/XDGCommonUIResources.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1ce0f43adf51469db4305f3c241ba570
+guid: d24f47766d743451899251cbc911baea
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/Internal/Standalone/Web/Function/CloseWebFunction.cs

@@ -16,7 +16,16 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}", XDGLoggerTag.Web);
             var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            UIManager.Dismiss();
+            if (webView?.ProviderWebView()?.Url != null)
+            {
+                var url = webView?.ProviderWebView()?.Url;
+                var queryParams = WebRequest.ParseQueryString(url);
+                var noUI = WebRequest.GetValueOrDefault(queryParams, "xdNoUI", "0") == "1";
+                if (!noUI)
+                {
+                    UIManager.Dismiss();
+                }
+            }
             webView?.ProviderWebTrans()?.TransObserver(WebActionEnum.CLOSE, dic);
             webView?.Release();
         }

package/Runtime/Internal/Standalone/Web/WebRequest.cs

@@ -81,7 +81,7 @@ namespace XD.SDK.Common.Internal.Standalone
             return dic;
         }
 
-        internal static TValue GetValueOrDefault<TKey, TValue>(
+        public static TValue GetValueOrDefault<TKey, TValue>(
             Dictionary<TKey, TValue> dictionary,
             TKey key,
             TValue defaultValue)

package/package.json

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

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

@@ -1,48 +0,0 @@
-#if UNITY_EDITOR || UNITY_STANDALONE
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using UnityEngine;
-
-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();
-    }
-
-    public class SteamUtils
-    {
-        public static ISteamSDKWrapper Instance { get; private 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)
-            {
-                Instance = Activator.CreateInstance(steamWrapperType) as ISteamSDKWrapper;
-            }
-            else
-            {
-                XDGLogger.Warn($"No class implements {interfaceType} Type. Current Platform: {Application.platform}, if you are using Editor, please check if you have installed XDSDK pc module.", XDGLoggerTag.Common);
-            }
-        }
-
-        /// <summary>
-        /// 是否有 SDK 支持，即 Steam 包
-        /// </summary>
-        public static bool IsSDKSupported => Instance != null;
-    }
-}
-
-#endif