Commit Graph

273 Commits

Author SHA1 Message Date
HungDK c00a68d068 Add navigate work, event 2026-01-09 15:17:50 +07:00
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-09 11:04:53 +07:00
VDH fb4b9b5d90 Merge branch 'develop' into feature/skill-data 2026-01-09 09:46:34 +07:00
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
NguyenVanDat 80d98804fc fix mining process slider 2026-01-07 16:40:16 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
VDH 5471c68071 Merge branch 'develop' into feature/skill-data 2026-01-07 09:32:28 +07:00
TungDV d4883f39dc Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-06 22:35:23 +07:00
Tungdv f9b9432f20 fix: update logic swim hp. 2026-01-06 19:04:58 +07:00
HungDK e5c09167fb Fix unstable reach site task completion 2026-01-06 16:59:14 +07:00
VDH 9fed589a9e cool down skill ui 2026-01-06 13:35:43 +07:00
Tungdv f2acc5ca2e fix: update swim hp. 2026-01-05 18:44: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 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
Tungdv e2d640b508 fix: update logic swim (error in get dir == vector3.zero when swim). 2026-01-02 14:10:57 +07:00
Tungdv a4316bfd7d fix: update logic swim hp. 2025-12-31 17:19:04 +07:00
VDH c8db1da837 adjust a little bit 2025-12-29 17:52:05 +07:00
VDH a825db4122 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-29 17:39:33 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
HungDK 53f96ff6a4 Merge branch 'develop' into feature/addressable-data 2025-12-29 11:19:17 +07:00
HungDK 6b18cadfd8 Convert auto select logic 2025-12-29 11:16:21 +07:00
NguyenVanDat 308c4c8b92 do logic host player mining 2025-12-26 11:47:55 +07:00
Tungdv b766229425 fix: update logic jump HP on ground. 2025-12-25 18:13:21 +07:00
HungDK 4b4c544898 Merge branch 'develop' into feature/life-skill 2025-12-23 14:27:14 +07:00
HungDK fb6f3b3c13 Add CanTakeItem and FindMineTool method 2025-12-22 17:49:59 +07:00
Tungdv 12b6861731 fix: revert commit fix jump. 2025-12-22 11:00:41 +07:00
Tungdv 98e4ba6088 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
2025-12-17 20:53:30 +07:00
Tungdv aad6933021 fix: fix bug jump on ground. 2025-12-17 20:49:38 +07:00
NguyenVanDat 818b1589d4 Merge branch 'develop' into feature/task-emote 2025-12-17 17:31:15 +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 1bc54fa74a fix pose action 2025-12-17 17:16:55 +07:00
NguyenVanDat 717eef48cb finish add summy loading task UI 2025-12-16 16:53:01 +07:00
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +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
HungDK ad72ea5106 Merge branch 'implement_task_UI' into feature/skill-hung 2025-12-15 10:32:12 +07:00
MinhHai 028563e660 Merge remote-tracking branch 'origin/implement_task_UI' into feature/fix-dyn-tasks 2025-12-15 10:01:23 +07:00
MinhHai 5646c3be62 add DlgTask into UIManager, fix load DynTask logic 2025-12-15 10:01:00 +07:00
Tungdv c43eac8599 Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-12-13 19:17:18 +07:00
Tungdv d1d59c6d04 fix: fix bug move on ground. 2025-12-13 19:11:38 +07:00
VDH 60d0a52d4e fix 2 struct 2025-12-13 17:49:34 +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
VDH d61478f161 Merge branch 'develop' into feature/skill-data 2025-12-12 18:59:26 +07:00
Tungdv 4c6a49c238 fix: update dir move HP with cam. 2025-12-12 18:14:01 +07:00