 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
|
f20c5a123e
|
st
|
2025-12-13 16:54:52 +07:00 |
|
|
VDH
|
9b0c3b3dc0
|
fix
|
2025-12-13 15:30:53 +07:00 |
|
|
VDH
|
d61478f161
|
Merge branch 'develop' into feature/skill-data
|
2025-12-12 18:59:26 +07:00 |
|
|
Tungdv
|
4c6a49c238
|
fix: update dir move HP with cam.
|
2025-12-12 18:14:01 +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 |
|
|
Tungdv
|
5ebf4fb49b
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/Scripts/CECGameRun.cs
|
2025-12-10 17:21:20 +07:00 |
|
|
VDH
|
972104970d
|
copnvert
|
2025-12-09 19:53:32 +07:00 |
|
|
Tungdv
|
ead70ecfea
|
fix: update move air.
|
2025-12-08 19:10:23 +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 |
|
|
HungDK
|
892d0d3aef
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-08 10:37:03 +07:00 |
|
|
NguyenVanDat
|
e973260dee
|
fix addressable release asset
|
2025-12-08 09:48:37 +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 |
|
|
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 |
|
|
HungDK
|
d4bccfb9fc
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-04 14:46:08 +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 |
|
|
HungDK
|
d8d7502fe0
|
Integrate and asign prefab
|
2025-12-03 16:50:59 +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 |
|
|
NguyenVanDat
|
d36ef36915
|
refactor hit vfx
|
2025-11-25 16:37:26 +07:00 |
|