com.typhoon.unitysdk 1.0.41 → 1.0.43

package/Editor/ApplyTool.cs

@@ -89,6 +89,7 @@ namespace TyphoonUnitySDK
 
                 match.Apply(setting);
                 InvokeOnApplyEnd(setting);
+                Debug.Log($"<color=#3ac9f3>想在应用前or后做点事情?任意Editor文件夹下创建class继承TyphoonUnitySDK.OnApplyProcessor实现接口</color>");
             }
         }
 
@@ -141,7 +142,6 @@ namespace TyphoonUnitySDK
             PlayerSettings.Android.minSdkVersion = setting.MinApiVersion;
             PlayerSettings.Android.targetSdkVersion = setting.TargetApiVersion;
 
-        
 
             //覆写GraphicsAPI
             if (setting.GraphicsAPIs.Length > 0)
@@ -206,7 +206,7 @@ namespace TyphoonUnitySDK
 
             PlayerSettings.WebGL.exceptionSupport = setting.ExceptionSupport;
             PlayerSettings.WebGL.debugSymbols = setting.WebglDebugSymbols;
-            
+
             //覆写AA参数
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
@@ -423,6 +423,25 @@ namespace TyphoonUnitySDK
         };
 
 
+        //重新注入脚本
+        public static void ReimportScript(HashSet<string> files)
+        {
+            var match = new HashSet<string>();
+            foreach (var file in files)
+            {
+                if (file.EndsWith(".cs"))
+                {
+                    match.Add(file);
+                }
+            }
+
+            foreach (var path in match)
+            {
+                AssetDatabase.ImportAsset(path, ImportAssetOptions.Default);
+            }
+        }
+
+
         /*应用ChinaAndroid*/
         public class ApplyChinaAndroid : IApply
         {
@@ -439,8 +458,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -478,8 +496,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -500,8 +517,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -522,8 +538,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -546,8 +561,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/VivoMini",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }

package/Editor/UniEditor.cs

@@ -70,6 +70,11 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static readonly string APPLY_HISTORY = ".typhoon/typhoon_sdk_apply_history.txt";
 
+        /// <summary>
+        /// 说明文档
+        /// </summary>
+        public static string DOC_URL = "https://auffm1e1gb.feishu.cn/docx/QiGldaOsWom8p4xGjchcTpm5nmh";
+
 
         /// <summary>
         /// 获取windows用户名文件夹
@@ -683,17 +688,6 @@ namespace TyphoonUnitySDK
             return result.ToArray();
         }
 
-        // /// <summary>
-        // /// 执行批处理
-        // /// </summary>
-        // public static void RunBat(string path, string args = "", Action complete = null)
-        // {
-        //     using (var process = Process.Start("explorer", $"\"{Path.GetFullPath(path)}\" {args}"))
-        //     {
-        //     }
-        //     
-        // }
-
 
         /// <summary>
         /// 执行批处理
@@ -758,5 +752,31 @@ namespace TyphoonUnitySDK
                 Alphaleonis.Win32.Filesystem.File.Delete(path, true);
             }
         }
+
+
+        [MenuItem("TyphoonSDK/说明文档", priority = -10000)]
+        public static void OpenDoc()
+        {
+            Application.OpenURL(DOC_URL);
+        }
+
+
+        [MenuItem("TyphoonSDK/打开.typhoonoutput", priority = -10000)]
+        public static void OpenOutPutFolder()
+        {
+            var file = $".typhoonoutput/.md";
+            if (!File.Exists(file))
+            {
+                var dir = Path.GetDirectoryName(file);
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+
+                File.WriteAllText(file, "");
+            }
+
+            EditorUtility.RevealInFinder(file);
+        }
     }
 }

package/Runtime/BaseSdk.cs

@@ -65,7 +65,7 @@ namespace TyphoonUnitySDK
         }
 
         /*隐藏banner*/
-        public virtual void HideBanner(string scene)
+        public virtual void HideBanner(string scene = "")
         {
         }
 
@@ -194,7 +194,13 @@ namespace TyphoonUnitySDK
 
         #region 侧边栏复访（抖音小游戏）
 
-        public virtual void IsSupportSideBar(Action success, Action<string> fail)
+        public virtual bool IsSupportSideBar()
+        {
+            //默认不支持
+            return false;
+        }
+
+        public virtual void CheckSideBarSupportFlag(Action success, Action<string> fail)
         {
             //默认不支持
             fail?.Invoke("no support in this channel");

package/Runtime/Interface.cs

@@ -155,8 +155,11 @@ namespace TyphoonUnitySDK
     /// </summary>
     public interface ISideBarReturn
     {
-        //是都支持侧边栏
-        void IsSupportSideBar(Action success, Action<string> fail);
+        //是否支持侧边栏
+        bool IsSupportSideBar();
+
+        //检查侧边栏支持flag
+        void CheckSideBarSupportFlag(Action success, Action<string> fail);
 
         //导航到侧边栏
         void NavigateToSideBar(Action success, Action<string> fail);

package/Runtime/{TyphoonSdk.cs → SdkLite.cs}

@@ -6,9 +6,9 @@ using UnityEngine;
 namespace TyphoonUnitySDK
 {
     /// <summary>
-    /// Typhoon SDK
+    /// Typhoon SDK 实例
     /// </summary>
-    public partial class TyphoonSdk : MonoSingleton<TyphoonSdk>
+    public partial class SdkLite : MonoSingleton<SdkLite>
     {
         /*绑定SDK实例*/
         public static Dictionary<AppChannel, string> SDKBindings = new Dictionary<AppChannel, string>
@@ -204,7 +204,7 @@ namespace TyphoonUnitySDK
         /// <param name="scene">广告场景</param>
         /// <param name="success">成功回调，发放奖励</param>
         /// <param name="fail">失败回调，返回失败原因</param>
-        public void ShowVideo(string scene, Action success, Action<string> fail)
+        public void ShowVideo(string scene, Action success, Action<string> fail = null)
         {
             Log($"ShowVideo:{scene}");
 #if UNITY_EDITOR
@@ -280,8 +280,8 @@ namespace TyphoonUnitySDK
         /// <summary>
         /// 隐藏banner
         /// </summary>
-        /// <param name="scene"></param>
-        public void HideBanner(string scene)
+        /// <param name="scene">暂不作用，可以不传</param>
+        public void HideBanner(string scene = "")
         {
 #if UNITY_EDITOR
             if (SdkTestInUnity.Instance.OpenInteractive)
@@ -625,11 +625,32 @@ namespace TyphoonUnitySDK
         #region 侧边栏（抖音小游戏）
 
         /// <summary>
-        /// 判断是否支持侧边栏，可以通过此接口判断是否开启侧边栏奖励入口
+        /// 判断是否支持侧边栏功能，可以通过此接口判断是否开启侧边栏相关UI，请在登录完成后再调用
+        /// </summary>
+        public virtual bool IsSupportSideBar()
+        {
+#if UNITY_EDITOR
+            switch (AppConfig.Channel)
+            {
+                case AppChannel.DouyinAndroid:
+                case AppChannel.DouyinIOS:
+                    break;
+                default:
+                    return false;
+            }
+
+            return SdkTestInUnity.Instance.IsSupportSideBarResult;
+#endif
+            return _sdk.IsSupportSideBar();
+        }
+
+
+        /// <summary>
+        /// 判断是否支持侧边栏,异步机制
         /// </summary>
         /// <param name="success">成功回调，表示支持该功能，可以显示入口</param>
         /// <param name="fail">失败回调，表示不支持该功能，可以显示入口</param>
-        public virtual void IsSupportSideBar(Action success, Action<string> fail)
+        public virtual void CheckSideBarSupportFlag(Action success, Action<string> fail)
         {
 #if UNITY_EDITOR
             switch (AppConfig.Channel)
@@ -654,7 +675,7 @@ namespace TyphoonUnitySDK
 
             return;
 #endif
-            _sdk.IsSupportSideBar(success, fail);
+            _sdk.CheckSideBarSupportFlag(success, fail);
         }
 
         /// <summary>

package/Runtime/TyphoonSdkCallback.cs

@@ -41,9 +41,9 @@ namespace TyphoonUnitySDK
                 case AppChannel.ChinaAndroid:
                     if (Input.GetKeyDown(KeyCode.Escape))
                     {
-                        if (TyphoonSdk.Instance.IsSupportExitGame())
+                        if (SdkLite.Instance.IsSupportExitGame())
                         {
-                            TyphoonSdk.Instance.ExitGame();
+                            SdkLite.Instance.ExitGame();
                         }
                     }
 

package/Runtime/WxMiniTouchInputSupport.cs

@@ -22,8 +22,11 @@ namespace TyphoonUnitySDK
                     if (type.Name.Contains("WXTouchInputOverride"))
                     {
                         Debug.Log("补充WXTouchInputOverride组件");
+#if !UNITY_EDITOR
                         //补充WXTouchInputOverride组件
                         gameObject.AddComponent(type);
+#endif
+
                         break;
                     }
                 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.41","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.43","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"}}