Commit Graph

316 Commits

Author SHA1 Message Date
HungDK ad72ea5106 Merge branch 'implement_task_UI' into feature/skill-hung 2025-12-15 10:32:12 +07:00
MinhHai 028563e660 Merge remote-tracking branch 'origin/implement_task_UI' into feature/fix-dyn-tasks 2025-12-15 10:01:23 +07:00
MinhHai 5646c3be62 add DlgTask into UIManager, fix load DynTask logic 2025-12-15 10:01:00 +07:00
NguyenVanDat e46bcbb56a show dummy DlgSubSkill 2025-12-13 15:04:27 +07:00
NguyenVanDat cdb18dd691 Merge branch 'implement_task_UI' into feature/task-emote
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Task/TaskTest.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2025-12-13 14:19:19 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00
NguyenVanDat 3feced81fc Merge branch 'develop' into feature/task-emote 2025-12-12 10:54:44 +07:00
HungDK a57e5b4f32 Update task, filtering all task can take 2025-12-11 17:41:20 +07:00
MinhHai de05654bd1 Merge remote-tracking branch 'origin/implement_task_UI' into feature/task-npc-give-award
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
2025-12-11 13:45:44 +07:00
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +07:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
Tungdv be85cf1d91 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-06 14:41:00 +07:00
Tungdv c7c34b373c fix: update data info for HP.
fix: update move fly and swim.
2025-12-06 14:14:55 +07:00
Tungdv f330d9606c fix: update logic jump move for HP. 2025-12-05 21:09:16 +07:00
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
HungDK d4bccfb9fc Merge branch 'develop' into feature/npc-shop 2025-12-04 14:46:08 +07:00
NguyenVanDat 111bd15e71 Merge branch 'feature/HP_jump' into feature/else-jump-animation 2025-12-04 09:38:56 +07:00
HungDK 6f25555cac Fix close service dlg NPC 2025-12-03 18:34:26 +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
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
HungDK 4760ed3c29 Fix disconnect error when player death before entergame 2025-12-02 11:43:29 +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 7ba4c0fed5 Update equipment preview show, hide 2025-12-01 14:49:41 +07:00
VDH 1aa3de6c15 hpworkmove 2025-11-26 14:15:05 +07:00
VDH c4347e5045 Merge branch 'develop' into feature/movefix
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-11-26 09:28:25 +07:00
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +07:00
Le Duc Anh 22cd6cb981 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 16:23:13 +07:00
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
Le Duc Anh 2ade91ee87 use correct attack range 2025-11-25 16:12:01 +07:00
VDH 8acf91dcb3 conflict 2025-11-25 14:28:04 +07:00
VDH 41005a7244 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 12:10:49 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
Tungdv b16df9f4c2 fix: double click to attack enemy. 2025-11-25 11:09:23 +07:00
Le Duc Anh fc9a75f70a rotate weapon in the code 2025-11-24 22:35:51 +07:00
NguyenVanDat a809a98e27 fix work stand and character animation 2025-11-24 16:46:11 +07:00
NguyenVanDat 5864ce132b fix bug: after finished attack player do not play idle animation 2025-11-24 16:08:20 +07:00