Commit Graph

1537 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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
Chomper9981 f083c400a0 Add BubbleText Logic 2026-04-13 14:44:16 +07: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 f768e8a9bc Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-13 13:58:00 +07:00
CuongNV 9919ebc8c0 fix bug chat system 2026-04-13 13:48:16 +07: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
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
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
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
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
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
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 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