com.typhoon.unitysdk 1.0.32 → 1.0.34

package/Editor/AddressableSupport.cs

@@ -282,16 +282,15 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string GetVariableValue(string variableName)
         {
-#if TYPHOON_ADDRESSABLE
             try
             {
-                var settings = AddressableAssetSettingsDefaultObject.Settings;
+                var settings = DefaultSettings;
                 return settings.profileSettings.GetValueByName(settings.activeProfileId, variableName);
             }
             finally
             {
             }
-#endif
+
             return string.Empty;
         }
 

package/Editor/ApplyTool.cs

@@ -384,6 +384,13 @@ namespace TyphoonUnitySDK
                 {
                     // Debug.Log($"删除：{folder}");
                     Directory.Delete(folder, true);
+                    var meta = $"{folder}.meta";
+                    if (File.Exists(meta))
+                    {
+                        File.Delete(meta);
+                    }
+
+                    AssetDatabase.Refresh();
                 }
             }
         }

package/Editor/WxMiniConfig.cs

@@ -47,7 +47,7 @@ namespace TyphoonUnitySDK
             var tmpEnable = GUI.enabled;
             GUI.enabled = true;
             GUILayout.Space(6);
-            GUIDrawer.DrawKeynotes("①推荐Unity版本：2019，2020，2021");
+            GUIDrawer.DrawKeynotes("①支持Unity版本：2019，2020，2021(推荐，支持ASTC压缩，坑最少)");
             GUIDrawer.DrawKeynotes("②为EventSystem加上WxMiniTouchInputSupport组件，用于支持多点触控");
             GUILayout.Space(6);
             GUI.enabled = tmpEnable;
@@ -66,6 +66,7 @@ namespace TyphoonUnitySDK
 
         private static bool DrawProperty_CDN(WxMiniConfig arg)
         {
+            GUILayout.Space(10);
             GUILayout.BeginHorizontal();
             arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
             GUILayout.EndHorizontal();
@@ -252,6 +253,9 @@ namespace TyphoonUnitySDK
 
         [Header("基础设置")] public string AppId = "";
         public string ProjectName = "";
+        [Header("广告参数(不填不开启)")] public string BannerAdUnit = "";
+        public string IntersAdUnit = "";
+        public string VideoAdUnit = "";
         public string CDN = "https://xxx.xxx.xxx";
         public Orientation ScreenOrientation = Orientation.Portrait;
         public int MemorySize = 256;

package/Runtime/SessionItem.cs

@@ -9,6 +9,8 @@ namespace TyphoonUnitySDK
     {
         #region 静态
 
+        private static long _sessionId = 0;
+
         /*session map*/
         public static Dictionary<long, SessionItem> SessionsMap = new Dictionary<long, SessionItem>();
 
@@ -18,12 +20,19 @@ namespace TyphoonUnitySDK
             if (SessionsMap.TryGetValue(session, out var match))
             {
                 match.OnExecute?.Invoke(json);
-                match.Dispose();
+                ClearSession(match.SessionId);
             }
         }
 
-
-        public static long _sessionId = 0;
+        /*清理Session*/
+        public static void ClearSession(long session)
+        {
+            if (SessionsMap.TryGetValue(session, out var match))
+            {
+                match.Dispose();
+                SessionsMap.Remove(session);
+            }
+        }
 
         #endregion
 

package/Runtime/WxMiniTouchInputSupport.cs

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

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

@@ -385,8 +385,14 @@ Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/UnityToJs.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/UnityToJs.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/WxMiniSdk.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/WxMiniSdk.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/WxMiniSdkCallBack.cs
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/WxMiniSdkCallBack.cs.meta
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/PublishWxMini.cs
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/PublishWxMini.cs.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-mini-sdk-config.js
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-mini-sdk-config.js.meta
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-mini-sdk-wx.js
+Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini/Editor/typhoon-mini-sdk-wx.js.meta
 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

package/package.json

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