duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,777 Commits 13 Branches 0 Tags
c851c46292fa1faa5360310c8ca4b66efdc331ce
Commit Graph

461 Commits

Author SHA1 Message Date
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
NguyenVanDat 111bd15e71 Merge branch 'feature/HP_jump' into feature/else-jump-animation 2025-12-04 09:38:56 +07:00
HungDK 6f25555cac Fix close service dlg NPC 2025-12-03 18:34:26 +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
Tungdv 015b441d88 Merge branch 'develop' into feature/HP_jump 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-03 10:03:22 +07:00
Tungdv 45c503e5e4 fix: update logic move with HP work. 2025-12-02 19:15:37 +07:00
VDH d318d36ad5 skill fix 2025-12-02 18:16:53 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
VDH 16ca5b87b8 Merge remote-tracking branch 'origin/develop' into feature/skill-data 2025-12-02 13:51:10 +07:00
VDH 8f8e7f010c continue with bless skill 2025-12-02 13:50:44 +07:00
HungDK 4760ed3c29 Fix disconnect error when player death before entergame 2025-12-02 11:43:29 +07:00
Tungdv b05af42643 fix: update logic move with HP work move. 2025-12-01 18:38:29 +07:00
Tungdv 01e8e4af67 Merge branch 'feature/movefix' into feature/HP_jump 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-12-01 17:29:19 +07:00
Tungdv f8433313e7 Merge branch 'develop' into feature/movefix 2025-12-01 17:22:00 +07:00
NguyenVanDat 3c347adb0f fix hpwork move 2025-12-01 17:20:36 +07:00
Tungdv d80f3109e4 feat: add logic jump for HP. 2025-12-01 17:20:11 +07:00
HungDK 7ba4c0fed5 Update equipment preview show, hide 2025-12-01 14:49:41 +07:00
VDH 1aa3de6c15 hpworkmove 2025-11-26 14:15:05 +07:00
VDH c4347e5045 Merge branch 'develop' into feature/movefix 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-26 09:28:25 +07:00
Le Duc Anh 22cd6cb981 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 16:23:13 +07:00
HungDK 31f4012bec done health bar 2025-11-25 16:20:55 +07:00
Le Duc Anh 2ade91ee87 use correct attack range 2025-11-25 16:12:01 +07:00
VDH 8acf91dcb3 conflict 2025-11-25 14:28:04 +07:00
VDH 41005a7244 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 12:10:49 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
Tungdv b16df9f4c2 fix: double click to attack enemy. 2025-11-25 11:09:23 +07:00
NguyenVanDat a809a98e27 fix work stand and character animation 2025-11-24 16:46:11 +07:00
NguyenVanDat 5864ce132b fix bug: after finished attack player do not play idle animation 2025-11-24 16:08:20 +07:00
VDH 2f9acd3e69 done skill 2025-11-24 12:08:59 +07:00
VDH 6b7537ca3e fix bug mege 2025-11-24 11:10:38 +07:00
VDH 1e34f48215 fix merge 2025-11-24 11:09:11 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2025-11-24 10:16:07 +07:00
MinhHai beb12c8723 update logic NotifyServer of class TaskClient 2025-11-22 18:58:40 +07:00
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
Tungdv 1951047c61 fix: update logic button back and close in dlgnpc. 2025-11-21 11:37:07 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Tungdv 17edc61e60 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-20 18:37:00 +07:00
Tungdv ceec82ffc5 fix: update logic select option in dlgnpc. 2025-11-20 18:18:06 +07:00
HungDK a35cd6d0e7 Update EC_Invtr 2025-11-20 13:47:10 +07:00
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +07:00
Tungdv 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00
NguyenVanDat e5fdb874c1 dummy change SelectGfx prefab 2025-11-19 11:50:23 +07:00
NguyenVanDat e8a76c0c58 fix character animation config name 2025-11-19 10:42:24 +07:00