com.typhoon.unitysdk 1.0.11 → 1.0.13

package/Editor/AddressableSupport.cs

@@ -25,7 +25,7 @@ namespace TyphoonUnitySDK
             var settings = AddressableAssetSettingsDefaultObject.Settings;
             if (settings == null)
             {
-                Debug.LogError("找不到Settings");
+                Debug.LogError("找不到Settings,请先初始化Addressables");
                 return;
             }
 
@@ -227,7 +227,9 @@ namespace TyphoonUnitySDK
         {
 #if TYPHOON_ADDRESSABLE
             var settings = AddressableAssetSettingsDefaultObject.Settings;
-            return settings.profileSettings.GetVariableNames();
+            if(settings!=null){
+                return settings.profileSettings.GetVariableNames();    
+            }
 #endif
             var result = new List<string>();
             return result;

package/Editor/EditorIcons.cs

@@ -30,6 +30,10 @@ namespace TyphoonUnitySDK
         public static Texture icon_download =>
             __icon_download
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_download.png");
+        private static Texture __icon_drop_arrow = null;
+        public static Texture icon_drop_arrow =>
+            __icon_drop_arrow
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_drop_arrow.png");
         private static Texture __icon_error = null;
         public static Texture icon_error =>
             __icon_error ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_error.png");

package/Editor/PublishSettingGUIDrawer.cs

@@ -141,7 +141,6 @@ namespace TyphoonUnitySDK
         /*重绘EnableSignature*/
         private static bool DrawProperty_EnableSignature(PublishSetting setting)
         {
-           
             return setting.BuildTarget != BuildTarget.Android;
         }
 
@@ -259,7 +258,7 @@ namespace TyphoonUnitySDK
             GUILayout.Label("关联profile", GUILayout.Width(142));
             var txt = setting.AAUseProfile;
             txt = string.IsNullOrEmpty(txt) ? "请选择" : txt;
-            if (GUILayout.Button(txt, Styles.DropDownButtonLeft))
+            if (GUILayout.Button(txt,"Popup"))
             {
                 AddressableSupport.PopUpProfileSelectorMenu(setting);
             }
@@ -300,7 +299,7 @@ namespace TyphoonUnitySDK
             }
 
             var variables = AddressableSupport.GetVariables();
-            if (GUILayout.Button("覆写 Veriable", Styles.DropDownButtonLeft))
+            if (GUILayout.Button("覆写 Veriable","Popup"))
             {
                 var used = new HashSet<string>();
                 foreach (var modify in modifies)
@@ -337,7 +336,7 @@ namespace TyphoonUnitySDK
                 var isValid = !string.IsNullOrEmpty(modify.VariableName) && variables.Contains(modify.VariableName);
                 var varName = isValid ? modify.VariableName : $"{modify.VariableName}(missing)";
                 GUILayout.BeginHorizontal();
-                if (GUILayout.Button(varName, Styles.DropDownButtonLeft, GUILayout.Width(200)))
+                if (GUILayout.Button(varName, "Popup", GUILayout.Width(200)))
                 {
                     var menu = new GenericMenu();
                     menu.AddItem(new GUIContent("删除"), false, () => { _cacheDelete = modify; });

package/Editor/PublishWindow.cs

@@ -159,7 +159,7 @@ namespace TyphoonUnitySDK
 
             /*绘制菜单栏*/
             var rectPos = rectLeftMenu;
-            rectPos.y = rectSearch.yMax;
+            rectPos.y = rectSearch.yMax+4;
             rectPos.height = rectLeftMenu.yMax - rectPos.y;
             GUILayout.BeginArea(rectPos);
             rectPos.x = 0;
@@ -206,7 +206,7 @@ namespace TyphoonUnitySDK
                         var lockRect = rectItem;
                         lockRect.width = 60;
                         lockRect.x = rectItem.xMax - lockRect.width;
-                        GUI.Label(lockRect,"未开放");
+                        GUI.Label(lockRect,"未开放",Styles.rlabel_italic);
                     }
                 }
 

package/Editor/Skin.guiskin

@@ -1910,7 +1910,7 @@ MonoBehaviour:
     m_Font: {fileID: 0}
     m_FontSize: 12
     m_FontStyle: 2
-    m_Alignment: 0
+    m_Alignment: 3
     m_WordWrap: 0
     m_RichText: 0
     m_TextClipping: 1

package/Editor/StylesExtension.cs

@@ -1,27 +1,27 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace TyphoonUnitySDK
-{
-    public partial class Styles
-    {
-        private static GUIStyle _dropDownButtonLeft = null;
-
-        public static GUIStyle DropDownButtonLeft
-        {
-            get
-            {
-                if (_dropDownButtonLeft == null)
-                {
-                    _dropDownButtonLeft = new GUIStyle(Styles.DropDownButton);
-                    _dropDownButtonLeft.alignment = TextAnchor.MiddleLeft;
-                }
-
-                return _dropDownButtonLeft;
-            }
-        }
-
-     
-    }
-}
+// using System.Collections;
+// using System.Collections.Generic;
+// using UnityEngine;
+//
+// namespace TyphoonUnitySDK
+// {
+//     public partial class Styles
+//     {
+//         private static GUIStyle _dropDownButtonLeft = null;
+//
+//         public static GUIStyle DropDownButtonLeft
+//         {
+//             get
+//             {
+//                 if (_dropDownButtonLeft == null)
+//                 {
+//                     _dropDownButtonLeft = new GUIStyle(Styles.DropDownButton);
+//                     _dropDownButtonLeft.alignment = TextAnchor.MiddleLeft;
+//                 }
+//
+//                 return _dropDownButtonLeft;
+//             }
+//         }
+//
+//      
+//     }
+// }

package/Editor/Texture/icon_drop_arrow.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: a6791288aed2e9743af84f77962d5a0e
+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: 

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.11","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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.13","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}}