Merge branch 'master' into CrossServerBoss

client_Wu Xijin

2019-01-09 c436a1318ee89ad041bd8ae5f9c2b992f062efda

Merge branch 'master' into CrossServerBoss

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -100,6 +100,7 @@
        };

        int[] m_CompressionValues = { 0, 1, 2 };



        int rechargeSkin = 1;



        public AssetBundleBuildTab()

        {

@@ -414,6 +415,9 @@
            EditorGUILayout.Space();

#endif

            GUILayout.BeginHorizontal();







            ClientPackage.AssetPrior = EditorGUILayout.IntField("AssetPrior", ClientPackage.AssetPrior, GUILayout.Height(50), GUILayout.Width(250));

            publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50));

            GUILayout.EndHorizontal();

@@ -455,6 +459,17 @@
                EditorApplication.delayCall += ExecuteSwitchVersionConfig;

            }



            GUILayout.Space(20);

            GUILayout.BeginHorizontal();

            rechargeSkin = EditorGUILayout.IntField("Recharge Skin", rechargeSkin, GUILayout.Width(250));

            if (GUILayout.Button("Switch"))

            {

                UpdateSpriteSetting.SetRechargeSkin(rechargeSkin);

                AssetDatabase.Refresh();

                UpdateSpritePackingSetting.UpdateAllSpritePackingSetting();

            }

            GUILayout.EndHorizontal();



            GUILayout.EndVertical();

            EditorGUILayout.EndScrollView();

        }


 UI/Core/ImageEx.cs

@@ -43,6 +43,8 @@
        }
    }

    [SerializeField] string m_IconKey = string.Empty;

    bool inited = false;
    protected override void Awake()
    {
@@ -54,6 +56,10 @@
            this.material = this.canvasAddition == null ? MaterialUtility.GetDefaultSpriteGrayMaterial() : this.canvasAddition.spriteGrayMaterial;
        }

        if (!string.IsNullOrEmpty(m_IconKey))
        {
            this.SetSprite(m_IconKey);
        }
    }
}