com.typhoon.unitysdk 1.0.27 → 1.0.29

package/Editor/ApplyTool.cs

@@ -39,8 +39,6 @@ namespace TyphoonUnitySDK
             var done = SwitchPlatformTo(setting.BuildTarget);
             if (done)
             {
-                //写入apply 历史
-                UniEditor.WriteApplyHistory(setting);
                 //修改参数
                 switch (setting.BuildTarget)
                 {
@@ -365,6 +363,28 @@ namespace TyphoonUnitySDK
 
                     File.Delete(path);
                 }
+
+                //如果仅存在.meta文件,清理文件夹
+                var clearFolder = true;
+                var remnant = Directory.GetFiles(folder, "*", SearchOption.AllDirectories);
+                foreach (var element in remnant)
+                {
+                    if (!element.EndsWith(".meta"))
+                    {
+                        // if (folder == "Assets/Plugins/Android")
+                        // {
+                        //     Debug.Log(element);
+                        // }
+                        clearFolder = false;
+                    }
+                }
+
+                //删除残余文件夹
+                if (clearFolder)
+                {
+                    // Debug.Log($"删除：{folder}");
+                    Directory.Delete(folder, true);
+                }
             }
         }
 

package/Editor/PreferencesWindow.cs

@@ -8,11 +8,6 @@ namespace TyphoonUnitySDK
 {
     public class PreferencesWindow : EditorWindow
     {
-        private static bool _preferenceFoldout = false;
-
-        private static bool _wxMiniConfigFoldout = false;
-
-
         private static Vector2 _scroll;
 
         [MenuItem("TyphoonSDK/选项", priority = 10000)]
@@ -24,7 +19,6 @@ namespace TyphoonUnitySDK
             win.Show();
         }
 
-
         protected void OnGUI()
         {
             var rect = new Rect(0, 0, position.width, position.height);

package/Editor/PublishWindow.cs

@@ -47,8 +47,6 @@ namespace TyphoonUnitySDK
                     return EditorIcons.icon_vivo;
                 case AppChannel.OppoMini:
                     return EditorIcons.icon_oppo;
-                default:
-                    return null;
             }
 
             return null;
@@ -221,7 +219,14 @@ namespace TyphoonUnitySDK
 
                     if (GUI.Button(rectItem, new GUIContent(setting.name, GetLogo(setting.Channel)), style))
                     {
+                        var change = _select != setting;
                         _select = setting;
+                        //写入apply 历史
+                        if (change)
+                        {
+                            // Debug.Log("写入历史");
+                            UniEditor.WriteApplyHistory(setting);
+                        }
                     }
 
                     if (_LockChannel.Contains(setting.Channel))
@@ -335,7 +340,6 @@ namespace TyphoonUnitySDK
                 rectNextBtn.x -= 2;
                 rectNextBtn.x -= rectNextBtn.width;
                 bool clickBuildAA = false;
-                var index = 0;
                 if (UniEditor.HasAddressableSupport())
                 {
                     clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.rbutton_bold);

package/Editor/TempPublish/PublishVivoBatSettingInspector.cs

@@ -129,6 +129,7 @@ namespace TyphoonUnitySDK
 
         /*修改config.java*/
         public void WriteConfigJava()
+        
         {
             var config =
                 $@"package com.typhoon.vivo_union;

package/Editor/TempPublish/PublishVivoBatSettingWindow.cs

@@ -35,7 +35,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
         protected void OnGUI()
         {
             var rect = new Rect(0, 0, position.width, position.height);

package/Editor/UniEditor.cs

@@ -39,12 +39,11 @@ namespace TyphoonUnitySDK
         public static string PackagePath_Douyin = $"{PathRoot}/Sources~/Package/Douyin.unitypackage";
 
 
-        
         /// <summary>
         /// google play资源包
         /// </summary>
         public static string PackagePath_GooglePlay = $"{PathRoot}/Sources~/Package/GooglePlay.unitypackage";
-        
+
         /// <summary>
         /// Toast模块
         /// </summary>
@@ -59,7 +58,7 @@ namespace TyphoonUnitySDK
         /// <summary>
         /// apply历史记录
         /// </summary>
-        public static readonly string APPLY_HISTORY = "Temp/typhoon_apply_history.txt";
+        public static readonly string APPLY_HISTORY = ".typhoon/typhoon_sdk_apply_history.txt";
 
 
         /// <summary>
@@ -405,7 +404,7 @@ namespace TyphoonUnitySDK
                 sb.Append($".{current}");
                 return sb.ToString();
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Debug.LogError("无法识别版本号格式");
             }

package/Runtime/BaseSdk.cs

@@ -7,7 +7,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// 默认sdk实现
     /// </summary>
-    public abstract class BaseSdk : MonoBehaviour, ISdk
+    public abstract class BaseSdk : ISdk
     {
         /*OnCreate*/
         public abstract void OnCreate();

package/Runtime/SDKInteractiveUI.cs

@@ -618,6 +618,7 @@ namespace TyphoonUnitySDK
                 EditorGUI.DrawRect(rectProcess, Color.green * 0.5f);
                 if (process >= 1)
                 {
+                    holdTime = 0;
                     hideHandler?.Invoke();
                 }
             }

package/Runtime/TestSdk.cs

@@ -1,12 +1,13 @@
 using System;
+using UnityEngine.Scripting;
 
 namespace TyphoonUnitySDK
 {
+    [Preserve]
     public class TestSdk : BaseSdk
     {
         public override void OnCreate()
         {
-            DontDestroyOnLoad(gameObject);
         }
 
         public override void InitSdk(Action success, Action<string> fail)

package/Runtime/TyphoonSdk.cs

@@ -13,12 +13,12 @@ namespace TyphoonUnitySDK
         /*绑定SDK实例*/
         public static Dictionary<AppChannel, string> SDKBindings = new Dictionary<AppChannel, string>
         {
-            { AppChannel.Test, "TYPHOON_SDK_TEST" }, //测试渠道
-            { AppChannel.ChinaAndroid, "TYPHOON_SDK_CHINA_ANDROID" }, //国内安卓
-            { AppChannel.WxMini, "TYPHOON_SDK_WX_MINI" }, //微信小游戏
-            { AppChannel.DouyinAndroid, "TYPHOON_SDK_DOUYIN_MINI" }, //抖音小游戏
-            { AppChannel.DouyinIOS, "TYPHOON_SDK_DOUYIN_MINI" }, //抖音小游戏
-            { AppChannel.GooglePlay, "TYPHOON_SDK_GOOGLE_PLAY" }, //GooglePlay
+            { AppChannel.Test, "TyphoonUnitySDK.TestSdk" }, //测试渠道
+            { AppChannel.ChinaAndroid, "TyphoonUnitySDK.ChinaAndroidSdk" }, //国内安卓
+            { AppChannel.WxMini, "TyphoonUnitySDK.WxMiniSdk" }, //微信小游戏
+            { AppChannel.DouyinAndroid, "TyphoonUnitySDK.DouyinSdk" }, //抖音小游戏
+            { AppChannel.DouyinIOS, "TyphoonUnitySDK.DouyinSdk" }, //抖音小游戏
+            { AppChannel.GooglePlay, "TyphoonUnitySDK.GooglePlaySdk" }, //GooglePlay
         };
 
         private ISdk _sdk;
@@ -40,10 +40,14 @@ namespace TyphoonUnitySDK
 #endif
             if (SDKBindings.TryGetValue(AppConfig.Channel, out var match))
             {
-                var source = Resources.Load<GameObject>(match);
-                var clone = Instantiate(source);
-                _sdk = clone.GetComponent<BaseSdk>();
-                DontDestroyOnLoad(clone);
+                var type = GetType(match);
+                if (type == null)
+                {
+                    throw new Exception($"找不到sdk实例type:{match}");
+                }
+
+                var instance = Activator.CreateInstance(type);
+                _sdk = instance as ISdk;
                 _sdk.OnCreate();
             }
             else
@@ -52,6 +56,23 @@ namespace TyphoonUnitySDK
             }
         }
 
+
+        // 反射获取type
+        private Type GetType(string typeName)
+        {
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (var assembly in assemblies)
+            {
+                var type = assembly.GetType(typeName);
+                if (type != null)
+                {
+                    return type;
+                }
+            }
+
+            return null;
+        }
+
         #endregion
 
         #region 初始化SDK

package/Runtime/WxMiniTouchInputSupport.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
 

package/Sources~/Package/ChinaAndroid.unitypackage.manifest

@@ -6,8 +6,5 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Editor/PublishChinaAndroidAAR.cs.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/Resources/TYPHOON_SDK_CHINA_ANDROID.prefab.meta

package/Sources~/Package/Douyin.unitypackage.manifest

@@ -94,10 +94,7 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/DouyinBannerAd.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/DouyinSdk.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/DouyinSdk.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Editor.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Resources.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Editor/PublishDouyinAndroid.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Editor/PublishDouyinAndroid.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Editor/PublishDouyinIOS.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Editor/PublishDouyinIOS.cs.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Resources/TYPHOON_SDK_DOUYIN_MINI.prefab
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin/Resources/TYPHOON_SDK_DOUYIN_MINI.prefab.meta

package/Sources~/Package/GooglePlay.unitypackage.manifest

@@ -2,8 +2,5 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/GooglePlaySdk.cs.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Editor/PublishGooglePlay.cs.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources/TYPHOON_SDK_GOOGLE_PLAY.prefab
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay/Resources/TYPHOON_SDK_GOOGLE_PLAY.prefab.meta

package/Sources~/Package/WxMini.unitypackage.manifest

@@ -391,7 +391,5 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-unity-wx.js
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-unity-wx.js.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Plugins/_unity_js_bridge.jslib
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Plugins/_unity_js_bridge.jslib.meta
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Resources/TYPHOON_SDK_WX_MINI.prefab
-Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Resources/TYPHOON_SDK_WX_MINI.prefab.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Resources/WX_TOUCH_INPUT_OVERRIDE.prefab
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Resources/WX_TOUCH_INPUT_OVERRIDE.prefab.meta

package/package.json

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

package/Editor/SkinsTexture.asset

@@ -1,133 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b4b13ba135089db49ac6aa3f0aa8e564, type: 3}
-  m_Name: SkinsTexture
-  m_EditorClassIdentifier: 
-  Texture2D:
-  - Name: box@2x
-    Texture2D: {fileID: 0}
-  - Name: btn act@2x
-    Texture2D: {fileID: 0}
-  - Name: btn on@2x
-    Texture2D: {fileID: 0}
-  - Name: btn onact@2x
-    Texture2D: {fileID: 0}
-  - Name: btn@2x
-    Texture2D: {fileID: 0}
-  - Name: btn_active
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_active
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_blue_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_green_active
-    Texture2D: {fileID: 0}
-  - Name: btn_green_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_green_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_normal
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_active
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_hover
-    Texture2D: {fileID: 0}
-  - Name: btn_yellow_normal
-    Texture2D: {fileID: 0}
-  - Name: buttonpulldown act@2x
-    Texture2D: {fileID: 0}
-  - Name: buttonpulldown@2x
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOff
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOff@2x
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOn
-    Texture2D: {fileID: 0}
-  - Name: PopupWindowOn@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz left act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz left@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz right act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz right@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll horiz@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert down act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert down@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert up act@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert up@2x
-    Texture2D: {fileID: 0}
-  - Name: scroll vert@2x
-    Texture2D: {fileID: 0}
-  - Name: search focused@2x
-    Texture2D: {fileID: 0}
-  - Name: search@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButton@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButtonActive@2x
-    Texture2D: {fileID: 0}
-  - Name: searchCancelButtonOff@2x
-    Texture2D: {fileID: 0}
-  - Name: slider horiz@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb act@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb focus@2x
-    Texture2D: {fileID: 0}
-  - Name: slider thumb@2x
-    Texture2D: {fileID: 0}
-  - Name: slider vert@2x
-    Texture2D: {fileID: 0}
-  - Name: TextField focused@2x
-    Texture2D: {fileID: 0}
-  - Name: TextField@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle act@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle focus@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on act@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on focus@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle on@2x
-    Texture2D: {fileID: 0}
-  - Name: toggle@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button act on@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button act@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button on@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar button@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar popup@2x
-    Texture2D: {fileID: 0}
-  - Name: toolbar pulldown@2x
-    Texture2D: {fileID: 0}

package/Editor/SkinsTexture.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b483135a891a1bc4ea22f8cd1bc29431
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: