Commit Graph

1811 Commits

Author SHA1 Message Date
VDH 3f57f648ce disable UI 2026-03-12 10:26:00 +07:00
NguyenVanDat f8a6300e1e fix close DlgNPC 2026-03-12 10:03:28 +07:00
Le Duc Anh a13ac49467 add 7 fly sword 2026-03-11 23:14:12 +07:00
anhld 980e8df778 Merge pull request 'attack fly sword to correct pos' (#221) from feature/fly-devices into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/221
2026-03-11 12:32:46 +00:00
Le Duc Anh 2aee6f6141 attack fly sword to correct pos 2026-03-11 19:31:14 +07:00
hainh b78d32ece3 Merge pull request 'feature/fix-teamate' (#220) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/220
2026-03-11 10:39:26 +00:00
VuNgocHaiC7 b0d1ec8926 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-11 17:38:17 +07:00
namth af39ebf2e8 Merge pull request 'feature/vu-linh-model' (#219) from feature/vu-linh-model into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/219
2026-03-11 10:36:21 +00:00
VuNgocHaiC7 c0b879d804 update dlg DlgFriendList.prefab 2026-03-11 17:36:16 +07:00
Chomper9981 8eb326ea25 Add hair for "Vu linh". animation will not loop for now. 2026-03-11 17:30:54 +07:00
Chomper9981 b5e017f39c Add skills gfx for "Vu Linh". fix minor bug about DlgNPC 2026-03-11 17:07:24 +07:00
tungdv 68cc7d7745 Merge pull request 'remove "return" logic.' (#217) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/217
2026-03-11 09:05:50 +00:00
Tungdv 28c152109d fix: remove "return" logic. 2026-03-11 16:05:21 +07:00
tungdv f5089e140c Merge pull request 'fix auto move to target when swim.' (#216) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/216
2026-03-11 08:42:42 +00:00
Tungdv 748874fa84 fix: fix auto move to target when swim. 2026-03-11 15:41:39 +07:00
namth 5bf6f5fdb1 Merge pull request 'fixbug/fix-small-bug' (#215) from fixbug/fix-small-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/215
2026-03-10 10:15:48 +00:00
Chomper9981 29ac9f06a0 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 17:14:55 +07:00
Chomper9981 2c432b0686 fix some wing proplem 2026-03-10 17:14:18 +07:00
hainh 4bc1979bf2 Merge pull request 'feature/fix-teamate' (#214) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/214
2026-03-10 09:02:48 +00:00
VuNgocHaiC7 b795dabdae Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-10 16:01:11 +07:00
VuNgocHaiC7 3ab1b23ca4 fix UI dlgTeamMain 2026-03-10 16:00:39 +07:00
Chomper9981 012b31f09e Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 15:58:20 +07:00
Chomper9981 ee40c62f64 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-10 15:56:31 +07:00
tungdv e77d38a7af Merge pull request 'add swing, sword for HP and add move fly, swim when attack target.' (#213) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/213
2026-03-10 08:56:22 +00:00
Chomper9981 1534b8a07c Add gfx for KK and PS 2026-03-10 15:55:55 +07:00
Tungdv ebd44a40fc feat: add move fly and swim when attack to target. 2026-03-10 15:54:04 +07:00
VuNgocHaiC7 e09dd9b1fb Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-10 15:16:49 +07:00
VuNgocHaiC7 d2d4845b79 fix some UI of dialog 2026-03-10 15:15:23 +07:00
Tungdv 94c20c4bdd Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/Scripts/CECPlayer_Inventory.cs
2026-03-10 14:47:49 +07:00
hoangvd 71fcaf2da7 Merge pull request 'feature/skillBehavior' (#212) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/212
2026-03-10 07:06:26 +00:00
VDH 97e9381015 Merge branch 'develop' into feature/skillBehavior 2026-03-10 14:01:11 +07:00
VDH fbcb3dc5e5 comment log 2026-03-10 14:00:49 +07:00
Chomper9981 af987f5c3e fix task trace behavior 2026-03-10 13:58:03 +07:00
NguyenVanDat 44d0a0f2dd Merge branch 'develop' into feature/ui-system-update 2026-03-10 11:16:38 +07:00
NguyenVanDat 10ff87c03c update ui: inventory popup 2026-03-10 10:54:06 +07:00
tungdv 9a9f85edf5 Merge pull request 'add config instance for limit jump' (#211) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/211
2026-03-10 03:40:45 +00:00
NguyenVanDat c60da80182 update ui: player stats 2026-03-10 10:08:00 +07:00
NguyenVanDat 68d7b3171c Merge branch 'develop' into feature/ui-system-update 2026-03-10 09:33:24 +07:00
NguyenVanDat 2a819b5c01 update dialogue so 2026-03-10 09:32:05 +07:00
Tungdv 51667e8867 feat: add config instance. 2026-03-09 19:28:45 +07:00
VDH dbb1cac4a6 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-03-09 17:53:02 +07:00
VDH 574fc0c8c6 fix bug flash move skill 2026-03-09 17:50:32 +07:00
namth 225ebdbb5d Merge pull request 'fixbug/fix-small-bug' (#210) from fixbug/fix-small-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/210
2026-03-09 10:17:43 +00:00
Chomper9981 b19ea07f49 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-09 17:10:56 +07:00
Chomper9981 f4ad63f525 change game object logic to using CECPlayer instead. fix dlgaward not gen enough data. fix wave hand invalid 2026-03-09 17:10:14 +07:00
hainh 1ddcb0bb57 Merge pull request 'feature/fix-teamate' (#209) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/209
2026-03-09 08:30:57 +00:00
VuNgocHaiC7 65a8b2db51 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-09 15:29:29 +07:00
VuNgocHaiC7 564e27b6b8 fix show dlgTeamList continuous 2026-03-09 15:29:21 +07:00
hungdk 0303dd3916 Merge pull request 'Add CreateGetOtherEquipDetailCmd and update player option UI prefab' (#208) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/208
2026-03-09 07:56:11 +00:00
HungDK bc743a8e89 Add CreateGetOtherEquipDetailCmd and update player option UI prefab 2026-03-09 14:52:55 +07:00