From 6e42b7d4f0370f9659aa397ff909aab477a3e676 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 23 一月 2019 14:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
Core/MapEditor/Data/MapData.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Core/MapEditor/Data/MapData.cs b/Core/MapEditor/Data/MapData.cs
index 78c01c6..733790f 100644
--- a/Core/MapEditor/Data/MapData.cs
+++ b/Core/MapEditor/Data/MapData.cs
@@ -20,13 +20,16 @@
if (AssetSource.refdataFromEditor)
{
#if UNITY_EDITOR
- _path = ResourcesPath.ResourcesOutPath + "Refdata/ScriptableObject/MapData/" + mapID + ".gd";
-
+ _path = StringUtility.Contact(ResourcesPath.CONFIG_FODLER,
+ "/",
+ MapEditorData_Suffix,
+ mapID,
+ ".bytes");
#endif
}
else
{
- _path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("mapdata/", mapID, ".gd"));
+ _path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("config/", MapEditorData_Suffix, mapID, ".bytes"));
}
MapData _mapData = null;
if (File.Exists(_path))
@@ -62,8 +65,13 @@
{
_event = new Evt_RefreshMonster();
}
+ else if (_type == Evt.E_EventType.SceneObject)
+ {
+ _event = new Evt_RefreshSceneObject();
+ }
if (_event != null)
{
+ _event.type = _type;
_event.Load(br);
eventDict[_event.id] = _event;
}
--
Gitblit v1.8.0