com.typhoon.unitysdk 1.0.18 → 1.0.20

package/Editor/PublishSettingGUIDrawer.cs

@@ -11,9 +11,13 @@ namespace TyphoonUnitySDK
     /// </summary>
     public static class PublishSettingGUIDrawer
     {
-        private static AddressableVariableModify _cacheDelete = null;
-        private static AddressableVariableModify _cacheMoveUp = null;
-        private static AddressableVariableModify _cacheMoveDown = null;
+        private static VariableModify _cacheDelete = null;
+        private static VariableModify _cacheMoveUp = null;
+        private static VariableModify _cacheMoveDown = null;
+
+        private static VariableModify _cachePresetDelete = null;
+        private static VariableModify _cachePresetMoveUp = null;
+        private static VariableModify _cachePresetMoveDown = null;
 
         /// <summary>
         /// 绑定重绘逻辑
@@ -41,8 +45,29 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.MinApiVersion), DrawProperty_MinApiVersion },
                 { nameof(PublishSetting.TargetApiVersion), DrawProperty_TargetApiVersion },
                 { nameof(PublishSetting.GraphicsAPIs), DrawProperty_GraphicsAPIs },
+                { nameof(PublishSetting.PresetModifyEnable), DrawProperty_PresetModifyEnable },
+                { nameof(PublishSetting.PresetModify), DrawProperty_PresetModify },
+                { nameof(PublishSetting.WxMiniGUIFoldout), DrawProperty_WxMiniGUIFoldout },
             };
 
+        /*绘制微信GUI*/
+        private static bool DrawProperty_WxMiniGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.WxMini)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.WxMiniGUIFoldout = GUIDrawer.DrawFoldout("微信小游戏", arg.WxMiniGUIFoldout, GUILayout.Height(26));
+            if (arg.WxMiniGUIFoldout)
+            {
+                WxMiniConfigGUIDrawer.DrawWxMiniConfig();
+            }
+
+            return true;
+        }
+
 
         /// <summary>
         /// 绘制GUI
@@ -57,7 +82,7 @@ namespace TyphoonUnitySDK
             area.center = view.center;
             var obj = new SerializedObject(setting);
             GUILayout.BeginArea(area);
-            scroll = GUILayout.BeginScrollView(scroll, GUIStyle.none, GUIStyle.none);
+            scroll = GUILayout.BeginScrollView(scroll, GUIStyle.none);
             DrawPropertyGUI(setting);
             GUILayout.Space(30);
             GUILayout.EndScrollView();
@@ -258,7 +283,7 @@ namespace TyphoonUnitySDK
             GUILayout.Label("关联profile", GUILayout.Width(142));
             var txt = setting.AAUseProfile;
             txt = string.IsNullOrEmpty(txt) ? "请选择" : txt;
-            if (GUILayout.Button(txt,"Popup"))
+            if (GUILayout.Button(txt, "Popup"))
             {
                 AddressableSupport.PopUpProfileSelectorMenu(setting);
             }
@@ -299,7 +324,7 @@ namespace TyphoonUnitySDK
             }
 
             var variables = AddressableSupport.GetVariables();
-            if (GUILayout.Button("覆写 Veriable","Popup"))
+            if (GUILayout.Button("覆写 Veriable", "Popup"))
             {
                 var used = new HashSet<string>();
                 foreach (var modify in modifies)
@@ -321,7 +346,7 @@ namespace TyphoonUnitySDK
                         else
                         {
                             Debug.Log($"加入新的参数:{variable}");
-                            setting.AAVariableModify.Add(new AddressableVariableModify(variable,
+                            setting.AAVariableModify.Add(new VariableModify(variable,
                                 AddressableSupport.GetVariableValue(variable)));
                             EditorUtility.SetDirty(setting);
                         }
@@ -388,6 +413,140 @@ namespace TyphoonUnitySDK
             return true;
         }
 
+
+        /*自定义参数修改*/
+        private static bool DrawProperty_PresetModify(PublishSetting setting)
+        {
+            if (!setting.PresetModifyEnable)
+            {
+                return true;
+            }
+
+
+            var modifies = setting.PresetModify;
+            for (int i = modifies.Count - 1; i >= 0; i--)
+            {
+                if (modifies[i] == null)
+                {
+                    modifies.RemoveAt(i);
+                    continue;
+                }
+            }
+
+            var variables = new HashSet<string>();
+            var presets = VariablePreset.Default.Presets;
+            foreach (var preset in presets)
+            {
+                variables.Add(preset.VariableName);
+            }
+
+            if (GUILayout.Button("覆写 Veriable", "Popup"))
+            {
+                var used = new HashSet<string>();
+                foreach (var modify in modifies)
+                {
+                    used.Add(modify.VariableName);
+                }
+
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("新增变量"), false, VariablePresetWindow.Open);
+                foreach (var item in presets)
+                {
+                    var isUsed = used.Contains(item.VariableName);
+                    var desc = isUsed ? $"{item.VariableName} (使用中)" : item.VariableName;
+                    menu.AddItem(new GUIContent(desc), false, () =>
+                    {
+                        if (isUsed)
+                        {
+                            Debug.Log("使用中，已加入");
+                        }
+                        else
+                        {
+                            Debug.Log($"加入新的变量:{item}");
+                            setting.PresetModify.Add(new VariableModify(item.VariableName, item.VariableValue));
+                            EditorUtility.SetDirty(setting);
+                        }
+                    });
+                }
+
+                menu.ShowAsContext();
+            }
+
+
+            foreach (var modify in modifies)
+            {
+                var isValid = !string.IsNullOrEmpty(modify.VariableName) && variables.Contains(modify.VariableName);
+                var varName = isValid ? modify.VariableName : $"{modify.VariableName}(missing)";
+                GUILayout.BeginHorizontal();
+                if (GUILayout.Button(varName, "Popup", GUILayout.Width(200)))
+                {
+                    var menu = new GenericMenu();
+                    menu.AddItem(new GUIContent("删除"), false, () => { _cachePresetDelete = modify; });
+                    menu.AddItem(new GUIContent("上移"), false, () => { _cachePresetMoveUp = modify; });
+                    menu.AddItem(new GUIContent("下移"), false, () => { _cachePresetMoveDown = modify; });
+                    menu.ShowAsContext();
+                }
+
+                var tem = modify.VariableValue;
+                modify.VariableValue = GUILayout.TextField(modify.VariableValue);
+                if (tem != modify.VariableValue)
+                {
+                    //修改自定义变量
+                    VariablePreset.Default.Modify(modify.VariableName, modify.VariableValue);
+                }
+
+                GUILayout.EndHorizontal();
+            }
+
+            /*删除*/
+            if (_cachePresetDelete != null)
+            {
+                setting.PresetModify.Remove(_cachePresetDelete);
+                EditorUtility.SetDirty(setting);
+                _cachePresetDelete = null;
+            }
+
+            /*上移*/
+            if (_cachePresetMoveUp != null)
+            {
+                var index = setting.PresetModify.IndexOf(_cachePresetMoveUp);
+                if (index >= 0 && (index - 1) >= 0)
+                {
+                    (setting.PresetModify[index], setting.PresetModify[index - 1]) = (
+                        setting.PresetModify[index - 1], setting.PresetModify[index]);
+                    EditorUtility.SetDirty(setting);
+                }
+
+                _cachePresetMoveUp = null;
+            }
+
+            /*下移*/
+            if (_cachePresetMoveDown != null)
+            {
+                var index = setting.PresetModify.IndexOf(_cachePresetMoveDown);
+                if (index >= 0 && (index + 1) < setting.PresetModify.Count)
+                {
+                    (setting.PresetModify[index + 1], setting.PresetModify[index]) = (
+                        setting.PresetModify[index], setting.PresetModify[index + 1]);
+                    EditorUtility.SetDirty(setting);
+                }
+
+                _cachePresetMoveDown = null;
+            }
+
+            return true;
+        }
+
+
+        private static bool DrawProperty_PresetModifyEnable(PublishSetting setting)
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("自定义变量", Styles.rbold_label);
+            setting.PresetModifyEnable = EditorGUILayout.Toggle("调整自定义变量", setting.PresetModifyEnable);
+            return true;
+        }
+
+
         /*绘制属性*/
         public static void DrawProperty(Object target, Func<string, bool> ignoreFunc)
         {

package/Editor/PublishTool.cs

@@ -17,11 +17,12 @@ namespace TyphoonUnitySDK
     public class PublishTool
     {
         /// <summary>
-        /// 发布绑定类
+        /// 绑定发布实现
         /// </summary>
         public static Dictionary<PublishProcess, string> PublicClasses = new Dictionary<PublishProcess, string>()
         {
-            { PublishProcess.ChinaAndroidAAR, "TyphoonUnitySDK.PublishChinaAndroidAAR" }
+            { PublishProcess.ChinaAndroidAAR, "TyphoonUnitySDK.PublishChinaAndroidAAR" },
+            { PublishProcess.WxMini, "TyphoonUnitySDK.PublishWxMini" }
         };
 
         /// <summary>
@@ -130,8 +131,5 @@ namespace TyphoonUnitySDK
             EditorUserBuildSettings.buildAppBundle = true;
 #endif
         }
-        
-        
-        
     }
 }

package/Editor/PublishVivoBatSettingInspector.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;

package/Editor/PublishWindow.cs

@@ -13,7 +13,7 @@ namespace TyphoonUnitySDK
             AppChannel.ChinaIOS,
             AppChannel.GooglePlay,
             AppChannel.SeaIOS,
-            AppChannel.WxMini,
+            // AppChannel.WxMini,
             AppChannel.VivoMini,
             AppChannel.OppoMini,
             AppChannel.DouyinAndroid,
@@ -132,7 +132,7 @@ namespace TyphoonUnitySDK
             rectToolbar.height = 22;
             GUILayout.BeginArea(rectToolbar);
             GUILayout.BeginHorizontal();
-            GUILayout.Label("发布配置", Styles.rbold_label, GUILayout.Width(110));
+            GUILayout.Label("发布配置", Styles.rbold_label, GUILayout.Width(70));
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.rbutton,
                     GUILayout.Width(40), GUILayout.Height(20)))
@@ -140,6 +140,13 @@ namespace TyphoonUnitySDK
                 UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
             }
 
+            GUILayout.Space(1);
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_variable, "自定义变量"), Styles.rbutton,
+                    GUILayout.Width(40), GUILayout.Height(20)))
+            {
+                VariablePresetWindow.Open();
+            }
+
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.rbutton,
                     GUILayout.Width(40), GUILayout.Height(20)))
@@ -268,15 +275,17 @@ namespace TyphoonUnitySDK
                 EditorGUI.DrawRect(rectTitle, Skins.PublishWindowTitleBgColor);
                 GUI.Label(rectTitle, $"{_select.name}", Styles.rbold_title);
                 var rectSave = rectTitle;
-                rectSave.width = 60;
+                rectSave.width = 90;
                 rectSave.x = rectTitle.xMax - rectSave.width;
                 var center = rectSave.center;
                 rectSave.width -= 8;
                 rectSave.height -= 8;
                 rectSave.center = center;
-                if (GUI.Button(rectSave, EditorIcons.icon_save))
+                if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save)))
                 {
                     EditorUtility.SetDirty(_select);
+                    //保存其它配置
+                    WxMiniConfig.Default.Save();
                     AssetDatabase.SaveAssets();
                 }
 
@@ -356,6 +365,7 @@ namespace TyphoonUnitySDK
                     _select.Publish();
                 }
 
+
                 GUI.enabled = temEnable;
             }
         }
@@ -383,6 +393,5 @@ namespace TyphoonUnitySDK
 
             PublishSettings = hash;
         }
-        
     }
 }

package/Editor/Texture/black_32x32.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 7aece39330810f6409821d6737771e27
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Texture/icon_arrow_right.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 2a94b6de54750b4498ed208b11096c8f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: