com.typhoon.unitysdk 1.0.19 → 1.0.21

package/Editor/VariablePresetWindow.cs

@@ -0,0 +1,153 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 自定义变量窗口
+    /// </summary>
+    public class VariablePresetWindow : EditorWindow
+    {
+        private Vector2 _scroll;
+        private string _inputTxt;
+        private VariablePreset.VariableItem moveUp = null;
+        private VariablePreset.VariableItem moveDown = null;
+        private VariablePreset.VariableItem delete = null;
+
+        public static void Open()
+        {
+            var win = GetWindow<VariablePresetWindow>();
+            win.minSize = new Vector2(600, 500);
+            win.titleContent = new GUIContent("自定义变量");
+            win.Show();
+        }
+
+        private void OnGUI()
+        {
+            var rect = new Rect(0, 0, position.width, position.height);
+            var rectTitle = rect;
+            rectTitle.height = 32;
+            rectTitle.width -= 8;
+            rectTitle.x += 4;
+            rectTitle.y += 4;
+            EditorGUI.DrawRect(rectTitle, Skins.PublishWindowTitleBgColor);
+            GUI.Label(rectTitle, "自定义变量", Styles.rbold_title);
+            var rectSave = rectTitle;
+            rectSave.width = 90;
+            rectSave.x = rectTitle.xMax - rectSave.width - 4;
+            var center = rectSave.center;
+            rectSave.height -= 8;
+            rectSave.center = center;
+            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save)))
+            {
+                VariablePreset.Default.Save();
+            }
+
+            var toolbarArea = rectTitle;
+            toolbarArea.y = rectTitle.yMax;
+            toolbarArea.y += 6;
+            toolbarArea.height = 22;
+            center = toolbarArea.center;
+            toolbarArea.width -= 4;
+            toolbarArea.center = center;
+            GUILayout.BeginArea(toolbarArea);
+            GUILayout.BeginHorizontal();
+            _inputTxt = GUILayout.TextField(_inputTxt);
+            GUI.SetNextControlName("input");
+            if (GUILayout.Button("+新建变量", GUILayout.Width(80)))
+            {
+                if (AddVariable(_inputTxt))
+                {
+                    _inputTxt = string.Empty;
+                }
+            }
+
+            var tipRect = new Rect(0, 0, 180, toolbarArea.height);
+            tipRect.y -= 2;
+            if (string.IsNullOrEmpty(_inputTxt) && GUI.GetNameOfFocusedControl() != "input")
+            {
+                GUI.Label(tipRect, "请输入变量名...", Styles.rlabel_italic);
+            }
+
+            GUILayout.EndHorizontal();
+            GUILayout.EndArea();
+            var contentArea = toolbarArea;
+            contentArea.y = toolbarArea.yMax + 2;
+            contentArea.height = rect.yMax - contentArea.y - 4;
+            GUILayout.BeginArea(contentArea);
+            var presets = VariablePreset.Default.Presets;
+
+            foreach (var item in presets)
+            {
+                GUILayout.BeginHorizontal();
+                if (GUILayout.Button(item.VariableName, "Popup", GUILayout.Width(180)))
+                {
+                    var tem = item;
+                    var menu = new GenericMenu();
+                    menu.AddItem(new GUIContent("删除"), false, () => delete = tem);
+                    menu.AddItem(new GUIContent("上移"), false, () => moveUp = tem);
+                    menu.AddItem(new GUIContent("下移"), false, () => moveDown = tem);
+                    menu.ShowAsContext();
+                }
+
+                item.VariableValue = GUILayout.TextField(item.VariableValue);
+                GUILayout.EndHorizontal();
+            }
+
+            GUILayout.EndArea();
+            if (moveUp != null)
+            {
+                MoveUp(moveUp);
+                moveUp = null;
+            }
+
+            if (moveDown != null)
+            {
+                MoveDown(moveDown);
+                moveDown = null;
+            }
+
+            if (delete != null)
+            {
+                DeleteVariable(delete);
+                delete = null;
+            }
+
+            // Repaint();
+        }
+
+        private bool AddVariable(string variableName)
+        {
+            if (string.IsNullOrEmpty(variableName))
+            {
+                UniEditor.ShowMessageBox($"变量名不可为空", null);
+                return false;
+            }
+
+            if (VariablePreset.Default.ContainsVariable(variableName))
+            {
+                UniEditor.ShowMessageBox($"已经存在变量：{variableName}", null);
+                return false;
+            }
+
+            VariablePreset.Default.Presets.Add(new VariablePreset.VariableItem(variableName, ""));
+            VariablePreset.Default.Save();
+            return true;
+        }
+
+        private void DeleteVariable(VariablePreset.VariableItem item)
+        {
+            VariablePreset.Default.Delete(item);
+        }
+
+        private void MoveUp(VariablePreset.VariableItem item)
+        {
+            VariablePreset.Default.MoveUp(item);
+        }
+
+        private void MoveDown(VariablePreset.VariableItem item)
+        {
+            VariablePreset.Default.MoveDown(item);
+        }
+    }
+}

package/Editor/VariablePresetWindow.cs.meta

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

package/Editor/WxMiniConfig.cs

@@ -0,0 +1,285 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /*微信小游戏配置GUI绘制*/
+    public static class WxMiniConfigGUIDrawer
+    {
+        //微信小游戏进阶设置
+        private static bool _wxMiniConfigAdvanceFoldout = false;
+
+        public static Dictionary<string, Func<WxMiniConfig, bool>> OverrideDrawGUIWxMiniConfig =
+            new Dictionary<string, Func<WxMiniConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(WxMiniConfig.AppId), DrawProperty_AppId },
+                { nameof(WxMiniConfig.ProjectName), DrawProperty_ProjectName },
+                { nameof(WxMiniConfig.ScreenOrientation), DrawProperty_ScreenOrientation },
+                { nameof(WxMiniConfig.MemorySize), DrawProperty_MemorySize },
+                { nameof(WxMiniConfig.DST), DrawProperty_DST },
+                { nameof(WxMiniConfig.AssetLoadType), DrawProperty_AssetLoadType },
+                { nameof(WxMiniConfig.LoadingBg), DrawProperty_LoadingBg },
+                { nameof(WxMiniConfig.CDN), DrawProperty_CDN },
+                /*进阶选项*/
+                { nameof(WxMiniConfig.UseFriendRelation), DrawProperty_Advance },
+                { nameof(WxMiniConfig.UseCompressedTexture), DrawProperty_Advance },
+                { nameof(WxMiniConfig.UseMiniGameChat), DrawProperty_Advance },
+                { nameof(WxMiniConfig.PreloadWXFont), DrawProperty_Advance },
+                { nameof(WxMiniConfig.DevelopBuild), DrawProperty_Advance },
+                { nameof(WxMiniConfig.AutoProfile), DrawProperty_Advance },
+                { nameof(WxMiniConfig.ScriptOnly), DrawProperty_Advance },
+                { nameof(WxMiniConfig.Il2CppOptimizeSize), DrawProperty_Advance },
+                { nameof(WxMiniConfig.ProfilingFuncs), DrawProperty_Advance },
+                { nameof(WxMiniConfig.Webgl2), DrawProperty_Advance },
+                { nameof(WxMiniConfig.ClearStreamingAssets), DrawProperty_Advance },
+                { nameof(WxMiniConfig.ProfilingMemory), DrawProperty_Advance },
+                { nameof(WxMiniConfig.CleanBuild), DrawProperty_Advance },
+                { nameof(WxMiniConfig.CustomNodePath), DrawProperty_Advance },
+            };
+
+
+        private static bool DrawProperty_m_Script(WxMiniConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①推荐Unity版本：2019，2020，2021");
+            GUIDrawer.DrawKeynotes("②为EventSystem加上WxMiniTouchInputSupport组件，用于支持多点触控");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+        private static bool DrawProperty_Advance(WxMiniConfig arg)
+        {
+            if (_wxMiniConfigAdvanceFoldout)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private static bool DrawProperty_CDN(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            arg.CDN = EditorGUILayout.TextField("CDN地址 (后台配白名单)", arg.CDN);
+            GUILayout.EndHorizontal();
+            GUILayout.TextArea($"支持与自定义变量组合，[变量名]作为占位符\n最终地址：{VariablePreset.Default.ParserToString(arg.CDN)}",
+                "helpBox",
+                GUILayout.Height(44));
+            return true;
+        }
+
+        private static bool DrawProperty_LoadingBg(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            arg.LoadingBg =
+                EditorGUILayout.ObjectField("Loading图（默认使用纯黑）", arg.LoadingBg, typeof(Texture), false) as Texture;
+            GUILayout.EndHorizontal();
+            GUILayout.Space(5);
+            _wxMiniConfigAdvanceFoldout = EditorGUILayout.Foldout(_wxMiniConfigAdvanceFoldout, "进阶选项");
+            return true;
+        }
+
+        private static bool DrawProperty_DST(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("发布目录", GUILayout.Width(146));
+            arg.DST = GUILayout.TextField(arg.DST);
+            if (GUILayout.Button("打开", GUILayout.Width(50)))
+            {
+                if (Directory.Exists(arg.DST))
+                {
+                    EditorUtility.RevealInFinder(arg.DST);
+                }
+            }
+
+            if (GUILayout.Button("浏览", GUILayout.Width(50)))
+            {
+                var path = EditorUtility.OpenFolderPanel("请选择", "", "typhoon_wx_game");
+                if (!string.IsNullOrEmpty(path))
+                {
+                    arg.DST = UniEditor.FullPathToAssetPath(path);
+                    GUI.FocusControl("");
+                    arg.Save();
+                }
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_MemorySize(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("分配内存（MB）", GUILayout.Width(146));
+            arg.MemorySize = EditorGUILayout.IntSlider(arg.MemorySize, 256, 2048);
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_ScreenOrientation(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("屏幕朝向", GUILayout.Width(146));
+            if (GUILayout.Button(arg.ScreenOrientation == WxMiniConfig.Orientation.Portrait ? "竖屏" : "横屏", "PopUp"))
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("竖屏"), false, () =>
+                {
+                    arg.ScreenOrientation = WxMiniConfig.Orientation.Portrait;
+                    arg.Save();
+                });
+                menu.AddItem(new GUIContent("横屏"), false, () =>
+                {
+                    arg.ScreenOrientation = WxMiniConfig.Orientation.Landscape;
+                    arg.Save();
+                });
+                menu.ShowAsContext();
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        private static bool DrawProperty_ProjectName(WxMiniConfig arg)
+        {
+            arg.ProjectName = EditorGUILayout.TextField("游戏名(找运营要)", arg.ProjectName);
+            return true;
+        }
+
+        private static bool DrawProperty_AppId(WxMiniConfig arg)
+        {
+            GUILayout.Space(5);
+            arg.AppId = EditorGUILayout.TextField("AppId(找运营要)", arg.AppId);
+            return true;
+        }
+
+        public static void DrawWxMiniConfig()
+        {
+            var config = WxMiniConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIWxMiniConfig.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+
+        private static bool DrawProperty_AssetLoadType(WxMiniConfig arg)
+        {
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("首包加载模式", GUILayout.Width(146));
+            if (GUILayout.Button(arg.AssetLoadType == 0 ? "CDN" : "游戏内", "PopUp"))
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("CDN"), false, () =>
+                {
+                    arg.AssetLoadType = 0;
+                    arg.Save();
+                });
+                menu.AddItem(new GUIContent("游戏内"), false, () =>
+                {
+                    arg.AssetLoadType = 1;
+                    arg.Save();
+                });
+                menu.ShowAsContext();
+            }
+
+            GUILayout.EndHorizontal();
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// 微信小游戏配置
+    /// </summary>
+    public class WxMiniConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/WxMiniConfig.asset";
+
+        private static WxMiniConfig _instance = null;
+
+        public static WxMiniConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<WxMiniConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<WxMiniConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+
+        /// <summary>
+        /// 朝向
+        /// </summary>
+        public enum Orientation
+        {
+            //横屏
+            Portrait,
+
+            //竖屏
+            Landscape,
+
+            LandscapeLeft,
+            LandscapeRight,
+        }
+
+        [Header("基础设置")] public string AppId = "";
+        public string ProjectName = "";
+        public string CDN = "https://xxx.xxx.xxx";
+        public Orientation ScreenOrientation = Orientation.Portrait;
+        public int MemorySize = 256;
+        public string DST = "typhoon_wx_game";
+
+        [Header("启动Loading配置")] public int AssetLoadType = 0; //首包加载方式，0:CDN,1:游戏内
+        public Texture LoadingBg;
+
+        [Header("SDK 功能选项")] public bool UseFriendRelation = false;
+        public bool UseCompressedTexture = false;
+        public bool UseMiniGameChat = false;
+        public bool PreloadWXFont = false;
+
+        [Header("调试编译选项")] public bool DevelopBuild = false;
+        public bool AutoProfile = false;
+        public bool ScriptOnly = false;
+        public bool Il2CppOptimizeSize = true;
+        public bool ProfilingFuncs = false;
+        public bool Webgl2 = false;
+        public bool ClearStreamingAssets = true;
+        public bool ProfilingMemory = false;
+        public bool CleanBuild = false;
+        public string CustomNodePath = string.Empty;
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

package/Editor/WxMiniConfig.cs.meta

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

package/Runtime/AppConfig.cs

@@ -24,5 +24,21 @@ namespace TyphoonUnitySDK
         /// 发布时间
         /// </summary>
         public static string PublishTime => AppConfigAsset.Instance.PublishTime;
+
+
+        /// <summary>
+        /// [抖音小游戏]视频广告ID
+        /// </summary>
+        public static string DouyinVideoId = AppConfigAsset.Instance.DouyinVideoId;
+
+        /// <summary>
+        /// [抖音小游戏]插页广告ID
+        /// </summary>
+        public static string DouyinIntersId => AppConfigAsset.Instance.DouyinIntersId;
+
+        /// <summary>
+        /// [抖音小游戏]BannerID
+        /// </summary>
+        public static string DouyinBannerId => AppConfigAsset.Instance.DouyinBannerId;
     }
 }

package/Runtime/AppConfigAsset.cs

@@ -44,7 +44,10 @@ namespace TyphoonUnitySDK
 
         [Tooltip("版本类型")] public VersionType VersionType = VersionType.Release;
 
-        [FormerlySerializedAs("PublishTimeString")] [Tooltip("发布时间")]
-        public string PublishTime = "19700101000000";
+        [Tooltip("发布时间")] public string PublishTime = "19700101000000";
+
+        [Tooltip("[抖音小游戏]视频广告ID")] public string DouyinVideoId;
+        [Tooltip("[抖音小游戏]插页广告ID")] public string DouyinIntersId;
+        [Tooltip("[抖音小游戏]Banner广告ID")] public string DouyinBannerId;
     }
 }

package/Runtime/TyphoonSdk.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -9,10 +10,14 @@ namespace TyphoonUnitySDK
     /// </summary>
     public partial class TyphoonSdk : MonoSingleton<TyphoonSdk>
     {
+        /*绑定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" }, //抖音小游戏
         };
 
         private ISdk _sdk;
@@ -381,5 +386,31 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 协程
+
+        /// <summary>
+        /// 使用协程延迟处理逻辑
+        /// </summary>
+        public Coroutine WaitTo(float delay, Action handler)
+        {
+            return StartCoroutine(IeWaitTo(delay, handler));
+        }
+
+        private IEnumerator IeWaitTo(float delay, Action handler)
+        {
+            yield return new WaitForSeconds(delay);
+            handler?.Invoke();
+        }
+
+        /// <summary>
+        /// 中断协程
+        /// </summary>
+        public void KillWaitTo(Coroutine coroutine)
+        {
+            StopCoroutine(coroutine);
+        }
+
+        #endregion
     }
 }

package/Runtime/UnityToJs.cs

@@ -0,0 +1,66 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using UnityEngine;
+
+
+namespace TyphoonUnitySDK
+{
+#if UNITY_WEBGL
+    /// <summary>
+    /// unity 调用 js
+    /// </summary>
+    public class UnityToJs
+    {
+        [DllImport("__Internal")]
+        private static extern void WebMethodCall(string msg);
+
+
+        [DllImport("__Internal")]
+        private static extern string WebMethodGet(string msg);
+
+        public static void MethodCall(string msg)
+        {
+#if UNITY_EDITOR
+            Debug.Log($"## unity call js {msg}");
+#else
+WebMethodCall(msg);
+#endif
+        }
+
+
+        public static string MethodGet(string msg)
+        {
+#if UNITY_EDITOR
+            Debug.Log($"## unity get js {msg}");
+            return msg;
+#else
+return WebMethodGet(msg);
+#endif
+        }
+
+        /*无回调的方式*/
+        public static void MethodCall(string method, object data)
+        {
+            var send = new
+            {
+                method,
+                data,
+            };
+            MethodCall(send.ToJson());
+        }
+
+        /*带回调的方式*/
+        public static void MethodCall(SessionItem session)
+        {
+            var send = new
+            {
+                session = session.SessionId,
+                method = session.MethodName,
+                data = session.SendData,
+            };
+            MethodCall(send.ToJson());
+        }
+    }
+#endif
+}

package/Runtime/UnityToJs.cs.meta

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

package/Runtime/WxMiniTouchInputSupport.cs

@@ -0,0 +1,33 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 微信小游戏多点触控支持
+    /// </summary>
+    public class WxMiniTouchInputSupport : MonoBehaviour
+    {
+        private void Awake()
+        {
+            if (AppConfig.Channel == AppChannel.WxMini)
+            {
+                //加载多点触控
+                var source = Resources.Load<GameObject>("WX_TOUCH_INPUT_OVERRIDE");
+                //获取
+                var com = source.GetComponents<BaseInput>();
+                foreach (var element in com)
+                {
+                    var type = element.GetType();
+                    if (type.Name.Contains("WXTouchInputOverride"))
+                    {
+                        Debug.Log("补充WXTouchInputOverride组件");
+                        //补充WXTouchInputOverride组件
+                        gameObject.AddComponent(type);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}

package/Runtime/WxMiniTouchInputSupport.cs.meta

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