diff --git a/Assets/PerfectWorld/Scene/AnimationTest.unity b/Assets/PerfectWorld/Scene/AnimationTest.unity index 2d16aa6a66..ce2ed17328 100644 --- a/Assets/PerfectWorld/Scene/AnimationTest.unity +++ b/Assets/PerfectWorld/Scene/AnimationTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2daf9dffc5bed73510959aebf1ee1b4b2fe326380d6417e1a262c919b651095e -size 70182 +oid sha256:11f16ce7ddd16e5c3de941b56358deb495efb2d5d4783c8d59c75aab0dad1975 +size 92966 diff --git a/Assets/PerfectWorld/Scripts/NPC/CECModel.cs b/Assets/PerfectWorld/Scripts/NPC/CECModel.cs index 1d715caad5..e797a8c2ca 100644 --- a/Assets/PerfectWorld/Scripts/NPC/CECModel.cs +++ b/Assets/PerfectWorld/Scripts/NPC/CECModel.cs @@ -1366,7 +1366,14 @@ public class CECModel { return false; } - + if(m_skeletonBuilder == null ) + { + return false; + } + if(pChild.m_skeletonBuilder == null) + { + return false; + } Transform hook = m_skeletonBuilder.GetHook(szHookName, true); Transform hangger = pChild.m_skeletonBuilder.GetHook(szCCName, true); if (hook == null || hangger == null) diff --git a/Assets/PerfectWorld/Scripts/Players/CECHostNavigatePlayer.cs b/Assets/PerfectWorld/Scripts/Players/CECHostNavigatePlayer.cs index 09b7c9f058..c6748bff39 100644 --- a/Assets/PerfectWorld/Scripts/Players/CECHostNavigatePlayer.cs +++ b/Assets/PerfectWorld/Scripts/Players/CECHostNavigatePlayer.cs @@ -193,7 +193,7 @@ namespace BrewMonster.Scripts m_pNavigateModel = new CECModel(); m_pNavigateModel.m_pPlayerModel = instance; SkeletonBuilder skeletonBuilder = instance.GetComponentInChildren(true); - NamedAnimancerComponent animancer = instance.GetComponent(); + NamedAnimancerComponent animancer = instance.GetComponentInChildren(); if (skeletonBuilder != null && animancer != null) { @@ -214,7 +214,6 @@ namespace BrewMonster.Scripts CameraController.Instance.UpdateFollowObject(m_pNavigateModel.transform); TickInvoker.Instance.RegisterTickable(this); // Clone host player model/equipment // 克隆宿主玩家模型与装备 - BMLogger.Log($"CECHostNavigatePlayer::InitAsync, debugStep: {debugStep++}"); bool loaded = await LoadFrom(m_pHostPlayer, false); if (loaded) SetupNavigatePlayerVisual(); @@ -278,6 +277,7 @@ namespace BrewMonster.Scripts base.Tick(dwDeltatime); if (!m_bNavigateModelApplied /*&& IsAllResReady()*/) { + //TOdo: implement IsAllresReady ApplyNavigateModel(); // if(!IsShapeChanged()) // ApplyNavigateModel(); @@ -365,8 +365,11 @@ namespace BrewMonster.Scripts private bool ApplyNavigateModel() { - // if ( !GetMajorModel() || m_pNavigateModel == null || m_bNavigateModelApplied) - // return false; + if ( !GetMajorModel() || m_pNavigateModel == null || m_bNavigateModelApplied) + { + BMLogger.Log($"GetMajorModel(){GetMajorModel() == true } m_NavigateMode {m_pNavigateModel == null} m_bNavigateModelApplied {m_bNavigateModelApplied} "); + return false; + } A3DVECTOR3 vCurPos = GetPos();