diff --git a/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs b/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs index 25067fc72d..c9ffcf2193 100644 --- a/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs +++ b/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs @@ -24,7 +24,6 @@ public class CECNPC : CECObject protected float m_fDistToHostH; protected OtherPlayer_Move_Info m_cdr; protected float m_fTouchRad = 1f; - protected ROLEBASICPROP m_BasicProps; protected Vector3 m_vMoveDir; protected int m_iPassiveMove; protected bool m_bStopMove; @@ -41,6 +40,7 @@ public class CECNPC : CECObject protected bool m_bAboutToDie; protected Vector3 m_vStopDir; protected ROLEEXTPROP m_ExtProps; + protected ROLEBASICPROP m_BasicProps; protected CECNPCModelPolicy m_pNPCModelPolicy; protected CECPolicyAction m_pPolicyAction; public int m_iMMIndex; @@ -51,6 +51,8 @@ public class CECNPC : CECObject protected static CECStringTab m_ActionNames; +/* public string NameNPC => m_strName; + public string ROLEBASICPROP => m_strName;*/ public virtual void SetUpCECNPC(CECNPCMan pNPCMan) diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs index 64b153befa..3e8deabc94 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs @@ -325,7 +325,7 @@ namespace CSNetwork //sss //BMLogger.LogError($"### GameDataSend: CMDID {pCmdHeader}"); int iHostID = _selectedRole.roleid; - //BMLogger.LogError($"### GameDataSend: " + pCmdHeader); + BMLogger.LogError($"### GameDataSend: " + pCmdHeader); switch (pCmdHeader) { diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index 1bac3b48ff..1513a0cbe9 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -156,7 +156,7 @@ public class CECHostPlayer : CECPlayer { idTraceTarget = idObject; idSelTarget = idObject; - + //EventBus.Publish(new NPCINFO(pNPC.NameNPC,)); } if (idTraceTarget != 0) { @@ -188,13 +188,13 @@ public class CECHostPlayer : CECPlayer // return; //} // Trace a object - if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK) + /* if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK) { if (!CanDo(ActionCanDo.CANDO_MELEE)) return; Debug.LogError("Attack"); NormalAttackObject(idTraceTarget, bForceAttack); - } + }*/ //else //{ // if (!CanDo(CANDO_MOVETO))