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

Merge branch 'develop' into feature/ivtr-operation

Browse Source
This commit is contained in:
HungDK
2026-05-19 13:41:41 +07:00
parent 69575c9489 91ca5329ce
commit 5d12039fd3
398 changed files with 2023812 additions and 36416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/CECHostPlayer.Combat.cs
+1 -1
View File
@@ -431,7 +431,7 @@ namespace BrewMonster
bDoOtherThing = true;
idTarget = m_idCurSkillTarget;
}
BMLogger.Log($"[COMBO] HOST_STOP_SKILL comboActive={comboActive} changeToMelee={changeToMelee} hasDelayedWork={hasDelayedWork} => bDoOtherThing={bDoOtherThing} idTarget={idTarget} curSkillID={m_pCurSkill?.GetSkillID()}");
// BMLogger.Log($"[COMBO] HOST_STOP_SKILL comboActive={comboActive} changeToMelee={changeToMelee} hasDelayedWork={hasDelayedWork} => bDoOtherThing={bDoOtherThing} idTarget={idTarget} curSkillID={m_pCurSkill?.GetSkillID()}");
m_pCurSkill.EndCharging();
m_pCurSkill = null;
Assets/Scripts/CECHostPlayer.Inventory.cs
+5 -5
View File
@@ -262,8 +262,8 @@ namespace BrewMonster
{
case CommandID.OWN_ITEM_INFO:
{
if (Application.isEditor || Debug.isDebugBuild)
Debug.Log($"[INVNET] HST_OWNITEMINFO cmd=OWN_ITEM_INFO bytes={(Msg.dwParam1 as byte[])?.Length ?? 0}");
// if (Application.isEditor || Debug.isDebugBuild)
// Debug.Log($"[INVNET] HST_OWNITEMINFO cmd=OWN_ITEM_INFO bytes={(Msg.dwParam1 as byte[])?.Length ?? 0}");
// Match C++ cmd_own_item_info layout and behavior: update an existing item in place.
// If the slot is missing (can happen if client missed OWN_IVTR_DATA), create it to match server state.
@@ -312,9 +312,9 @@ namespace BrewMonster
else
pItem.SetItemInfo(null, 0);
#if UNITY_EDITOR
Debug.Log($"[Inventory] OWN_ITEM_INFO pkg={byPackage} slot={bySlot} tid={type} count={count} contentLen={content_length}");
#endif
// #if UNITY_EDITOR
// Debug.Log($"[Inventory] OWN_ITEM_INFO pkg={byPackage} slot={bySlot} tid={type} count={count} contentLen={content_length}");
// #endif
if (byPackage == InventoryConst.IVTRTYPE_EQUIPPACK)
{
Assets/Scripts/CECHostPlayer.Skill.cs
+2 -2
View File
@@ -517,7 +517,7 @@ namespace BrewMonster
public bool ApplySkillShortcut(int idSkill, bool bCombo = false /* false */,
int idSelTarget = 0 /* 0 */, int iForceAtk = -1 /* -1 */)
{
// Debug.LogError($"ApplySkillShortcut: Skill detected, calling idSkill :"+ idSkill);
Debug.LogError($"ApplySkillShortcut: Skill detected, calling idSkill :"+ idSkill);
//StackChecker::ACTrace(4);
// Debug.Log($"[SKILL_CAST_DEBUG] ApplySkillShortcut: Entry, skillID={idSkill}, bCombo={bCombo}, idSelTarget={idSelTarget}, iForceAtk={iForceAtk}, " +
@@ -624,7 +624,7 @@ namespace BrewMonster
if (pSkill.GetType() == (int)skill_type.TYPE_BLESS ||
pSkill.GetType() == (int)skill_type.TYPE_NEUTRALBLESS)
{
BMLogger.LogError($"ApplySkillShortcut: Skill {pSkill.GetSkillID()} is a bless skill, applying bless skill target rules");
// BMLogger.LogError($"ApplySkillShortcut: Skill {pSkill.GetSkillID()} is a bless skill, applying bless skill target rules");
if (iTargetType == 0 || !GPDataTypeHelper.ISPLAYERID(idSelTarget))
idCastTarget = m_PlayerInfo.cid;
Assets/Scripts/CECPlayer_Inventory.cs
+11 -2
View File
@@ -417,11 +417,20 @@ namespace BrewMonster
if(pflySwordPrefab != null)
{
var pflySwordObject = Instantiate(pflySwordPrefab).transform;
pflySwordObject.parent = m_pPlayerCECModel.m_skeletonBuilder.GetHook("HH_feijian").transform;
Transform HH_feijian = m_pPlayerCECModel.m_skeletonBuilder.GetHook("HH_feijian").transform;
Transform CC_feijian = FindChildRecursive(pflySwordObject, "CC_feijian");
var posHH_feijian = HH_feijian.localPosition;
if (posHH_feijian.z < 0)
{
posHH_feijian.z *= -1f;
}
posHH_feijian.y += CC_feijian.localPosition.y;
HH_feijian.localPosition = posHH_feijian;
pflySwordObject.parent = HH_feijian;
pflySwordObject.localPosition = Vector3.zero;
pflySwordObject.localRotation = Quaternion.identity;
pflySwordObject.localScale = Vector3.one;
//HH_feijian.transform.position = CC_feijian.transform.position;
m_Wing = pflySwordObject.transform;
m_Wing.gameObject.SetActive(false);
Assets/Scripts/PlayerVisual.cs
+14 -80
View File
@@ -1,4 +1,3 @@
using System;
using Animancer;
using BrewMonster;
using System.Collections.Generic;
@@ -12,10 +11,10 @@ namespace BrewMonster
public string AnimationName;
public bool IsForceStopPrevious;
public int ITransTime;
public CECAttackEvent AttackEvent;
public bool IsLoop;
public ChannelAct ChannelAct;
public int Rank;
public float PlaySpeed;
}
public class PlayerVisual : MonoBehaviour
{
@@ -26,7 +25,6 @@ namespace BrewMonster
[SerializeField] private AnimancerState _currentState;
[SerializeField] private Queue<AnimationQueue> _animationQueue = new Queue<AnimationQueue>();
[SerializeField] private List<string> _animationList = new List<string>();
[SerializeField] private bool isHit;
[SerializeField] private int id;
[SerializeField] private bool isDebug;
[SerializeField] private bool debugNamePlateBounds;
@@ -34,7 +32,6 @@ namespace BrewMonster
private const float FadeTime = 100;
private const FadeMode FadeMode = Animancer.FadeMode.FixedDuration;
QueueActionEvent queueActionEvent;
private string previousAnimationName;
private void PlayActionEventHandler(PlayActionEvent @event)
{
@@ -56,24 +53,25 @@ namespace BrewMonster
{
AnimationName = @event.AnimationName,
IsForceStopPrevious = @event.IsForceStopPrevious,
AttackEvent = @event.AttackEvent,
ITransTime = @event.ITransTime,
ChannelAct = @event.ChannelAct,
Rank = @event.Rank
Rank = @event.Rank,
PlaySpeed = @event.PlaySpeed
});
_animationList = _animationQueue.Select(q => q.AnimationName).ToList();
return;
}
}
previousAnimationName = @event.AnimationName;
InternalPlayAnimation(@event.AnimationName, @event.ITransTime, FadeMode);
ApplyAnimationEndCallbacks(@event.AttackEvent, @event.ChannelAct, @event.Rank, @event.AnimationName, @event.IsLoop);
InternalPlayAnimation(@event.AnimationName, @event.ITransTime, FadeMode, @event.PlaySpeed);
ApplyAnimationEndCallbacks(@event.AnimationName, @event.IsLoop);
}
public void InitPlayerEventDoneHandler()
{
namedAnimancer = GetComponentInChildren<NamedAnimancerComponent>();
if (namedAnimancer == null)
{
BrewMonster.BMLogger.LogWarning("InitPlayerEventDoneHandler animancer == null");
BMLogger.LogWarning("InitPlayerEventDoneHandler animancer == null");
return;
}
var player = GetComponentInParent<CECPlayer>();
@@ -89,7 +87,6 @@ namespace BrewMonster
_playerInfo = player.GetPlayInfo();
id = _playerInfo.cid;
EventBus.SubscribeChannel<PlayActionEvent>(_playerInfo.cid, PlayActionEventHandler);
EventBus.SubscribeChannelClass<QueueActionEvent>(_playerInfo.cid, QueueActionEventHandler);
EventBus.SubscribeChannel<ClearComActFlagAllRankNodesEvent>(_playerInfo.cid, ClearComActFlagAllRankNodesEventHandler);
_eventBusSubscribed = true;
}
@@ -102,7 +99,6 @@ namespace BrewMonster
if (!_eventBusSubscribed)
return;
EventBus.UnsubscribeChannel<PlayActionEvent>(_playerInfo.cid, PlayActionEventHandler);
EventBus.UnsubscribeChannelClass<QueueActionEvent>(_playerInfo.cid, QueueActionEventHandler);
EventBus.UnsubscribeChannel<ClearComActFlagAllRankNodesEvent>(_playerInfo.cid, ClearComActFlagAllRankNodesEventHandler);
_eventBusSubscribed = false;
}
@@ -131,54 +127,14 @@ namespace BrewMonster
{
_animationQueue.Clear();
_animationList = _animationQueue.Select(q => q.AnimationName).ToList();
if (isHit)
{
ApplyDamage();
}
//todo: this is dummy to force change to idle state
// EventBus.PublishChannel(_playerInfo.cid, new PlayActionEvent("站立_通用"));
}
private void QueueActionEventHandler(QueueActionEvent @event)
{
if (!EnqueueAnimation(@event))
{
BMLogger.LogError("HoangDev : EnqueueAnimation Failed");
}
}
private void Update()
{
PlayNext();
}
public bool EnqueueAnimation(QueueActionEvent @event)
{
if (namedAnimancer == null)
{
return false;
}
if(previousAnimationName == @event.AnimationName)
{
return false;
}
previousAnimationName = @event.AnimationName;
_animationQueue.Enqueue(new AnimationQueue
{
AnimationName = @event.AnimationName,
IsForceStopPrevious = @event.IsForceStopPrevious,
ITransTime = @event.ITransTime,
AttackEvent = @event.AttackEvent,
IsLoop = @event.IsLoop,
ChannelAct = @event.ChannelAct,
Rank = @event.Rank
});
_animationList = _animationQueue.Select(q => q.AnimationName).ToList();
if (!isHit)
{
queueActionEvent = @event;
isHit = @event.IsHitAnim;
}
return true;
}
/// <summary>
/// This function is used to enqueue an animation for looping when the animancer is not set to looping
/// </summary>
@@ -199,16 +155,14 @@ namespace BrewMonster
{
AnimationName = animationName,
IsForceStopPrevious = false,
AttackEvent = null,
IsLoop = true
});
Debug.Log($"EnqueueAnimationForLooping: {animationName}, _animationQueue: {string.Join(", ", _animationList)}");
_animationList = _animationQueue.Select(q => q.AnimationName).ToList();
return true;
}
private void PlayNext()
{
if (_animationQueue.Count == 0)
{
return;
@@ -220,45 +174,24 @@ namespace BrewMonster
_currentState = null;
}
if (_currentState != null && _currentState.NormalizedTime < 1f) return;
if (isHit)// have it relative to check _currentState == null?
{
ApplyDamage();
}
var animationQueue = _animationQueue.Dequeue();
_animationList = _animationQueue.Select(q => q.AnimationName).ToList();
previousAnimationName = animationQueue.AnimationName;
InternalPlayAnimation(animationQueue.AnimationName, animationQueue.ITransTime, FadeMode);
ApplyAnimationEndCallbacks(animationQueue.AttackEvent, animationQueue.ChannelAct, animationQueue.Rank, animationQueue.AnimationName,animationQueue.IsLoop);
InternalPlayAnimation(animationQueue.AnimationName, animationQueue.ITransTime, FadeMode, animationQueue.PlaySpeed);
ApplyAnimationEndCallbacks(animationQueue.AnimationName, animationQueue.IsLoop);
}
private void ApplyAnimationEndCallbacks(CECAttackEvent attackEvent, ChannelAct channelAct, int rank, string animationName, bool isLoop)
private void ApplyAnimationEndCallbacks( string animationName, bool isLoop)
{
if (_currentState == null) return;
_currentState.Events.OnEnd = () =>
{
if (attackEvent != null)
attackEvent.m_bSignaled = true;
if(isLoop)
{
EnqueueAnimationForLooping(animationName);
}
if (channelAct == null || string.IsNullOrEmpty(animationName))
return;
var node = channelAct.GetNodeByRank((byte)rank);
node?.m_pActive?.m_ActionNames?.Remove(animationName);
};
}
void ApplyDamage()
{
if (queueActionEvent == null)
{
return;
}
isHit = false;
queueActionEvent.SetFlag(true, queueActionEvent.AttackEvent);
queueActionEvent = null;
}
private void OnDestroy()
{
UnregisterPlayerEventHandlers();
@@ -282,7 +215,7 @@ namespace BrewMonster
/// <param name="animationName"></param>
/// <param name="duration"></param>
/// <param name="fadeMode"></param>
private void InternalPlayAnimation(string animationName, float duration = FadeTime, FadeMode fadeMode = FadeMode)
private void InternalPlayAnimation(string animationName, float duration = FadeTime, FadeMode fadeMode = FadeMode, float playSpeed = 1.0f)
{
if (namedAnimancer == null)
{
@@ -293,6 +226,7 @@ namespace BrewMonster
{
_currentState = namedAnimancer.TryPlay(animationName, duration / 1000, fadeMode);
_currentState.Time = 0;
_currentState.Speed = playSpeed > 0f ? playSpeed : 1.0f;
_currentAnimationName = animationName;
return;
}
@@ -322,7 +256,7 @@ namespace BrewMonster
// 回退到从此组件的层次结构搜索
namedAnimancer = GetComponentInChildren<NamedAnimancerComponent>();
}
if (namedAnimancer == null)
{
BMLogger.LogWarning($"PlayerVisual: RefreshNamedAnimancer - namedAnimancer == null after refresh (modelRoot: {modelRoot?.name ?? "null"})");