Commit Graph

2311 Commits

Author SHA1 Message Date
Le Duc Anh 7279909fe5 move surface to UI 2026-01-31 18:27:23 +07:00
Le Duc Anh d6e4daeda2 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-31 18:20:34 +07:00
Le Duc Anh 3a2772c739 finish minimap v1 2026-01-31 18:18:36 +07:00
Tungdv 8b4fb251de fix: update logic show pet. 2026-01-30 19:35:19 +07:00
Le Duc Anh f40abb2132 update host player pos 2026-01-30 17:21:15 +07:00
NguyenVanDat d9c3333dc9 Merge branch 'develop' into feature/embed-stone 2026-01-30 15:07:20 +07:00
NguyenVanDat 14b5a6f780 do embed stone 2026-01-30 15:06:37 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
HungDK 030a42031b Add teamate ui 2026-01-30 09:34:27 +07:00
Le Duc Anh ea8e6a79f1 update mini map 2026-01-29 19:25:53 +07:00
Tungdv b5d5ae1982 fix: update logic pet. 2026-01-29 19:24:57 +07:00
VDH e2e63b83f2 convert ui code 2026-01-29 19:24:42 +07:00
Chomper9981 0821e2f741 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-29 17:49:03 +07:00
Chomper9981 670c114b96 add missing file 2026-01-29 17:42:56 +07:00
Chomper9981 5aff603a47 Add task trace Feature. Modify task UI. 2026-01-29 17:42:34 +07:00
VuNgocHaiC7 8d1965653c update UI of DlgProduce and DlgInstall, chage iconTask 2026-01-29 17:39:16 +07:00
VuNgocHaiC7 ccbe1b4a0c update feature useitem 2026-01-29 17:08:58 +07:00
VuNgocHaiC7 d69fed7aea fix conflig use item 2026-01-29 14:23:24 +07:00
VuNgocHaiC7 2dea3a8f02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2026-01-29 14:04:49 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
NguyenVanDat 0c3decd408 Merge branch 'develop' into feature/embed-stone 2026-01-29 09:35:30 +07:00
Le Duc Anh c31adee89f use sprites for minimap 2026-01-28 19:33:09 +07:00
Tungdv ef07a39964 fix: update logic dlg pet. 2026-01-28 19:31:14 +07:00
VDH a3b5a72b9c Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
2026-01-28 16:47:35 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
Le Duc Anh b8d54ab6f7 Merge branch 'feature/mini-map' of https://git.brew.monster/Unity/perfect-world-unity into feature/mini-map 2026-01-28 09:55:19 +07:00
Le Duc Anh b21190fda8 update minimap textures 2026-01-28 09:52:20 +07:00
Le Duc Anh 8f4fc62426 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-28 09:46:40 +07:00
Tungdv 4c51d6bf19 fix: update logic dlg pet. 2026-01-27 19:47:15 +07:00
VDH c22ca07a0f done skill combo 2026-01-27 18:04:32 +07:00
HungDK c748d9c39e Merge branch 'develop' into feature/character_info 2026-01-27 17:57:39 +07:00
HungDK 111a346c43 Update UIManager.prefab 2026-01-27 17:57:01 +07:00
HungDK 83bd64cc4f Add open dlgcharacter event 2026-01-27 17:41:59 +07:00
HungDK 312edda4aa Fix get character name logic 2026-01-27 17:41:33 +07:00
HungDK af13bd5c47 Add DlgCharacter ui logic 2026-01-27 17:39:03 +07:00
HungDK c3a925cd6c Add c2s_SendCmdSetStatusPts to modify character potential point 2026-01-27 17:38:47 +07:00
HungDK 3ae32cb977 Update DialogScriptTableObject.asset 2026-01-27 17:37:36 +07:00
HungDK 3be987855f Add ui resource and prefap 2026-01-27 17:37:30 +07:00
HungDK 76bb956061 Add button, event to open dlg character 2026-01-27 17:36:36 +07:00
NguyenVanDat ee5e123b13 update logic embed stone 2026-01-27 11:35:03 +07:00
Tungdv 0ce6bc8c82 fix: update popup pet. 2026-01-26 19:11:15 +07:00
NguyenVanDat a64b5ab79f Merge branch 'develop' into feature/embed-stone 2026-01-26 11:05:56 +07:00
NguyenVanDat b64b08ab06 show gold need to embed stone 2026-01-26 09:51:10 +07:00
Tungdv 4972735d83 fix: update logic dlg pet 2026-01-23 19:49:40 +07:00
VDH 7d9f75de18 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-23 18:08:51 +07:00
VDH 3de0850a2b push convert flow use skill combo 2026-01-23 18:01:15 +07:00
Chomper9981 035f313e00 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 17:38:52 +07:00
Chomper9981 366a1a8cec Change Task UI tree. (Add color, add tree space) 2026-01-23 17:38:31 +07:00
VuNgocHaiC7 3b0068cfc6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-23 14:13:19 +07:00
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00