 NguyenVanDat
|
1bc54fa74a
|
fix pose action
|
2025-12-17 17:16:55 +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 |
|
|
Tungdv
|
df792f0560
|
Fix: update check brush.
|
2025-12-16 17:32:16 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
Tungdv
|
ead70ecfea
|
fix: update move air.
|
2025-12-08 19:10:23 +07:00 |
|
|
VDH
|
2410af3078
|
done pos skill
|
2025-12-08 17:49:57 +07:00 |
|
|
Tungdv
|
4c863a8ee8
|
fix: update move fly and swim.
|
2025-12-06 18:49:21 +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 |
|
|
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
|
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 |
|
|
VDH
|
5c42c9792b
|
test buff skill
|
2025-12-02 16:46:47 +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
|
d80f3109e4
|
feat: add logic jump for HP.
|
2025-12-01 17:20:11 +07:00 |
|
|
VDH
|
8acf91dcb3
|
conflict
|
2025-11-25 14:28:04 +07:00 |
|
|
NguyenVanDat
|
ae391ad0c5
|
make walk run is true as default
|
2025-11-24 17:05:04 +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 |
|
|
Le Duc Anh
|
f46b917dd8
|
fix the missing addressable objects
|
2025-11-21 16:18:19 +07:00 |
|
|
VDH
|
c37ec4d136
|
Push hoang current work
|
2025-11-21 10:18:08 +07:00 |
|
|
NguyenVanDat
|
e8a76c0c58
|
fix character animation config name
|
2025-11-19 10:42:24 +07:00 |
|
|
VDH
|
a30427e3f5
|
Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECHostPlayer_Inventory.cs
|
2025-11-19 10:35:54 +07:00 |
|
|
Le Duc Anh
|
45024b5761
|
turn off default equipments if needed
|
2025-11-18 22:04:56 +07:00 |
|
|
VDH
|
8ee2477681
|
get config
|
2025-11-18 18:54:56 +07:00 |
|
|
VDH
|
de738b8f16
|
Merge branch 'feature/skillui' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
|
2025-11-18 09:44:10 +07:00 |
|
|
Tungdv
|
afa9f882a9
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-17 19:06:14 +07:00 |
|
|
Tungdv
|
86c304f43a
|
fix: update logic select option dialog npc.
|
2025-11-17 18:52:07 +07:00 |
|
|
NguyenVanDat
|
e59127a425
|
catch message start and stop attack
|
2025-11-17 18:24:12 +07:00 |
|
|
Tungdv
|
fa1bd3d076
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
|
2025-11-17 14:50:24 +07:00 |
|
|
NguyenVanDat
|
16fadfe2a4
|
fix play animation
|
2025-11-15 13:54:29 +07:00 |
|
|
VDH
|
f86cce30e9
|
11/14
|
2025-11-14 19:03:42 +07:00 |
|