773 Commits

Author SHA1 Message Date
VDH d3a9683795 fix dupUI 2026-03-12 15:47:35 +07:00
MinhHai 1452e0cf0b fix DdlgQuickBar: i <= a_pSCS.Count -> i < a_pSCS.Count 2026-03-12 14:58:44 +07:00
VuNgocHaiC7 66fb5b7263 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-12 14:55:19 +07:00
VuNgocHaiC7 fad41e507b fix code some ui and teamlist 2026-03-12 14:54:21 +07:00
MinhHai 850b44fd1d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
2026-03-12 14:49:03 +07:00
VDH 2b2120ec58 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-12 14:27:42 +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
MinhHai e81797def4 change MiniMapUI class to DlgMap 2026-03-12 13:49:03 +07:00
NguyenVanDat f8a6300e1e fix close DlgNPC 2026-03-12 10:03:28 +07:00
Le Duc Anh a13ac49467 add 7 fly sword 2026-03-11 23:14:12 +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
MinhHai af23389192 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 2026-03-11 16:43:26 +07:00
MinhHai 0af8844948 WIP: open comment Save User Layout 2026-03-11 16:43:10 +07:00
VDH 18b32f6d5f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/skillBehavior 2026-03-11 11:09:40 +07:00
VDH 3fc7106e76 switch skill shortcut 2026-03-10 18:01:47 +07:00
Chomper9981 29ac9f06a0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 17:14:55 +07:00
VuNgocHaiC7 3ab1b23ca4 fix UI dlgTeamMain 2026-03-10 16:00:39 +07:00
Chomper9981 ee40c62f64 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 15:56:31 +07:00
VuNgocHaiC7 d2d4845b79 fix some UI of dialog 2026-03-10 15:15:23 +07:00
Chomper9981 af987f5c3e fix task trace behavior 2026-03-10 13:58:03 +07:00
NguyenVanDat 10ff87c03c update ui: inventory popup 2026-03-10 10:54:06 +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
CuongNV b744546442 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-09 16:58:49 +07:00
CuongNV 13c907187f Show Canvas player for chat system 2026-03-09 16:54:38 +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 29ad5a723e update ui: update task 2026-03-09 11:39:30 +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
CuongNV 4da68f5721 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-07 10:37:26 +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
CuongNV 85e138fdbc Add bug for chat 2026-03-07 10:05:46 +07:00
VuNgocHaiC7 f289148269 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-06 18:03:44 +07:00
VuNgocHaiC7 1c7989159e fix UI dlgTeamList auto show true 2026-03-06 18:03:17 +07:00
MinhHai 7e5fd02e1f Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic 2026-03-06 17:33:37 +07:00
MinhHai 56e385ab88 DONE: logout full and logout half login 2026-03-06 17:33:14 +07:00
VuNgocHaiC7 2c0bbafb6f update code PetDetail 2026-03-06 16:55:00 +07:00
CuongNV 72299d0b71 Add base script for chat 2026-03-06 16:45:35 +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