 VDH
|
dd476f0512
|
Merge branch 'develop' into feature/loopanimation
|
2025-12-22 17:37:40 +07:00 |
|
|
MinhHai
|
d74f86443a
|
Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ
|
2025-12-22 11:40:03 +07:00 |
|
|
Tungdv
|
d698c0d3cf
|
Merge remote-tracking branch 'origin/develop' into feature/HP_jump
|
2025-12-22 11:02:22 +07:00 |
|
|
Tungdv
|
12b6861731
|
fix: revert commit fix jump.
|
2025-12-22 11:00:41 +07:00 |
|
|
VDH
|
1683d61c66
|
animation
|
2025-12-22 10:53:17 +07:00 |
|
|
VDH
|
a980f64fbd
|
fix animation with weapon
|
2025-12-19 12:44:49 +07:00 |
|
|
MinhHai
|
807fbdf6b0
|
Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ
|
2025-12-18 22:28:28 +07:00 |
|
|
MinhHai
|
9edb6682b8
|
complete cache 4 class_properties via ID
|
2025-12-18 22:27:05 +07:00 |
|
|
VDH
|
eaaeaf6734
|
npc douple fix
|
2025-12-18 17:23:18 +07:00 |
|
|
Tungdv
|
98e4ba6088
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
|
2025-12-17 20:53:30 +07:00 |
|
|
Tungdv
|
aad6933021
|
fix: fix bug jump on ground.
|
2025-12-17 20:49:38 +07:00 |
|
|
NguyenVanDat
|
818b1589d4
|
Merge branch 'develop' into feature/task-emote
|
2025-12-17 17:31:15 +07:00 |
|
|
VDH
|
04cbdb4934
|
Merge branch 'develop' into feature/skill-data
|
2025-12-17 17:18:28 +07:00 |
|
|
VDH
|
ab7051b2ca
|
done fix anim npc and hostplayer attack anim
|
2025-12-17 17:17:16 +07:00 |
|
|
NguyenVanDat
|
1bc54fa74a
|
fix pose action
|
2025-12-17 17:16:55 +07:00 |
|
|
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 |
|
|
VDH
|
f0c190d9f1
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2025-12-16 11:56:27 +07:00 |
|
|
VDH
|
438f560346
|
done fix animation npc move trans to stand
|
2025-12-16 11:01:27 +07:00 |
|
|
VDH
|
54b1cc7127
|
fix animation processing
|
2025-12-16 09:30:09 +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 |
|