Commit Graph

338 Commits

Author SHA1 Message Date
NguyenVanDat b00588dc3a Merge branch 'develop' into feature/create-skill-combo 2026-04-10 09:35:22 +07:00
NguyenVanDat 9eb53ef562 show skill icon and asign skill 2026-04-10 09:33:02 +07:00
CuongNV dd7b335b0a add logic show emoji 2026-04-09 17:05:39 +07:00
CuongNV b1fc46b50c add limit char for chat 2026-04-09 16:33:52 +07:00
CuongNV c637e3af47 hide emoji 2026-04-09 15:21:53 +07:00
CuongNV 1f74bd3845 Update data layout element 2026-04-09 15:15:44 +07:00
CuongNV 9ac4ae65b6 add layout Element 2026-04-09 15:09:21 +07:00
CuongNV 2ad5e5adf2 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-09 14:54:10 +07:00
CuongNV c3bc869457 add new chat mini 2026-04-09 14:52:37 +07:00
CuongNV 1a9a350b8b add click background off chat and convert emoji 2026-04-09 14:31:37 +07:00
Le Duc Anh 4017df3037 update animation for npc12 2026-04-09 14:28:25 +07:00
CuongNV 316a5bd2d5 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-09 10:25:20 +07:00
NguyenVanDat fd970c3123 Merge branch 'develop' into feature/create-skill-combo 2026-04-09 09:14:29 +07:00
CuongNV 98ad533e74 add Emoji setting 2026-04-08 17:42:02 +07:00
NguyenVanDat 918af2a06b update logic skill slot 2026-04-08 17:35:01 +07:00
Chomper9981 c692179b67 Add Button for HPMP Usage 2026-04-08 15:58:51 +07:00
CuongNV 46e6d7c3b2 add ui emoji 2026-04-08 15:43:36 +07:00
HungDK a83e6fa995 Merge branch 'develop' into feature/update-ui 2026-04-08 11:12:14 +07:00
NguyenVanDat 36fc625977 add skill slot widget 2026-04-08 09:19:54 +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