Commit Graph

  • ab5eb93265 fix npc dialogue NguyenVanDat 2026-03-13 14:09:46 +07:00
  • c198b25989 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop VDH 2026-03-13 12:34:17 +07:00
  • 27da6c956f analyzer VDH 2026-03-13 12:34:01 +07:00
  • 56c0098a26 fix npc close NguyenVanDat 2026-03-13 12:18:52 +07:00
  • ce1f1e83f6 Merge pull request 'update show wing and sword fly in EP' (#232) from feature/elseplayer into develop tungdv 2026-03-13 04:28:09 +00:00
  • e6c2981ebb Merge remote-tracking branch 'origin/develop' into feature/elseplayer Tungdv 2026-03-13 11:27:06 +07:00
  • 144badd924 fix: update logic show wing and sword. Tungdv 2026-03-13 10:54:46 +07:00
  • 54296e2dfb Merge pull request 'fix merge bug' (#231) from feature/skill-hud into develop namth 2026-03-13 03:51:43 +00:00
  • 2a2fa66ffa fix merge bug Chomper9981 2026-03-13 10:51:02 +07:00
  • 6a6ee351a3 Merge pull request 'feature/skill-hud' (#230) from feature/skill-hud into develop namth 2026-03-13 03:40:11 +00:00
  • 9788d29219 fix: update logic show wing and sword. Tungdv 2026-03-13 10:40:04 +07:00
  • 67acf39b7a fix not open skill UI when click on empty quick bar slot Chomper9981 2026-03-13 10:38:51 +07:00
  • 34e5b569ed Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-13 10:36:48 +07:00
  • febcaa74b2 add quick change skill for dev only Chomper9981 2026-03-13 10:35:13 +07:00
  • 87e3695171 Merge pull request 'Equip data change' (#229) from feature/wings-flysword into develop anhld 2026-03-13 03:33:37 +00:00
  • dd3755c6e0 Equip data change Le Duc Anh 2026-03-13 10:32:47 +07:00
  • 67b6d6f388 add chat on top player local CuongNV 2026-03-13 09:57:56 +07:00
  • fa92a237e7 Merge pull request 'Fly sword and else player equipment' (#228) from feature/wings-flysword into develop anhld 2026-03-12 17:22:56 +00:00
  • 5b31865962 WIP:show equipment for else player Le Duc Anh 2026-03-13 00:21:52 +07:00
  • dc0092eab0 add equip dat Le Duc Anh 2026-03-12 21:24:20 +07:00
  • 4ebf4cf169 update equipement data Le Duc Anh 2026-03-12 21:14:07 +07:00
  • 2015dbf73e Add PROTOCOL_ADDFRIEND and enable add friend request HungDK 2026-03-12 20:58:29 +07:00
  • 65c0b00011 fix: update logic show wing and sword fly. Tungdv 2026-03-12 19:27:19 +07:00
  • 67220287db move EDITOR scripts to proper tag Le Duc Anh 2026-03-12 18:11:00 +07:00
  • 99b4aecb69 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop Le Duc Anh 2026-03-12 17:44:52 +07:00
  • c8079dd9b8 add vfx for flywsword 14 Le Duc Anh 2026-03-12 17:44:27 +07:00
  • 72310e9a42 Merge remote-tracking branch 'origin/develop' into feature/chat CuongNV 2026-03-12 17:29:11 +07:00
  • e32ff4631b add UI chat CuongNV 2026-03-12 17:26:24 +07:00
  • ee9855ccb3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-12 17:15:38 +07:00
  • e4c25eea12 Merge pull request 'update clone code for DlgPetList' (#227) from feature/fix-teamate into develop hainh 2026-03-12 10:14:19 +00:00
  • 6243736c70 update clone code for DlgPetList VuNgocHaiC7 2026-03-12 17:13:31 +07:00
  • c9ad4fe2a8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-12 17:12:26 +07:00
  • b5f89bb703 remove old skill cycle logic Chomper9981 2026-03-12 17:08:54 +07:00
  • e2c8dd4d44 Merge remote-tracking branch 'origin/develop' into feature/elseplayer Tungdv 2026-03-12 16:51:45 +07:00
  • f5be092c15 fix: update init data EP. Tungdv 2026-03-12 16:51:30 +07:00
  • a41103c15d Merge pull request 'feature/fix-teamate' (#226) from feature/fix-teamate into develop hainh 2026-03-12 09:13:18 +00:00
  • 74d02c8fe4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate VuNgocHaiC7 2026-03-12 16:12:00 +07:00
  • 772af07696 fix code for UI dlgTeamList VuNgocHaiC7 2026-03-12 16:11:09 +07:00
  • 7319df6660 Merge pull request 'feature/skillBehavior' (#225) from feature/skillBehavior into develop hoangvd 2026-03-12 08:48:36 +00:00
  • d3a9683795 fix dupUI VDH 2026-03-12 15:47:35 +07:00
  • 1452e0cf0b fix DdlgQuickBar: i <= a_pSCS.Count -> i < a_pSCS.Count MinhHai 2026-03-12 14:58:44 +07:00
  • 66fb5b7263 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate VuNgocHaiC7 2026-03-12 14:55:19 +07:00
  • fad41e507b fix code some ui and teamlist VuNgocHaiC7 2026-03-12 14:54:21 +07:00
  • 850b44fd1d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo MinhHai 2026-03-12 14:49:03 +07:00
  • 511f8a8a3a add TickInvoker in Boostrap scene, fix DlgMap MinhHai 2026-03-12 14:42:09 +07:00
  • 775afa6c4d Merge pull request 'feature/skillBehavior' (#224) from feature/skillBehavior into develop hoangvd 2026-03-12 07:28:30 +00:00
  • 2b2120ec58 Merge branch 'develop' into feature/skillBehavior VDH 2026-03-12 14:27:42 +07:00
  • 951b855c38 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo MinhHai 2026-03-12 14:18:09 +07:00
  • d949e4f912 Merge pull request 'Update UIManager.prefab' (#222) from feature/fix-teamate into develop hainh 2026-03-12 06:54:52 +00:00
  • b487798110 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo MinhHai 2026-03-12 13:53:54 +07:00
  • f8a8d3d9d4 DONE: save skill combo MinhHai 2026-03-12 13:50:41 +07:00
  • e81797def4 change MiniMapUI class to DlgMap MinhHai 2026-03-12 13:49:03 +07:00
  • e373edca9e Update UIManager.prefab VuNgocHaiC7 2026-03-12 13:42:05 +07:00
  • 3f57f648ce disable UI VDH 2026-03-12 10:26:00 +07:00
  • f8a6300e1e fix close DlgNPC NguyenVanDat 2026-03-12 10:03:28 +07:00
  • a13ac49467 add 7 fly sword Le Duc Anh 2026-03-11 23:14:12 +07:00
  • 980e8df778 Merge pull request 'attack fly sword to correct pos' (#221) from feature/fly-devices into develop anhld 2026-03-11 12:32:46 +00:00
  • 2aee6f6141 attack fly sword to correct pos Le Duc Anh 2026-03-11 19:31:14 +07:00
  • b78d32ece3 Merge pull request 'feature/fix-teamate' (#220) from feature/fix-teamate into develop hainh 2026-03-11 10:39:26 +00:00
  • b0d1ec8926 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate VuNgocHaiC7 2026-03-11 17:38:17 +07:00
  • af39ebf2e8 Merge pull request 'feature/vu-linh-model' (#219) from feature/vu-linh-model into develop namth 2026-03-11 10:36:21 +00:00
  • c0b879d804 update dlg DlgFriendList.prefab VuNgocHaiC7 2026-03-11 17:36:16 +07:00
  • 8eb326ea25 Add hair for "Vu linh". animation will not loop for now. Chomper9981 2026-03-11 17:30:54 +07:00
  • b5e017f39c Add skills gfx for "Vu Linh". fix minor bug about DlgNPC Chomper9981 2026-03-11 17:07:24 +07:00
  • af23389192 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo MinhHai 2026-03-11 16:43:26 +07:00
  • 0af8844948 WIP: open comment Save User Layout MinhHai 2026-03-11 16:43:10 +07:00
  • 5feb313867 Merge branch 'develop' into feature/skillBehavior VDH 2026-03-11 16:08:01 +07:00
  • 230bb83e6f add more handle protocol VDH 2026-03-11 16:05:54 +07:00
  • 68cc7d7745 Merge pull request 'remove "return" logic.' (#217) from feature/HP_jump into develop tungdv 2026-03-11 09:05:50 +00:00
  • 28c152109d fix: remove "return" logic. Tungdv 2026-03-11 16:05:21 +07:00
  • f5089e140c Merge pull request 'fix auto move to target when swim.' (#216) from feature/HP_jump into develop tungdv 2026-03-11 08:42:42 +00:00
  • 748874fa84 fix: fix auto move to target when swim. Tungdv 2026-03-11 15:41:39 +07:00
  • 18b32f6d5f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/skillBehavior VDH 2026-03-11 11:09:40 +07:00
  • 3fc7106e76 switch skill shortcut VDH 2026-03-10 18:01:47 +07:00
  • 5bf6f5fdb1 Merge pull request 'fixbug/fix-small-bug' (#215) from fixbug/fix-small-bug into develop namth 2026-03-10 10:15:48 +00:00
  • 29ac9f06a0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-10 17:14:55 +07:00
  • 2c432b0686 fix some wing proplem Chomper9981 2026-03-10 17:14:18 +07:00
  • 4bc1979bf2 Merge pull request 'feature/fix-teamate' (#214) from feature/fix-teamate into develop hainh 2026-03-10 09:02:48 +00:00
  • b795dabdae Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate VuNgocHaiC7 2026-03-10 16:01:11 +07:00
  • 3ab1b23ca4 fix UI dlgTeamMain VuNgocHaiC7 2026-03-10 16:00:39 +07:00
  • 012b31f09e Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-10 15:58:20 +07:00
  • ee40c62f64 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop Chomper9981 2026-03-10 15:56:31 +07:00
  • e77d38a7af Merge pull request 'add swing, sword for HP and add move fly, swim when attack target.' (#213) from feature/hp_pet into develop tungdv 2026-03-10 08:56:22 +00:00
  • 1534b8a07c Add gfx for KK and PS Chomper9981 2026-03-10 15:55:55 +07:00
  • ebd44a40fc feat: add move fly and swim when attack to target. Tungdv 2026-03-10 15:54:04 +07:00
  • e09dd9b1fb Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate VuNgocHaiC7 2026-03-10 15:16:49 +07:00
  • d2d4845b79 fix some UI of dialog VuNgocHaiC7 2026-03-10 15:15:23 +07:00
  • 94c20c4bdd Merge remote-tracking branch 'origin/develop' into feature/hp_pet Tungdv 2026-03-10 14:47:49 +07:00
  • 71fcaf2da7 Merge pull request 'feature/skillBehavior' (#212) from feature/skillBehavior into develop hoangvd 2026-03-10 07:06:26 +00:00
  • 97e9381015 Merge branch 'develop' into feature/skillBehavior VDH 2026-03-10 14:01:11 +07:00
  • fbcb3dc5e5 comment log VDH 2026-03-10 14:00:49 +07:00
  • af987f5c3e fix task trace behavior Chomper9981 2026-03-10 13:58:03 +07:00
  • 44d0a0f2dd Merge branch 'develop' into feature/ui-system-update NguyenVanDat 2026-03-10 11:16:38 +07:00
  • 10ff87c03c update ui: inventory popup NguyenVanDat 2026-03-10 10:54:06 +07:00
  • 9a9f85edf5 Merge pull request 'add config instance for limit jump' (#211) from feature/HP_jump into develop tungdv 2026-03-10 03:40:45 +00:00
  • c60da80182 update ui: player stats NguyenVanDat 2026-03-10 10:08:00 +07:00
  • 68d7b3171c Merge branch 'develop' into feature/ui-system-update NguyenVanDat 2026-03-10 09:33:24 +07:00
  • 2a819b5c01 update dialogue so NguyenVanDat 2026-03-10 09:32:05 +07:00
  • 51667e8867 feat: add config instance. Tungdv 2026-03-09 19:28:45 +07:00
  • dbb1cac4a6 Merge branch 'develop' into feature/skillBehavior VDH 2026-03-09 17:53:02 +07:00