From efa5f8d07fc3321f6ac5f5d97fb422db28d0886f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 05 三月 2019 10:55:31 +0800
Subject: [PATCH] Merge branch 'master' into Equip

---
 Core/MapEditor/Editor/MapEditor.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Core/MapEditor/Editor/MapEditor.cs b/Core/MapEditor/Editor/MapEditor.cs
index 8eaf9ef..9d19abb 100644
--- a/Core/MapEditor/Editor/MapEditor.cs
+++ b/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");

--
Gitblit v1.8.0