duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/anim-test-scene' (#452) from feature/anim-test-scene into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/452
This commit is contained in:
namth
2026-05-19 11:04:52 +00:00
parent 16bd713dd6 ea9297bc91
commit 7301f9897c
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scene/AnimationTest.unity
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2daf9dffc5bed73510959aebf1ee1b4b2fe326380d6417e1a262c919b651095e
size 70182
oid sha256:11f16ce7ddd16e5c3de941b56358deb495efb2d5d4783c8d59c75aab0dad1975
size 92966
Assets/PerfectWorld/Scripts/NPC/CECModel.cs
+8 -1
View File
@@ -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)
Assets/PerfectWorld/Scripts/Players/CECHostNavigatePlayer.cs
+7 -4
View File
@@ -193,7 +193,7 @@ namespace BrewMonster.Scripts
m_pNavigateModel = new CECModel();
m_pNavigateModel.m_pPlayerModel = instance;
SkeletonBuilder skeletonBuilder = instance.GetComponentInChildren<SkeletonBuilder>(true);
NamedAnimancerComponent animancer = instance.GetComponent<NamedAnimancerComponent>();
NamedAnimancerComponent animancer = instance.GetComponentInChildren<NamedAnimancerComponent>();
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();