Commit Graph

129 Commits

Author SHA1 Message Date
HungDK c70b752c19 Merge branch 'develop' into fixbug/npc-dialog 2026-04-13 16:31:23 +07:00
Le Duc Anh 8f1b34a790 add missing model 3D 2026-04-13 15:55:57 +07:00
Chomper9981 a9c3be19f1 fix after merge 2026-04-13 15:16:28 +07:00
HungDK 7b66b5e37c Add model, vfx to task lv8 2026-04-13 14:46:06 +07:00
Le Duc Anh 701e06c1e8 add missing monster model 2026-04-13 11:41:00 +07:00
Le Duc Anh ccc13db1e7 add model relate to level 19 tasks 2026-04-12 21:38:34 +07:00
Le Duc Anh 0309e0674b update a69 colliders 2026-04-11 16:04:09 +07:00
anhld 08e5fc1d68 Merge pull request 'Show preview for character when create new char' (#327) from feature/show-preview-create-char-screen into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/327
2026-04-10 08:44:46 +00:00
Le Duc Anh 1a1c26cf03 Show preview for character when create new char 2026-04-10 15:35:58 +07:00
VuNgocHaiC7 d6d248a78f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/coordinates_weapon 2026-04-10 14:46:54 +07:00
VuNgocHaiC7 2a0b40f227 fix prefabs weapons 2026-04-10 14:46:12 +07:00
Le Duc Anh 4017df3037 update animation for npc12 2026-04-09 14:28:25 +07:00
VuNgocHaiC7 089a9764d8 fix coordinates for weapons 2026-04-08 17:38:25 +07:00
Le Duc Anh fa98c5b76c rotate weapon 2026-04-08 11:31:45 +07:00
Chomper9981 131fb322f2 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-06 13:39:58 +07:00
Chomper9981 ff03d7d0eb Add Animation phoenix fly in the lv 10 quest. 2026-04-06 13:39:39 +07:00
Le Duc Anh 8e2c565583 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-03 16:33:49 +07:00
Le Duc Anh 20c1a7cfc4 add char preview in login screen 2026-04-03 16:33:30 +07:00
Chomper9981 c53ba56b82 Add VM GFX,. Add some UI for skillUI 2026-04-02 15:26:16 +07:00
Chomper9981 dc7831d537 Merge 4 2026-04-01 18:01:11 +07:00
Chomper9981 85ef52b897 Merge 3 2026-04-01 18:00:44 +07:00
Chomper9981 291f9a094b Merge 2 2026-04-01 18:00:13 +07:00
Chomper9981 4144077219 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-01 17:59:31 +07:00
Chomper9981 4fd2efa588 Fix some minor bug. Add some addreasable and UI component 2026-04-01 17:41:42 +07:00
Le Duc Anh 220158635e modify a69 collider bursh 2026-03-30 14:51:07 +07:00
Le Duc Anh b29aec673b update a 69 model 2026-03-30 14:12:18 +07:00
Le Duc Anh 4337001a2c add Tien Thu equipments 2026-03-19 15:46:52 +07:00
Le Duc Anh bd2fe1d4f3 add hair model TiT 2026-03-18 17:19:37 +07:00
Le Duc Anh a2b24be051 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-18 16:41:30 +07:00
Le Duc Anh 62ac1ad4da add Than Thu equipment 2026-03-18 16:39:56 +07:00
Tungdv 0ccc726e3d fix: update wing for HP. 2026-03-18 16:34:31 +07:00
Tungdv c800b48d52 Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
2026-03-18 12:54:34 +07:00
Le Duc Anh 2c5b9a9104 load equipment async 2026-03-17 17:39:28 +07:00
Tungdv b26ca5c56e feat: add new model skin sword fly. 2026-03-13 19:50:02 +07:00
Le Duc Anh c8079dd9b8 add vfx for flywsword 14 2026-03-12 17:44:27 +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
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 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
Le Duc Anh 9a3355abd4 update terrain for a69 2026-03-09 10:52:03 +07:00
Le Duc Anh 91bbfb6679 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-09 10:03:29 +07:00
Le Duc Anh cfa6372001 add Bong Minh Dong a69 map 2026-03-07 20:11:25 +07:00
Chomper9981 1ec660c957 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-07 15:22:46 +07:00
VDH 5228f357f1 done phap su gfx 2026-03-07 14:33:50 +07:00
Chomper9981 b46907c460 fix act not synch with dmg. add loop for some "Than Thu" animation 2026-03-07 11:28:40 +07:00
Le Duc Anh 3f4e0d74e5 update map models 2026-03-06 17:50:25 +07:00
Tungdv 2e03de644d fix: update fly with sword and wing. 2026-03-06 17:33:20 +07:00
Chomper9981 b148b9db19 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-05 16:49:41 +07:00