Commit Graph

187 Commits

Author SHA1 Message Date
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
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27:26 +07:00
Chomper9981 10e4cfa1d3 fix bug "dance" quest not working(workaround). Trigger action via action skill table. fix bug some matter object dont have collider(workaround) 2026-02-26 17:28:53 +07:00
Le Duc Anh 0e6ceaf6f3 Play from Bootstrap scene. Move heavy logic to other Thread 2026-02-20 01:20:05 +07:00
Le Duc Anh d385e47ff3 update project settings for builds 2026-02-15 21:44:45 +07:00
Le Duc Anh 72c72bd8e5 modify login scene 2026-02-09 18:06:59 +07:00
VDH b70f68fe81 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-02-05 17:41:50 +07:00
Tungdv 7a96c7e252 Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.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/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2026-02-05 17:29:54 +07:00
VuNgocHaiC7 9da8ac2a50 UI DlgPetList.prefab 2026-02-05 13:46:49 +07:00
VDH 414562f221 done excute skill bar 2026-02-05 11:21:49 +07:00
Tungdv cda4e1343a fix: update logic rider pet. 2026-02-04 19:27:01 +07:00
VuNgocHaiC7 ca4e403513 fix UI DlgInstall.prefab and DlgUninstall.prefab 2026-02-04 14:00:31 +07:00
VuNgocHaiC7 7fdce58713 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-03 17:39:51 +07:00
VuNgocHaiC7 bcb2f61348 update UI DlgUninstall.prefab 2026-02-03 17:38:50 +07:00
VDH b04695944b convert skill 2026-02-03 16:18:31 +07:00
VDH ef1804f967 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-03 15:09:55 +07:00
VDH eca33817e8 done ui info 2026-02-03 15:01:57 +07:00
HungDK 9cc0ffce45 Merge remote-tracking branch 'origin/develop' into feature/character_info
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
2026-02-03 10:10:05 +07:00
HungDK 024c8e5307 Add button to prefabs 2026-02-03 09:48:15 +07:00
VuNgocHaiC7 bca7fd1c6a fix UI DlgInstall.prefab 2026-02-02 18:18:01 +07:00
VDH e57899226d infoskill done data 2026-02-02 18:16:11 +07:00
NguyenVanDat b808bda60c fix embed stone 2026-02-02 15:22:15 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
VDH e91a491444 get description skill 2026-02-02 09:40:39 +07:00
Tungdv ef894f6e49 fix: update logic pet. 2026-01-31 19:23:50 +07:00
NguyenVanDat d9c3333dc9 Merge branch 'develop' into feature/embed-stone 2026-01-30 15:07:20 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
VuNgocHaiC7 8d1965653c update UI of DlgProduce and DlgInstall, chage iconTask 2026-01-29 17:39:16 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58: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
HungDK 7640bbadc2 Merge branch 'develop' into feature/creating-role 2026-01-22 16:37:59 +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 649537a4ce Add Create role UI prefab 2026-01-22 10:08:37 +07:00
VuNgocHaiC7 de36b370d6 complete UI DlgInstall.prefab 2026-01-21 17:37:35 +07:00
VuNgocHaiC7 312d03f3e5 update ui DlgInstall.prefab 2026-01-21 16:40:25 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-19 16:22:53 +07:00
Chomper9981 093c257f74 Load more ItemType 2026-01-19 16:16:51 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
VDH 7cb64013c2 save prefab 2026-01-16 18:37:32 +07:00
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
Chomper9981 c069cba784 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-16 13:36:31 +07:00
Chomper9981 e37fbefad4 Add Suite ("Noi dung bo trang bi") to show with item in inventory. Rename some Variant that have confuse name in hostplayer. 2026-01-16 13:35:51 +07:00
VDH 5462a3a79f save merge dev 2026-01-15 11:40:02 +07:00