Commit Graph

2511 Commits

Author SHA1 Message Date
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
Chomper9981 db888586e5 fix anim double call proplem. fix kK idle anime 2026-04-20 10:17:25 +07:00
NguyenVanDat 47f16af3f6 check limit matter collider size 2026-04-20 09:45:40 +07:00
Chomper9981 e5a5140035 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 09:17:48 +07:00
tungdv ef0ee9a6dc Merge pull request 'fix crash on mobile when enter world.' (#362) from feature/fix_crash into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/362
2026-04-18 10:41:30 +00:00
Tungdv 12ecb7dcb4 fix: fix crash on mobile when enter world. 2026-04-18 17:40:33 +07:00
Le Duc Anh fd08797f4a update router 2026-04-18 16:45:13 +07:00
hungdk ba6d0a82b0 Merge pull request 'Change distance to check reach destination' (#361) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/361
2026-04-18 09:23:29 +00:00
HungDK c7145b439e Change distance to check reach destination 2026-04-18 16:22:46 +07:00
hungdk aad141da9f Merge pull request 'fixbug/npc-dialog' (#360) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/360
2026-04-18 08:10:54 +00:00
HungDK 9f5ef429be Merge branch 'develop' into fixbug/npc-dialog 2026-04-18 15:10:27 +07:00
HungDK 439941d15e Fix unstable router, water route 2026-04-18 15:10:10 +07:00
hungdk 44f5f1cf2c Merge pull request 'Fix unstable router, water and air route' (#359) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/359
2026-04-18 06:54:37 +00:00
HungDK 5bfe81facd Fix unstable router, water and air route 2026-04-18 13:51:02 +07:00
cuongnv f3544be841 Merge pull request 'feature/combo-skill-short-cut' (#358) from feature/combo-skill-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/358
2026-04-17 11:19:09 +00: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
Chomper9981 870ecaea72 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:58:30 +07:00
Chomper9981 a03405900f Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:58:09 +07:00
namth 96a7b2ebd0 Merge pull request 'Add sfx to skill trigger' (#357) from feature/skill-sfx into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/357
2026-04-17 09:57:49 +00:00
Chomper9981 4a736cd058 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:57:08 +07:00
Chomper9981 7ac9721f3c Add sfx to skill trigger 2026-04-17 16:55:36 +07:00
namth 233a232aa5 Merge pull request 'Skip wound animation. add chanel logic to active it agaist.' (#356) from fixbug/fix-animation-stop-unexpectedly into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/356
2026-04-17 08:44:29 +00:00
Chomper9981 c6c61f5a0c Skip wound animation. add chanel logic to active it agaist. 2026-04-17 15:42:26 +07:00
hainh e61d590171 Merge pull request 'feature/update-ui' (#355) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/355
2026-04-16 10:22:02 +00:00
VuNgocHaiC7 2c77a4788e update btn cheat tele NPC 2026-04-16 17:18:14 +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