Commit Graph

76 Commits

Author SHA1 Message Date
Chomper9981 4fd2efa588 Fix some minor bug. Add some addreasable and UI component 2026-04-01 17:41:42 +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
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
Chomper9981 d70e2ba5ad Add feature change shape for player("Than thu") 2026-03-05 16:46:55 +07:00
Tungdv fd1d803315 feat: add model fly sword. 2026-03-04 19:14:26 +07:00
Le Duc Anh aa4b887d1c WIP flying sword 2026-03-03 14:22:50 +07:00
Le Duc Anh 224bd75b47 update more npc models 2026-03-02 20:38:51 +07:00
Le Duc Anh 0b90bd8aa2 add missing npc 2026-02-26 00:37:13 +07:00
Le Duc Anh b83ef09442 update weapn 2026-01-09 19:55:57 +07:00
MinhHai 719849fa29 update angle for 2 models, update class CECMatter to Non set rotate when spawn 2026-01-09 18:14:44 +07:00
Le Duc Anh 67908e80fc update 长击刀极品 2026-01-08 00:21:07 +07:00
HungDK c73164518a Update 短斧.prefab 2026-01-07 17:55:24 +07:00
HungDK c390fad7ee Add model, vfx to task lv8 2026-01-07 16:01:49 +07:00
VuNgocHaiC7 26e299bbea fix broken prefabs 2025-12-30 22:05:40 +07:00
VuNgocHaiC7 6df923ae08 update anim monster and npc 2025-12-30 17:12:47 +07:00
VuNgocHaiC7 857b72dcae update animation monster and npc 2025-12-30 17:09:27 +07:00
VDH bf624ec7b1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/ModelRenderer/Art/Models/models/npcs/怪物/2013/花豹/花豹.prefab
#	Assets/ModelRenderer/Art/Models/models/npcs/怪物/2014/僧侣单剑/僧侣单剑.prefab
#	Assets/ModelRenderer/Art/Models/models/npcs/怪物/2014/双刀怨灵卫/双刀怨灵卫.prefab
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-12-29 10:57:43 +07:00
VDH 95a0f0775f fix anim to do fix anim con bao di 2025-12-22 17:35:46 +07:00
VDH 1683d61c66 animation 2025-12-22 10:53:17 +07:00
VDH 156cfa7b0d Merge branch 'develop' into feature/loopanimation 2025-12-19 16:03:20 +07:00
Le Duc Anh 039082a3f8 add npc 2025-12-19 15:54:16 +07:00
Le Duc Anh 2080acd1b1 add more npc models 2025-12-19 15:41:32 +07:00
VDH a980f64fbd fix animation with weapon 2025-12-19 12:44:49 +07:00
VDH 81bd9b55df anim npc processing 2025-12-18 11:20:46 +07:00
Le Duc Anh d15b0a2e30 Merge remote-tracking branch 'origin/develop' into internal-testing-build 2025-12-17 21:01:55 +07:00
Le Duc Anh 2d65447e30 add npc models 2025-12-17 21:00:58 +07:00
VDH 04cbdb4934 Merge branch 'develop' into feature/skill-data 2025-12-17 17:18:28 +07:00
VDH ab7051b2ca done fix anim npc and hostplayer attack anim 2025-12-17 17:17:16 +07:00
NguyenVanDat 07b6009568 Merge branch 'develop' into feature/task-emote 2025-12-17 09:44:36 +07:00
Le Duc Anh 7edb881cb3 add matte morel 2025-12-16 20:13:56 +07:00
NguyenVanDat 61b54ee1ba wave hand emote 2025-12-16 18:28:01 +07:00
VDH f0c190d9f1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2025-12-16 11:56:27 +07:00