com.typhoon.unitysdk 1.1.14 → 1.1.15

package/CHANGELOG.md

@@ -1,7 +1,13 @@
 # 更新日志
-## [1.1.14] - 2025-08-09
+## [1.1.15] - 2025-08-09
 
 ### 修复
+* 修复测试参数bug
+
+
+## [1.1.14] - 2025-08-09
+
+### 修复
 * 修复sdktestunity构建时间不对时的bug
 
 

package/Runtime/SDKInteractiveUI.cs

@@ -18,7 +18,18 @@ namespace TyphoonUnitySDK
         public static Color Blue = new Color(0.02f, 0.49f, 0.84f, 0.8f);
         public static Color DarkBlue = new Color(0.05f, 0.33f, 0.61f, 1f);
 
-        public static float HOLD_TIME = SdkTestInUnity.Instance.InteractiveHoldCloseTime;
+        public static float HOLD_TIME
+        {
+            get
+            {
+                if (SdkTestInUnity.HasInstance())
+                {
+                    return SdkTestInUnity.Instance.InteractiveHoldCloseTime;
+                }
+
+                return 1.2f;
+            }
+        }
 
         public static string PathRoot => RuntimeUtil.GetPathRoot();
 
@@ -229,7 +240,6 @@ namespace TyphoonUnitySDK
                     DrawViewTxtLabel(rectClose, "关闭");
                     //悬停/关闭
                     HoldHide(rectClose, ref HoldTime, Hide);
-
                     var rectTitle = view;
                     rectTitle.width = 300;
                     rectTitle.height = 66;
@@ -292,15 +302,12 @@ namespace TyphoonUnitySDK
                     var process = 1 - Mathf.Clamp01((CloseTime - Time.realtimeSinceStartup) / DURATION);
                     var center = Vector2.Lerp(startCenter, endCenter, process);
                     rectToast.center = center;
-
                     var rectOutline = rectToast;
                     rectOutline.width += 8;
                     rectOutline.height += 8;
                     rectOutline.center = rectToast.center;
-
                     EditorGUI.DrawRect(rectOutline, DarkBlue);
                     EditorGUI.DrawRect(rectToast, Blue);
-
                     _labelStyle.fontSize = (int)(Mathf.Min(rectToast.width * 0.5f / Length, 48));
                     GUI.Label(rectToast, $"弹出插页：{Scene}", _labelStyle);
                     if (Time.realtimeSinceStartup > CloseTime)
@@ -360,29 +367,24 @@ namespace TyphoonUnitySDK
                     rectYes.width = 346;
                     rectYes.height = 80;
                     rectYes.center = rect.center;
-
                     var rectNo = rectYes;
                     rectNo.y = rectYes.yMax;
                     rectNo.y += 40;
-
                     var rectTitle = rectYes;
                     rectTitle.y = rectYes.yMin - rectTitle.height;
                     rectTitle.y -= 40;
                     var center = rectTitle.center;
                     rectTitle.width = 500;
                     rectTitle.center = center;
-
                     var rectBg = new Rect();
                     rectBg.width = rectTitle.width;
                     rectBg.height = rectNo.yMax - rectTitle.yMin;
                     rectBg.width += 20;
                     rectBg.height += 20;
                     rectBg.center = rect.center;
-
                     EditorGUI.DrawRect(rect, Color.black * 0.7f);
                     EditorGUI.DrawRect(rectBg, Blue);
 
-
                     //失败返回
                     DrawViewTxtLabel(rectYes, "成功返回");
                     DrawViewTxtLabel(rectNo, "失败返回");
@@ -552,7 +554,6 @@ namespace TyphoonUnitySDK
                     rectClose.y += 10;
                     DrawViewTxtLabel(rectClose, "关闭");
                     HoldHide(rectClose, ref HoldTime, Hide);
-
                     var rectTitle = imageRect;
                     rectTitle.width = 400;
                     rectTitle.height = 128;
@@ -572,7 +573,6 @@ namespace TyphoonUnitySDK
         private void OnGUI()
         {
 #if UNITY_EDITOR
-
             var mode = GetMode();
             var rect = new Rect(0, 0, Screen.width, Screen.height);
             Banner.OnGUI(rect, mode);

package/Runtime/SdkTestInUnity.cs

@@ -89,80 +89,37 @@ public class SdkTestInUnity : ScriptableObject
     };
 
 
-    //     private static SdkTestInUnity _instance = null;
-    //
-    //     public static SdkTestInUnity Instance
-    //     {
-    //         get
-    //         {
-    // #if UNITY_EDITOR
-    //             if (_instance == null)
-    //             {
-    //                 _instance = AssetDatabase.LoadAssetAtPath<SdkTestInUnity>(ASSET_PATH);
-    //                 if (_instance == null)
-    //                 {
-    //                     _instance = CreateInstance<SdkTestInUnity>();
-    //                     var folder = Path.GetDirectoryName(ASSET_PATH);
-    //                     if (!Directory.Exists(folder))
-    //                     {
-    //                         Directory.CreateDirectory(folder);
-    //                         AssetDatabase.Refresh();
-    //                     }
-    //
-    //                     AssetDatabase.CreateAsset(_instance, ASSET_PATH);
-    //                     AssetDatabase.Refresh();
-    //                 }
-    //             }
-    // #endif
-    //             return _instance;
-    //         }
-    //     }
-
     private static SdkTestInUnity _instance = null;
-    private static bool _initialized = false;
+    private static object _lock = new object();
+    public static bool HasInstance() => _instance != null;
 
     public static SdkTestInUnity Instance
     {
         get
         {
 #if UNITY_EDITOR
-            if (!_initialized)
+            if (_instance == null)
             {
-                _initialized = true;
-                InitializeInstance();
+                _instance = AssetDatabase.LoadAssetAtPath<SdkTestInUnity>(ASSET_PATH);
+                lock (_lock)
+                {
+                    if (_instance == null)
+                    {
+                        _instance = CreateInstance<SdkTestInUnity>();
+                        var folder = Path.GetDirectoryName(ASSET_PATH);
+                        if (!Directory.Exists(folder))
+                        {
+                            Directory.CreateDirectory(folder);
+                            AssetDatabase.Refresh();
+                        }
+
+                        AssetDatabase.CreateAsset(_instance, ASSET_PATH);
+                        AssetDatabase.Refresh();
+                    }
+                }
             }
 #endif
             return _instance;
         }
     }
-
-
-#if UNITY_EDITOR
-    private static void InitializeInstance()
-    {
-        if (_instance != null) return;
-        _instance = AssetDatabase.LoadAssetAtPath<SdkTestInUnity>(ASSET_PATH);
-        if (_instance == null)
-        {
-            _instance = CreateInstance<SdkTestInUnity>();
-            var folder = Path.GetDirectoryName(ASSET_PATH);
-            if (!Directory.Exists(folder))
-            {
-                Directory.CreateDirectory(folder);
-                AssetDatabase.Refresh();
-            }
-
-            AssetDatabase.CreateAsset(_instance, ASSET_PATH);
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-    }
-
-    [InitializeOnLoadMethod]
-    private static void EditorInitialize()
-    {
-        // 确保在编辑器加载时初始化，但不会在静态构造函数里触发
-        InitializeInstance();
-    }
-#endif
 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.14","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.1.14] - 2025-08-09\r\n\r\n### 修复\n* 修复sdktestunity构建时间不对时的bug\r\n\r\n","major_flag":false,"write_time_stamp":1754672927000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.15","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.1.15] - 2025-08-09\r\n\r\n### 修复\n* 修复测试参数bug\r\n\r\n","major_flag":false,"write_time_stamp":1754673872000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}