3000 Commits

Author SHA1 Message Date
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 042edb466c Merge pull request 'feature/character_info' (#139) from feature/character_info into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/139
2026-01-27 10:58:46 +00: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
Le Duc Anh f6dd665ae0 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-27 10:27:17 +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
namth b904802474 Merge pull request 'feature/ui-task' (#138) from feature/ui-task into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/138
2026-01-23 10:42:14 +00: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
hainh 632127c17c Merge pull request 'feature/produce-equipment' (#137) from feature/produce-equipment into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/137
2026-01-23 07:14:27 +00: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
namth 34b1ff2261 Merge pull request 'feature/item-data-man' (#136) from feature/item-data-man into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/136
2026-01-23 02:35:15 +00:00
Chomper9981 4aa78566a4 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 09:32:13 +07:00
Chomper9981 46cfb747c6 add all item till level 20 through the quest for TIT(tien thu). fix the bug suite not count decoration data. 2026-01-23 09:31:55 +07:00
Tungdv c712653b21 fix: update logic pet. 2026-01-22 20:13:46 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
Le Duc Anh 8bdc21f01c WIP vertex calculation 2026-01-22 16:44:50 +07:00
hungdk 6dd7089708 Merge pull request 'feature/creating-role' (#135) from feature/creating-role into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/135
2026-01-22 09:40:03 +00:00
HungDK 7640bbadc2 Merge branch 'develop' into feature/creating-role 2026-01-22 16:37:59 +07:00
HungDK 0e883425d7 Callback onto unitys main thread 2026-01-22 16:30:25 +07:00
HungDK 8cf5ba8fa9 Update init flow 2026-01-22 16:24:10 +07:00
HungDK be5c38b0e3 Add create new role panel item 2026-01-22 16:20:49 +07:00
HungDK 8e29de3d13 Add create role complete callback 2026-01-22 16:19:44 +07:00
HungDK db1656973b Add s_bShowMale auto asign gender by prof 2026-01-22 16:15:59 +07:00
HungDK 4ca527188b Update LoginScene.unity 2026-01-22 16:14:14 +07:00
HungDK 7df8438803 Add create character bg 2026-01-22 16:14:05 +07:00
Le Duc Anh 065481297d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-22 15:00:15 +07:00
Le Duc Anh 75f45a85ef WIP: minmap 2026-01-22 14:58:14 +07:00
namth 6a80b15a9a Merge pull request 'feature/item-data-man' (#134) from feature/item-data-man into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/134
2026-01-22 03:21:35 +00:00