com.typhoon.unitysdk 1.0.39 → 1.0.40

package/Runtime/SDKInteractiveUI.cs

@@ -14,6 +14,10 @@ namespace TyphoonUnitySDK
     public class SDKInteractiveUI : MonoSingleton<SDKInteractiveUI>
     {
 #if UNITY_EDITOR
+
+        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 string PathRoot => RuntimeUtil.GetPathRoot();
@@ -103,7 +107,7 @@ namespace TyphoonUnitySDK
             Sources =
                 AssetDatabase.LoadAssetAtPath<InteractiveSources>(path);
             Banner.Initialize(Sources);
-            Video.Initialize(Sources);
+            Video.Initialize();
             Inters.Initialize(Sources);
             Native.Initialize(Sources);
             FloatIcon.Initialize(Sources);
@@ -119,9 +123,9 @@ namespace TyphoonUnitySDK
             Banner.Hide();
         }
 
-        public void ShowInters()
+        public void ShowInters(string scene)
         {
-            Inters.Show();
+            Inters.Show(scene);
         }
 
         public void ShowVideo(Action success, Action<string> fail)
@@ -244,20 +248,31 @@ namespace TyphoonUnitySDK
 
         public class IntersView
         {
+            private const float DURATION = 0.8F;
             public InteractiveSources Sources;
-
             public bool IsShow = false;
-            public Texture2D Image => Sources.Get("test_inters");
-            public float HoldTime = 0;
+            public string Scene;
+            public float CloseTime;
+            public int Length;
+            private GUIStyle _labelStyle = null;
 
             public void Initialize(InteractiveSources sources)
             {
                 Sources = sources;
+                _labelStyle = new GUIStyle("label");
+                _labelStyle.margin = new RectOffset(2, 2, 2, 2);
+                _labelStyle.padding = new RectOffset(2, 2, 2, 2);
+                _labelStyle.border = new RectOffset(2, 2, 2, 2);
+                _labelStyle.alignment = TextAnchor.MiddleCenter;
+                // _labelStyle.fontStyle = FontStyle.Bold;
             }
 
-            public void Show()
+            public void Show(string scene)
             {
+                Scene = scene;
+                Length = scene.Length;
                 IsShow = true;
+                CloseTime = Time.realtimeSinceStartup + DURATION;
             }
 
             public void Hide()
@@ -269,28 +284,32 @@ namespace TyphoonUnitySDK
             {
                 if (IsShow)
                 {
-                    EditorGUI.DrawRect(rect, Color.black);
-                    var size = CalculateImageMatchSize(Image, rect);
-                    var imageRect = rect;
-                    imageRect.width = size.x;
-                    imageRect.height = size.y;
-                    imageRect.center = rect.center;
-                    GUI.DrawTexture(imageRect, Image);
-
-                    var rectClose = imageRect;
-                    rectClose.width = 246;
-                    rectClose.height = 66;
-                    rectClose.x = imageRect.xMax - rectClose.width - 10;
-                    rectClose.y += 10;
-                    DrawViewTxtLabel(rectClose, "关闭");
-                    //悬停/关闭
-                    HoldHide(rectClose, ref HoldTime, Hide);
-
-                    var titleRect = imageRect;
-                    titleRect.width = 400;
-                    titleRect.height = 128;
-                    titleRect.center = imageRect.center;
-                    DrawViewTxtLabel(titleRect, "这是一个测试插页广告");
+                    var rectToast = rect;
+                    rectToast.width = 500;
+                    rectToast.height = 128;
+                    rectToast.center = rect.center;
+                    rectToast.y = rect.yMax - rectToast.height;
+                    rectToast.y -= 50;
+                    var startCenter = rectToast.center;
+                    var endCenter = rectToast.center - Vector2.up * 64;
+                    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)
+                    {
+                        Hide();
+                    }
                 }
             }
         }
@@ -301,18 +320,14 @@ namespace TyphoonUnitySDK
 
         public class VideoView
         {
-            public InteractiveSources Sources;
             public bool IsShow = false;
             public Action OnSuccess;
             public Action OnFail;
-            public Texture2D Image => Sources.Get("test_inters");
-            public float HoldTime = 0;
             public float BtnYesHoldTime = 0;
             public float BtnNoHoldTime = 0;
 
-            public void Initialize(InteractiveSources sources)
+            public void Initialize()
             {
-                Sources = sources;
             }
 
             public void OnClickSuccess()
@@ -344,41 +359,39 @@ namespace TyphoonUnitySDK
             {
                 if (IsShow)
                 {
-                    EditorGUI.DrawRect(rect, Color.black);
-                    var size = CalculateImageMatchSize(Image, rect);
-                    var adRect = rect;
-                    adRect.width = size.x;
-                    adRect.height = size.y;
-                    adRect.center = rect.center;
-                    GUI.DrawTexture(adRect, Image);
-
-                    var rectClose = adRect;
-                    rectClose.width = 246;
-                    rectClose.height = 66;
-                    rectClose.x = adRect.xMax - rectClose.width - 10;
-                    rectClose.y += 10;
-                    DrawViewTxtLabel(rectClose, "关闭");
-
-                    //成功返回
-                    var rectYes = adRect;
+                    var rectYes = rect;
                     rectYes.width = 346;
-                    rectYes.height = 128;
-                    rectYes.center = new Vector2(adRect.center.x, adRect.center.y + 80);
-                    //失败返回
+                    rectYes.height = 80;
+                    rectYes.center = rect.center;
+
                     var rectNo = rectYes;
-                    rectNo.center = new Vector2(adRect.center.x, adRect.center.y - 80);
+                    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, "失败返回");
                     HoldHide(rectYes, ref BtnYesHoldTime, OnClickSuccess);
                     HoldHide(rectNo, ref BtnNoHoldTime, OnClickFail);
-                    HoldHide(rectClose, ref HoldTime, OnClickFail);
-
-                    var rectTitle = adRect;
-                    rectTitle.width = 400;
-                    rectTitle.height = 128;
-                    rectTitle.center = adRect.center;
-                    rectTitle.y -= 300;
-                    DrawViewTxtLabel(rectTitle, "这是一个测试视频");
+                    DrawViewTxtLabel(rectTitle, "模拟激励视频");
                 }
             }
         }

package/Runtime/TyphoonSdk.cs

@@ -244,7 +244,7 @@ namespace TyphoonUnitySDK
 #if UNITY_EDITOR
             if (SdkTestInUnity.Instance.OpenInteractive)
             {
-                SDKInteractiveUI.Instance.ShowInters();
+                SDKInteractiveUI.Instance.ShowInters(scene);
                 return;
             }
 

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.39","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.40","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}