From bd19eadbee8a0d3ec67c36a166a8cca4f87f454e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 15 十月 2018 14:44:33 +0800
Subject: [PATCH] Merge branch 'master' into UserCenter
---
Fight/GameActor/GA_NpcCollect.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Fight/GameActor/GA_NpcCollect.cs b/Fight/GameActor/GA_NpcCollect.cs
index 8df5b76..eec39bb 100644
--- a/Fight/GameActor/GA_NpcCollect.cs
+++ b/Fight/GameActor/GA_NpcCollect.cs
@@ -109,6 +109,17 @@
m_Animator = m_Model.GetComponent<Animator>();
if (m_Animator)
{
+ RuntimeAnimatorController _controller = null;
+ if (m_LoadDefaultRes)
+ {
+ _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func();
+ }
+ else
+ {
+ _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE);
+ }
+ m_Animator.runtimeAnimatorController = _controller;
+
m_Animator.enabled = true;
m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID);
}
--
Gitblit v1.8.0