Commit Graph

2311 Commits

Author SHA1 Message Date
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 ff1e86f853 disable emoji button 2026-04-13 09:57:01 +07:00
CuongNV a3ced103d8 update exit button 2026-04-13 09:52:37 +07:00
CuongNV 1fcba1b77b Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-13 09:28:16 +07:00
Le Duc Anh ccc13db1e7 add model relate to level 19 tasks 2026-04-12 21:38:34 +07:00
Le Duc Anh 7e563d6c65 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-11 16:05:57 +07:00
Le Duc Anh 0309e0674b update a69 colliders 2026-04-11 16:04:09 +07:00
VDH b9d64b5a07 show why can't learn skill or upgrade 2026-04-10 17:24:51 +07:00
VDH 5da2b32919 Merge branch 'develop' into fix-bug/spawn-multiple-fly-gfx 2026-04-10 16:36:25 +07:00
VDH ea56a82b5c done gfx sound 2026-04-10 16:35:07 +07:00
HungDK 0699879722 Merge branch 'develop' into feature/update-ui 2026-04-10 16:22:31 +07:00
HungDK 414881065b Fixing task cant be taking 2026-04-10 16:22:11 +07:00
anhld 08e5fc1d68 Merge pull request 'Show preview for character when create new char' (#327) from feature/show-preview-create-char-screen into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/327
2026-04-10 08:44:46 +00:00
Le Duc Anh 1a1c26cf03 Show preview for character when create new char 2026-04-10 15:35:58 +07:00
CuongNV 0d27c96ca9 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-10 14:51:20 +07:00
CuongNV ec5e9a6bb9 Add Dropdown 2026-04-10 14:50:40 +07:00
VuNgocHaiC7 d6d248a78f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/coordinates_weapon 2026-04-10 14:46:54 +07:00
VuNgocHaiC7 2a0b40f227 fix prefabs weapons 2026-04-10 14:46:12 +07:00
CuongNV 2d877acaf3 Add tool and change sprite tmp 2026-04-10 11:35:28 +07:00
Chomper9981 1eb07ce750 Fix Shop Price UI. Fix some item that not showing data in shop. 2026-04-10 11:18:49 +07:00
Chomper9981 94dc81a12d Fix bug cant logout and Buff icon not update 2026-04-10 09:35:58 +07:00
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
Chomper9981 5325e9ad23 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-09 16:29:33 +07:00
Chomper9981 617ec486b5 Fix some UI element 2026-04-09 16:29:13 +07:00
HungDK d3385da642 Merge branch 'develop' into feature/update-ui 2026-04-09 16:14:51 +07:00
HungDK 05dec39638 Fix unasign event on npc dlg 2026-04-09 16:14:01 +07:00
CuongNV c637e3af47 hide emoji 2026-04-09 15:21:53 +07:00
CuongNV 2d9525819a Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-09 15:16:07 +07:00
CuongNV 1f74bd3845 Update data layout element 2026-04-09 15:15:44 +07:00
Le Duc Anh c84e8e371c rearrange Main HUD 2026-04-09 15:11:01 +07:00
CuongNV 9ac4ae65b6 add layout Element 2026-04-09 15:09:21 +07:00
cuongnv 03830ea373 Merge pull request 'feature/chat_01' (#318) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/318
2026-04-09 07:57:14 +00: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
Le Duc Anh 168c4c6191 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-09 14:27:16 +07:00
CuongNV f149eac63b Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-09 11:57:49 +07:00
CuongNV a99496e401 add logic show emoji 2026-04-09 11:56:36 +07:00
hungdk 61ccd05888 Merge pull request 'Update DlgNPC.cs' (#317) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/317
2026-04-09 04:25:53 +00:00
HungDK d80cb167b5 Merge branch 'develop' into feature/update-ui 2026-04-09 11:25:15 +07:00
HungDK d70bfe7e07 Update DlgNPC.cs 2026-04-09 11:25:03 +07:00
VDH 9388636e28 Merge branch 'develop' into fix-bug/spawn-multiple-fly-gfx 2026-04-09 11:13:16 +07:00