From 870ecaea72b4039590a35d7087afb17a846949a4 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Fri, 17 Apr 2026 16:58:30 +0700 Subject: [PATCH 1/2] Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui From db888586e57b761b99ecc93397aaf8c4d90e5e88 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Mon, 20 Apr 2026 10:17:25 +0700 Subject: [PATCH 2/2] fix anim double call proplem. fix kK idle anime --- .../武侠男/躯干/tcks_武侠男/{站立_空拳.anim => 站立空拳.anim} | 2 +- .../躯干/tcks_武侠男/{站立_空拳.anim.meta => 站立空拳.anim.meta} | 0 Assets/PerfectWorld/Scripts/Move/CECPlayer.cs | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) rename Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/{站立_空拳.anim => 站立空拳.anim} (99%) rename Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/{站立_空拳.anim.meta => 站立空拳.anim.meta} (100%) diff --git a/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立_空拳.anim b/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立空拳.anim similarity index 99% rename from Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立_空拳.anim rename to Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立空拳.anim index 27f1fa8a6e..d475402871 100644 --- a/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立_空拳.anim +++ b/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立空拳.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u7AD9\u7ACB_\u7A7A\u62F3" + m_Name: "\u7AD9\u7ACB\u7A7A\u62F3" serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立_空拳.anim.meta b/Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立空拳.anim.meta similarity index 100% rename from Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立_空拳.anim.meta rename to Assets/ModelRenderer/Art/Animations/models/players/形象/武侠男/躯干/tcks_武侠男/站立空拳.anim.meta diff --git a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs index 0f9c6fdb38..b9b7c0d998 100644 --- a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs +++ b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs @@ -1253,6 +1253,7 @@ namespace BrewMonster }else{ m_pActionController.QueueNonSkillActionWithName(iAction, szAct, iTransTime, bRestart, false, false, true, null, COMACT_FLAG_MODE_ONCE_MULTIIGNOREGFX); } + return true; } else if( ( iAction >= (int)PLAYER_ACTION_TYPE.ACT_EXP_WAVE && @@ -1270,6 +1271,7 @@ namespace BrewMonster }else{ m_pActionController.QueueNonSkillActionWithName(iAction, szAct, iTransTime, false, false, false, true, null, COMACT_FLAG_MODE_ONCE_MULTIIGNOREGFX); } + return true; } else if (iAction == (int)PLAYER_ACTION_TYPE.ACT_EXP_FASHIONWEAPON) { @@ -1289,6 +1291,7 @@ namespace BrewMonster } } } + return true; } else {