Commit Graph

2232 Commits

Author SHA1 Message Date
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
VuNgocHaiC7 586df104ae update DialogNPCShop 2026-04-06 15:37:22 +07:00
cuongnv 119bb5faac Merge pull request 'feature/chat_01' (#289) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/289
2026-04-06 08:30:57 +00:00
CuongNV ce3eb2fe9a Merge remote-tracking branch 'origin/develop' into feature/chat_01
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
2026-04-06 15:26:16 +07:00
CuongNV 2f083c870d add chat world 2026-04-06 15:23:59 +07:00
HungDK f96f8fe45a Update filter professions of else player in teamate 2026-04-06 14:46:07 +07:00
namth 6461e9878b Merge pull request 'feature/player-clone' (#287) from feature/player-clone into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/287
2026-04-06 07:31:54 +00:00
Chomper9981 47a219866b Fix some bug related to flying phoenix 2026-04-06 14:31:09 +07:00
CuongNV 22ad4ebaca update emoji for chat 2026-04-06 13:47:47 +07:00
Chomper9981 131fb322f2 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-06 13:39:58 +07:00
Chomper9981 ff03d7d0eb Add Animation phoenix fly in the lv 10 quest. 2026-04-06 13:39:39 +07:00
hungdk b75d0a6932 Merge pull request 'feature/update-ui' (#286) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/286
2026-04-06 04:29:01 +00:00
HungDK b5ee09fe68 Merge branch 'develop' into feature/update-ui 2026-04-06 11:27:56 +07:00
HungDK d8e7c87365 Add tabs button to show task and item inventory 2026-04-06 11:25:28 +07:00
CuongNV bae949626e add new Image Emoji 2026-04-06 11:23:05 +07:00
CuongNV afcfc1aa16 add tool change UI 2026-04-06 11:21:51 +07:00
HungDK 2060f92f2c Fixing buying progress and result in inventory 2026-04-06 10:12:21 +07:00
Le Duc Anh f8b8ac60d8 update build 0.2.3 2026-04-04 12:06:03 +07:00
hainh 4d3c786783 Merge pull request 'feature/update-ui' (#285) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/285
2026-04-03 10:40:05 +00:00
VuNgocHaiC7 fc16108ff0 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-03 17:38:57 +07:00