Commit Graph

516 Commits

Author SHA1 Message Date
Chomper9981 a7dcbd4e69 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-11 10:01:53 +07:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
Tungdv 21f41ecae1 feat: add rotation cam. 2025-12-10 17:18:38 +07:00
Tungdv ebdb99865d fix: update move air. 2025-12-09 19:53:50 +07:00
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +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 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
Tungdv 4c863a8ee8 fix: update move fly and swim. 2025-12-06 18:49:21 +07: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
NguyenVanDat 593d6374da fix object attack facing to target 2025-12-05 14:21:47 +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
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
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 d8d7502fe0 Integrate and asign prefab 2025-12-03 16:50:59 +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 015b441d88 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-12-03 10:03:22 +07:00
Tungdv 45c503e5e4 fix: update logic move with HP work. 2025-12-02 19:15:37 +07:00
MinhHai 3ad0f7013b Merge branch 'implement_task_UI' into develop 2025-12-02 14:28:33 +07:00
MinhHai a73bacfa87 fix UIPlayer class 2025-12-02 14:28:00 +07:00
HungDK 4760ed3c29 Fix disconnect error when player death before entergame 2025-12-02 11:43:29 +07:00
MinhHai f827878785 Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
2025-12-02 10:25:35 +07:00
MinhHai 039d0a3ddc update logic get notify task from server 2025-12-02 10:22:02 +07:00
Tungdv b05af42643 fix: update logic move with HP work move. 2025-12-01 18:38:29 +07:00
Tungdv 01e8e4af67 Merge branch 'feature/movefix' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-01 17:29:19 +07:00
Tungdv f8433313e7 Merge branch 'develop' into feature/movefix 2025-12-01 17:22:00 +07:00
NguyenVanDat 3c347adb0f fix hpwork move 2025-12-01 17:20:36 +07:00
Tungdv d80f3109e4 feat: add logic jump for HP. 2025-12-01 17:20:11 +07:00
HungDK 636469a87f Push missing folder 2025-12-01 14:50:48 +07:00
HungDK 7ba4c0fed5 Update equipment preview show, hide 2025-12-01 14:49:41 +07:00
NguyenVanDat 2715dcaa9c get vfx path 2025-11-28 08:57:53 +07:00