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

Merge remote-tracking branch 'origin/develop' into feature/Addessable_CDN

Browse Source 
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/MiniMap/CDlgMiniMap.cs
This commit is contained in:
CuongNV
2026-05-15 11:26:01 +07:00
parent 743f24f800 96b926f2bc
commit 63aab4887b
306 changed files with 2183868 additions and 576 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
@@ -259,8 +259,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.
@@ -309,9 +309,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/PlayerVisual.cs
+3 -4
View File
@@ -202,13 +202,12 @@ namespace BrewMonster
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;
@@ -246,7 +245,7 @@ namespace BrewMonster
return;
var node = channelAct.GetNodeByRank((byte)rank);
node?.m_pActive?.m_ActionNames?.Remove(animationName);
};
}
void ApplyDamage()
@@ -322,7 +321,7 @@ namespace BrewMonster
// 回退到从此组件的层次结构搜索
namedAnimancer = GetComponentInChildren<NamedAnimancerComponent>();
}
if (namedAnimancer == null)
{
BMLogger.LogWarning($"PlayerVisual: RefreshNamedAnimancer - namedAnimancer == null after refresh (modelRoot: {modelRoot?.name ?? "null"})");