Commit Graph

2341 Commits

Author SHA1 Message Date
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 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
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
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
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
hungdk ffb183b01e Merge pull request 'feature/update-ui' (#322) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/322
2026-04-09 09:16:47 +00: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 acdf938e0b Merge pull request 'hide emoji' (#321) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/321
2026-04-09 08:22:32 +00:00
CuongNV c637e3af47 hide emoji 2026-04-09 15:21:53 +07:00
cuongnv 6dbfef5dd8 Merge pull request 'feature/chat_01' (#320) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/320
2026-04-09 08:16:52 +00: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 cb181493c8 Merge pull request 'feature/chat_01' (#319) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/319
2026-04-09 07:58:09 +00: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
hoangvd 20a289831c Merge pull request 'fix-bug/spawn-multiple-fly-gfx' (#316) from fix-bug/spawn-multiple-fly-gfx into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/316
2026-04-09 04:14:11 +00:00
VDH 9388636e28 Merge branch 'develop' into fix-bug/spawn-multiple-fly-gfx 2026-04-09 11:13:16 +07:00
VDH ce526d29d6 lock view 2026-04-09 11:12:40 +07:00
hungdk 652aec9ef2 Merge pull request 'feature/update-ui' (#315) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/315
2026-04-09 03:54:51 +00:00
HungDK 8972bccc01 Merge branch 'develop' into feature/update-ui 2026-04-09 10:54:03 +07:00
HungDK fc38b2199d Update select target to nearest everytimes 2026-04-09 10:53:36 +07:00
CuongNV 316a5bd2d5 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-09 10:25:20 +07:00
CuongNV 6af4d1cf54 add Emoji 2026-04-08 17:50:12 +07:00
hainh 3996b705e8 Merge pull request 'feature/update-ui' (#314) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/314
2026-04-08 10:43:10 +00:00
CuongNV 98ad533e74 add Emoji setting 2026-04-08 17:42:02 +07:00