Commit Graph

  • 90e0961a47 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut CuongNV 2026-04-20 14:12:57 +07:00
  • 48548d23cc fix bug dont show icon skill CuongNV 2026-04-20 14:12:28 +07:00
  • 6859486b32 update edit combo NguyenVanDat 2026-04-20 11:41:15 +07:00
  • 6f81209da6 resize mini chat CuongNV 2026-04-20 11:40:43 +07:00
  • 77341cc829 Merge pull request 'fix skill' (#365) from fix-bug/fix-20/4-skill into develop hoangvd 2026-04-20 04:29:19 +00:00
  • 8167f7887a fix skill VDH 2026-04-20 11:28:41 +07:00
  • 6c15eb0192 Merge branch 'develop' into feature/chat_01 CuongNV 2026-04-20 11:17:45 +07:00
  • ed9e0a1895 Merge pull request 'feature/combo-skill-short-cut' (#364) from feature/combo-skill-short-cut into develop cuongnv 2026-04-20 04:15:50 +00:00
  • 3ea1518cc0 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut CuongNV 2026-04-20 11:14:34 +07:00
  • ef632e7f11 update icon combo CuongNV 2026-04-20 11:11:23 +07:00
  • 6fe6999fa3 Merge pull request 'fixbug/kk-idle-anim' (#363) from fixbug/kk-idle-anim into develop namth 2026-04-20 03:19:52 +00:00
  • fd7f7f85f8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-20 10:17:43 +07:00
  • db888586e5 fix anim double call proplem. fix kK idle anime Chomper9981 2026-04-20 10:17:25 +07:00
  • 47f16af3f6 check limit matter collider size NguyenVanDat 2026-04-20 09:45:40 +07:00
  • e5a5140035 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-20 09:17:48 +07:00
  • ef0ee9a6dc Merge pull request 'fix crash on mobile when enter world.' (#362) from feature/fix_crash into develop tungdv 2026-04-18 10:41:30 +00:00
  • 12ecb7dcb4 fix: fix crash on mobile when enter world. Tungdv 2026-04-18 17:40:33 +07:00
  • fd08797f4a update router Le Duc Anh 2026-04-18 16:45:13 +07:00
  • ba6d0a82b0 Merge pull request 'Change distance to check reach destination' (#361) from fixbug/npc-dialog into develop hungdk 2026-04-18 09:23:29 +00:00
  • c7145b439e Change distance to check reach destination HungDK 2026-04-18 16:22:46 +07:00
  • aad141da9f Merge pull request 'fixbug/npc-dialog' (#360) from fixbug/npc-dialog into develop hungdk 2026-04-18 08:10:54 +00:00
  • 9f5ef429be Merge branch 'develop' into fixbug/npc-dialog HungDK 2026-04-18 15:10:27 +07:00
  • 439941d15e Fix unstable router, water route HungDK 2026-04-18 15:10:10 +07:00
  • 44f5f1cf2c Merge pull request 'Fix unstable router, water and air route' (#359) from fixbug/npc-dialog into develop hungdk 2026-04-18 06:54:37 +00:00
  • 5bfe81facd Fix unstable router, water and air route HungDK 2026-04-18 13:51:02 +07:00
  • f3544be841 Merge pull request 'feature/combo-skill-short-cut' (#358) from feature/combo-skill-short-cut into develop cuongnv 2026-04-17 11:19:09 +00:00
  • ee23c8e782 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut CuongNV 2026-04-17 18:18:02 +07:00
  • 5cf2abeff1 add set icon CuongNV 2026-04-17 18:17:42 +07:00
  • ad6875622c update assign combo to slot skill CuongNV 2026-04-17 17:45:02 +07:00
  • 870ecaea72 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-17 16:58:30 +07:00
  • a03405900f Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-17 16:58:09 +07:00
  • 96a7b2ebd0 Merge pull request 'Add sfx to skill trigger' (#357) from feature/skill-sfx into develop namth 2026-04-17 09:57:49 +00:00
  • 4a736cd058 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-17 16:57:08 +07:00
  • 7ac9721f3c Add sfx to skill trigger Chomper9981 2026-04-17 16:55:36 +07:00
  • 233a232aa5 Merge pull request 'Skip wound animation. add chanel logic to active it agaist.' (#356) from fixbug/fix-animation-stop-unexpectedly into develop namth 2026-04-17 08:44:29 +00:00
  • c6c61f5a0c Skip wound animation. add chanel logic to active it agaist. Chomper9981 2026-04-17 15:42:26 +07:00
  • e61d590171 Merge pull request 'feature/update-ui' (#355) from feature/update-ui into develop hainh 2026-04-16 10:22:02 +00:00
  • 2c77a4788e update btn cheat tele NPC VuNgocHaiC7 2026-04-16 17:18:14 +07:00
  • d825a775fc Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui VuNgocHaiC7 2026-04-16 17:08:02 +07:00
  • 6d1be1fc94 cheat tele NPC VuNgocHaiC7 2026-04-16 17:04:44 +07:00
  • 2884dac189 Merge pull request 'change combine action logic to dictionary' (#354) from feature/implement-a3dcombineaction into develop namth 2026-04-16 09:22:05 +00:00
  • 10c9a00e6a change combine action logic to dictionary Chomper9981 2026-04-16 16:21:10 +07:00
  • 26756001ae Merge pull request 'feature/implement-a3dcombineaction' (#353) from feature/implement-a3dcombineaction into develop namth 2026-04-16 09:00:22 +00:00
  • 813748be38 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-16 15:58:16 +07:00
  • a2f6941df7 Add white tiger anim Chomper9981 2026-04-16 15:57:43 +07:00
  • fae52c81d3 Merge pull request 'fix-bug/character-sound' (#352) from fix-bug/character-sound into develop hoangvd 2026-04-16 08:56:27 +00:00
  • 250b339bdf Merge branch 'develop' into fix-bug/character-sound VDH 2026-04-16 15:55:26 +07:00
  • c58e03fe7c Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop Le Duc Anh 2026-04-16 15:53:10 +07:00
  • f40fdcca4b add sfx to addressable and fix their path names Le Duc Anh 2026-04-16 15:52:50 +07:00
  • a0dda219a9 Merge branch 'develop' into fix-bug/character-sound VDH 2026-04-16 15:48:16 +07:00
  • dbe2315fa5 fix use skill the second can't hear sfx VDH 2026-04-16 15:47:50 +07:00
  • e5a5c5ed30 Merge pull request 'feature/implement-a3dcombineaction' (#351) from feature/implement-a3dcombineaction into develop namth 2026-04-16 08:41:05 +00:00
  • c2c546fee0 fix mage model Chomper9981 2026-04-16 15:40:43 +07:00
  • f4662becb9 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-16 15:37:26 +07:00
  • 15331b4e90 fix ui after merge Chomper9981 2026-04-16 15:37:07 +07:00
  • decc616ee5 Merge pull request 'feature/implement-a3dcombineaction' (#350) from feature/implement-a3dcombineaction into develop namth 2026-04-16 08:33:35 +00:00
  • aacd303e94 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui Chomper9981 2026-04-16 15:31:33 +07:00
  • 97bb1f97d4 Add A3DCombinedAction logic Chomper9981 2026-04-16 15:30:52 +07:00
  • c2707eff0a update combo NguyenVanDat 2026-04-16 15:05:33 +07:00
  • 5b2feeb39f update log CuongNV 2026-04-16 14:40:39 +07:00
  • f1e3eec78f Merge pull request 'feature/chat_01' (#349) from feature/chat_01 into develop cuongnv 2026-04-16 07:30:36 +00:00
  • d489cfcd7b Merge remote-tracking branch 'origin/develop' into feature/chat_01 CuongNV 2026-04-16 14:29:26 +07:00
  • 329f62a050 update prefab and logic draw name CuongNV 2026-04-16 14:29:08 +07:00
  • 0078c62ce4 Merge pull request 'feature/chat_01' (#348) from feature/chat_01 into develop cuongnv 2026-04-16 03:13:15 +00:00
  • 042fdeeba4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 CuongNV 2026-04-16 10:12:10 +07:00
  • 0c84e82d03 update prefab CuongNV 2026-04-16 10:11:07 +07:00
  • d5f6d7d6ea update prefabs CuongNV 2026-04-15 18:38:57 +07:00
  • 78ceafb347 add + CuongNV 2026-04-15 18:38:31 +07:00
  • 8c72c3349c add code height name CuongNV 2026-04-15 18:38:20 +07:00
  • 69be7be7ff Merge pull request 'fix-bug/character-sound' (#347) from fix-bug/character-sound into develop hoangvd 2026-04-15 10:35:55 +00:00
  • 1cbfd46d04 Merge branch 'develop' into fix-bug/character-sound VDH 2026-04-15 17:35:18 +07:00
  • 8feefab707 adjust addressable VDH 2026-04-15 17:35:01 +07:00
  • 108cb79480 Merge pull request 'Update HP move in scene a69.' (#346) from feature/HP_fix_move_in_a69 into develop tungdv 2026-04-15 10:23:11 +00:00
  • 31fe8d77d1 Merge remote-tracking branch 'origin/develop' into feature/HP_fix_move_in_a69 Tungdv 2026-04-15 17:20:40 +07:00
  • f8dbd6e458 fix: Update HP move in scene a69. Tungdv 2026-04-15 17:20:25 +07:00
  • 0339a77137 Merge pull request 'feature/update-ui' (#345) from feature/update-ui into develop hainh 2026-04-15 10:12:30 +00:00
  • 200082e973 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui VuNgocHaiC7 2026-04-15 17:11:05 +07:00
  • 6a426712fd fix text detail of item VuNgocHaiC7 2026-04-15 17:07:13 +07:00
  • cda04521a3 Merge pull request 'fix-bug/character-sound' (#344) from fix-bug/character-sound into develop hoangvd 2026-04-15 09:01:42 +00:00
  • 19617ff30e Merge branch 'develop' into fix-bug/character-sound VDH 2026-04-15 16:00:51 +07:00
  • 625a50bc82 done sound VDH 2026-04-15 16:00:31 +07:00
  • 3770a943d1 for move sound VDH 2026-04-15 15:33:35 +07:00
  • b65b2238d8 Merge pull request 'fixbug/npc-dialog' (#343) from fixbug/npc-dialog into develop hungdk 2026-04-15 08:12:38 +00:00
  • 2fe24bcb84 Merge branch 'develop' into fixbug/npc-dialog HungDK 2026-04-15 15:10:54 +07:00
  • e2aab01cfe Fix elf npc services HungDK 2026-04-15 15:10:37 +07:00
  • 81771c6bd7 Fix error of npc option HungDK 2026-04-15 14:14:04 +07:00
  • 9ddb91a087 Fix raycast to not hit through ui HungDK 2026-04-15 11:26:47 +07:00
  • 8e9360180f Merge pull request 'fix the adressable proplem' (#342) from fixbug/fix-missing-adressable into develop namth 2026-04-15 02:38:59 +00:00
  • 9e38438971 fix the adressable proplem Chomper9981 2026-04-15 09:37:31 +07:00
  • a56554c19b load sound into map collection VDH 2026-04-14 17:50:19 +07:00
  • 553d191788 Merge branch 'develop' into feature/create-skill-combo NguyenVanDat 2026-04-14 13:33:43 +07:00
  • a1c92565dc finish edit combo NguyenVanDat 2026-04-14 12:22:02 +07:00
  • bf0b5acea2 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop VDH 2026-04-14 11:35:15 +07:00
  • b183d69bef adjust sound addressable VDH 2026-04-14 11:35:04 +07:00
  • 160c57b352 Merge pull request 'Add missing shop item data' (#341) from fixbug/shopui-item into develop namth 2026-04-14 04:07:49 +00:00
  • fde31ab9b8 Add missing shop item data Chomper9981 2026-04-14 11:06:08 +07:00
  • e53cd4043f Merge branch 'develop' into feature/create-skill-combo NguyenVanDat 2026-04-14 09:16:21 +07:00
  • 49b79a588e update logic create new combo NguyenVanDat 2026-04-14 09:11:00 +07:00
  • d97bde89f4 update models Le Duc Anh 2026-04-13 17:33:06 +07:00
  • f269b9abc3 Merge pull request 'feature/update-ui' (#340) from feature/update-ui into develop hainh 2026-04-13 10:11:05 +00:00