Commit Graph

45 Commits

Author SHA1 Message Date
MinhHai 219c87f469 add new pack: Editor Attributes, complete GoTo cmd 2026-01-09 15:01:29 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 7e83b578fe coool down ui 2026-01-05 18:25:27 +07:00
VDH fe3eacbc91 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-05 15:30:29 +07:00
VDH 2d3c9a96ef fix bug can't use skill when player is far from target 2026-01-05 15:27:12 +07:00
NguyenVanDat ce03f2d38a update process bar 2026-01-05 11:31:22 +07:00
NguyenVanDat 397cb6b98f deactive process as default 2026-01-05 09:40:01 +07:00
NguyenVanDat 22742363ce Merge branch 'develop' into feature/mine-processing 2026-01-05 09:31:38 +07:00
NguyenVanDat 38348f8e10 add and show mining progress run with real time 2026-01-05 09:27:00 +07:00
HungDK e616f17e3f Update task ui 2025-12-30 11:12:03 +07:00
HungDK 585f92225e Merge branch 'develop' into implement_task_UI 2025-12-17 11:37:07 +07:00
MinhHai 8dee1d3541 fix DlgTask prefab: change name 2025-12-17 11:23:10 +07:00
HungDK fa7b374442 Add task icon, correct show logic, dlg ui feature 2025-12-17 11:07:50 +07:00
Tungdv eda56b6850 Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-17 10:41:27 +07:00
Tungdv 97bf433381 fix: update logic move on ground.
feat: add btn jump.
2025-12-17 10:40:29 +07:00
NguyenVanDat a786ee236e Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_GPDataType.cs
2025-12-16 11:59:08 +07:00
Tungdv b7cb744c35 fix: update move for HP. 2025-12-15 17:55:58 +07:00
NguyenVanDat e46bcbb56a show dummy DlgSubSkill 2025-12-13 15:04:27 +07:00
NguyenVanDat cdb18dd691 Merge branch 'implement_task_UI' into feature/task-emote
# Conflicts:
#	Assets/PerfectWorld/Scene/TaskTest.unity
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Task/TaskTest.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2025-12-13 14:19:19 +07:00
NguyenVanDat a228a5ce1f add action emote 2025-12-13 14:12:09 +07:00
MinhHai ba94ec3416 add DlgTask into UI System 2025-12-12 15:46:38 +07:00
Tungdv 21f41ecae1 feat: add rotation cam. 2025-12-10 17:18:38 +07:00
Le Duc Anh 6759873670 default UI 2025-11-25 15:53:22 +07:00
HungDK be3eb81d40 Update UI 2025-11-25 15:02:17 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
VDH f8a43f86b4 fix after merge 2025-11-24 11:17:54 +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
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
MinhHai e1bfd720e3 update logic receive Command.TASK_VER_DATA 2025-11-21 11:29:34 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
MinhHai d992dcbc5f Merge remote-tracking branch 'origin/feature/hp_interact_npc_merge' into implement_task_UI 2025-11-17 19:14:26 +07:00
MinhHai 884a0274af fix Search Task feature 2025-11-17 19:07:15 +07:00
Tungdv fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
2025-11-17 14:50:24 +07:00
MinhHai 75e897d315 update visual for prefab UI 2025-11-16 16:45:34 +07:00
MinhHai 7798c1a909 show npc name on UI 2025-11-14 18:08:46 +07:00
NguyenVanDat daeabf3aca Merge remote-tracking branch 'origin/develop' into feature/add-vfx 2025-11-13 09:13:15 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2025-11-12 19:39:19 +07:00
MinhHai 2c3c44de4e update Task: complete read task templ, log task name and description on UI, add sprites asset 2025-11-12 16:56:35 +07:00
NguyenVanDat f1e15cdc2d apply final level up vfx 2025-11-12 14:05:00 +07:00
VDH e01c923e16 ref 2025-11-11 14:13:14 +07:00
HungDK 9e825620cd Fix GameController position in scene 2025-11-04 15:11:50 +07:00
VDH 42399c1a70 for merge 2025-11-04 10:43:29 +07:00
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00