Commit Graph

346 Commits

Author SHA1 Message Date
HungDK 8a7829e038 Fix merge conflict 2026-05-19 13:47:54 +07:00
HungDK 5d12039fd3 Merge branch 'develop' into feature/ivtr-operation 2026-05-19 13:41:41 +07:00
HungDK 69575c9489 Add quick sort item feature 2026-05-19 11:26:11 +07:00
HungDK 5376b6ad8c Add item auto slot operation and update ui 2026-05-19 11:11:01 +07:00
CuongNV 91fdc736e4 update prefabs 2026-05-18 16:20:01 +07:00
CuongNV a26ec4acc3 fix show model in inventory 2026-05-18 16:10:23 +07:00
CuongNV 4c730583b3 fix logic set pos camera in intentory 2026-05-18 14:25:08 +07:00
Le Duc Anh 74985ca09e ingame graphic options 2026-05-15 13:41:38 +07:00
VuNgocHaiC7 6396a4e162 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/optimate 2026-05-04 17:43:05 +07:00
VuNgocHaiC7 3eadd532cc update test logout 2026-05-04 17:42:57 +07:00
Tungdv f9eb2c04c4 feat: add btn cancel in skill progress. 2026-05-04 16:38:22 +07:00
VuNgocHaiC7 391f790022 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/optimate
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
#	Assets/PerfectWorld/Scene/LoginScene.unity
2026-05-04 13:35:23 +07:00
vuong dinh hoang 134383f80e Merge branch 'develop' into feature/Sound 2026-05-04 09:38:12 +07:00
Le Duc Anh d387565fb8 Draw Transmit Way. Send Keep Alive package every 5 seconds 2026-05-02 21:22:17 +07:00
Le Duc Anh 7853bd2dd6 WIP: Transmit services 2026-04-30 17:40:26 +07:00
VuNgocHaiC7 f33c878cd9 fix code optimate for PlayerModelPreview v3 2026-04-26 16:37:34 +07:00
vuong dinh hoang fa1055b3cf Merge branch 'develop' into feature/Sound
# Conflicts:
#	Assets/PerfectWorld/Scene/LoginScene.unity
#	Assets/Prefabs/UI/Music.prefab
#	Assets/Scripts/CECHostPlayer.cs
2026-04-26 14:09:23 +07:00
vuong dinh hoang c213ef0c12 fix sound 2026-04-26 14:08:36 +07:00
VuNgocHaiC7 efa4f9a00a fix code optimate for show char v1 2026-04-25 18:05:26 +07:00
VuNgocHaiC7 f3fd0c4a88 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-25 13:49:00 +07:00
CuongNV a1531f1b32 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-04-25 11:38:27 +07:00
CuongNV 99cb7d0fc0 add logic show emoji for typingPreview and file md 2026-04-25 11:37:57 +07:00
CuongNV 0c6f73b4db update logic check height typingPreview 2026-04-25 10:51:54 +07:00
CuongNV 7bb80c2ca0 update verticals offset for prefab typing preview 2026-04-25 10:33:08 +07:00
VuNgocHaiC7 229adf88a2 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-24 17:32:25 +07:00
VuNgocHaiC7 3aa1c4d7f3 update ui editbodychar.prefab 2026-04-24 17:32:04 +07:00
Tran Hai Nam d3a7983637 fix move sfx 2026-04-24 17:11:05 +07:00
vuong dinh hoang 58b0d9c8eb fix lost music background 2026-04-24 15:38:00 +07:00
Le Duc Anh dfb7874b88 travel on world map 2026-04-24 15:33:39 +07:00
CuongNV b40c9e246f add chat typing preview 2026-04-24 15:25:09 +07:00
CuongNV 1c83f867e5 update prefab 2026-04-22 17:12:39 +07:00
CuongNV 100e734a0f Test preview chat for mobile 2026-04-22 16:32:58 +07:00
vuong dinh hoang 071ea098d7 add music 2026-04-21 17:11:00 +07:00
Le Duc Anh 8f921fda4f update world map 2026-04-20 17:08:04 +07:00
CuongNV 6c468115a5 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-20 14:37:52 +07:00
CuongNV 6f81209da6 resize mini chat 2026-04-20 11:40:43 +07:00
VDH 8167f7887a fix skill 2026-04-20 11:28:41 +07:00
NguyenVanDat c2707eff0a update combo 2026-04-16 15:05:33 +07:00
NguyenVanDat a1c92565dc finish edit combo 2026-04-14 12:22:02 +07:00
NguyenVanDat e53cd4043f Merge branch 'develop' into feature/create-skill-combo 2026-04-14 09:16:21 +07:00
NguyenVanDat 49b79a588e update logic create new combo 2026-04-14 09:11:00 +07:00
VuNgocHaiC7 d4699f231a Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-13 17:09:57 +07:00
VuNgocHaiC7 ef1abad46d fix bug money and PW-149 2026-04-13 17:08:35 +07:00
CuongNV 34750e3491 add height icon 2026-04-13 14:11:57 +07:00
CuongNV f768e8a9bc Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-13 13:58:00 +07:00
CuongNV f2300e836b polish screen 2026-04-13 13:56:57 +07:00
CuongNV 9919ebc8c0 fix bug chat system 2026-04-13 13:48:16 +07:00
CuongNV 1793b54947 update view scroll for chat 2026-04-13 11:25:55 +07:00
VDH 82f7ac3172 adjust ui no wrap 2026-04-13 10:16:43 +07:00
NguyenVanDat 006a2d1bb2 Merge branch 'develop' into feature/create-skill-combo 2026-04-13 10:14:49 +07:00