Commit Graph

2251 Commits

Author SHA1 Message Date
namth edc2e89c01 Merge pull request 'feature/anti-quickbar-spam' (#303) from feature/anti-quickbar-spam into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/303
2026-04-07 09:50:09 +00:00
Chomper9981 21eeae10cb Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-07 16:49:21 +07:00
Chomper9981 7d5f26435b Add anti spam quick bar 2026-04-07 16:48:54 +07:00
hungdk cf0e54ce1b Merge pull request 'feature/update-ui' (#302) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/302
2026-04-07 09:28:30 +00:00
HungDK 45502af3b2 Merge branch 'develop' into feature/update-ui 2026-04-07 16:27:26 +07:00
HungDK e5556bc5e6 Update CECMatter.cs 2026-04-07 16:26:08 +07:00
anhld 4df7078679 Merge pull request 'show equipment when use player clone' (#301) from feature/show-equipment-host-navigate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/301
2026-04-07 08:29:19 +00:00
Le Duc Anh ea6eff72ca show equipment when use player clone 2026-04-07 15:27:42 +07:00
namth 872667136c Merge pull request 'feature/emote-short-cut' (#300) from feature/emote-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/300
2026-04-07 08:11:41 +00:00
Chomper9981 149d2c6420 resolve conflict after merge. 2026-04-07 15:09:37 +07:00
Chomper9981 9c36d08ad7 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature/emote-short-cut 2026-04-07 14:55:57 +07:00
Chomper9981 3238c10d31 Add action assign feature 2026-04-07 14:52:34 +07:00
Chomper9981 48d1171689 fix Skill action UI now will not make several time to correct UI 2026-04-07 10:13:41 +07:00
hungdk a85253b33d Merge pull request 'feature/update-ui' (#299) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/299
2026-04-07 03:06:58 +00:00
HungDK bf5ca87353 Merge branch 'develop' into feature/update-ui 2026-04-07 10:06:14 +07:00
HungDK 7c5b51836d Add combine items 2026-04-07 10:05:58 +07:00
NguyenVanDat 564c7b40c5 refactor short cut action 2026-04-07 09:33:44 +07:00
HungDK bed971ebb4 Update logic to show the split button on item have quantity bigger than 2 or equal 2 2026-04-07 09:24:05 +07:00
hungdk 30d8c7c253 Merge pull request 'feature/update-ui' (#298) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/298
2026-04-06 12:08:06 +00:00
HungDK 7fdfffc306 Merge branch 'develop' into feature/update-ui 2026-04-06 19:07:35 +07:00
HungDK 1227e0c538 Show name of matter 2026-04-06 19:07:16 +07:00
tungdv 828734d44f Merge pull request 'Update UI name EP.' (#297) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/297
2026-04-06 11:41:12 +00:00
Tungdv 48a26d84aa Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2026-04-06 18:40:17 +07:00
Tungdv d6eb7f00eb fix: Update UI name EP. 2026-04-06 18:39:48 +07:00
anhld 31da3129b3 Merge pull request 'show equipment on login screen (preview player)' (#296) from feature/show-equipment-on-preview into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/296
2026-04-06 10:54:08 +00:00
Le Duc Anh ec632f192c show equipment 2026-04-06 17:53:25 +07:00
cuongnv 6d55d6f6ba Merge pull request 'feature/chat_01' (#295) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/295
2026-04-06 10:51:34 +00:00
CuongNV b7a6573894 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-06 17:50:53 +07:00
CuongNV 4e1e74c5ad fix bug fomat info 2026-04-06 17:50:20 +07:00
hainh f998410ee2 Merge pull request 'feature/update-ui' (#294) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/294
2026-04-06 10:48:24 +00:00
VuNgocHaiC7 9c1a400065 Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 17:45:09 +07:00
VuNgocHaiC7 cee34da78d Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 17:44:50 +07:00
namth f57423765d Merge pull request 'feature/tasktrace-behavior' (#293) from feature/tasktrace-behavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/293
2026-04-06 10:31:58 +00:00
Chomper9981 11dc8678e3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-06 17:30:58 +07:00
Chomper9981 bb4b349930 Add tasktrace task following behavior 2026-04-06 17:30:39 +07:00
HungDK 7d303c3fca Update ui, split item, handle split, change button text 2026-04-06 17:15:40 +07:00
VuNgocHaiC7 7881afd2b1 Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 16:05:49 +07:00
VuNgocHaiC7 c4828ae386 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 16:05:14 +07:00
VuNgocHaiC7 b146f14220 add tachItem.prefab 2026-04-06 16:04:12 +07:00
HungDK 1ac274fe5f Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 16:03:45 +07:00
HungDK 4d751188bf Update NPCShopUIManager.cs 2026-04-06 16:03:41 +07:00
hoangvd 3d442b43a5 Merge pull request 'feature/camera-zoom' (#292) from feature/camera-zoom into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/292
2026-04-06 08:52:38 +00:00
hoangvd a8685605b9 Merge pull request 'hide ui and add zoom cam' (#291) from feature/camera-zoom into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/291
2026-04-06 08:51:02 +00:00
VDH 59f0509e77 Merge branch 'develop' into feature/camera-zoom 2026-04-06 15:48:06 +07:00
VDH a4931995d0 hide ui and add zoom cam 2026-04-06 15:47:21 +07:00
namth 458f3cc518 Merge pull request 'fixbug/book-required-skill' (#290) from fixbug/book-required-skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/290
2026-04-06 08:42:13 +00:00
Chomper9981 60e5553dbd Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-06 15:41:17 +07:00
Chomper9981 67e81a556e fix book quest after learn not show anything 2026-04-06 15:39:00 +07:00
VuNgocHaiC7 66add06c8b Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 15:38:22 +07:00
VuNgocHaiC7 1bc9c3b810 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-06 15:37:47 +07:00