 Tungdv
|
3a05b94366
|
Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HostPlayer.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Managers/EC_Object.cs
# Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
# Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
# Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
# Assets/PerfectWorld/Scripts/UI/pickupItem.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/EC_Utility.cs
# Assets/Scripts/GameController.cs
# Assets/Scripts/InitializePlayer.cs
# Assets/Scripts/Move/EC_Player.cs
# Assets/Scripts/PlayerVisual.cs
|
2025-10-20 16:58:20 +07:00 |
|
|
VDH
|
bd344fcff5
|
player animation
|
2025-10-11 16:09:00 +07:00 |
|
|
VDH
|
042b248368
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
# Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
# Assets/PerfectWorld/Scripts/Move/EC_Player.cs
# Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/Move/CECPlayer.cs
|
2025-10-11 10:09:59 +07:00 |
|
|
VDH
|
dd38edcdd5
|
change name file
|
2025-10-11 10:08:24 +07:00 |
|
|
VDH
|
bcba39d951
|
reset
|
2025-10-11 10:02:52 +07:00 |
|
|
VDH
|
a7666f9aa1
|
organize folder
|
2025-10-10 15:10:36 +07:00 |
|