773 Commits

Author SHA1 Message Date
vuong dinh hoang a176f264dc Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill 2026-04-22 10:50:00 +07:00
vuong dinh hoang d6f87f6fdd add music bg and embience 2026-04-22 10:49:18 +07:00
CuongNV 410e4522f9 update focus frame 2026-04-22 10:38:14 +07:00
vuong dinh hoang 071ea098d7 add music 2026-04-21 17:11:00 +07:00
Tran Hai Nam aac787e2e0 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-21 15:00:20 +07:00
Tran Hai Nam 2f4b6d77da Add %data for equipment 2026-04-21 14:57:43 +07:00
vuong dinh hoang 284a77e4d2 remove debug 2026-04-21 11:43:07 +07:00
Chomper9981 d1bcefd953 update logic select skill 2026-04-21 10:52:00 +07:00
Le Duc Anh e8f4520ff4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-21 10:41:11 +07:00
Le Duc Anh 6dafbf56ca remove sfx wav subfix. Update some NRE cases 2026-04-21 10:41:04 +07:00
CuongNV 81fa75ca95 fix combo skill 2026-04-20 19:33:37 +07:00
Le Duc Anh 8f921fda4f update world map 2026-04-20 17:08:04 +07:00
CuongNV 90e0961a47 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-20 14:12:57 +07:00
CuongNV 48548d23cc fix bug dont show icon skill 2026-04-20 14:12:28 +07:00
NguyenVanDat 6859486b32 update edit combo 2026-04-20 11:41:15 +07:00
VDH 8167f7887a fix skill 2026-04-20 11:28:41 +07:00
CuongNV ef632e7f11 update icon combo 2026-04-20 11:11:23 +07:00
Le Duc Anh fd08797f4a update router 2026-04-18 16:45:13 +07:00
CuongNV ee23c8e782 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-17 18:18:02 +07:00
CuongNV 5cf2abeff1 add set icon 2026-04-17 18:17:42 +07:00
CuongNV ad6875622c update assign combo to slot skill 2026-04-17 17:45:02 +07:00
VuNgocHaiC7 d825a775fc Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-16 17:08:02 +07:00
VuNgocHaiC7 6d1be1fc94 cheat tele NPC 2026-04-16 17:04:44 +07:00
NguyenVanDat c2707eff0a update combo 2026-04-16 15:05:33 +07:00
CuongNV 329f62a050 update prefab and logic draw name 2026-04-16 14:29:08 +07:00
CuongNV 042fdeeba4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-16 10:12:10 +07:00
CuongNV 0c84e82d03 update prefab 2026-04-16 10:11:07 +07:00
CuongNV 8c72c3349c add code height name 2026-04-15 18:38:20 +07:00
VuNgocHaiC7 200082e973 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-15 17:11:05 +07:00
VuNgocHaiC7 6a426712fd fix text detail of item 2026-04-15 17:07:13 +07:00
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 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