Commit Graph

908 Commits

Author SHA1 Message Date
tungdv c15f7f4e36 Merge pull request 'fix: update icon jump btn.' (#83) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/83
2025-12-17 05:07:40 +00:00
Tungdv e2ca56054c fix: update icon jump btn. 2025-12-17 12:07:09 +07:00
NguyenVanDat 7caea6cc3d add action button 2025-12-17 11:50:26 +07:00
NguyenVanDat b7e8533ebf Merge branch 'develop' into feature/task-emote 2025-12-17 11:45:21 +07:00
HungDK 9effcf2673 Add task btn 2025-12-17 11:41:40 +07:00
NguyenVanDat a7c22eb396 Merge branch 'develop' into feature/task-emote
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-17 11:41:25 +07:00
NguyenVanDat c91b2347cf add emote icon 2025-12-17 11:38:01 +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 6c0d3d80db Merge pull request 'add button jump' (#82) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/82
2025-12-17 03:45:02 +00:00
Tungdv f13f739a5a fix: update button jump in scene a61. 2025-12-17 10:43:47 +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 4065ed3c52 Merge branch 'implement_task_UI' into feature/task-emote 2025-12-16 18:20:09 +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 b2110adf46 Merge branch 'develop' into feature/task-emote 2025-12-16 16:59:42 +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 c05ff2744c Merge branch 'implement_task_UI' into feature/task-emote 2025-12-16 15:48:25 +07:00
hainh 59b66967e8 Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/77
2025-12-16 08:42:12 +00:00
VungochaiC7 3c33170b8b update prefabs SelectCharacter (Scroll role) 2025-12-16 15:39: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 52a7394e78 Merge branch 'implement_task_UI' into feature/task-emote 2025-12-16 11:59:36 +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
HungDK e124f2fab1 Implement write task struct data logic 2025-12-16 11:02:28 +07:00
HungDK 7184ab3ad3 Update ui task 2025-12-16 10:58:47 +07:00
HungDK a6d970d0be Implement deserialize logic for data of new, complete, giveup task 2025-12-16 10:58:09 +07:00
HungDK f647e578ad Implement RealignTask logic and update monster killed count real timre 2025-12-16 10:45:25 +07:00
HungDK 8822775d6a Implement TASK_SVR_NOTIFY_STORAGE notify 2025-12-16 10:43:12 +07:00
HungDK dac9753570 Fix condition to follow cpp code 2025-12-16 10:42:40 +07:00
HungDK 6141971ddf Add handle storage task data method 2025-12-16 10:41:31 +07:00
NguyenVanDat 9777ac78c5 add unitask 2025-12-16 09:45:42 +07:00