diff --git a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs index 0058b57bf4..c108730425 100644 --- a/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs +++ b/Assets/PerfectWorld/Scripts/Move/EC_CDR.cs @@ -220,12 +220,13 @@ namespace BrewMonster.Scripts //bool hasHit = CollideWithEnv_BoxCast(vStart, vDelta, vExt, mask, // out RaycastHit hit, out float fFraction, out Vector3 hitNormal, out bool bStartSolid); Vector3 posFoot = vStart - Vector3.up * vExt.y; + Debug.DrawLine(vStart, posFoot + vVelocity, Color.yellow, 10f); bool bClear = !Physics.Raycast(posFoot, (posFoot + vVelocity).normalized, out RaycastHit hit, fDeltaDist, mask); nTry++; if (bClear) { vFinalPos = vStart + vDelta; - Debug.DrawLine(posFoot, vFinalPos, Color.red, 10f); + Debug.DrawLine(vStart, vFinalPos, Color.red, 10f); CDRInfo.fMoveDist += fDeltaDist; break; } diff --git a/Assets/Scenes/a61.unity b/Assets/Scenes/a61.unity index 53626cc797..a1ba5bc062 100644 --- a/Assets/Scenes/a61.unity +++ b/Assets/Scenes/a61.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78669dc5fa14a381c579516583b1cbd4aae51ff6e2ae606ff286dd51f78fe266 +oid sha256:83be124266b0b08e95d67f6a647ee64594af1b9c784997da01817fe0fd1da242 size 543980635 diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index ff21ca7037..81585d2730 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -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"); + //Debug.LogError("Attack"); NormalAttackObject(idTraceTarget, bForceAttack); - }*/ + } //else //{ // if (!CanDo(CANDO_MOVETO)) @@ -823,7 +823,7 @@ public class CECHostPlayer : CECPlayer SetPlayerInfor(new INFO(role.cid, role.crc_e, role.crc_c)); Vector3 pos = new Vector3(role.pos.x, role.pos.y, role.pos.z); if (txtName != null) txtName.text = roleName; - transform.position = pos; + //transform.position = pos; SetModelHostPlayer(); m_dwResFlags = (uint)PlayerResourcesReadyFlag.RESFG_ALL; joystick = FindAnyObjectByType(); @@ -837,7 +837,7 @@ public class CECHostPlayer : CECPlayer m_aabb.Extents.Set(0.3f, 0.9f, 0.3f); m_aabbServer = m_aabb; CalcPlayerAABB(); - + SetPos(pos); // Create work manager m_pWorkMan = new CECHPWorkMan(this); if (m_pWorkMan == null)