Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 Core/MapEditor/Editor/MapEditor.cs

@@ -82,6 +82,14 @@

        public override void OnInspectorGUI()
        {
            if (GUILayout.Button("测试"))
            {
                var m = MapData.LoadFormFile(10120);
                if (m == null)
                {
                    Debug.Log("加载失败");
                }
            }
            if (gUISkin == null)
            {
                gUISkin = AssetDatabase.LoadAssetAtPath<GUISkin>("Assets/Scripts/Core/MapEditor/Editor/EditorResources/EditorSkin.guiskin");