Commit Graph

2777 Commits

Author SHA1 Message Date
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
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
hoangvd 0563fd6116 Merge pull request 'fix-bug/spawn-multiple-fly-gfx' (#330) from fix-bug/spawn-multiple-fly-gfx into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/330
2026-04-10 10:26:04 +00:00
VDH e6c28bacc4 Merge branch 'develop' into fix-bug/spawn-multiple-fly-gfx 2026-04-10 17:25:30 +07:00
VDH b9d64b5a07 show why can't learn skill or upgrade 2026-04-10 17:24:51 +07:00
hoangvd c3bc741d36 Merge pull request 'fix-bug/spawn-multiple-fly-gfx' (#329) from fix-bug/spawn-multiple-fly-gfx into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/329
2026-04-10 09:42:59 +00: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 b3c3c685f9 Merge pull request 'Fixing task cant be taking' (#328) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/328
2026-04-10 09:26:44 +00: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 1c68d2563c add doc chatsystem flow 2026-04-10 15:27:36 +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
hainh b7c162ddc4 Merge pull request 'feature/coordinates_weapon' (#326) from feature/coordinates_weapon into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/326
2026-04-10 07:47:53 +00: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
namth c0f3bc7cfa Merge pull request 'Fix Shop Price UI. Fix some item that not showing data in shop.' (#325) from fixbug/shop-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/325
2026-04-10 04:20:02 +00:00
Chomper9981 1eb07ce750 Fix Shop Price UI. Fix some item that not showing data in shop. 2026-04-10 11:18:49 +07:00
namth 9af714a807 Merge pull request 'Fix bug cant logout and Buff icon not update' (#324) from fixbug/log-out-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/324
2026-04-10 02:37:34 +00: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
namth d2d47378c2 Merge pull request 'fixbug/fix-ui' (#323) from fixbug/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/323
2026-04-09 09:31:10 +00: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