com.typhoon.unitysdk 1.0.28 → 1.0.30

package/Editor/AddressableSupport.cs

@@ -184,7 +184,7 @@ namespace TyphoonUnitySDK
                 settings.activeProfileId = profileId;
                 foreach (var element in publish.AAVariableModify)
                 {
-                    SetVariable(profileId, element.VariableName, element.VariableValue);
+                    SetVariable(publish.AAUseProfile, element.VariableName, element.VariableValue);
                 }
 
                 EditorUtility.SetDirty(settings);

package/Editor/ApplyTool.cs

@@ -39,7 +39,6 @@ namespace TyphoonUnitySDK
             var done = SwitchPlatformTo(setting.BuildTarget);
             if (done)
             {
-            
                 //修改参数
                 switch (setting.BuildTarget)
                 {
@@ -364,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/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();
                 }
             }
@@ -633,7 +634,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
         public static Type GetType(string typeName)
         {
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();

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.28","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.30","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/Runtime/Resources/TYPHOON_SDK_TEST.prefab

@@ -1,45 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3052855270983707171
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2699745964915742218}
-  - component: {fileID: 2587331464460211208}
-  m_Layer: 0
-  m_Name: TYPHOON_SDK_TEST
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2699745964915742218
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3052855270983707171}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2587331464460211208
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3052855270983707171}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c2fd32a072371b04b84c786471b7723a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

package/Runtime/Resources/TYPHOON_SDK_TEST.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: db9ec57a2f7581c42a407ba8ac1e2439
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: