Commit Graph

271 Commits

Author SHA1 Message Date
Chomper9981 c692179b67 Add Button for HPMP Usage 2026-04-08 15:58:51 +07:00
HungDK a83e6fa995 Merge branch 'develop' into feature/update-ui 2026-04-08 11:12:14 +07:00
CuongNV 4807e1a0fd add mini chat 2026-04-07 17:07:08 +07:00
VuNgocHaiC7 c82692ddb8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-07 17:02:40 +07:00
CuongNV 99d1650c2f add UI context 2026-04-07 17:01:37 +07:00
VuNgocHaiC7 a609ebda1c fix some UI 2026-04-07 17:00:48 +07:00
CuongNV 8488c2a8a4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-07 15:31:57 +07:00
CuongNV 54331e8eef add UI and logic UI 2026-04-07 15:31:06 +07: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 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 7d303c3fca Update ui, split item, handle split, change button text 2026-04-06 17:15:40 +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
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 a4931995d0 hide ui and add zoom cam 2026-04-06 15:47:21 +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 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 d8e7c87365 Add tabs button to show task and item inventory 2026-04-06 11:25:28 +07: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
VuNgocHaiC7 b692b62fd6 fix again some UI for prefabs 2026-04-03 17:38:02 +07:00
Le Duc Anh 69a71f0de8 add Thuong Pham title 2026-04-03 17:05:44 +07:00
Le Duc Anh 8e2c565583 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-03 16:33:49 +07:00
Le Duc Anh 20c1a7cfc4 add char preview in login screen 2026-04-03 16:33:30 +07:00
Chomper9981 eb058237fa Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-03 13:49:33 +07:00
VuNgocHaiC7 91a53e2585 Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-02 17:57:52 +07:00
VuNgocHaiC7 a33c35722b update ui for dialogProduce.prefab 2026-04-02 17:57:25 +07:00
HungDK 569d987dcf Add buying stackable item, not stackable. Fixing cant buy item from 2nd tabs 2026-04-02 17:32:51 +07:00
Chomper9981 c53ba56b82 Add VM GFX,. Add some UI for skillUI 2026-04-02 15:26:16 +07:00
Chomper9981 4144077219 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-01 17:59:31 +07:00
Chomper9981 4fd2efa588 Fix some minor bug. Add some addreasable and UI component 2026-04-01 17:41:42 +07:00
HungDK 9174bd7149 Update create role 2026-03-31 15:54:59 +07:00
CuongNV 86f01e58e6 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-31 14:46:34 +07:00
Chomper9981 1db16de356 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-31 14:00:56 +07:00
Chomper9981 b8a7770f92 Fix bug not teleport when end "Gap mat tien nu" quest. Add Belizer fly to this quest location 2026-03-31 14:00:32 +07:00
CuongNV c653f7ff62 Merge remote-tracking branch 'origin/develop' into feature/chat_01
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-03-31 09:40:10 +07:00
NguyenVanDat 35693f672d update login flow 2026-03-31 09:05:07 +07:00
CuongNV 6b3910a7cc update font for text 2026-03-30 15:22:11 +07:00
CuongNV 1957f29ec2 change size height prefab_ChatSystemUI 2026-03-30 10:41:20 +07:00
CuongNV 2fee354738 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-26 09:46:34 +07:00
HungDK 2ef8ec179a Update shop and inventory 2026-03-25 10:35:58 +07:00
HungDK 5f97ad0bc8 Update prevent inappropriate word 2026-03-25 10:31:49 +07:00
VuNgocHaiC7 11600180d4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
2026-03-24 16:13:00 +07:00
CuongNV 81f674ae10 add show update error in chat 2026-03-24 15:53:37 +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