com.typhoon.unitysdk 1.0.9 → 1.0.11

package/Runtime/SdkTestInUnity.cs

@@ -12,8 +12,10 @@ public class SdkTestInUnity : ScriptableObject
     [Header("登录回调")] public bool LoginResult = true;
     [Header("是否支持ExitGame")] public bool IsSupportExitGame = true;
     [Header("开启交互式测试")] public bool OpenInteractive = true;
+    [Header("交互式测试悬停关闭检测时间")] public float InteractiveHoldCloseTime = 1.2f;
     [Header("视频广告回调")] public bool ShowVideoResult = true;
 
+
     private static SdkTestInUnity _instance = null;
 
     public static SdkTestInUnity Instance

package/Runtime/TyphoonSdk.cs

@@ -15,15 +15,11 @@ namespace TyphoonUnitySDK
             { AppChannel.ChinaAndroid, "TYPHOON_SDK_CHINA_ANDROID" }, //国内安卓
         };
 
-        public static bool InUnity = false;
         private ISdk _sdk;
 
         protected override void Init()
         {
             base.Init();
-#if UNITY_EDITOR
-            InUnity = true;
-#endif
             DontDestroyOnLoad(gameObject);
             //构建SDK实例
             CreateSDK();
@@ -57,12 +53,11 @@ namespace TyphoonUnitySDK
         public void InitSdk(Action success, Action<string> fail)
         {
             Log("InitSdk");
-            if (InUnity)
-            {
-                //直接成功
-                success?.Invoke();
-                return;
-            }
+#if UNITY_EDITOR
+            //直接成功
+            success?.Invoke();
+            return;
+#endif
 
             _sdk.InitSdk(success, fail);
         }
@@ -77,20 +72,19 @@ namespace TyphoonUnitySDK
         public void Login(Action success, Action<string> fail)
         {
             Log("Login");
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.LoginResult)
             {
-                if (SdkTestInUnity.Instance.LoginResult)
-                {
-                    success?.Invoke();
-                }
-                else
-                {
-                    fail?.Invoke("test in unity login result false ");
-                }
-
-                return;
+                success?.Invoke();
+            }
+            else
+            {
+                fail?.Invoke("test in unity login result false ");
             }
 
+            return;
+#endif
+
             _sdk.Login(success, fail);
         }
 
@@ -103,11 +97,9 @@ namespace TyphoonUnitySDK
         /// </summary>
         public bool IsSupportExitGame()
         {
-            if (InUnity)
-            {
-                return SdkTestInUnity.Instance.IsSupportExitGame;
-            }
-
+#if UNITY_EDITOR
+            return SdkTestInUnity.Instance.IsSupportExitGame;
+#endif
             return _sdk.IsSupportExitGame();
         }
 
@@ -117,11 +109,9 @@ namespace TyphoonUnitySDK
         public void ExitGame()
         {
             Log("ExitGame");
-            if (InUnity)
-            {
-                return;
-            }
-
+#if UNITY_EDITOR
+            return;
+#endif
             if (IsSupportExitGame())
             {
                 _sdk.ExitGame();
@@ -150,27 +140,26 @@ namespace TyphoonUnitySDK
         public void ShowVideo(string scene, Action success, Action<string> fail)
         {
             Log($"ShowVideo:{scene}");
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.ShowVideo(success, fail);
-                    return;
-                }
-
-                //弹窗提示Unity广告
-                if (SdkTestInUnity.Instance.ShowVideoResult)
-                {
-                    success?.Invoke();
-                }
-                else
-                {
-                    fail?.Invoke("test result fail");
-                }
-
+                SDKInteractiveUI.Instance.ShowVideo(success, fail);
                 return;
             }
 
+            //弹窗提示Unity广告
+            if (SdkTestInUnity.Instance.ShowVideoResult)
+            {
+                success?.Invoke();
+            }
+            else
+            {
+                fail?.Invoke("test result fail");
+            }
+
+            return;
+#endif
+
             _sdk.ShowVideo(scene, success, fail);
         }
 
@@ -185,17 +174,15 @@ namespace TyphoonUnitySDK
         public void ShowInters(string scene)
         {
             Log($"ShowInters:{scene}");
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.ShowInters();
-                    return;
-                }
-
+                SDKInteractiveUI.Instance.ShowInters();
                 return;
             }
 
+            return;
+#endif
             _sdk.ShowInters(scene);
         }
 
@@ -210,17 +197,16 @@ namespace TyphoonUnitySDK
         /// <param name="position">banner位置</param>
         public void ShowBanner(string scene, BannerPosition position)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.ShowBanner(position);
-                    return;
-                }
-
+                SDKInteractiveUI.Instance.ShowBanner(position);
                 return;
             }
 
+            return;
+#endif
+
             _sdk.ShowBanner(scene, position);
         }
 
@@ -230,16 +216,14 @@ namespace TyphoonUnitySDK
         /// <param name="scene"></param>
         public void HideBanner(string scene)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.HideBanner();
-                }
-
-                return;
+                SDKInteractiveUI.Instance.HideBanner();
             }
 
+            return;
+#endif
             _sdk.HideBanner(scene);
         }
 
@@ -253,16 +237,14 @@ namespace TyphoonUnitySDK
         /// <param name="scene">广告场景</param>
         public void ShowNative(string scene)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.ShowNative();
-                }
-
-                return;
+                SDKInteractiveUI.Instance.ShowNative();
             }
 
+            return;
+#endif
             _sdk.ShowNative(scene);
         }
 
@@ -272,16 +254,15 @@ namespace TyphoonUnitySDK
         /// <param name="scene">广告场景</param>
         public void HideNative(string scene)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.HideNative();
-                }
-
-                return;
+                SDKInteractiveUI.Instance.HideNative();
             }
 
+            return;
+#endif
+
             _sdk.HideNative(scene);
         }
 
@@ -297,16 +278,15 @@ namespace TyphoonUnitySDK
         /// <param name="spy">屏幕百分比Y(左上角)</param>
         public void ShowFloatIcon(string scene, float spx, float spy)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.ShowFlatIcon(scene, spx, spy);
-                }
-
-                return;
+                SDKInteractiveUI.Instance.ShowFlatIcon(scene, spx, spy);
             }
 
+            return;
+#endif
+
             _sdk.ShowFloatIcon(scene, spx, spy);
         }
 
@@ -316,16 +296,14 @@ namespace TyphoonUnitySDK
         /// <param name="scene">广告场景</param>
         public void HideFloatIcon(string scene)
         {
-            if (InUnity)
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                if (SdkTestInUnity.Instance.OpenInteractive)
-                {
-                    SDKInteractiveUI.Instance.HideFloatIcon(scene);
-                }
-
-                return;
+                SDKInteractiveUI.Instance.HideFloatIcon(scene);
             }
 
+            return;
+#endif
             _sdk.HideFloatIcon(scene);
         }
 

package/Sources~/ChinaAndroid/Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs

@@ -45,9 +45,9 @@ namespace TyphoonUnitySDK
             Debug.Log($"发布完成 {path}");
             EditorUtility.RevealInFinder(path);
             //生成发布bat
-            var gradle = AndroidExternalToolsSettings.gradlePath;
+            var gradle = Preferences.Default.GradlePath;
             var publish_bat = $"{path}/publish.bat";
-            File.WriteAllText(publish_bat, $"{gradle} assembleRelease --max-workers=8");
+            File.WriteAllText(publish_bat, $"{gradle}\\gradle assembleRelease --max-workers=8");
             result.AndroidProj = path;
             PublishTool.InvokeOnPublishEnd(setting, result);
             return result;

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.9","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.11","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}