com.typhoon.unitysdk 1.0.40 → 1.0.42

package/Editor/ApplyTool.cs

@@ -141,7 +141,6 @@ namespace TyphoonUnitySDK
             PlayerSettings.Android.minSdkVersion = setting.MinApiVersion;
             PlayerSettings.Android.targetSdkVersion = setting.TargetApiVersion;
 
-        
 
             //覆写GraphicsAPI
             if (setting.GraphicsAPIs.Length > 0)
@@ -206,7 +205,7 @@ namespace TyphoonUnitySDK
 
             PlayerSettings.WebGL.exceptionSupport = setting.ExceptionSupport;
             PlayerSettings.WebGL.debugSymbols = setting.WebglDebugSymbols;
-            
+
             //覆写AA参数
             AddressableSupport.ModifyAAProfileAndVariables(setting);
             //写入App config
@@ -423,6 +422,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 +457,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -478,8 +495,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -500,8 +516,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -522,8 +537,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/GooglePlay",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }
@@ -546,8 +560,7 @@ namespace TyphoonUnitySDK
                     ClearFilesInDirectory(folder, manifest);
                 }
 
-                AssetDatabase.ImportAsset($"Assets/Typhoon_Gen/TyphoonSDK/Runtime/VivoMini",
-                    ImportAssetOptions.ImportRecursive);
+                ReimportScript(manifest);
                 AssetDatabase.Refresh();
             }
         }

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>

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