 Tungdv
|
9aa995d504
|
fix: fix bug auto move when click on screen.
|
2025-12-26 11:49:28 +07:00 |
|
|
VDH
|
2cd0306744
|
Merge branch 'develop' into feature/TaskThread
# Conflicts:
# Assets/AddressableAssetsData/AssetGroups/configuration.asset
|
2025-12-26 10:22:37 +07:00 |
|
|
Tungdv
|
9926f8956c
|
Merge branch 'develop' into feature/HP_jump
|
2025-12-25 18:15:49 +07:00 |
|
|
Tungdv
|
b766229425
|
fix: update logic jump HP on ground.
|
2025-12-25 18:13:21 +07:00 |
|
|
VDH
|
a72cb120ff
|
task addreasble
|
2025-12-25 16:35:28 +07:00 |
|
|
Le Duc Anh
|
238910f689
|
add GFX attack
|
2025-12-24 16:55:37 +07:00 |
|
|
HungDK
|
9e65e01b7c
|
Reapply "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 2d6a15eb40.
|
2025-12-24 15:06:43 +07:00 |
|
|
HungDK
|
2d6a15eb40
|
Revert "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 59b66967e8, reversing
changes made to e62b2d9e3a.
|
2025-12-24 13:45:34 +07:00 |
|
|
VDH
|
e5e3f35559
|
fix bug anim npc monster
|
2025-12-24 09:50:38 +07:00 |
|
|
VDH
|
4b75e854f3
|
Merge branch 'develop' into feature/loopanimation
# Conflicts:
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/Scenes/a61.unity
|
2025-12-23 17:55:21 +07:00 |
|
|
VDH
|
9dc80fe5f0
|
bo debug
|
2025-12-23 17:47:47 +07:00 |
|
|
VDH
|
824f713c37
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-12-23 17:33:14 +07:00 |
|
|
VDH
|
2b12799546
|
fix npc double
|
2025-12-23 17:33:09 +07:00 |
|
|
NguyenVanDat
|
650777dc26
|
Merge branch 'develop' into feature/do-emote-else-player
|
2025-12-23 16:47:17 +07:00 |
|
|
NguyenVanDat
|
d3c3f1ff50
|
finished fix else player emote
|
2025-12-23 16:45:55 +07:00 |
|
|
HungDK
|
4b4c544898
|
Merge branch 'develop' into feature/life-skill
|
2025-12-23 14:27:14 +07:00 |
|
|
HungDK
|
6d5b905c61
|
Fix pickup money
|
2025-12-23 14:23:48 +07:00 |
|
|
HungDK
|
ffb88a57ea
|
Add pickup item, gather logic of movement, anim
|
2025-12-23 10:31:20 +07:00 |
|
|
HungDK
|
eb8980943c
|
Add trace to gather matter and gathering matter
|
2025-12-22 18:06:20 +07:00 |
|
|
HungDK
|
1aaec5865d
|
Update EC_ManMatter.cs
|
2025-12-22 17:55:10 +07:00 |
|
|
HungDK
|
9fcbdf7e5c
|
Add check matter IsMatter
|
2025-12-22 17:54:49 +07:00 |
|
|
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 |
|
|
NguyenVanDat
|
1dd0f89d60
|
Merge branch 'develop' into feature/do-emote-else-player
|
2025-12-22 09:19:31 +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 |
|
|
NguyenVanDat
|
09e7482889
|
update else player emote
|
2025-12-18 15:34:04 +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 |
|