com.typhoon.unitysdk 1.0.37 → 1.0.39

package/Editor/ToolBox/CompressTextureTool/XCompressTool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ef59cc7d4f98edb4b83358d79ca05ac9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/ToolBox/CompressTextureTool.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f51e7949cd208f344b92653b67d626ad
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/ToolBox.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9496b8d5910f8e749adc4061f4307ba2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/UniEditor.cs

@@ -267,7 +267,7 @@ namespace TyphoonUnitySDK
             return AddressableSupport.HasAddressableModule();
         }
 
-        [MenuItem("TyphoonSDK/安装拓展/Toast模块", priority = 100)]
+        // [MenuItem("TyphoonSDK/安装拓展/Toast模块", priority = 100)]
         public static void InstallToast()
         {
             AssetDatabase.ImportPackage(UniEditor.PackagePath_Toast, true);

package/Editor/VivoMiniConfig.cs

@@ -8,7 +8,7 @@ using UnityEngine;
 
 namespace TyphoonUnitySDK
 {
-    /*微信小游戏配置GUI绘制*/
+    /*VIVO小游戏配置GUI绘制*/
     public static class VivoMiniConfigGUIDrawer
     {
         //微信小游戏进阶设置
@@ -442,8 +442,8 @@ namespace TyphoonUnitySDK
         public Texture GameIcon; //logo
         public Texture LoadBackground; //加载背景
         public Orientation ScreenOrientation = Orientation.Portrait; //屏幕朝向
-        public bool LimitFps = false;
-        public int FrameRate = 60;
+        public bool LimitFps = true;
+        public int FrameRate = 30;
         public string PrivatePem = "";
         public string CertificatePem = "";
         public string VersionName = "0.0.1"; //版本名

package/Runtime/BaseSdk.cs

@@ -128,13 +128,13 @@ namespace TyphoonUnitySDK
         #region 录屏分享（抖音小游戏）
 
         /*是否支持录屏分享*/
-        public virtual bool CanRecordGame()
+        public virtual bool IsSupportGameRecord()
         {
             return false;
         }
 
         /*开始录屏*/
-        public virtual void StartRecordGame(bool isRecordAudio = true, int maxRecordTimeSec = 600,
+        public virtual void StartGameRecord(bool isRecordAudio = true, int maxRecordTimeSec = 600,
             Action onStart = null,
             Action<string> onError = null, Action<string> onComplete = null)
         {
@@ -142,14 +142,14 @@ namespace TyphoonUnitySDK
         }
 
         /*停止录屏*/
-        public virtual void StopRecordGame(Action<string> complete = null, Action<string> onError = null,
+        public virtual void StopGameRecord(Action<string> complete = null, Action<string> onError = null,
             List<TimeClip> clips = null, bool autoMerge = true)
         {
             onError?.Invoke("not support");
         }
 
         /*获取录屏时长*/
-        public virtual float GetRecordDuration()
+        public virtual float GetGameRecordDuration()
         {
             return 0;
         }
@@ -168,6 +168,10 @@ namespace TyphoonUnitySDK
             fail?.Invoke("not support");
         }
 
+        public virtual void ClearGameRecord()
+        {
+        }
+
         #endregion
 
         #region Http请求
@@ -187,5 +191,36 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 侧边栏复访（抖音小游戏）
+
+        public virtual void IsSupportSideBar(Action success, Action<string> fail)
+        {
+            //默认不支持
+            fail?.Invoke("no support in this channel");
+        }
+
+        public virtual void NavigateToSideBar(Action success, Action<string> fail)
+        {
+            //默认不支持
+            fail?.Invoke("no support in this channel");
+        }
+
+        public virtual bool IsEnterFromSideBar()
+        {
+            //默认不支持
+            return false;
+        }
+
+        #endregion
+
+        #region Toast
+
+        public virtual void ShowToast(string message)
+        {
+            Toast.Instance.Show(message);
+        }
+
+        #endregion
     }
 }

package/Runtime/Interface.cs

@@ -7,7 +7,7 @@ namespace TyphoonUnitySDK
     /// SDK全功能接口
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
-        INativeAD, IRecordGame, IHttpGet, IHttpPost
+        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast
     {
     }
 
@@ -120,27 +120,49 @@ namespace TyphoonUnitySDK
     public interface IRecordGame
     {
         /*是否可以录屏*/
-        bool CanRecordGame();
+        bool IsSupportGameRecord();
 
-        /*开启录屏*/
-        void StartRecordGame(bool isRecordAudio = true, int maxRecordTimeSec = 600,
+        /*开启游戏录屏*/
+        void StartGameRecord(bool isRecordAudio = true, int maxRecordTimeSec = 600,
             Action onStart = null, Action<string> onError = null, Action<string> onComplete = null);
 
-        /*结束录屏*/
-        void StopRecordGame(Action<string> complete = null, Action<string> onError = null,
+        /*结束游戏录屏*/
+        void StopGameRecord(Action<string> complete = null, Action<string> onError = null,
             List<TimeClip> clips = null,
             bool autoMerge = true);
 
 
-        /*获取录屏时间*/
-        float GetRecordDuration();
+        /*获取游戏录屏时间*/
+        float GetGameRecordDuration();
 
-        /*可分享游戏录屏*/
+        /*是否可分享游戏录屏*/
         bool CanShareRecordGame();
 
         /*分享游戏录屏*/
         void ShareRecordGame(string title, List<string> topics, Action success, Action<string> fail = null,
             Action cancel = null);
+
+        /*清理游戏录屏*/
+        void ClearGameRecord();
+    }
+
+    #endregion
+
+    #region 侧边栏（抖音小游戏）
+
+    /// <summary>
+    /// 侧边栏回访
+    /// </summary>
+    public interface ISideBarReturn
+    {
+        //是都支持侧边栏
+        void IsSupportSideBar(Action success, Action<string> fail);
+
+        //导航到侧边栏
+        void NavigateToSideBar(Action success, Action<string> fail);
+
+        //是否从侧边栏进入
+        bool IsEnterFromSideBar();
     }
 
     #endregion
@@ -164,4 +186,17 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+
+    #region ShowToast
+
+    /// <summary>
+    /// 显示toast
+    /// </summary>
+    public interface IShowToast
+    {
+        void ShowToast(string message);
+    }
+
+    #endregion
 }

package/Runtime/LabelOverride.cs

@@ -0,0 +1,62 @@
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    using UnityEngine;
+#if UNITY_EDITOR
+    using UnityEditor;
+#endif
+
+    public class LabelOverride : PropertyAttribute
+    {
+        public string label;
+
+        public LabelOverride(string label)
+        {
+            this.label = label;
+        }
+
+#if UNITY_EDITOR
+        [CustomPropertyDrawer(typeof(LabelOverride))]
+        public class ThisPropertyDrawer : PropertyDrawer
+        {
+            public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+            {
+                try
+                {
+                    var propertyAttribute = this.attribute as LabelOverride;
+                    if (IsItBloodyArrayTho(property) == false)
+                    {
+                        label.text = propertyAttribute.label;
+                    }
+                    else
+                    {
+                        Debug.LogWarningFormat(
+                            "{0}(\"{1}\") doesn't support arrays ",
+                            typeof(LabelOverride).Name,
+                            propertyAttribute.label
+                        );
+                    }
+
+                    EditorGUI.PropertyField(position, property, label);
+                }
+                catch (System.Exception ex)
+                {
+                    Debug.LogException(ex);
+                }
+            }
+
+            bool IsItBloodyArrayTho(SerializedProperty property)
+            {
+                string path = property.propertyPath;
+                int idot = path.IndexOf('.');
+                if (idot == -1) return false;
+                string propName = path.Substring(0, idot);
+                SerializedProperty p = property.serializedObject.FindProperty(propName);
+                return p.isArray;
+                //CREDITS: https://answers.unity.com/questions/603882/serializedproperty-isnt-being-detected-as-an-array.html
+            }
+        }
+#endif
+    }
+}

package/Runtime/LabelOverride.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec2c9f1b3c6e01e428e3a0a7057cd678
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/SdkTestInUnity.cs

@@ -1,20 +1,29 @@
 using System.IO;
+using TyphoonUnitySDK;
 
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 using UnityEngine;
+using UnityEngine.Serialization;
 
 public class SdkTestInUnity : ScriptableObject
 {
     private const string ASSET_PATH = "Assets/Typhoon_Gen/TyphoonSDK/Editor/SdkTestInUnity.asset";
 
-    [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;
-    [Header("视频广告flag")] public bool GetVideoFlagResult = true;
+    [LabelOverride("登录回调")] public bool LoginResult = true;
+    [LabelOverride("是否支持ExitGame")] public bool IsSupportExitGame = true;
+    [LabelOverride("开启广告交互式测试")] public bool OpenInteractive = true;
+    [LabelOverride("广告交互式悬停关闭时间")] public float InteractiveHoldCloseTime = 1.2f;
+    [LabelOverride("视频广告flag")] public bool GetVideoFlagResult = true;
+    [LabelOverride("视频广告回调")] public bool ShowVideoResult = true;
+
+    [FormerlySerializedAs("IsSupportSideBar")] [Header("抖音小游戏相关")] [LabelOverride("是否支持侧边栏-回调结果")]
+    public bool IsSupportSideBarResult = true;
+
+    [LabelOverride("导航到侧边栏-回调结果")] public bool NavigateToSideBarResult = true;
+
+    [LabelOverride("侧边栏进入标记")] public bool IsEnterFromSideBar = true;
 
 
     private static SdkTestInUnity _instance = null;

package/Runtime/SimulateRecordGame.cs

@@ -67,6 +67,12 @@ namespace TyphoonUnitySDK
             return RecordTime > 0;
         }
 
+        public void ClearRecord()
+        {
+            IsRecording = false;
+            RecordTime = 0;
+        }
+
         public void Share(Action success, Action fail)
         {
             if (!CanShare())

package/Runtime/Toast.cs

@@ -0,0 +1,108 @@
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    internal class Toast : MonoSingleton<Toast>
+    {
+        private static float RADIAN_90 = 90 * Mathf.Deg2Rad;
+
+        /*出现动画的时长*/
+        private const float APPEAR_DURAITON = 0.25F;
+        private const float HIDE_DURAITON = 0.25F;
+
+        public bool IsPlaying = false;
+        public float PlayingTime = 0;
+        public float Duration = 2;
+        public float HideStartTime;
+        public string Message;
+        public float Alpha = 0;
+        public Texture2D Background;
+        private GUIStyle _style;
+
+        protected override void Init()
+        {
+            base.Init();
+            DontDestroyOnLoad(gameObject);
+            Background =
+                Resources.Load<Texture2D>("TYPHOON_TEXTURE_TOAST_BLACK");
+            _style = new GUIStyle()
+            {
+                margin = new RectOffset(2, 2, 2, 2),
+                border = new RectOffset(2, 2, 2, 2),
+                padding = new RectOffset(2, 2, 2, 2),
+                alignment = TextAnchor.MiddleCenter,
+                fontSize = 14,
+            };
+        }
+
+        public void Show(string content, float duration = 1.6f)
+        {
+            var size = (int)(Screen.width * 0.7f / content.Length);
+            _style.fontSize = size;
+            Alpha = 0;
+            Message = content;
+            IsPlaying = true;
+            PlayingTime = 0;
+            Duration = Mathf.Clamp(duration, 0.5f, float.MaxValue);
+            HideStartTime = Duration - HIDE_DURAITON;
+        }
+
+        private void Update()
+        {
+            if (IsPlaying)
+            {
+                PlayingTime += Time.unscaledDeltaTime;
+                if (PlayingTime < APPEAR_DURAITON)
+                {
+                    var process = PlayingTime / APPEAR_DURAITON;
+                    var scale = Mathf.Sin(Mathf.Lerp(0, RADIAN_90, process));
+                    Alpha = scale;
+                }
+                else if (PlayingTime > HideStartTime)
+                {
+                    var process = (PlayingTime - HideStartTime) / HIDE_DURAITON;
+                    var alpha = Mathf.Lerp(1, 0, process);
+                    Alpha = alpha;
+                }
+                else
+                {
+                    Alpha = 1;
+                }
+
+                if (PlayingTime > Duration)
+                {
+                    IsPlaying = false;
+                    Alpha = 0;
+                }
+            }
+        }
+
+        public void Clear()
+        {
+            IsPlaying = false;
+            Alpha = 0;
+        }
+
+
+        private void OnGUI()
+        {
+            if (IsPlaying)
+            {
+                var temDepth = GUI.depth;
+                var temColor = GUI.color;
+                GUI.depth = 30000;
+                var rect = new Rect(0, 0, Screen.width, Screen.height);
+                var rectView = rect;
+                rectView.height = rect.height * 0.1f;
+                rectView.width = rect.width * 0.8f;
+                rectView.center = rect.center;
+                _style.normal.textColor = Color.white * Alpha;
+                GUI.color = Color.white * Alpha;
+                GUI.DrawTexture(rectView, Background);
+                GUI.color = temColor;
+                GUI.TextArea(rectView, Message, _style);
+                GUI.depth = temDepth;
+            }
+        }
+    }
+}

package/Runtime/Toast.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c419db402591f2142a393b605bc170a7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: