Commit Graph

389 Commits

Author SHA1 Message Date
NguyenVanDat 80d98804fc fix mining process slider 2026-01-07 16:40:16 +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 e6aeaad00f Bind attack, interact btn 2025-12-29 16:56:42 +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 668a2aacd1 Merge branch 'develop' into feature/mine-processing 2025-12-26 11:48:51 +07:00
NguyenVanDat 308c4c8b92 do logic host player mining 2025-12-26 11:47:55 +07:00
HungDK ce2d81a43f Change load addressable script 2025-12-26 10:10:17 +07:00
Tungdv b766229425 fix: update logic jump HP on ground. 2025-12-25 18:13:21 +07:00
VDH 4b75e854f3 Merge branch 'develop' into feature/loopanimation
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scenes/a61.unity
2025-12-23 17:55: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
VDH dd476f0512 Merge branch 'develop' into feature/loopanimation 2025-12-22 17:37:40 +07:00
VDH d5fdcc73b3 fix anim 2025-12-22 13:58:58 +07:00
Tungdv 12b6861731 fix: revert commit fix jump. 2025-12-22 11:00:41 +07:00
VDH a980f64fbd fix animation with weapon 2025-12-19 12:44:49 +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
anhld e71338200f Merge pull request 'internal-testing-build' (#86) from internal-testing-build into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/86
2025-12-17 11:10:43 +00:00
Le Duc Anh 93d0cbd634 show UI task 2025-12-17 17:32:01 +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 c118781f85 add logic to wave hand button 2025-12-17 14:18:10 +07:00
NguyenVanDat c91b2347cf add emote icon 2025-12-17 11:38:01 +07:00
NguyenVanDat 52537d511c Merge branch 'implement_task_UI' into feature/task-emote 2025-12-17 11:20:27 +07:00
HungDK fa7b374442 Add task icon, correct show logic, dlg ui feature 2025-12-17 11:07:50 +07:00
NguyenVanDat 61b54ee1ba wave hand emote 2025-12-16 18:28:01 +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
VDH f0c190d9f1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
2025-12-16 11:56:27 +07:00
VDH 54b1cc7127 fix animation processing 2025-12-16 09:30:09 +07:00