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/GActorPlayerBase.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index b8202ef..8655498 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -1135,6 +1135,7 @@
m_HorseModel = null;
if (m_HorseAnimator)
{
+ m_HorseAnimator.runtimeAnimatorController = null;
m_HorseAnimator.enabled = false;
m_HorseAnimator = null;
}
@@ -1225,6 +1226,7 @@
m_HorseModel = null;
if (m_HorseAnimator)
{
+ m_HorseAnimator.runtimeAnimatorController = null;
m_HorseAnimator.enabled = false;
m_HorseAnimator = null;
}
@@ -1251,6 +1253,18 @@
m_HorseModel = GameObjectPoolManager.Instance.RequestGameObject(_prefab);
m_HorseAnimator = m_HorseModel.GetComponent<Animator>();
+
+ RuntimeAnimatorController _controller = null;
+ if (m_LoadDefaultHorse)
+ {
+ _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Horse();
+ }
+ else
+ {
+ _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _modelResConfig.ResourcesName);
+ }
+
+ m_HorseAnimator.runtimeAnimatorController = _controller;
m_HorseAnimator.enabled = true;
// 鍏堣缃牴鑺傜偣
--
Gitblit v1.8.0