Commit Graph

2411 Commits

Author SHA1 Message Date
VDH a56554c19b load sound into map collection 2026-04-14 17:50:19 +07:00
NguyenVanDat 553d191788 Merge branch 'develop' into feature/create-skill-combo 2026-04-14 13:33:43 +07:00
NguyenVanDat a1c92565dc finish edit combo 2026-04-14 12:22:02 +07:00
VDH bf0b5acea2 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-14 11:35:15 +07:00
VDH b183d69bef adjust sound addressable 2026-04-14 11:35:04 +07:00
namth 160c57b352 Merge pull request 'Add missing shop item data' (#341) from fixbug/shopui-item into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/341
2026-04-14 04:07:49 +00:00
Chomper9981 fde31ab9b8 Add missing shop item data 2026-04-14 11:06:08 +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
Le Duc Anh d97bde89f4 update models 2026-04-13 17:33:06 +07:00
hainh f269b9abc3 Merge pull request 'feature/update-ui' (#340) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/340
2026-04-13 10:11:05 +00: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
namth 62fa04b99f Merge pull request 'fixbug/quest-related-bug' (#339) from fixbug/quest-related-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/339
2026-04-13 10:00:51 +00:00
Chomper9981 23d1608547 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-13 16:59:42 +07:00
Chomper9981 947e1a6100 fix time format bug 2026-04-13 16:59:20 +07:00
hungdk a6a32d2488 Merge pull request 'fixbug/npc-dialog' (#338) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/338
2026-04-13 09:33:18 +00:00
HungDK c70b752c19 Merge branch 'develop' into fixbug/npc-dialog 2026-04-13 16:31:23 +07:00
HungDK fe0197a399 Update CECMatter.cs fix PW-139 2026-04-13 16:13:28 +07:00
Chomper9981 ad2daf1c55 fix Item not reset after reopen dlg award 2026-04-13 16:02:05 +07:00
Le Duc Anh 8f1b34a790 add missing model 3D 2026-04-13 15:55:57 +07:00
namth 735799ce0d Merge pull request 'feature/bubble-text' (#337) from feature/bubble-text into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/337
2026-04-13 08:20:20 +00:00
Chomper9981 a9c3be19f1 fix after merge 2026-04-13 15:16:28 +07:00
Chomper9981 0a909af027 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-13 14:47:37 +07:00
HungDK 7b66b5e37c Add model, vfx to task lv8 2026-04-13 14:46:06 +07:00
Chomper9981 f083c400a0 Add BubbleText Logic 2026-04-13 14:44:16 +07:00
hungdk ac13d35fbe Merge pull request 'fixbug/npc-dialog' (#336) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/336
2026-04-13 07:21:22 +00:00
HungDK e198a3a7f9 Merge branch 'develop' into fixbug/npc-dialog 2026-04-13 14:20:19 +07:00
HungDK 680b77970e DISABLE NPC Storage 2026-04-13 14:19:27 +07:00
cuongnv 907380dce2 Merge pull request 'feature/chat_01' (#335) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/335
2026-04-13 07:13:02 +00:00
CuongNV 34750e3491 add height icon 2026-04-13 14:11:57 +07:00
CuongNV 3c3a84b873 Update doc chatsystem 2026-04-13 14:05:43 +07:00
cuongnv 54d3cd11c3 Merge pull request 'feature/chat_01' (#334) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/334
2026-04-13 07:02:46 +00: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
hungdk 25502d7989 Merge pull request 'fixbug/npc-dialog' (#333) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/333
2026-04-13 06:40:00 +00:00
HungDK a0cba71803 Merge branch 'develop' into fixbug/npc-dialog 2026-04-13 13:38:06 +07:00
HungDK 05410d236d Fix text PW-138 2026-04-13 12:31:49 +07:00
Le Duc Anh 701e06c1e8 add missing monster model 2026-04-13 11:41:00 +07:00
CuongNV 1793b54947 update view scroll for chat 2026-04-13 11:25:55 +07:00
HungDK 2e6989c604 Fix PW-137 mall not opening correct 2026-04-13 11:00:15 +07:00
hoangvd f2f329bc35 Merge pull request 'fix-bug/can't-learn-skill-require-books' (#332) from fix-bug/can't-learn-skill-require-books into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/332
2026-04-13 03:17:03 +00: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
NguyenVanDat a1f1632422 finish edit current combo 2026-04-13 10:12:11 +07:00
VDH 1f46ac7df3 Merge branch 'develop' into fix-bug/can't-learn-skill-require-books 2026-04-13 10:09:39 +07:00
VDH eb52b57d2a fix bug 2026-04-13 10:09:15 +07:00
cuongnv 6e9efff68a Merge pull request 'feature/chat_01' (#331) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/331
2026-04-13 02:57:53 +00:00
CuongNV ff1e86f853 disable emoji button 2026-04-13 09:57:01 +07:00