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

870 Commits

This Branch
This Branch
All Branches
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
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
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
NguyenVanDat e62b2d9e3a add unitask 2025-12-16 09:42:07 +07:00
tungdv 0f23f349b9 Merge pull request 'fix move HP on Ground.' (#81) from feature/HP_jump into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/81
 2025-12-15 11:00:39 +00: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 f1dc674b2f Merge pull request 'fix move on ground.' (#80) from feature/HP_jump into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/80
 2025-12-13 12:41:32 +00: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
Le Duc Anh 0df2f45179 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-13 18:46:55 +07:00
Le Duc Anh 81853da600 add more monster 2025-12-13 18:45:42 +07:00
hoangvd 4fd50a2b0b Merge pull request 'feature/skill-data' (#79) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/79
 2025-12-13 10:52:53 +00: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 d61478f161 Merge branch 'develop' into feature/skill-data 2025-12-12 18:59:26 +07:00
tungdv c6a13ee469 Merge pull request 'Update rotation cam' (#78) from feature/HP_jump into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/78
 2025-12-12 11:17:52 +00:00
Tungdv 65cb2fa69d Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-12 18:15:06 +07:00
VDH e629523ff1 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/Scenes/a61.unity
 2025-12-12 18:14:14 +07:00
Tungdv 4c6a49c238 fix: update dir move HP with cam. 2025-12-12 18:14:01 +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 0bd16fce24 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-12-12 15:47:14 +07:00
MinhHai ba94ec3416 add DlgTask into UI System 2025-12-12 15:46:38 +07:00