773 Commits

Author SHA1 Message Date
VDH 1683d61c66 animation 2025-12-22 10:53:17 +07:00
VDH 04cbdb4934 Merge branch 'develop' into feature/skill-data 2025-12-17 17:18:28 +07:00
VDH ab7051b2ca done fix anim npc and hostplayer attack anim 2025-12-17 17:17:16 +07:00
HungDK 585f92225e Merge branch 'develop' into implement_task_UI 2025-12-17 11:37:07 +07:00
MinhHai 8dee1d3541 fix DlgTask prefab: change name 2025-12-17 11:23:10 +07:00
Tungdv eda56b6850 Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-17 10:41:27 +07:00
Tungdv 97bf433381 fix: update logic move on ground.
feat: add btn jump.
2025-12-17 10:40:29 +07:00
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +07:00
NguyenVanDat a786ee236e Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_GPDataType.cs
2025-12-16 11:59:08 +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
VDH 9b0c3b3dc0 fix 2025-12-13 15:30:53 +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
VDH 89c7b550f0 convert all skill in stub1 2025-12-12 18:06:48 +07:00
NguyenVanDat 3feced81fc Merge branch 'develop' into feature/task-emote 2025-12-12 10:54:44 +07:00
VDH 504cdb11d6 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/World/CECWorld.cs
#	Assets/Scenes/a61.unity
2025-12-11 14:14:54 +07:00
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +07:00
MinhHai 175790f370 Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award 2025-12-11 11:37:16 +07:00
VDH 45f69c9f44 skill ui 2025-12-10 18:17:34 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
NguyenVanDat 157659d320 Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
2025-12-08 15:40:11 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
MinhHai 9bc02e1fef add DlgAward 2025-12-05 22:00:00 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +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
MinhHai 9bbfc4d84f update method InitActiveTask of CECTaskInterface 2025-12-04 09:32:08 +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
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
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
HungDK 1e37e357d9 Merge branch 'develop' into feature/joystick-fix 2025-11-26 10:00:17 +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
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00