Commit Graph

258 Commits

Author SHA1 Message Date
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
2025-12-10 17:21:20 +07:00
Tungdv ebdb99865d fix: update move air. 2025-12-09 19:53:50 +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
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +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 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 b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +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
Tungdv 45c503e5e4 fix: update logic move with HP work. 2025-12-02 19:15:37 +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
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
NguyenVanDat 2715dcaa9c get vfx path 2025-11-28 08:57:53 +07:00
VDH 1aa3de6c15 hpworkmove 2025-11-26 14:15:05 +07:00
VDH c4347e5045 Merge branch 'develop' into feature/movefix
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-11-26 09:28:25 +07:00
Le Duc Anh 28bdab60d8 load else player 2025-11-25 18:52:32 +07:00
Le Duc Anh 50812676ce setup for build 2025-11-25 17:41:10 +07:00
NguyenVanDat d36ef36915 refactor hit vfx 2025-11-25 16:37:26 +07:00
Le Duc Anh ea5ab318c5 change camera angle. Add more monster 2025-11-25 15:48:33 +07:00
Le Duc Anh 686f16fc70 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 15:14:40 +07:00
Tungdv be5bc82c7c fix: update anim stop move when finish auto move to target. 2025-11-25 15:12:54 +07:00
VDH ddb50c3c4c st 2025-11-25 14:42:44 +07:00
VDH 8acf91dcb3 conflict 2025-11-25 14:28:04 +07:00
Le Duc Anh a3eb81f8ac Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 14:02:28 +07:00
Le Duc Anh d016980696 fade out enemies 2025-11-25 14:02:07 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
NguyenVanDat e7d61b4694 fix character animation 2025-11-24 16:50:13 +07:00
NguyenVanDat a809a98e27 fix work stand and character animation 2025-11-24 16:46:11 +07:00
VDH f68115eddf st 2025-11-24 14:04:27 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +07:00
Le Duc Anh 95f2386397 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-21 16:04:56 +07:00
Le Duc Anh 30e636267c udpate matter flow 2025-11-21 16:01:11 +07:00
NguyenVanDat d80f7f4f07 Merge branch 'develop' into feature/refactor-game-run 2025-11-21 11:50:36 +07:00
NguyenVanDat 8f5673c68e refactor game run and fix game flow 2025-11-21 11:48:39 +07:00
Tungdv 939b714ced Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
2025-11-21 11:45:16 +07:00
MinhHai 0bcacf1599 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-21 11:31:09 +07:00
MinhHai e1bfd720e3 update logic receive Command.TASK_VER_DATA 2025-11-21 11:29:34 +07:00