Commit Graph

40 Commits

Author SHA1 Message Date
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-09 11:04:53 +07:00
NguyenVanDat 88213f7649 finish mining task 2026-01-09 11:01:03 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
VDH 4aeae053b9 for test 2026-01-06 19:36:22 +07:00
NguyenVanDat ce03f2d38a update process bar 2026-01-05 11:31:22 +07:00
NguyenVanDat 38348f8e10 add and show mining progress run with real time 2026-01-05 09:27:00 +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
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
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +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
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +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
MinhHai 9bc02e1fef add DlgAward 2025-12-05 22:00:00 +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
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
Tungdv 59976a4be5 fix: update dlgnpc. 2025-11-22 17:47:15 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
Tungdv 1951047c61 fix: update logic button back and close in dlgnpc. 2025-11-21 11:37:07 +07:00
Tungdv 17edc61e60 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-11-20 18:37:00 +07:00
Tungdv ceec82ffc5 fix: update logic select option in dlgnpc. 2025-11-20 18:18:06 +07:00
Tungdv 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00
Tungdv bb28c8505d fix: update logic select option in dlg npc. 2025-11-18 19:01:03 +07:00
Tungdv 4633e8278c fix: update logic send cmd accept task. 2025-11-18 16:40:04 +07:00
Tungdv c90e50eed9 feat: add base uimanger and dlg manager. 2025-11-18 14:10:29 +07:00
Tungdv 86c304f43a fix: update logic select option dialog npc. 2025-11-17 18:52:07 +07:00
Tungdv 1325a8df63 fix: update logic select option interact npc. 2025-11-17 14:31:20 +07:00
Tungdv e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +07:00
tung.do@monkey.edu.vn 8bf8f3716c fix: update text dlgnpc and fix bug merge. 2025-11-13 01:51:06 +07:00
Tungdv 020058d9da fix: update logic show dialog NPC. 2025-11-12 17:20:15 +07:00
Tungdv ec4bb785b8 fix: update logic show dialog. 2025-11-10 19:50:39 +07:00
Tungdv f643998dda ifx: update logic show dialog npc. 2025-11-08 18:51:00 +07:00
Tungdv 920317683b fix: update logic show dialog npc. 2025-11-07 18:32:49 +07:00
tungdv 551a6dd576 fix: update show dialog npc. 2025-11-07 13:38:33 +07:00
Tungdv 3bd29134b9 fix: update dialog NPC. 2025-11-06 18:58:05 +07:00