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

583 Commits

Author SHA1 Message Date
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
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
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
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +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
Tungdv 2087f4f069 Merge branch 'develop' into feature/HP_jump 2025-12-15 17:59:09 +07:00
Tungdv b7cb744c35 fix: update move for HP. 2025-12-15 17:55:58 +07:00
HungDK a3f22af550 Fix duplicate and wrong argument 2025-12-15 16:20:38 +07:00
HungDK 6c25b1f0dc Add abandon task option 2025-12-15 16:18:51 +07:00
HungDK 341a8bfde9 Remove duplicate struct 2025-12-15 16:17:22 +07:00
VungochaiC7 ab563a6dba Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/color-text 2025-12-15 13:38:34 +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
Le Duc Anh 9378866567 add 4 more player models 2025-12-15 00:12:16 +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 fa177ec734 Merge branch 'develop' into feature/skill-data 2025-12-13 17:50:04 +07:00
Le Duc Anh 3984170c6f remove NPC Disappeared events 2025-12-13 17:49:37 +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
HungDK 3279b322b2 Fixing missing task search method, get task status 2025-12-13 16:35:45 +07:00
NguyenVanDat dd64a49dd6 check null shortcut 2025-12-13 16:10:21 +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 10fd731948 st 2025-12-13 10:43:00 +07:00
VDH 89c7b550f0 convert all skill in stub1 2025-12-12 18:06:48 +07:00
VungochaiC7 b4777baca3 Update Prefabs Inventory UI, add drag-and-drop equipment functionality. 2025-12-12 16:42:48 +07:00
MinhHai ba94ec3416 add DlgTask into UI System 2025-12-12 15:46:38 +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
MinhHai 175790f370 Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award 2025-12-11 11:37:16 +07:00
Chomper9981 a7dcbd4e69 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-11 10:01:53 +07:00
VDH 45f69c9f44 skill ui 2025-12-10 18:17:34 +07:00
Tungdv 5ebf4fb49b Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/Scripts/CECGameRun.cs
 2025-12-10 17:21:20 +07:00
Tungdv 21f41ecae1 feat: add rotation cam. 2025-12-10 17:18:38 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
Tungdv ebdb99865d fix: update move air. 2025-12-09 19:53:50 +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