Commit Graph

792 Commits

Author SHA1 Message Date
VDH 2c20aea277 save 2025-12-11 14:13:37 +07:00
VDH 45f69c9f44 skill ui 2025-12-10 18:17:34 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +07:00
VDH 2410af3078 done pos skill 2025-12-08 17:49:57 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
HungDK 9993297ab5 Update Tab_Button.prefab 2025-12-08 10:33:32 +07:00
HungDK f42e1d27de Update InventoryUI.prefab 2025-12-08 10:27:45 +07:00
HungDK 729bd4ce6e Add button and correct refresh detail item pannel size 2025-12-08 10:26:44 +07:00
NguyenVanDat 659253c3d2 temporary add vfx for weapon attack 2025-12-08 10:23:00 +07:00
HungDK 421bcfd6a6 Update EC_InventoryUI.cs 2025-12-08 10:12:35 +07:00
NguyenVanDat 6be2ef9a39 Merge branch 'develop' into feature/vfx 2025-12-08 10:12:32 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
HungDK d2fd5b2f0a Add missing id config of items description 2025-12-08 09:17:36 +07:00
VDH a48ac9baf8 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-06 16:41:34 +07:00
VDH e19be27a1a skill 2025-12-06 16:35:34 +07:00
tungdv b0b16ef6a2 Merge pull request 'Update Jump for HP.' (#74) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/74
2025-12-06 07:45:50 +00:00
Tungdv 09322bcf41 fix: delete log. 2025-12-06 14:44:34 +07:00
Tungdv be85cf1d91 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-06 14:41:00 +07:00
Tungdv c7c34b373c fix: update data info for HP.
fix: update move fly and swim.
2025-12-06 14:14:55 +07:00
Tungdv 956fde82b4 feat: set ext prop for HP. 2025-12-05 21:59:35 +07:00
Tungdv f330d9606c fix: update logic jump move for HP. 2025-12-05 21:09:16 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
NguyenVanDat 593d6374da fix object attack facing to target 2025-12-05 14:21:47 +07:00
VDH 2d3f98bb2c fix after merge 2025-12-05 10:16:08 +07:00
Tungdv 1d7181c1fc fix: update logic jump move. 2025-12-04 20:06:02 +07:00
Tungdv b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
VDH 3b5386840d fix after merge 2025-12-04 18:12:17 +07:00
VDH 47f4033dff Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
#	Assets/PerfectWorld/Scripts/Managers/CECManager.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-12-04 17:58:10 +07:00
VDH 0529114779 done skill bless 2025-12-04 17:26:42 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +07:00
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +07:00
HungDK d4bccfb9fc Merge branch 'develop' into feature/npc-shop 2025-12-04 14:46:08 +07:00
HungDK b051a86014 Add place holder item detail, buy option 2025-12-04 14:39:46 +07:00
NguyenVanDat 111bd15e71 Merge branch 'feature/HP_jump' into feature/else-jump-animation 2025-12-04 09:38:56 +07:00
HungDK 6f25555cac Fix close service dlg NPC 2025-12-03 18:34:26 +07:00
NguyenVanDat 2b0f675ebd Merge branch 'develop' into feature/movefix 2025-12-03 18:14:59 +07:00
NguyenVanDat 632f6b3813 replace state machine by HPWork 2025-12-03 18:14:10 +07:00
Tungdv aa012f7c60 feat: add hpworkfall.
fix: update logic jump stand.
2025-12-03 18:09:38 +07:00
HungDK 4a82c1b82c Update Joystick.cs 2025-12-03 17:49:34 +07:00
HungDK d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +07:00
HungDK 582d014da0 Add ui 2025-12-03 16:44:13 +07:00
HungDK 054026bc55 Load basic shop of npc 2025-12-03 16:43:52 +07:00
HungDK 010c66ca47 Add CESHOP 2025-12-03 16:43:11 +07:00
Tungdv 1d6703572f Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-03 11:14:00 +07:00
NguyenVanDat 832f268b41 Merge branch 'develop' into feature/movefix 2025-12-03 10:20:26 +07:00
Le Duc Anh 721f1d6f10 set layer terrain for terrain 2025-12-03 10:17:09 +07:00
NguyenVanDat 4ad7519b58 Merge branch 'feature/HP_jump' into feature/movefix 2025-12-03 10:04:03 +07:00