Commit Graph

68 Commits

Author SHA1 Message Date
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
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 c961eea8e6 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
2025-10-09 17:00:48 +07:00
Tungdv 2dee89793d fix: Update attack normal HP. 2025-10-09 16:57:07 +07:00
VDH 6a0125be95 else player and npc 2025-10-09 15:31:53 +07:00
VDH 7c5652ec2e m 2025-10-09 14:06:12 +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
tung.do@monkey.edu.vn dd77543cdb fix: update normal attack. 2025-10-09 02:08:11 +07:00
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
HungDK fd3a269886 Merge branch 'develop' into feature/inventory 2025-10-08 13:49:30 +07:00
tung.do@monkey.edu.vn ddcc5c22d1 fix: Update normal attack. 2025-10-08 01:34:03 +07:00
Tungdv ee618bc38e fix: update attack normal. 2025-10-07 18:13:30 +07:00
Tungdv 9c2b5b87f3 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
2025-10-07 14:15:17 +07:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-07 09:31:01 +07:00
tung.do@monkey.edu.vn 597b9e1877 fix: Update normal atk. 2025-10-07 00:25:55 +07:00
Tungdv 7818ec70e3 fix: update normal attack. 2025-10-06 18:32:32 +07:00
Tungdv 83816419ae Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
2025-10-06 17:36:58 +07:00
Tungdv 38cb41ec5b fix: update struct a3dvecter. 2025-10-06 17:34:45 +07:00
Tungdv 78e7d1babb feat: add struct for normal atk. 2025-10-03 19:10:14 +07:00
HungDK 726837cf5e Add PICKUP_ITEM cmd handler 2025-10-03 15:39:46 +07:00
HungDK 946122387c Update drop item hander 2025-10-02 18:05:56 +07:00
Tungdv 98ff6a50a8 fix: Update logic normal attack. 2025-10-01 17:42:43 +07:00
VDH 4198c2f968 npc move procvess 2025-10-01 15:07:18 +07:00
Tungdv 4bad286d20 feat: add logic and struct class for normal atk. 2025-09-30 17:49:49 +07:00
NguyenVanDat d1c716914d temporary stop task 2025-09-30 09:19:11 +07:00
Tungdv 834c7c775a feat: add funtion normal atk. 2025-09-30 09:11:54 +07:00
NguyenVanDat 38ee1979c7 init tasks from data 2025-09-26 16:46:44 +07:00
Tungdv 9b564261a2 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:37:48 +07:00
NguyenVanDat d791b05e9c temporary fix task 2025-09-25 17:35:45 +07:00
Tungdv eb86bfd011 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:28:23 +07:00
NguyenVanDat dd73b4944a Merge branch 'develop' into feature/quest_sytem
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-09-25 17:20:07 +07:00
Tungdv e6f5492346 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:16:54 +07:00
Tungdv 59cf4c05fd feat: Add new camera on host player.
fix: Update animtion run and stand on elseplayer.
2025-09-25 17:05:49 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
NguyenVanDat db489e6758 fix task data 2025-09-24 17:41:11 +07:00
HungDK 960fd880b6 Update ui icon (placeholder) placed data 2025-09-24 09:28:40 +07:00
HungDK cbff89b47a Update equip item, send - get work 2025-09-22 19:01:45 +07:00
VDH f8d208be02 for build 2025-09-22 18:03:35 +07:00
VDH a995887904 done else player animation 2025-09-22 12:15:11 +07:00
VDH 0dd73da3c4 animation host done 2025-09-19 17:39:39 +07:00
VDH 53013d7887 aniamtion processs 2025-09-18 18:07:23 +07:00
VDH 6d49aef738 Merge remote-tracking branch 'origin/develop' into feature/movement 2025-09-16 11:12:30 +07:00
HungDK 3f148c3f0f Merge branch 'feature/inventory' into develop 2025-09-16 11:04:46 +07:00
VDH 7918cac983 use event bus 2025-09-16 11:00:28 +07:00
HungDK 2b3af4037a Add ui, font 2025-09-15 20:17:49 +07:00
VDH 68eb9bd928 change state move and idle 2025-09-15 18:01:08 +07:00