From 2f723e5320ef618985cc9ea8f71deafd3e4bec36 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 16 四月 2019 11:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/ResModule/ScriptableObjectLoader.cs | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/Core/ResModule/ScriptableObjectLoader.cs b/Core/ResModule/ScriptableObjectLoader.cs
index f33838c..ee49c5e 100644
--- a/Core/ResModule/ScriptableObjectLoader.cs
+++ b/Core/ResModule/ScriptableObjectLoader.cs
@@ -23,6 +23,7 @@
public const string SoTreasureMeridian_Suffix = "SoTreasureMeridian_";
public const string SoTreasure3D_Suffix = "SoTreasure3D_";
public const string SoDemonDungeon_Suffix = "SoDemonDungeon_";
+ public const string SoHazyMapNpc_Suffix = "SoHazyMapNpc_";
public static SoMap LoadSoMapObjectGenerate(int mapID)
{
@@ -457,4 +458,33 @@
return config;
}
+
+ public static HazyMapNpcScriptableObject LoadSoHazyMapNpc(int _mapId)
+ {
+ HazyMapNpcScriptableObject config = null;
+ if (AssetSource.refdataFromEditor)
+ {
+#if UNITY_EDITOR
+ var resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+ "Refdata/ScriptableObject/SoHazyMapNpc/",
+ SoHazyMapNpc_Suffix,
+ _mapId,
+ ".asset");
+
+ config = AssetDatabase.LoadAssetAtPath<HazyMapNpcScriptableObject>(resourcePath);
+#endif
+ }
+ else
+ {
+ var assetName = StringUtility.Contact(SoHazyMapNpc_Suffix, _mapId);
+ var assetInfo = new AssetInfo(bundleName, assetName);
+ config = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as HazyMapNpcScriptableObject;
+ }
+
+ if (config == null)
+ {
+ }
+
+ return config;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0