diff --git a/Assets/ModelRenderer/Art/Models/models/players/形象/武侠男/躯干/武侠男.prefab b/Assets/ModelRenderer/Art/Models/models/players/形象/武侠男/躯干/武侠男.prefab index e5aa375c5a..f5a3a9e904 100644 --- a/Assets/ModelRenderer/Art/Models/models/players/形象/武侠男/躯干/武侠男.prefab +++ b/Assets/ModelRenderer/Art/Models/models/players/形象/武侠男/躯干/武侠男.prefab @@ -3308,6 +3308,7 @@ MonoBehaviour: - {fileID: 7400000, guid: d3c1bf1bc3105b247aae16f9c99519ea, type: 2} - {fileID: 7400000, guid: b9c1b4aacfc88174f9bfcb8bf1c69eb5, type: 2} - {fileID: 7400000, guid: d54a450816dbc4d4ca43afbe607052ad, type: 2} + - {fileID: 7400000, guid: cbff0726770bb1146bc70346d5fc38f9, type: 2} --- !u!1 &2587141697474146175 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs index 935439f809..2d92eeceb9 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs @@ -59,7 +59,7 @@ namespace BrewMonster.Scripts { m_iPoseAction = iAction; m_bSession = bSession; - + // m_pHost.PlayAction(m_iPoseAction, false, 300); m_pHost.PlayAction(m_iPoseAction, true); if (!bSession && iAction != (int)PLAYER_ACTION_TYPE.ACT_EXP_KISS) @@ -173,8 +173,14 @@ namespace BrewMonster.Scripts { // Chariot war special case omitted for now m_pHost.PlayAction(m_iCurAction, false, 300); + Debug.LogError("m_iPoseAction == (int)PLAYER_ACTION_TYPE.ACT_STAND"); //m_oldAction = m_iCurAction; } + else + { + // Debug.LogError($"m_iPoseAction == {(PLAYER_ACTION_TYPE)m_iPoseAction}"); + m_pHost.PlayAction(m_iPoseAction, false, 300); + } // Force to update object's direction and up // m_pHost.m_vecGroundNormal = m_pHost.m_vecGroundNormalSet; diff --git a/Assets/Scripts/PlayerVisual.cs b/Assets/Scripts/PlayerVisual.cs index f1fdc6f543..78b9161fb2 100644 --- a/Assets/Scripts/PlayerVisual.cs +++ b/Assets/Scripts/PlayerVisual.cs @@ -1,3 +1,4 @@ +using System; using Animancer; using BrewMonster; using System.Collections.Generic; @@ -150,6 +151,7 @@ namespace BrewMonster return namedAnimancer.States.TryGet("ActionName", out var existingState) ? true : false; } + private string _currentAnimationName; /// /// play an animation with name /// @@ -158,7 +160,17 @@ namespace BrewMonster /// private void InternalPlayAnimation(string animationName, float duration = FadeTime, FadeMode fadeMode = FadeMode) { + // if (string.CompareOrdinal(_currentAnimationName, "招手_通用") == 0) + // { + // Debug.LogError(0); + // return; + // } + if (string.CompareOrdinal(animationName, "招手_通用") == 0) + { + Debug.LogError(2); + } _currentState = namedAnimancer.TryPlay(animationName, duration, fadeMode); + _currentAnimationName = animationName; if (_currentState == null) { BMLogger.LogError($"Null animation with name: {animationName}");