Commit Graph

22 Commits

Author SHA1 Message Date
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 8eafdb2ed2 npc die done 2025-10-16 16:28:29 +07:00
Tungdv 001a16cf32 fix: update namespace.
feat: add new logic EC_World.
2025-10-14 18:34:16 +07:00
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
hoangvd 38a12bd3fa revert 439722a8c4
revert Merge pull request 'feature/movement' (#22) from feature/movement into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22

mất package
2025-10-09 11:06:44 +00:00
VDH 6a0125be95 else player and npc 2025-10-09 15:31:53 +07:00
Tungdv ee2f337b26 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs
2025-10-09 09:58:48 +07:00
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
HungDK bd4c66042b Fix conflix 2025-10-08 14:16:20 +07:00
HungDK fd3a269886 Merge branch 'develop' into feature/inventory 2025-10-08 13:49:30 +07:00
HungDK 7bd276d4b8 Add man_mater msg 2025-10-02 18:06:16 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
VDH 2f109d039f edit tool 2025-09-16 15:34:48 +07:00
tung.do@monkey.edu.vn 3b6c2bb4a3 fix: update logic show exist elseplayer (load word before spawn character). 2025-09-14 02:13:09 +07:00
tung.do@monkey.edu.vn 48fef1008d fix: show exist elseplayer 2025-09-14 00:47:52 +07:00
Tungdv 0252370c2b Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
2025-09-13 16:36:09 +07:00
Tungdv b30dffff1c fix: Update move elseplayer
ToDo: Need add Init data elesplayer.
2025-09-11 19:16:23 +07:00
VDH 032cd80b77 change type time 2025-09-11 09:36:24 +07:00
Le Duc Anh 822a1fc78e disconnect after quit game 2025-09-10 14:18:20 +07:00
Tungdv e6e95c6ede fix: Update show player after select role. 2025-09-09 13:08:15 +07:00
VDH e9d6046565 prepare for model 2025-09-09 10:35:36 +07:00
Le Duc Anh b75c818a1b demo post message 2025-09-06 15:12:00 +07:00