Commit Graph

1783 Commits

Author SHA1 Message Date
CuongNV d21236aec7 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-24 14:34:49 +07:00
Chomper9981 2d2fb70b8c Fix UI 2026-03-24 14:24:27 +07:00
Chomper9981 f9220e3f05 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-24 14:20:00 +07:00
Chomper9981 344ea4a131 Remove Resolve Dependency 2026-03-24 14:19:05 +07:00
CuongNV 7c9a163861 add update UI filter 2026-03-24 12:27:44 +07:00
Chomper9981 10b915f0e0 fix UI Bug aftermearge 2026-03-24 11:25:01 +07:00
CuongNV 19820fcf2a Add filter ui chat 2026-03-24 10:58:19 +07:00
Chomper9981 1f9d5395a9 Merge branch 'release/re-alpha-version' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:55:19 +07:00
Chomper9981 afb0cef6c8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:54:01 +07:00
Chomper9981 281690316a Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:53:46 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
Le Duc Anh 4899cf9e96 WIP: re-alpha-version 2026-03-23 19:35:43 +07:00
Le Duc Anh d2a11e50d8 WIP: re-alpha-version 2026-03-23 19:30:20 +07:00
HungDK d962c70801 fix bug fly gfx don't be destroyed 2026-03-23 16:26:40 +07:00
CuongNV 1035289271 fix show misc for chat 2026-03-23 16:10:28 +07:00
CuongNV 015d06c16c add filter chat 2026-03-23 16:01:58 +07:00
CuongNV 5a2408629d Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 15:52:09 +07:00
NguyenVanDat 83f339bd70 upate filter logic 2026-03-23 15:51:22 +07:00
NguyenVanDat 93519b7f2e add tool test badword 2026-03-23 11:03:47 +07:00
CuongNV 09b4fa9467 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 10:54:09 +07:00
NguyenVanDat b034c0b19e Merge branch 'develop' into feature/world-filter 2026-03-23 10:50:32 +07:00
NguyenVanDat f87dcbd7f8 add badword filter version 1 2026-03-23 10:46:10 +07:00
CuongNV 607ee2a013 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 09:39:34 +07:00
CuongNV c5d6275f30 fix input chat for mobile 2026-03-20 16:50:33 +07:00
VuNgocHaiC7 0ff167624b Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-20 16:47:23 +07:00
VuNgocHaiC7 65afe04918 update money in inventory when pickup money and button confirm dlgAwarld for item_info setActive false 2026-03-20 16:47:14 +07:00
CuongNV 1bae9c4092 add new logic update inputField 2026-03-20 16:42:20 +07:00
Chomper9981 ee75334b1d fix task trace position 2026-03-20 16:16:17 +07:00
Tungdv c5ed99babc fix: update camera detech collider. 2026-03-20 15:58:21 +07:00
Tungdv 8099b87c71 fix: update camera detech collider. 2026-03-20 15:50:59 +07:00
CuongNV f64cf04403 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 15:46:41 +07:00
CuongNV bdf3a25858 update size text and image item_info 2026-03-20 15:28:03 +07:00
Le Duc Anh f627c5e6a7 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-20 15:08:41 +07:00
Le Duc Anh ca49c2b1c5 camera controller option 2 2026-03-20 15:07:59 +07:00
Tungdv b6defe44c6 Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
2026-03-20 14:49:48 +07:00
Tungdv 3a8507c15b fix: update rotation camera. 2026-03-20 14:40:50 +07:00
CuongNV cf02ddf4cf Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 14:33:30 +07:00
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +07:00
CuongNV 0021ce2ade Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-20 13:53:37 +07:00
CuongNV fad24cfdd8 add new logic chat Input 2026-03-20 13:52:55 +07:00
Chomper9981 265dea6ff3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into check-out-branch 2026-03-20 10:11:28 +07:00
namth b0e3aa4b43 Merge pull request 'feature/task-trace-ui' (#261) from feature/task-trace-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/261
2026-03-20 03:07:06 +00:00
Chomper9981 d986b11380 Fix UI after merge 2026-03-20 10:03:52 +07:00
Chomper9981 3a89f85d1f Merge origin/develop into current branch (resolve conflicts using develop)
Made-with: Cursor
2026-03-19 18:13:14 +07:00
VuNgocHaiC7 f290d44d13 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-19 17:54:21 +07:00
Chomper9981 8e4117e139 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 17:53:54 +07:00
VuNgocHaiC7 f9dbdc1c3c fix ui for dlg FriendList 2026-03-19 17:50:49 +07:00
Chomper9981 bb107503ab Change UI for TaskTrace. Add side bar for MainUI 2026-03-19 17:48:02 +07:00
CuongNV 06b4cd91ca Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-19 16:53:59 +07:00
CuongNV 221c6ad364 change prefab chatsystem and update logic button channel 2026-03-19 16:52:49 +07:00