From b3e5a4062208ec6d677a253d539519b8a4b62a00 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 13 十月 2018 16:31:36 +0800
Subject: [PATCH] 382 场景NPC对象状态机读取逻辑修改
---
Core/ResModule/InstanceResourcesLoader.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/Core/ResModule/InstanceResourcesLoader.cs b/Core/ResModule/InstanceResourcesLoader.cs
index 371b385..a7f8d61 100644
--- a/Core/ResModule/InstanceResourcesLoader.cs
+++ b/Core/ResModule/InstanceResourcesLoader.cs
@@ -11,6 +11,7 @@
public static readonly string horseSuffix = "Prefab_Horse_";
public static readonly string weaponSuffix = "Prefab_Weapon_";
public static readonly string secondarySuffix = "Prefab_Secondary_";
+ public static readonly string handSuffix = "Prefab_Hand_";
public static readonly string wingSuffix = "Prefab_Wing_";
public static GameObject LoadNpc(int id)
@@ -23,6 +24,30 @@
}
return LoadModelPrefab(raceSuffix, _m.MODE);
+ }
+
+ public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Fight()
+ {
+ return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,
+ GeneralConfig.Instance.ModeDefaultConfig[1][1]);
+ }
+
+ public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Func()
+ {
+ return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,
+ GeneralConfig.Instance.ModeDefaultConfig[0][1]);
+ }
+
+ public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Horse()
+ {
+ return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,
+ GeneralConfig.Instance.ModeDefaultConfig[3][1]);
+ }
+
+ public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Pet()
+ {
+ return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,
+ GeneralConfig.Instance.ModeDefaultConfig[2][1]);
}
public static GameObject LoadDefaultFightNPC()
@@ -113,6 +138,10 @@
{
return LoadModelPrefab(secondarySuffix, _name, _ui);
}
+ else if (_m.Type == (int)E_ModelResType.Hand)
+ {
+ return LoadModelPrefab(handSuffix, _name, _ui);
+ }
return null;
}
@@ -175,7 +204,7 @@
}
else
{
- string _bundleName = StringUtility.Contact(ResourcesPath.MOB_FOLDER_NAME, "prefab_race_" + name);
+ string _bundleName = StringUtility.Contact(ResourcesPath.MOB_FOLDER_NAME, "prefab_race_" + name.Replace("_UI", ""));
string _assetName = _suffix + name;
AssetInfo _assetInfo = new AssetInfo(_bundleName, _assetName);
_gameObject = AssetBundleUtility.Instance.Sync_LoadAsset(_assetInfo) as GameObject;
--
Gitblit v1.8.0