From c90cdd78c2bf8bcfa25cec7432a5876f6085ecfb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 01 二月 2019 11:18:37 +0800
Subject: [PATCH] 3335 切换地图逻辑重构。

---
 System/AssetVersion/AssetVersionUtility.cs |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/System/AssetVersion/AssetVersionUtility.cs b/System/AssetVersion/AssetVersionUtility.cs
index 2aab530..87586ac 100644
--- a/System/AssetVersion/AssetVersionUtility.cs
+++ b/System/AssetVersion/AssetVersionUtility.cs
@@ -183,25 +183,19 @@
 
     public static bool IsSceneAssetValid(int mapId, int lineId)
     {
-        var dataMapId = 0;
-        var mapConfig = Config.Instance.Get<MapConfig>(mapId);
-        if (mapConfig == null)
-        {
-            return false;
+        if (AssetSource.sceneFromEditor || mapId < 100)
+        {
+            return true;
         }
 
-        if (mapConfig.MapFBType != 0)
-        {
-            var model = ModelCenter.Instance.GetModel<DungeonModel>();
-            dataMapId = model.GetDataMapIdByMapId(mapId);
-        }
-        else
-        {
-            lineId = 0;
-            dataMapId = mapId;
+        var dataMapId = MapUtility.GetDataMapId(mapId);
+        lineId = MapUtility.GetLineId(mapId, lineId);
+        var mapResConfig = MapResourcesConfig.GetConfig(dataMapId, lineId);
+        if (mapResConfig == null)
+        {
+            return false;
         }
 
-        var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(dataMapId, lineId);
         if (!IsAssetValid(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower())))
         {
             return false;

--
Gitblit v1.8.0