com.typhoon.unitysdk 1.0.43 → 1.0.45

package/Editor/AddressableSupport.cs

@@ -228,8 +228,11 @@ namespace TyphoonUnitySDK
                 // AddressableAssetSettings.CleanPlayerContent(builder as IDataBuilder);
             }
 
-            Debug.Log($"profile:{settings.profileSettings.GetProfileName(profileId)}");
+            Debug.Log(
+                $"<color=#{SdkDebug.BlueHex}>使用profile:{settings.profileSettings.GetProfileName(profileId)}</color>");
 
+            Debug.Log(
+                $"<color=#{SdkDebug.BlueHex}>想要在AA构建前or后做点事情？任意Editor文件夹下创建class继承于TyphoonUnitySDK.OnBuildAAProcessor</color>");
             //触发AA回调
             var sub = GetSubClassTypes(typeof(OnBuildAAProcessor));
             var match = new List<OnBuildAAProcessor>();

package/Editor/ApplyTool.cs

@@ -89,7 +89,7 @@ namespace TyphoonUnitySDK
 
                 match.Apply(setting);
                 InvokeOnApplyEnd(setting);
-                Debug.Log($"<color=#3ac9f3>想在应用前or后做点事情?任意Editor文件夹下创建class继承TyphoonUnitySDK.OnApplyProcessor实现接口</color>");
+                Debug.Log($"<color=#{SdkDebug.BlueHex}>想在应用前or后做点事情?任意Editor文件夹下创建class继承TyphoonUnitySDK.OnApplyProcessor实现接口</color>");
             }
         }
 

package/Editor/DouyinConfig.cs

@@ -52,17 +52,22 @@ namespace TyphoonUnitySDK
             var tmpEnable = GUI.enabled;
             GUI.enabled = true;
             GUILayout.Space(6);
-            GUIDrawer.DrawKeynotes("①仅支持Unity版本：2019.4.35(逐步放弃)，2021.3.14（最优，支持ASTC压缩，可减少Webgl运行消耗）");
-            GUIDrawer.DrawKeynotes("    详细以官方文档地址为准,链接如下：");
+            GUIDrawer.DrawKeynotes("①仅支持Unity版本：2019.4.35(逐步放弃)，2021.3.14（最优，支持ASTC压缩）");
             var url = "https://bytedance.feishu.cn/docx/doxcnTTjZHp8J6HzdrSbWu1aK5b";
-            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
-            GUIDrawer.DrawKeynotes("②需要接入录屏分享功能");
-            GUIDrawer.DrawKeynotes("③使用指定广告图标，链接如下:");
+            GUIDrawer.DrawUrlLink($"        [官方说明] {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("②webgl不支持多线程，修改代码进行适配 (只发Android可忽略)");
+            GUIDrawer.DrawKeynotes("③录屏分享（必须接入）");
+            url = "https://auffm1e1gb.feishu.cn/docx/QiGldaOsWom8p4xGjchcTpm5nmh#R5wFdxUELo22n7xbg7jcmI53n0f";
+            GUIDrawer.DrawUrlLink($"        [API文档] {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("④使用指定广告图标，注意广告规范");
             url = "https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/operation1/advertise/norms";
-            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
-            GUIDrawer.DrawKeynotes("④需要接入侧边栏复访");
+            GUIDrawer.DrawUrlLink($"        [官方说明] {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("⑤侧边栏复访（必须接入）");
             url = "https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/operation1/ability/-retention/sidebar#c6ed8ce0";
-            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawUrlLink($"        [官方说明] {url}", () => Application.OpenURL(url));
+            url = "https://auffm1e1gb.feishu.cn/docx/QiGldaOsWom8p4xGjchcTpm5nmh#K322dje8YoJ6psxM7XkcGs5zn6f";
+            GUIDrawer.DrawUrlLink($"        [API文档] {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("⑥记得在抖音小游戏后台配置域名白名单（如果需要）");
             GUILayout.Space(6);
             GUI.enabled = tmpEnable;
             return true;

package/Editor/GUIDrawer.cs

@@ -38,7 +38,9 @@ namespace TyphoonUnitySDK
                 if (_linkstyle == null)
                 {
                     _linkstyle = new GUIStyle(Styles.rlabel_italic);
-                    _linkstyle.normal.textColor = new Color(0.02f, 0.49f, 0.84f, 1f);
+                    _linkstyle.normal.textColor = EditorGUIUtility.isProSkin
+                        ? new Color(0.71f, 0.27f, 0.91f, 1f)
+                        : new Color(0.39f, 0.15f, 0.51f, 1f);
                 }
 
                 return _linkstyle;
@@ -96,6 +98,7 @@ namespace TyphoonUnitySDK
             StyleTooltip.normal.textColor = EditorGUIUtility.isProSkin
                 ? new Color(0.47f, 0.8f, 1f, 1f)
                 : new Color(0.04f, 0.31f, 0.57f, 1f);
+            StyleTooltip.richText = true;
             GUILayout.TextArea(content, StyleTooltip, option);
         }
 

package/Editor/Preferences.cs

@@ -27,7 +27,7 @@ namespace TyphoonUnitySDK
                     _instance = CreateInstance<Preferences>();
                     UniEditor.CreateDirIfNotExist(Path.GetDirectoryName(AssetPath));
                     AssetDatabase.CreateAsset(_instance, AssetPath);
-                    Debug.Log($"<color=#3ac9f3>生成:{AssetPath}</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>生成:{AssetPath}</color>");
                 }
 
                 return _instance;

package/Editor/PublishWindow.cs

@@ -350,21 +350,21 @@ namespace TyphoonUnitySDK
 
                 if (clickApply)
                 {
-                    Debug.Log($"<color=#3ac9f3>应用...{_select}</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>应用...{_select}</color>");
                     _select.Apply();
-                    Debug.Log($"<color=#3ac9f3>应用完毕</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>应用完毕</color>");
                 }
 
                 if (clickBuildAA)
                 {
-                    Debug.Log($"<color=#3ac9f3>构建AA...</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>构建AA...</color>");
                     AddressableSupport.BuildAASource(_select);
-                    Debug.Log($"<color=#3ac9f3>构建AA结束</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>构建AA结束</color>");
                 }
 
                 if (clickPublish)
                 {
-                    Debug.Log($"<color=#3ac9f3>发布...</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>发布...</color>");
                     _select.Publish();
                 }
 

package/Editor/UniEditor.cs

@@ -126,7 +126,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void ImportPackage(string path, bool interactive = true)
         {
-            Debug.Log($"<color=#3ac9f3>导入----{path}</color>");
+            Debug.Log($"<color=#{SdkDebug.BlueHex}>导入----{path}</color>");
             AssetDatabase.ImportPackage(path, interactive);
         }
 
@@ -172,7 +172,7 @@ namespace TyphoonUnitySDK
                 PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTarget, definesString);
                 foreach (var element in removes)
                 {
-                    Debug.Log($"<color=#51d364>移除宏定义：{element}</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>移除宏定义：{element}</color>");
                 }
             }
         }
@@ -213,7 +213,7 @@ namespace TyphoonUnitySDK
                 PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTarget, definesString);
                 foreach (var element in append)
                 {
-                    Debug.Log($"<color=#51d364>添加宏定义：{element}</color>");
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>添加宏定义：{element}</color>");
                 }
             }
         }

package/Editor/WxMiniConfig.cs

@@ -49,6 +49,8 @@ namespace TyphoonUnitySDK
             GUILayout.Space(6);
             GUIDrawer.DrawKeynotes("①支持Unity版本：2019，2020，2021(推荐，支持ASTC压缩，坑最少)");
             GUIDrawer.DrawKeynotes("②为EventSystem加上WxMiniTouchInputSupport组件，用于支持多点触控");
+            GUIDrawer.DrawKeynotes("③webgl不支持多线程，修改代码进行适配");
+            GUIDrawer.DrawKeynotes("④记得在微信公众平台后台配置域名白名单（如果需要）");
             GUILayout.Space(6);
             GUI.enabled = tmpEnable;
             return true;
@@ -71,9 +73,8 @@ namespace TyphoonUnitySDK
             arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
             GUILayout.EndHorizontal();
             GUIDrawer.DrawKeynotes($"支持与自定义变量组合，[变量名]作为占位符\n最终地址：{VariablePreset.Default.ParserToString(arg.CDN)}");
-            // GUILayout.TextArea($"支持与自定义变量组合，[变量名]作为占位符\n最终地址：{VariablePreset.Default.ParserToString(arg.CDN)}",
-            //     "helpBox",
-            //     GUILayout.Height(44));
+            GUIDrawer.DrawKeynotes(
+                $"<b>[ 注 意 ! ] </b>如果有远端资源需要动态下载，需要放在CDN地址的StreamingAssets下，参考路径：\n{VariablePreset.Default.ParserToString(arg.CDN)}/StreamingAssets/<资源文件,子目录资源文件>...\n非此地址下载的aa或ab资源不会常驻保存（每次重启游戏都会丢失,可能导致重复下载）造成CDN浪费");
             GUILayout.Space(5);
             return true;
         }

package/Editor/doc/changelog.md

@@ -0,0 +1,2 @@
+迭代记录
+测试数据...

package/Editor/doc/changelog.md.meta

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

package/Editor/doc.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e1aeeed2c3ab8f34682319596458dec4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/BaseSdk.cs

@@ -228,5 +228,14 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 事件上报
+
+        public virtual void Track(string eventName, KvMap map)
+        {
+            //默认不处理
+        }
+
+        #endregion
     }
 }

package/Runtime/Interface.cs

@@ -7,7 +7,7 @@ namespace TyphoonUnitySDK
     /// SDK全功能接口
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
-        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast
+        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast,ITrack
     {
     }
 
@@ -202,4 +202,13 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+    #region 事件上报
+
+    public interface ITrack
+    {
+        void Track(string eventName, KvMap map);
+    }
+
+    #endregion
 }

package/Runtime/KvMap.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 事件上报数据字典
+    /// </summary>
+    [Serializable]
+    public class KvMap : Dictionary<string, object>
+    {
+    }
+}

package/Runtime/KvMap.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2491498cacb200443b2fbf81850a6e7e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/SdkDebug.cs

@@ -1,15 +1,24 @@
 using UnityEngine;
+using UnityEngine.Scripting;
 
 namespace TyphoonUnitySDK
 {
     /// <summary>
     /// SDK 日志输出
     /// </summary>
+    [Preserve]
     public class SdkDebug
     {
         public static bool IsDebug = true;
         public static string Prefix = "##typhoon-unity-sdk:";
 
+#if UNITY_EDITOR
+        public static string BlueHex => UnityEditor.EditorGUIUtility.isProSkin ? "26ade9" : "092415";
+#else
+        public static string BlueHex => "26ade9";
+#endif
+
+
         public static void Log(string message)
         {
             if (!IsDebug)

package/Runtime/SdkLite.cs

@@ -10,6 +10,32 @@ namespace TyphoonUnitySDK
     /// </summary>
     public partial class SdkLite : MonoSingleton<SdkLite>
     {
+        /// <summary>
+        /// 生命周期回调——监听小程序启动或切前台<para/>
+        /// 初始化完成后才会触发<para/>
+        /// 支持：微信小游戏,抖音小游戏，vivo小游戏<para/>
+        /// </summary>
+        public static event Action OnShow = null;
+
+        /// <summary>
+        /// 生命周期回调——监听小程序切后台<para/>
+        /// 初始化完成后才会触发<para/>
+        /// 支持：微信小游戏,抖音小游戏，vivo小游戏<para/>
+        /// </summary>
+        public static event Action OnHide = null;
+
+        //触发OnShow
+        public static void InvokeOnShow()
+        {
+            OnShow?.Invoke();
+        }
+
+        //触发OnHide
+        public static void InvokeOnHide()
+        {
+            OnHide?.Invoke();
+        }
+
         /*绑定SDK实例*/
         public static Dictionary<AppChannel, string> SDKBindings = new Dictionary<AppChannel, string>
         {
@@ -40,6 +66,7 @@ namespace TyphoonUnitySDK
             }
         }
 
+
         protected override void Init()
         {
             base.Init();
@@ -53,6 +80,7 @@ namespace TyphoonUnitySDK
         private void CreateSDK()
         {
 #if UNITY_EDITOR
+            SimulateOnShow.Instance.Build();
             return;
 #endif
             if (SDKBindings.TryGetValue(AppConfig.Channel, out var match))
@@ -670,7 +698,7 @@ namespace TyphoonUnitySDK
             else
             {
                 fail?.Invoke("not support");
-                Debug.Log("<color=#e53e30> [SDK模拟] 是否支持侧边栏-回调结果==false,可从'TyphoonSDK/模拟测试'修改</color>");
+                Debug.Log($"<color=#{SdkDebug.BlueHex}> [SDK模拟] 是否支持侧边栏-回调结果==false,可从'TyphoonSDK/模拟测试'修改</color>");
             }
 
             return;
@@ -708,7 +736,7 @@ namespace TyphoonUnitySDK
                 }
 
                 fail?.Invoke("not support");
-                Debug.Log("<color=#e53e30> [SDK模拟] 导航到侧边栏-回调结果==false,可从'TyphoonSDK/模拟测试'修改</color>");
+                Debug.Log($"<color=#{SdkDebug.BlueHex}> [SDK模拟] 导航到侧边栏-回调结果==false,可从'TyphoonSDK/模拟测试'修改</color>");
             }
 
             return;
@@ -730,7 +758,7 @@ namespace TyphoonUnitySDK
                 {
                     if (!SdkTestInUnity.Instance.IsEnterFromSideBar)
                     {
-                        Debug.Log("<color=#e53e30> [SDK模拟] 侧边栏进入标记==false,可从'TyphoonSDK/模拟测试'修改</color>");
+                        Debug.Log($"<color=#{SdkDebug.BlueHex}> [SDK模拟] 侧边栏进入标记==false,可从'TyphoonSDK/模拟测试'修改</color>");
                     }
 
                     return SdkTestInUnity.Instance.IsEnterFromSideBar;
@@ -761,5 +789,46 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+
+        #region 事件上报
+
+        /// <summary>
+        /// 多项事件上报<para/>
+        /// 为了保证各渠道兼容性，注意[事件名][字段名]都使用英文+数字的形式
+        /// </summary>
+        /// <param name="eventName">事件名</param>
+        /// <param name="map">携带的数据集合</param>
+        public virtual void Track(string eventName, KvMap map)
+        {
+#if UNITY_EDITOR
+            if (SdkTestInUnity.Instance.TrackLogFlag)
+            {
+                //开启日志
+                Debug.Log(
+                    $"<color=#{SdkDebug.BlueHex}> [SDK模拟] Track [eventName]:{eventName} [map]:{map.ToXJson()} 可从'TyphoonSDK/模拟测试'中修改</color>");
+            }
+
+            return;
+#endif
+            _sdk.Track(eventName, map);
+        }
+
+        /// <summary>
+        /// 单项事件上报<para/>
+        /// </summary>
+        /// <param name="eventName">事件名</param>
+        /// <param name="field">字段名</param>
+        /// <param name="value">携带的数据(可为空)</param>
+        public virtual void Track(string eventName, string field, object value = null)
+        {
+            var map = new KvMap()
+            {
+                { field, value }
+            };
+            Track(eventName, map);
+        }
+
+        #endregion
     }
 }

package/Runtime/SdkTestInUnity.cs

@@ -1,11 +1,9 @@
 using System.IO;
 using TyphoonUnitySDK;
-
+using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
-using UnityEngine;
-using UnityEngine.Serialization;
 
 public class SdkTestInUnity : ScriptableObject
 {
@@ -18,13 +16,17 @@ public class SdkTestInUnity : ScriptableObject
     [LabelOverride("视频广告flag")] public bool GetVideoFlagResult = true;
     [LabelOverride("视频广告回调")] public bool ShowVideoResult = true;
 
-    [FormerlySerializedAs("IsSupportSideBar")] [Header("抖音小游戏相关")] [LabelOverride("是否支持侧边栏-回调结果")]
+    [LabelOverride("模拟小游戏端onShow,onHide")] public bool SimulateInvokeOnShow = true;
+
+    [Header("抖音小游戏相关")] [LabelOverride("是否支持侧边栏-回调结果")]
     public bool IsSupportSideBarResult = true;
 
     [LabelOverride("导航到侧边栏-回调结果")] public bool NavigateToSideBarResult = true;
 
     [LabelOverride("侧边栏进入标记")] public bool IsEnterFromSideBar = true;
 
+    [LabelOverride("事件上报Log")] public bool TrackLogFlag = true;
+
 
     private static SdkTestInUnity _instance = null;
 
@@ -38,7 +40,7 @@ public class SdkTestInUnity : ScriptableObject
                 _instance = AssetDatabase.LoadAssetAtPath<SdkTestInUnity>(ASSET_PATH);
                 if (_instance == null)
                 {
-                    _instance = ScriptableObject.CreateInstance<SdkTestInUnity>();
+                    _instance = CreateInstance<SdkTestInUnity>();
                     var folder = Path.GetDirectoryName(ASSET_PATH);
                     if (!Directory.Exists(folder))
                     {

package/Runtime/SimulateOnShow.cs

@@ -0,0 +1,30 @@
+using System;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 模拟小游戏端onShow,onHide
+    /// </summary>
+    public class SimulateOnShow : MonoSingleton<SimulateOnShow>
+    {
+#if UNITY_EDITOR
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            if (SdkTestInUnity.Instance.SimulateInvokeOnShow)
+            {
+                if (hasFocus)
+                {
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>[SDK模拟]onShow 可从'TyphoonSDK/模拟测试'修改</color>");
+                    SdkLite.InvokeOnShow();
+                }
+                else
+                {
+                    Debug.Log($"<color=#{SdkDebug.BlueHex}>[SDK模拟]onHide 可从'TyphoonSDK/模拟测试'修改</color>");
+                    SdkLite.InvokeOnHide();
+                }
+            }
+        }
+#endif
+    }
+}

package/Runtime/SimulateOnShow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a7e78afce88b00498ba0d218a79b9e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

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