 VDH
|
dd476f0512
|
Merge branch 'develop' into feature/loopanimation
|
2025-12-22 17:37:40 +07:00 |
|
|
VDH
|
d5fdcc73b3
|
fix anim
|
2025-12-22 13:58:58 +07:00 |
|
|
Tungdv
|
12b6861731
|
fix: revert commit fix jump.
|
2025-12-22 11:00:41 +07:00 |
|
|
VDH
|
a980f64fbd
|
fix animation with weapon
|
2025-12-19 12:44:49 +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 |
|
|
anhld
|
e71338200f
|
Merge pull request 'internal-testing-build' (#86) from internal-testing-build into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/86
|
2025-12-17 11:10:43 +00:00 |
|
|
Le Duc Anh
|
93d0cbd634
|
show UI task
|
2025-12-17 17:32:01 +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
|
c118781f85
|
add logic to wave hand button
|
2025-12-17 14:18:10 +07:00 |
|
|
NguyenVanDat
|
c91b2347cf
|
add emote icon
|
2025-12-17 11:38:01 +07:00 |
|
|
NguyenVanDat
|
52537d511c
|
Merge branch 'implement_task_UI' into feature/task-emote
|
2025-12-17 11:20:27 +07:00 |
|
|
HungDK
|
fa7b374442
|
Add task icon, correct show logic, dlg ui feature
|
2025-12-17 11:07:50 +07:00 |
|
|
NguyenVanDat
|
61b54ee1ba
|
wave hand emote
|
2025-12-16 18:28:01 +07:00 |
|
|
NguyenVanDat
|
717eef48cb
|
finish add summy loading task UI
|
2025-12-16 16:53:01 +07:00 |
|
|
NguyenVanDat
|
5a0ad3ad4f
|
loading task ui
|
2025-12-16 15:39:18 +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
|
54b1cc7127
|
fix animation processing
|
2025-12-16 09:30:09 +07:00 |
|
|
Tungdv
|
b7cb744c35
|
fix: update move for HP.
|
2025-12-15 17:55:58 +07:00 |
|
|
HungDK
|
ad72ea5106
|
Merge branch 'implement_task_UI' into feature/skill-hung
|
2025-12-15 10:32:12 +07:00 |
|
|
MinhHai
|
028563e660
|
Merge remote-tracking branch 'origin/implement_task_UI' into feature/fix-dyn-tasks
|
2025-12-15 10:01:23 +07:00 |
|
|
MinhHai
|
5646c3be62
|
add DlgTask into UIManager, fix load DynTask logic
|
2025-12-15 10:01:00 +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
|
f20c5a123e
|
st
|
2025-12-13 16:54:52 +07:00 |
|
|
VDH
|
9b0c3b3dc0
|
fix
|
2025-12-13 15:30:53 +07:00 |
|
|
NguyenVanDat
|
e46bcbb56a
|
show dummy DlgSubSkill
|
2025-12-13 15:04:27 +07:00 |
|
|
NguyenVanDat
|
cdb18dd691
|
Merge branch 'implement_task_UI' into feature/task-emote
# Conflicts:
# Assets/PerfectWorld/Scene/TaskTest.unity
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
# Assets/PerfectWorld/Scripts/Task/TaskTest.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
|
2025-12-13 14:19:19 +07:00 |
|
|
NguyenVanDat
|
a228a5ce1f
|
add action emote
|
2025-12-13 14:12:09 +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 |
|
|
NguyenVanDat
|
3feced81fc
|
Merge branch 'develop' into feature/task-emote
|
2025-12-12 10:54:44 +07:00 |
|
|
HungDK
|
a57e5b4f32
|
Update task, filtering all task can take
|
2025-12-11 17:41:20 +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 |
|
|
MinhHai
|
09c3b5de28
|
complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory
|
2025-12-11 11:41: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 |
|
|
NguyenVanDat
|
c454eba988
|
add auto team
|
2025-12-10 13:55:52 +07:00 |
|
|
VDH
|
972104970d
|
copnvert
|
2025-12-09 19:53:32 +07:00 |
|
|
NguyenVanDat
|
c8a21a5a33
|
add auto team
|
2025-12-09 18:13:30 +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 |
|