Commit Graph

630 Commits

Author SHA1 Message Date
VDH eaaeaf6734 npc douple fix 2025-12-18 17:23:18 +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 107c5a3631 add VFX 2025-12-17 18:07:46 +07: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
NguyenVanDat 58b3c3640a update log 2025-12-17 17:30:27 +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
Le Duc Anh 949e815680 Merge remote-tracking branch 'origin/develop' into internal-testing-build 2025-12-17 15:51:49 +07:00
Le Duc Anh 7f145625fd temporary stop loading the data files 2025-12-17 15:50:26 +07:00
HungDK 664fd9c41d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-17 15:07:01 +07:00
HungDK 82d40516cb Fix incorrect ui value symbol display 2025-12-17 15:06:57 +07:00
Le Duc Anh 2b84911a68 optimize loading 2025-12-17 14:20:23 +07:00
NguyenVanDat 074c4e9bc3 remove not use log 2025-12-17 14:06:12 +07:00
Le Duc Anh a7186f3d37 move tasks file to persistent path 2025-12-17 13:53:51 +07:00
HungDK 823479d3fb Add raycast to collect matter 2025-12-17 12:36:50 +07:00
NguyenVanDat a7c22eb396 Merge branch 'develop' into feature/task-emote
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-17 11:41:25 +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
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
MinhHai 2aed1dd794 Merge branch 'implement_task_UI' of https://git.brew.monster/Unity/perfect-world-unity into implement_task_UI 2025-12-17 10:49:35 +07:00
MinhHai c15108fcf5 cache TaskTempl Data into SO 2025-12-17 10:49:19 +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
HungDK e2324c634d Add gametime 2025-12-17 10:01:03 +07:00
NguyenVanDat 07b6009568 Merge branch 'develop' into feature/task-emote 2025-12-17 09:44:36 +07:00
Le Duc Anh 7edb881cb3 add matte morel 2025-12-16 20:13:56 +07:00
Le Duc Anh 84e32e56b3 add protocol 2025-12-16 19:35:42 +07:00
NguyenVanDat d8c4bd5e4c Merge branch 'implement_task_UI' into feature/task-emote 2025-12-16 18:28:53 +07:00
NguyenVanDat 61b54ee1ba wave hand emote 2025-12-16 18:28:01 +07:00
MinhHai ff50d807a7 fix load task on editor 2025-12-16 18:25:32 +07:00
NguyenVanDat 67bbf2d2ba fix preload task 2025-12-16 18:19:34 +07:00
MinhHai bf3b364eef Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-12-16 17:32:48 +07:00
Tungdv df792f0560 Fix: update check brush. 2025-12-16 17:32:16 +07:00
NguyenVanDat f99c516cdb Merge branch 'develop' into feature/loading-task 2025-12-16 16:55:12 +07:00
NguyenVanDat 717eef48cb finish add summy loading task UI 2025-12-16 16:53:01 +07:00
HungDK 15bf9e0ddd Merge branch 'implement_task_UI' into feature/skill-hung 2025-12-16 16:37:34 +07:00
HungDK c35e464a1d Fixing wrong logic check task and subtask 2025-12-16 16:37:03 +07:00
NguyenVanDat b5b9730b3a fix emote conflict 2025-12-16 16:01:30 +07:00
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +07:00
HungDK 5f04ba4fd3 Merge branch 'implement_task_UI' into feature/skill-hung 2025-12-16 14:05:15 +07:00
VungochaiC7 b4d6b4bec3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/color-text 2025-12-16 13:55:38 +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
HungDK e124f2fab1 Implement write task struct data logic 2025-12-16 11:02:28 +07:00
VDH 438f560346 done fix animation npc move trans to stand 2025-12-16 11:01:27 +07:00