Commit Graph

2443 Commits

Author SHA1 Message Date
Chomper9981 15331b4e90 fix ui after merge 2026-04-16 15:37:07 +07:00
Chomper9981 aacd303e94 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:31:33 +07:00
Chomper9981 97bb1f97d4 Add A3DCombinedAction logic 2026-04-16 15:30:52 +07:00
cuongnv f1e3eec78f Merge pull request 'feature/chat_01' (#349) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/349
2026-04-16 07:30:36 +00:00
CuongNV d489cfcd7b Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-16 14:29:26 +07:00
CuongNV 329f62a050 update prefab and logic draw name 2026-04-16 14:29:08 +07:00
cuongnv 0078c62ce4 Merge pull request 'feature/chat_01' (#348) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/348
2026-04-16 03:13:15 +00:00
CuongNV 042fdeeba4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-16 10:12:10 +07:00
CuongNV 0c84e82d03 update prefab 2026-04-16 10:11:07 +07:00
CuongNV d5f6d7d6ea update prefabs 2026-04-15 18:38:57 +07:00
CuongNV 78ceafb347 add + 2026-04-15 18:38:31 +07:00
CuongNV 8c72c3349c add code height name 2026-04-15 18:38:20 +07:00
hoangvd 69be7be7ff Merge pull request 'fix-bug/character-sound' (#347) from fix-bug/character-sound into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/347
2026-04-15 10:35:55 +00:00
VDH 1cbfd46d04 Merge branch 'develop' into fix-bug/character-sound 2026-04-15 17:35:18 +07:00
VDH 8feefab707 adjust addressable 2026-04-15 17:35:01 +07:00
tungdv 108cb79480 Merge pull request 'Update HP move in scene a69.' (#346) from feature/HP_fix_move_in_a69 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/346
2026-04-15 10:23:11 +00:00
Tungdv 31fe8d77d1 Merge remote-tracking branch 'origin/develop' into feature/HP_fix_move_in_a69 2026-04-15 17:20:40 +07:00
Tungdv f8dbd6e458 fix: Update HP move in scene a69. 2026-04-15 17:20:25 +07:00
hainh 0339a77137 Merge pull request 'feature/update-ui' (#345) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/345
2026-04-15 10:12:30 +00:00
VuNgocHaiC7 200082e973 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-15 17:11:05 +07:00
VuNgocHaiC7 6a426712fd fix text detail of item 2026-04-15 17:07:13 +07:00
hoangvd cda04521a3 Merge pull request 'fix-bug/character-sound' (#344) from fix-bug/character-sound into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/344
2026-04-15 09:01:42 +00:00
VDH 19617ff30e Merge branch 'develop' into fix-bug/character-sound 2026-04-15 16:00:51 +07:00
VDH 625a50bc82 done sound 2026-04-15 16:00:31 +07:00
VDH 3770a943d1 for move sound 2026-04-15 15:33:35 +07:00
hungdk b65b2238d8 Merge pull request 'fixbug/npc-dialog' (#343) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/343
2026-04-15 08:12:38 +00:00
HungDK 2fe24bcb84 Merge branch 'develop' into fixbug/npc-dialog 2026-04-15 15:10:54 +07:00
HungDK e2aab01cfe Fix elf npc services 2026-04-15 15:10:37 +07:00
HungDK 81771c6bd7 Fix error of npc option 2026-04-15 14:14:04 +07:00
HungDK 9ddb91a087 Fix raycast to not hit through ui 2026-04-15 11:26:47 +07:00
namth 8e9360180f Merge pull request 'fix the adressable proplem' (#342) from fixbug/fix-missing-adressable into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/342
2026-04-15 02:38:59 +00:00
Chomper9981 9e38438971 fix the adressable proplem 2026-04-15 09:37:31 +07:00
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