Commit Graph

160 Commits

Author SHA1 Message Date
Chomper9981 febcaa74b2 add quick change skill for dev only 2026-03-13 10:35:13 +07:00
Chomper9981 c9ad4fe2a8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-12 17:12:26 +07:00
Chomper9981 b5f89bb703 remove old skill cycle logic 2026-03-12 17:08:54 +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 fad41e507b fix code some ui and teamlist 2026-03-12 14:54:21 +07:00
MinhHai 511f8a8a3a add TickInvoker in Boostrap scene, fix DlgMap 2026-03-12 14:42:09 +07:00
MinhHai 951b855c38 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 2026-03-12 14:18:09 +07:00
MinhHai f8a8d3d9d4 DONE: save skill combo 2026-03-12 13:50:41 +07:00
VuNgocHaiC7 e373edca9e Update UIManager.prefab 2026-03-12 13:42:05 +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 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
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 25fff7a67d update npc dlg 2026-03-07 16:33:01 +07:00
HungDK bc49fefdcd Add close btn to player stats ui 2026-03-06 17:28:47 +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
Le Duc Anh fbe3e92462 Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain 2026-03-02 20:15:20 +07:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
VuNgocHaiC7 61125bf8e1 BtnOpenCharacter of HUDPlayer 2026-03-02 14:59:58 +07:00
HungDK cdd86f2a8d Update Teamate.prefab 2026-03-02 14:36:47 +07:00
Le Duc Anh 76183faa47 unload world scene when logout 2026-02-27 20:46:21 +07:00
Chomper9981 ed4adcfaa0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-27 17:30:14 +07:00
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27: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
Chomper9981 2b869e5285 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:33:31 +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
VDH cfdd048415 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
#	Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
2026-02-26 15:30:49 +07:00
VDH 1a80e1a6a6 save prefabb 2026-02-26 15:27:59 +07:00
VDH abcf251e77 fix micro bug 2026-02-26 15:27:18 +07:00
MinhHai a9eb777799 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-25 16:11:52 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
HungDK 1f1832fa6f Merge branch 'develop' into feature/character_info 2026-02-24 17:04:41 +07:00
MinhHai aa53269f35 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-24 14:35:11 +07:00
Chomper9981 837fc4973b fix bug task not update update in runtime. 2026-02-24 11:22:26 +07:00
HungDK d066a1a541 Merge remote-tracking branch 'origin/develop' into feature/character_info 2026-02-24 11:12:38 +07:00
Chomper9981 6bd0b92038 Fix bug task trace not working on mobile devide, make task trace update in runtime. 2026-02-24 10:01:49 +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 2d08405d56 refactor LitModelHolder 2026-02-19 10:40:00 +07:00
Le Duc Anh 1c39a46b7f move escape button 2026-02-11 17:08:29 +07:00
VDH c04b5b1f09 adjust UI layout add logic disable UI for quickbar UI 2026-02-11 15:31:37 +07:00
MinhHai 125229cae5 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
2026-02-11 14:56:21 +07:00
NguyenVanDat ae658e7a2e fix null button in message box 2026-02-11 11:04:20 +07:00
Chomper9981 ef15618895 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-10 17:01:00 +07:00
Chomper9981 d91d1ca9cd change tasktrace prefab 2026-02-10 17:00:37 +07:00
Le Duc Anh d0f0abed53 add missing icons main assset 2026-02-10 15:21:45 +07:00