com.typhoon.unitysdk 1.1.4 → 1.1.5

package/Editor/PublishSettingGUIDrawer.cs

@@ -50,12 +50,15 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.GraphicsAPIs), DrawProperty_GraphicsAPIs },
                 { nameof(PublishSetting.PresetModifyEnable), DrawProperty_PresetModifyEnable },
                 { nameof(PublishSetting.PresetModify), DrawProperty_PresetModify },
+                { nameof(PublishSetting.WebGLCanvasWidth), DrawProperty_CanvasWidth },
+                { nameof(PublishSetting.WebGLCanvasHeight), DrawProperty_CanvasHeight },
                 { nameof(PublishSetting.WxMiniGUIFoldout), DrawProperty_WxMiniGUIFoldout },
                 { nameof(PublishSetting.DouyinGUIFoldout), DrawProperty_DouyinGUIFoldout },
                 { nameof(PublishSetting.VivoMiniGUIFoldout), DrawProperty_VivoMiniGUIFoldout },
                 { nameof(PublishSetting.OppoMiniGUIFoldout), DrawProperty_OppoMiniGUIFoldout },
                 { nameof(PublishSetting.ChinaAndroidGUIFoldout), DrawProperty_ChinaAndroidGUIFoldout },
                 { nameof(PublishSetting.KuaishouWebglGUIFoldout), DrawProperty_KuaiShouWebglGUIFoldout },
+                { nameof(PublishSetting.MiniGameGUIFoldout), DrawProperty_MiniGameGUIFoldout },
             };
 
         private static bool DrawProperty_ChinaAndroidGUIFoldout(PublishSetting arg)
@@ -180,7 +183,7 @@ namespace TyphoonUnitySDK
             return true;
         }
 
-
+        //绘制kuai shou
         private static bool DrawProperty_KuaiShouWebglGUIFoldout(PublishSetting arg)
         {
             if (arg.Channel != AppChannel.KuaiShouWebgl)
@@ -189,8 +192,9 @@ namespace TyphoonUnitySDK
             }
 
             GUILayout.Space(10);
-            arg.OppoMiniGUIFoldout = GUIDrawer.DrawFoldout("快手小游戏-webgl", arg.OppoMiniGUIFoldout, GUILayout.Height(26));
-            if (arg.OppoMiniGUIFoldout)
+            arg.KuaishouWebglGUIFoldout =
+                GUIDrawer.DrawFoldout("快手小游戏-webgl", arg.KuaishouWebglGUIFoldout, GUILayout.Height(26));
+            if (arg.KuaishouWebglGUIFoldout)
             {
                 KuaiShouWebglConfigGUIDrawer.DrawGUI();
             }
@@ -198,6 +202,25 @@ namespace TyphoonUnitySDK
             return true;
         }
 
+        //绘制 minigame
+        private static bool DrawProperty_MiniGameGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.MiniGame)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.MiniGameGUIFoldout =
+                GUIDrawer.DrawFoldout("微游-webgl", arg.MiniGameGUIFoldout, GUILayout.Height(26));
+            if (arg.MiniGameGUIFoldout)
+            {
+                MiniGameWebglConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
 
         /// <summary>
         /// 绘制GUI
@@ -360,7 +383,6 @@ namespace TyphoonUnitySDK
             }
 
             GUILayout.EndHorizontal();
-
             return true;
         }
 
@@ -552,7 +574,6 @@ namespace TyphoonUnitySDK
                 return true;
             }
 
-
             var modifies = setting.PresetModify;
             for (int i = modifies.Count - 1; i >= 0; i--)
             {
@@ -602,7 +623,6 @@ namespace TyphoonUnitySDK
                 menu.ShowAsContext();
             }
 
-
             foreach (var modify in modifies)
             {
                 var isValid = !string.IsNullOrEmpty(modify.VariableName) && variables.Contains(modify.VariableName);
@@ -627,7 +647,6 @@ namespace TyphoonUnitySDK
                 GUILayout.EndHorizontal();
             }
 
-
             /*删除*/
             if (_cachePresetDelete != null)
             {
@@ -699,5 +718,71 @@ namespace TyphoonUnitySDK
             obj.ApplyModifiedProperties();
             EditorGUI.EndChangeCheck();
         }
+
+
+        /*WEBGL画布大小配置*/
+        public static bool DrawProperty_CanvasHeight(PublishSetting arg)
+        {
+            if (!arg.CanEditWebglCanvasSize())
+            {
+                return true;
+            }
+
+            GUILayout.BeginHorizontal();
+            arg.WebGLCanvasHeight = EditorGUILayout.IntField("画布高度", arg.WebGLCanvasHeight);
+            GUILayout.EndHorizontal();
+            GUILayout.Space(3);
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("常用尺寸", Styles.ItalicLabel);
+            GUILayout.EndHorizontal();
+            GUILayout.Space(2);
+            GUILayout.BeginHorizontal();
+            if (GUILayout.Button("600*960(竖屏)"))
+            {
+                SetCanvasSize(arg, 600, 960);
+            }
+
+            if (GUILayout.Button("600*960(横屏)"))
+            {
+                SetCanvasSize(arg, 960, 600);
+            }
+
+            if (GUILayout.Button("720*1280(竖屏)"))
+            {
+                SetCanvasSize(arg, 720, 1280);
+            }
+
+            if (GUILayout.Button("720*1280(横屏)"))
+            {
+                SetCanvasSize(arg, 1280, 720);
+            }
+
+            GUILayout.EndHorizontal();
+            GUILayout.Space(6);
+            return true;
+        }
+
+
+        public static bool DrawProperty_CanvasWidth(PublishSetting arg)
+        {
+            if (!arg.CanEditWebglCanvasSize())
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            GUILayout.Label("画布大小", Styles.BoldLabel);
+            GUILayout.BeginHorizontal();
+            arg.WebGLCanvasWidth = EditorGUILayout.IntField("画布宽度", arg.WebGLCanvasWidth);
+            GUILayout.EndHorizontal();
+            return true;
+        }
+
+        public static void SetCanvasSize(PublishSetting config, int width, int height)
+        {
+            config.WebGLCanvasWidth = width;
+            config.WebGLCanvasHeight = height;
+            EditorUtility.SetDirty(config);
+        }
     }
 }

package/Editor/PublishTool.cs

@@ -28,6 +28,7 @@ namespace TyphoonUnitySDK
             { PublishProcess.GooglePlay, "TyphoonUnitySDK.PublishGooglePlay" },
             { PublishProcess.VivoMini, "TyphoonUnitySDK.PublishVivoMini" },
             { PublishProcess.OppoMini, "TyphoonUnitySDK.PublishOppoMini" },
+            { PublishProcess.MiniGame, "TyphoonUnitySDK.PublishMiniGame" },
         };
 
         /// <summary>

package/Editor/PublishWindow.cs

@@ -50,6 +50,8 @@ namespace TyphoonUnitySDK
                     return EditorIcons.icon_oppo;
                 case AppChannel.KuaiShouWebgl:
                     return EditorIcons.icon_kuaishou;
+                case AppChannel.MiniGame:
+                    return EditorIcons.icon_minigame;
             }
 
             return null;

package/Editor/SdkTestInUnityWindow.cs

@@ -26,11 +26,12 @@ namespace TyphoonUnitySDK
             EditorInstance.OnInspectorGUI();
         }
 
-        [MenuItem("TyphoonSDK/模拟测试", priority = 10)]
+        [MenuItem("TyphoonSDK/测试参数 【仅Unity开发】", priority = 10)]
         public static void Open()
         {
             var win = GetWindow<SdkTestInUnityWindow>();
             win.titleContent = new GUIContent("SDK 模拟测试 (unity)");
+            win.minSize = new Vector2(400, 600);
             win.Show();
         }
     }

package/Editor/Texture/icon_kuaishou.png.meta

@@ -1,166 +1,166 @@
-fileFormatVersion: 2
-guid: 0c1d06acea265684189729009a924063
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 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
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 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
-    ignorePlatformSupport: 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
-    ignorePlatformSupport: 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
-    ignorePlatformSupport: 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
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0c1d06acea265684189729009a924063
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Texture/icon_minigame.png.meta

@@ -0,0 +1,145 @@
+fileFormatVersion: 2
+guid: 1f1a537f95763ae42bc267ab86d95e48
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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: