Commit Graph

703 Commits

Author SHA1 Message Date
Tungdv 1d7181c1fc fix: update logic jump move. 2025-12-04 20:06:02 +07:00
Tungdv b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
VDH 3b5386840d fix after merge 2025-12-04 18:12:17 +07:00
VDH 47f4033dff Merge branch 'develop' into feature/skill-data
# 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
2025-12-04 17:58:10 +07:00
VDH 0529114779 done skill bless 2025-12-04 17:26:42 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +07:00
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +07:00
HungDK d4bccfb9fc Merge branch 'develop' into feature/npc-shop 2025-12-04 14:46:08 +07:00
HungDK b051a86014 Add place holder item detail, buy option 2025-12-04 14:39:46 +07:00
NguyenVanDat 111bd15e71 Merge branch 'feature/HP_jump' into feature/else-jump-animation 2025-12-04 09:38:56 +07:00
MinhHai 6faa7a7904 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-12-04 09:32:34 +07:00
MinhHai 9bbfc4d84f update method InitActiveTask of CECTaskInterface 2025-12-04 09:32:08 +07:00
NguyenVanDat 632f6b3813 replace state machine by HPWork 2025-12-03 18:14:10 +07:00
Tungdv aa012f7c60 feat: add hpworkfall.
fix: update logic jump stand.
2025-12-03 18:09:38 +07:00
HungDK d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +07:00
HungDK 054026bc55 Load basic shop of npc 2025-12-03 16:43:52 +07:00
HungDK 010c66ca47 Add CESHOP 2025-12-03 16:43:11 +07:00
Tungdv 015b441d88 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-12-03 10:03:22 +07:00
Tungdv 45c503e5e4 fix: update logic move with HP work. 2025-12-02 19:15:37 +07:00
VDH d318d36ad5 skill fix 2025-12-02 18:16:53 +07:00
VDH dd85fb1da6 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/UI/HUDPlayer.cs
2025-12-02 16:47:51 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
MinhHai 3ad0f7013b Merge branch 'implement_task_UI' into develop 2025-12-02 14:28:33 +07:00
MinhHai a73bacfa87 fix UIPlayer class 2025-12-02 14:28:00 +07:00
VDH 16ca5b87b8 Merge remote-tracking branch 'origin/develop' into feature/skill-data 2025-12-02 13:51:10 +07:00
VDH 8f8e7f010c continue with bless skill 2025-12-02 13:50:44 +07:00
HungDK 4760ed3c29 Fix disconnect error when player death before entergame 2025-12-02 11:43:29 +07:00
MinhHai f827878785 Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
2025-12-02 10:25:35 +07:00
MinhHai 039d0a3ddc update logic get notify task from server 2025-12-02 10:22:02 +07:00
Tungdv b05af42643 fix: update logic move with HP work move. 2025-12-01 18:38:29 +07:00
Tungdv 01e8e4af67 Merge branch 'feature/movefix' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-01 17:29:19 +07:00
Tungdv f8433313e7 Merge branch 'develop' into feature/movefix 2025-12-01 17:22:00 +07:00
NguyenVanDat 3c347adb0f fix hpwork move 2025-12-01 17:20:36 +07:00
Tungdv d80f3109e4 feat: add logic jump for HP. 2025-12-01 17:20:11 +07:00
HungDK 636469a87f Push missing folder 2025-12-01 14:50:48 +07:00
HungDK 7ba4c0fed5 Update equipment preview show, hide 2025-12-01 14:49:41 +07:00
NguyenVanDat 2715dcaa9c get vfx path 2025-11-28 08:57:53 +07:00
VDH 1aa3de6c15 hpworkmove 2025-11-26 14:15:05 +07:00
HungDK 1e37e357d9 Merge branch 'develop' into feature/joystick-fix 2025-11-26 10:00:17 +07:00
VDH c4347e5045 Merge branch 'develop' into feature/movefix
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-11-26 09:28:25 +07:00
Le Duc Anh 28bdab60d8 load else player 2025-11-25 18:52:32 +07:00
Le Duc Anh 50812676ce setup for build 2025-11-25 17:41:10 +07:00
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +07:00
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
Le Duc Anh ea5ab318c5 change camera angle. Add more monster 2025-11-25 15:48:33 +07:00
Le Duc Anh 686f16fc70 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 15:14:40 +07:00
Tungdv be5bc82c7c fix: update anim stop move when finish auto move to target. 2025-11-25 15:12:54 +07:00
VDH ddb50c3c4c st 2025-11-25 14:42:44 +07:00
VDH 8acf91dcb3 conflict 2025-11-25 14:28:04 +07:00
Le Duc Anh a3eb81f8ac Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 14:02:28 +07:00