duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
920 Commits 13 Branches 0 Tags
93d0cbd634a5442f0d38183e2b2d8572196dc972
Commit Graph

348 Commits

Author SHA1 Message Date
Le Duc Anh 93d0cbd634 show UI task 2025-12-17 17:32:01 +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
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
VDH f20c5a123e st 2025-12-13 16:54:52 +07:00
VDH 9b0c3b3dc0 fix 2025-12-13 15:30:53 +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
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
NguyenVanDat 3feced81fc Merge branch 'develop' into feature/task-emote 2025-12-12 10:54:44 +07:00
HungDK a57e5b4f32 Update task, filtering all task can take 2025-12-11 17:41:20 +07:00
VDH 504cdb11d6 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/World/CECWorld.cs
#	Assets/Scenes/a61.unity
 2025-12-11 14:14:54 +07:00
MinhHai de05654bd1 Merge remote-tracking branch 'origin/implement_task_UI' into feature/task-npc-give-award 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
 2025-12-11 13:45:44 +07:00
MinhHai 09c3b5de28 complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory 2025-12-11 11:41:54 +07:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
 2025-12-10 17:21:20 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
Tungdv ead70ecfea fix: update move air. 2025-12-08 19:10:23 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +07:00
VDH 2410af3078 done pos skill 2025-12-08 17:49:57 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
NguyenVanDat e973260dee fix addressable release asset 2025-12-08 09:48:37 +07:00
VDH a48ac9baf8 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-06 16:41:34 +07:00
VDH e19be27a1a skill 2025-12-06 16:35:34 +07:00
Tungdv be85cf1d91 Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-06 14:41:00 +07:00
Tungdv c7c34b373c fix: update data info for HP. 
fix: update move fly and swim.
 2025-12-06 14:14:55 +07:00
Tungdv f330d9606c fix: update logic jump move for HP. 2025-12-05 21:09:16 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 2d3f98bb2c fix after merge 2025-12-05 10:16:08 +07:00
Tungdv 1d7181c1fc fix: update logic jump move. 2025-12-04 20:06:02 +07:00
Tungdv b5aeba251d fix: update logic jump stand for HP. 2025-12-04 19:18:58 +07:00
VDH 3b5386840d fix after merge 2025-12-04 18:12:17 +07:00
VDH 47f4033dff Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
#	Assets/PerfectWorld/Scripts/Managers/CECManager.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2025-12-04 17:58:10 +07:00
VDH 0529114779 done skill bless 2025-12-04 17:26:42 +07:00