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

291 Commits

Author SHA1 Message Date
NguyenVanDat 074c4e9bc3 remove not use log 2025-12-17 14:06:12 +07:00
NguyenVanDat a7c22eb396 Merge branch 'develop' into feature/task-emote 
# Conflicts:
#	Assets/Scenes/a61.unity
 2025-12-17 11:41:25 +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
NguyenVanDat 61b54ee1ba wave hand emote 2025-12-16 18:28:01 +07:00
NguyenVanDat f99c516cdb Merge branch 'develop' into feature/loading-task 2025-12-16 16:55:12 +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
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
Le Duc Anh 9378866567 add 4 more player models 2025-12-15 00:12:16 +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 f20c5a123e st 2025-12-13 16:54:52 +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
NguyenVanDat 3feced81fc Merge branch 'develop' into feature/task-emote 2025-12-12 10:54:44 +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
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 ebdb99865d fix: update move air. 2025-12-09 19:53:50 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +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
NguyenVanDat 157659d320 Merge branch 'develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
 2025-12-08 15:40:11 +07:00
HungDK 892d0d3aef Merge branch 'develop' into feature/npc-shop 2025-12-08 10:37:03 +07:00
HungDK 729bd4ce6e Add button and correct refresh detail item pannel size 2025-12-08 10:26:44 +07:00
NguyenVanDat 659253c3d2 temporary add vfx for weapon attack 2025-12-08 10:23:00 +07:00
HungDK 421bcfd6a6 Update EC_InventoryUI.cs 2025-12-08 10:12:35 +07:00
NguyenVanDat 6be2ef9a39 Merge branch 'develop' into feature/vfx 2025-12-08 10:12:32 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +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 09322bcf41 fix: delete log. 2025-12-06 14:44: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
MinhHai 9bc02e1fef add DlgAward 2025-12-05 22:00:00 +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
NguyenVanDat 593d6374da fix object attack facing to target 2025-12-05 14:21:47 +07:00
VDH 2d3f98bb2c fix after merge 2025-12-05 10:16:08 +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
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +07:00
NguyenVanDat 111bd15e71 Merge branch 'feature/HP_jump' into feature/else-jump-animation 2025-12-04 09:38:56 +07:00
NguyenVanDat 632f6b3813 replace state machine by HPWork 2025-12-03 18:14:10 +07:00
Tungdv aa012f7c60 feat: add hpworkfall. 
fix: update logic jump stand.
 2025-12-03 18:09:38 +07:00