 Tungdv
|
5ebf4fb49b
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/Scripts/CECGameRun.cs
|
2025-12-10 17:21:20 +07:00 |
|
|
Tungdv
|
ead70ecfea
|
fix: update move air.
|
2025-12-08 19:10:23 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Le Duc Anh
|
fc9a75f70a
|
rotate weapon in the code
|
2025-11-24 22:35:51 +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
|
9418884c28
|
fix skill after merge
|
2025-11-24 11:36:21 +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
|
ae94300b0f
|
st
|
2025-11-24 10:21:08 +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 |
|
|
MinhHai
|
7ba8ca49ba
|
fix EC_Game: get GameRun, cache TaskData before playmode
|
2025-11-22 10:04:50 +07:00 |
|
|
Tungdv
|
9129784de0
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-21 17:07:50 +07:00 |
|
|
Tungdv
|
45ad9bc162
|
fix: Update logic select task in dlgnpc.
|
2025-11-21 17:03:39 +07:00 |
|
|
Le Duc Anh
|
95f2386397
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-21 16:04:56 +07:00 |
|