Commit Graph

180 Commits

Author SHA1 Message Date
HungDK eae2eb16d5 Merge branch 'develop' into feature/friend 2026-03-17 17:38:59 +07:00
NguyenVanDat 13a08c97b3 end service when close DlgNpc 2026-03-17 11:16:11 +07:00
NguyenVanDat a960d7a5df finished refactor message box 2026-03-17 10:22:03 +07:00
HungDK 2870a5e309 Merge branch 'develop' into feature/friend 2026-03-16 17:40:12 +07:00
NguyenVanDat ab5eb93265 fix npc dialogue 2026-03-13 14:09:46 +07:00
NguyenVanDat 56c0098a26 fix npc close 2026-03-13 12:18:52 +07:00
Chomper9981 67acf39b7a fix not open skill UI when click on empty quick bar slot 2026-03-13 10:38:51 +07:00
HungDK 2015dbf73e Add PROTOCOL_ADDFRIEND and enable add friend request 2026-03-12 20:58:29 +07:00
VuNgocHaiC7 6243736c70 update clone code for DlgPetList 2026-03-12 17:13:31 +07:00
VuNgocHaiC7 74d02c8fe4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-12 16:12:00 +07:00
VuNgocHaiC7 772af07696 fix code for UI dlgTeamList 2026-03-12 16:11:09 +07:00
VuNgocHaiC7 fad41e507b fix code some ui and teamlist 2026-03-12 14:54:21 +07:00
MinhHai b487798110 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-12 13:53:54 +07:00
MinhHai f8a8d3d9d4 DONE: save skill combo 2026-03-12 13:50:41 +07:00
NguyenVanDat f8a6300e1e fix close DlgNPC 2026-03-12 10:03:28 +07:00
VuNgocHaiC7 b0d1ec8926 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-11 17:38:17 +07:00
VuNgocHaiC7 c0b879d804 update dlg DlgFriendList.prefab 2026-03-11 17:36:16 +07:00
Chomper9981 b5e017f39c Add skills gfx for "Vu Linh". fix minor bug about DlgNPC 2026-03-11 17:07:24 +07:00
VuNgocHaiC7 3ab1b23ca4 fix UI dlgTeamMain 2026-03-10 16:00:39 +07:00
VuNgocHaiC7 d2d4845b79 fix some UI of dialog 2026-03-10 15:15:23 +07:00
NguyenVanDat c60da80182 update ui: player stats 2026-03-10 10:08:00 +07:00
NguyenVanDat 68d7b3171c Merge branch 'develop' into feature/ui-system-update 2026-03-10 09:33:24 +07:00
VuNgocHaiC7 65a8b2db51 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-09 15:29:29 +07:00
VuNgocHaiC7 564e27b6b8 fix show dlgTeamList continuous 2026-03-09 15:29:21 +07:00
HungDK bc743a8e89 Add CreateGetOtherEquipDetailCmd and update player option UI prefab 2026-03-09 14:52:55 +07:00
NguyenVanDat 7d700d122e update ui: npc and award popup 2026-03-09 10:52:37 +07:00
NguyenVanDat 25fff7a67d update npc dlg 2026-03-07 16:33:01 +07:00
NguyenVanDat eef8e52436 finished refacor NPC shop UI 2026-03-07 14:57:55 +07:00
NguyenVanDat 13eabb99ed Merge branch 'develop' into feature/ui-system-update
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
2026-03-07 14:40:59 +07:00
NguyenVanDat 33dc5dc7b3 fix bug: can not end service when buy or create item in NPC shop 2026-03-07 14:38:50 +07:00
NguyenVanDat 1e17b4108c update UI logic embed stone and clear stone 2026-03-07 13:47:29 +07:00
NguyenVanDat bad2515394 Merge branch 'develop' into feature/ui-system-update
# Conflicts:
#	Assets/Scripts/CECUIManager.cs
2026-03-07 10:08:28 +07:00
VuNgocHaiC7 1c7989159e fix UI dlgTeamList auto show true 2026-03-06 18:03:17 +07:00
VuNgocHaiC7 2c0bbafb6f update code PetDetail 2026-03-06 16:55:00 +07:00
VuNgocHaiC7 01672cde16 Update DlgPetDetail for DlgPetList 2026-03-05 17:40:09 +07:00
VuNgocHaiC7 4666393214 update code dlgPetList 2026-03-05 15:37:00 +07:00
NguyenVanDat 78d29bc8cf update stack logic and document 2026-03-05 10:26:21 +07:00
NguyenVanDat 8cfab19cf6 add stack ui logic 2026-03-05 09:48:47 +07:00
VuNgocHaiC7 e33adda85f change UI DlgPetList and code test for dlg 2026-03-04 17:35:19 +07:00
VuNgocHaiC7 c8976e6d4d fix dlg TeamList, dlg PetList, dlg Install 2026-03-04 16:39:09 +07:00
VuNgocHaiC7 21f2d712c4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-03 16:46:20 +07:00
VuNgocHaiC7 9ff77591f7 update code and prefabs dlg teamList 2026-03-03 16:45:57 +07:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
VuNgocHaiC7 46191105b4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-03-02 14:30:27 +07:00
VuNgocHaiC7 92bbee64c3 Done DlgInstall 2026-03-02 14:30:18 +07:00
Tungdv 8199d01929 fix: update dlg pet restore. 2026-02-27 18:24:11 +07:00
Tungdv a64111b1b6 fix: fix bug dlg pet hatch. 2026-02-27 17:47:10 +07:00
Tungdv 89b184f854 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 17:27:16 +07:00
Tungdv 1210ff2c51 fix: update dlg pet list and dlg pet restore. 2026-02-27 17:24:26 +07:00
MinhHai cee2eb74f7 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2026-02-27 15:56:39 +07:00