773 Commits

Author SHA1 Message Date
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 ce3eb2fe9a Merge remote-tracking branch 'origin/develop' into feature/chat_01
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
2026-04-06 15:26:16 +07:00
HungDK f96f8fe45a Update filter professions of else player in teamate 2026-04-06 14:46:07 +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
CuongNV bae949626e add new Image Emoji 2026-04-06 11:23:05 +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
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
CuongNV d3b4e25c9a Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-02 11:43:01 +07:00
CuongNV aad2789f58 add logic whisper 2026-04-02 11:42:34 +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
CuongNV 56923e1b40 update logic chatsystem 2026-04-01 16:50:38 +07:00
CuongNV 9e81951f12 remove log and change ErrorChatHandler 2026-04-01 10:41:22 +07:00
CuongNV c8d55d01a9 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-31 17:14:43 +07:00
CuongNV 4bce9e7fb2 update code change color 2026-03-31 17:14:13 +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
CuongNV 7f17d7f289 add Whisper chat 2026-03-31 14:46:09 +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 753bd65847 Active player 2026-03-30 17:37:35 +07:00
CuongNV 2fee354738 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-26 09:46:34 +07:00
Chomper9981 31abea6e9b Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-25 11:20:20 +07:00
Chomper9981 0dfff3a4ae Add animation for skill 2026-03-25 11:19:48 +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
HungDK 445ff4ae62 Fix dead and revive error before enter world 2026-03-25 10:31:24 +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
VuNgocHaiC7 5b52e17ef4 update money when buy item and manufacturing, pethatch, petrec 2026-03-24 16:11:43 +07:00
CuongNV d21236aec7 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-24 14:34:49 +07:00
CuongNV 19820fcf2a Add filter ui chat 2026-03-24 10:58:19 +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
VuNgocHaiC7 1004d64457 fix again some UI and update money when buy item 2026-03-23 17:59:11 +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
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +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
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