Commit Graph

639 Commits

Author SHA1 Message Date
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 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 05410d236d Fix text PW-138 2026-04-13 12:31:49 +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
VDH b9d64b5a07 show why can't learn skill or upgrade 2026-04-10 17:24:51 +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
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
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
CuongNV c3bc869457 add new chat mini 2026-04-09 14:52:37 +07:00
Le Duc Anh 4017df3037 update animation for npc12 2026-04-09 14:28:25 +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
VDH ce526d29d6 lock view 2026-04-09 11:12:40 +07:00
NguyenVanDat fd970c3123 Merge branch 'develop' into feature/create-skill-combo 2026-04-09 09:14:29 +07:00
VuNgocHaiC7 503fc49681 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-08 17:38:48 +07:00
VuNgocHaiC7 089a9764d8 fix coordinates for weapons 2026-04-08 17:38:25 +07:00
NguyenVanDat 918af2a06b update logic skill slot 2026-04-08 17:35:01 +07:00
Chomper9981 8ad46acfaa fix performent issual of using medicine 2026-04-08 16:58:48 +07:00
Chomper9981 1bcae728db Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 16:00:01 +07:00
Chomper9981 c692179b67 Add Button for HPMP Usage 2026-04-08 15:58:51 +07:00
HungDK 7e24ee55f3 Merge branch 'develop' into feature/update-ui 2026-04-08 14:10:51 +07:00
HungDK a04fca3914 Add pickup nearest button 2026-04-08 14:08:47 +07:00
Chomper9981 6703bfb42e Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 13:47:00 +07:00