47f4033dff
# Conflicts: # Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs # Assets/PerfectWorld/Scripts/Managers/CECManager.cs # Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs # Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs # Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs # Assets/PerfectWorld/Scripts/Managers/aabbcd.cs # Assets/PerfectWorld/Scripts/Move/CECPlayer.cs # Assets/PerfectWorld/Scripts/Move/EC_CDR.cs # Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs # Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs # Assets/Scripts/CECHostPlayer.cs # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset