| Core/ResModule/InstanceResourcesLoader.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_NpcCollect.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorNpcFight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorNpcNoFight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/ResModule/InstanceResourcesLoader.cs
@@ -26,6 +26,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() { return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0], 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); } Fight/GameActor/GActorNpcFight.cs
@@ -31,7 +31,7 @@ { get { if (!m_Animator) if (!m_Animator || !m_Animator.runtimeAnimatorController) { return -1; } @@ -40,7 +40,7 @@ set { if (m_Animator) if (m_Animator && m_Animator.runtimeAnimatorController) { if (m_Animator.parameterCount > 0) { @@ -127,7 +127,27 @@ if (m_Animator) { RuntimeAnimatorController _controller = null; if (m_LoadDefaultRes) { if (this is GA_Pet) { _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Pet(); } else { _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Fight(); } } else { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE); } m_Animator.runtimeAnimatorController = _controller; m_Animator.enabled = true; if (m_Animator.parameterCount > 0) { m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID); @@ -254,6 +274,7 @@ if (m_Animator) { m_Animator.runtimeAnimatorController = null; NextAction = 0; m_Animator.enabled = false; m_Animator = null; @@ -731,6 +752,7 @@ public sealed override void Polymorph(bool doOrNo, int npcID) { IsPolyMorph = doOrNo; var _npcConfig = Config.Instance.Get<NPCConfig>(npcID); if (IsPolyMorph) { @@ -752,6 +774,16 @@ var _a = m_SheepModel.GetComponent<Animator>(); if (_a) { RuntimeAnimatorController _controller = null; if (m_SheepIsDefaultNpc) { _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Fight(); } else { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _npcConfig.MODE); } _a.enabled = true; _a.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID); m_Animator.enabled = false; @@ -777,6 +809,7 @@ if (_a) { _a.enabled = false; _a.runtimeAnimatorController = null; } if (m_SheepIsDefaultNpc) Fight/GameActor/GActorNpcNoFight.cs
@@ -128,6 +128,7 @@ if (m_Animator) { m_Animator.runtimeAnimatorController = null; m_Animator.enabled = false; m_Animator = null; } @@ -141,7 +142,7 @@ m_Dig = null; } if(Root) if (Root) { Root.localScale = Vector3.one; } @@ -190,6 +191,16 @@ 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); }
