Commit Graph

2538 Commits

Author SHA1 Message Date
CuongNV 410e4522f9 update focus frame 2026-04-22 10:38:14 +07:00
Le Duc Anh fb07759606 add a temporary background music system. To be replaced later. 2026-04-21 17:32:01 +07:00
tungdv 3bdd0e0c78 Merge pull request 'fix bug auto move for EP' (#375) from feature/EP_fix_bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/375
2026-04-21 09:40:03 +00:00
Tungdv aabbe085a3 Merge branch 'develop' into feature/EP_fix_bug 2026-04-21 16:38:51 +07:00
Tungdv eb52277197 fix: fix bug move for EP. 2026-04-21 16:38:09 +07:00
namth 8077a26138 Merge pull request 'feature/item-percent-info' (#374) from feature/item-percent-info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/374
2026-04-21 08:00:50 +00: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
cuongnv 95dece9f43 Merge pull request 'feature/chat_01' (#373) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/373
2026-04-21 07:46:04 +00:00
CuongNV bb363c521e Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-21 14:44:27 +07:00
CuongNV 7dd3975ba6 update tool change prefabs 2026-04-21 14:43:26 +07:00
hoangvd 85fea3ab3e Merge pull request 'remove debug' (#372) from hotfix/remove-debuglog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/372
2026-04-21 07:39:12 +00:00
Tran Hai Nam 23d131b7f9 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-21 14:04:54 +07:00
vuong dinh hoang 284a77e4d2 remove debug 2026-04-21 11:43:07 +07:00
Le Duc Anh 3c380b67a8 add missing models 2026-04-21 11:29:24 +07:00
Tran Hai Nam 14066c41b1 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-21 11:27:52 +07:00
Tran Hai Nam 7aa7dddaab remove fallback log 2026-04-21 11:25:38 +07:00
hungdk 487c299953 Merge pull request 'fixbug/npc-dialog' (#370) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/370
2026-04-21 03:59:05 +00:00
HungDK da0dfbd001 Merge branch 'develop' into fixbug/npc-dialog 2026-04-21 10:55:36 +07:00
HungDK c9aef9d68d Fix clean request logout1 2026-04-21 10:53:17 +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
Tran Hai Nam 16001d78e8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-20 16:58:18 +07:00
Tran Hai Nam 37c329fbb8 remove .wav 2026-04-20 16:53:24 +07:00
cuongnv edbc2ef567 Merge pull request 'feature/chat_01' (#369) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/369
2026-04-20 08:25:25 +00:00
CuongNV 85417fe8ed Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-20 15:24:35 +07:00
CuongNV 088d7c4cb2 update prefabs matter 2026-04-20 15:23:43 +07:00
namth c79e2a7c5d Merge pull request 'fixbug/item-display' (#368) from fixbug/item-display into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/368
2026-04-20 07:55:08 +00:00
Chomper9981 a3c2f478ef Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 14:44:07 +07:00
cuongnv 32809ff28b Merge pull request 'feature/chat_01' (#367) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/367
2026-04-20 07:39:00 +00:00
CuongNV 6c468115a5 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-20 14:37:52 +07:00
CuongNV d30a3d5e99 update code hide popup before 2026-04-20 14:37:28 +07:00
Chomper9981 2bf643fca9 fix equipment percent proplem 2026-04-20 14:21:27 +07:00
Chomper9981 cab1d5d962 fix ObjectCoord bug in TaskTrace 2026-04-20 14:20:33 +07:00
cuongnv 2a88b6c37c Merge pull request 'feature/combo-skill-short-cut' (#366) from feature/combo-skill-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/366
2026-04-20 07:13:52 +00: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
CuongNV 6f81209da6 resize mini chat 2026-04-20 11:40:43 +07:00
hoangvd 77341cc829 Merge pull request 'fix skill' (#365) from fix-bug/fix-20/4-skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/365
2026-04-20 04:29:19 +00:00
VDH 8167f7887a fix skill 2026-04-20 11:28:41 +07:00
CuongNV 6c15eb0192 Merge branch 'develop' into feature/chat_01 2026-04-20 11:17:45 +07:00
cuongnv ed9e0a1895 Merge pull request 'feature/combo-skill-short-cut' (#364) from feature/combo-skill-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/364
2026-04-20 04:15:50 +00:00
CuongNV 3ea1518cc0 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-20 11:14:34 +07:00
CuongNV ef632e7f11 update icon combo 2026-04-20 11:11:23 +07:00
namth 6fe6999fa3 Merge pull request 'fixbug/kk-idle-anim' (#363) from fixbug/kk-idle-anim into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/363
2026-04-20 03:19:52 +00:00
Chomper9981 fd7f7f85f8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 10:17:43 +07:00