From 338f62378641d8a9a6c734c721d01829f40a7e41 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 06 五月 2019 10:53:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/MapEditor/Editor/MapEditor.cs | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/Core/MapEditor/Editor/MapEditor.cs b/Core/MapEditor/Editor/MapEditor.cs
index ebb4dab..e811cf4 100644
--- a/Core/MapEditor/Editor/MapEditor.cs
+++ b/Core/MapEditor/Editor/MapEditor.cs
@@ -103,28 +103,20 @@
_mapData.id = EditorGUILayout.IntField(_mapData.id, gUISkin.textField, GUILayout.Height(22));
if (GUILayout.Button("鍔犺浇", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
{
- Load();
+ LoadJson();
}
if (GUILayout.Button("淇濆瓨", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
{
- Save();
+ SaveJson();
}
if (GUILayout.Button("瀵煎嚭", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
{
Export();
}
- if (GUILayout.Button("瀵煎叆", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
- {
- MapData.LoadFormFile(10010);
- }
- if (GUILayout.Button("淇濆瓨1", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
- {
- SaveJson();
- }
- if (GUILayout.Button("鍔犺浇1", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
- {
- LoadJson();
- }
+ // if (GUILayout.Button("瀵煎叆", gUISkin.button, GUILayout.Width(60), GUILayout.Height(22)))
+ // {
+ // MapData.LoadFormFile(10010);
+ // }
EditorGUILayout.EndHorizontal();
/// --------------------------------------------------------------------------------
--
Gitblit v1.8.0