Commit Graph

1508 Commits

Author SHA1 Message Date
hainh 415503db8c Merge pull request 'feature/update_dlgInstall' (#161) from feature/update_dlgInstall into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/161
2026-02-11 10:50:00 +00:00
VuNgocHaiC7 e5529a94e3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:46:55 +07:00
tungdv b6e8a13211 Merge pull request 'update logic move when jump stand.' (#160) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/160
2026-02-11 10:37:57 +00:00
Tungdv 7c132590f1 fix: update logic move when jump stand. 2026-02-11 17:37:27 +07:00
VuNgocHaiC7 366001be85 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall 2026-02-11 17:37:06 +07:00
VuNgocHaiC7 363520be53 update info item for dlgInstall after the merge 2026-02-11 17:36:16 +07:00
Le Duc Anh 1c39a46b7f move escape button 2026-02-11 17:08:29 +07:00
hoangvd cb18c63c87 Merge pull request 'adjust UI layout add logic disable UI for quickbar UI' (#159) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/159
2026-02-11 09:57:56 +00:00
Le Duc Anh b5eb447688 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-02-11 16:44:20 +07:00
Le Duc Anh 00c0e1d88a fix some minor issues 2026-02-11 16:43:53 +07:00
tungdv d434b87493 Merge pull request 'update logic move with brush.' (#158) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/158
2026-02-11 09:39:20 +00:00
Tungdv ca35caea4c Merge branch 'develop' into feature/hp_swim 2026-02-11 16:38:22 +07:00
Tungdv b98e81cab8 fix: update logic move with brush. 2026-02-11 16:34:31 +07:00
VDH c04b5b1f09 adjust UI layout add logic disable UI for quickbar UI 2026-02-11 15:31:37 +07:00
hoangvd 980e638b3b Merge pull request 'feature/skill-set-shortcut' (#157) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/157
2026-02-11 08:10:28 +00:00
VDH 4cdfbb1d62 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 15:00:35 +07:00
VDH 77deaf2e08 fix bug endless loop 2026-02-11 14:58:08 +07:00
Le Duc Anh a309b17ddb Update scripts 2026-02-11 14:42:41 +07:00
Le Duc Anh d1ea14eede Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-02-11 13:47:23 +07:00
NguyenVanDat ae658e7a2e fix null button in message box 2026-02-11 11:04:20 +07:00
VDH b5184947f2 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-11 10:50:17 +07:00
VDH 88d7bd550b fix bug after convert by tool 2026-02-11 10:43:08 +07:00
Le Duc Anh e2028396bb add all a61 colliders 2026-02-10 23:22:51 +07:00
tungdv 31e3dd24a8 Merge pull request 'update move with brush.' (#156) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/156
2026-02-10 12:45:50 +00:00
Tungdv e252649f7f Merge branch 'develop' into feature/hp_swim 2026-02-10 19:44:32 +07:00
Tungdv 5f943f4c32 feat: delete log. 2026-02-10 19:41:20 +07:00
VDH d0914160b2 convert skill and add path 2026-02-10 19:28:15 +07:00
Tungdv 5787b1b088 fix: fix bug swim HP. 2026-02-10 18:36:33 +07:00
Tungdv 20f0812254 fix: fix bug logic swim HP. 2026-02-10 18:35:25 +07:00
Tungdv ea437dca63 fix: update logic move with brush. 2026-02-10 17:58:13 +07:00
namth 65a20ae878 Merge pull request 'feature/ui-task-trace' (#155) from feature/ui-task-trace into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/155
2026-02-10 10:01:56 +00: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
Le Duc Anh b9b56bd047 WIP: Add more colliders 2026-02-10 14:59:57 +07:00
Tungdv 1f4671ee46 Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
2026-02-10 14:25:14 +07:00
Le Duc Anh 1f0d38cfa4 WIP:add colliders for testing 2026-02-10 14:14:34 +07:00
Tungdv 411d70a496 fix: update logic move with brush. 2026-02-10 14:04:46 +07:00
Chomper9981 2e04507aa6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-10 12:16:25 +07:00
Chomper9981 a86e15e48a Fix bug cant get "Lan xi ki di" in main quest progress 2026-02-10 12:14:47 +07:00
Tungdv 077a76f77e fix: test move with brush. 2026-02-10 11:12:12 +07:00
Le Duc Anh 72c72bd8e5 modify login scene 2026-02-09 18:06:59 +07:00
VDH 7458032777 spawn skill 5 2026-02-09 18:05:37 +07:00
hoangvd 6358d9cd05 Merge pull request 'feature/skill-set-shortcut' (#154) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/154
2026-02-09 08:17:33 +00:00
VDH a9b154a0b8 Merge branch 'develop' into feature/skill-set-shortcut 2026-02-09 15:15:58 +07:00
VDH 8bce2d6b06 tesst skill 2026-02-09 15:15:31 +07:00
Chomper9981 5a959f562a fix bug quest "Chao hoi lay trang suc" 2026-02-07 16:12:00 +07:00
Chomper9981 fc39addf5f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-02-07 14:58:00 +07:00
Chomper9981 f9c7d0f04c Create UI for DlgQuest, fix the proplem with quest have deep not equal 3 2026-02-07 14:57:35 +07:00
VDH 781c5cd08d done passive skill UI 2026-02-06 15:13:42 +07:00