 NguyenVanDat
|
d0d7346a72
|
Merge branch 'develop' into feature/mine-processing
# Conflicts:
# Assets/Scenes/a61.unity
|
2026-01-09 11:04:53 +07:00 |
|
|
NguyenVanDat
|
88213f7649
|
finish mining task
|
2026-01-09 11:01:03 +07:00 |
|
|
NguyenVanDat
|
570455afce
|
add escape button (changed a61)
|
2026-01-09 09:38:51 +07:00 |
|
|
VDH
|
892b273ea5
|
done ui load name and icon
|
2026-01-08 18:43:10 +07:00 |
|
|
VDH
|
0884ae338f
|
convert skill
|
2026-01-07 18:30:57 +07:00 |
|
|
VDH
|
81eb5720fc
|
skill ui progressing
|
2026-01-07 14:45:32 +07:00 |
|
|
VDH
|
5471c68071
|
Merge branch 'develop' into feature/skill-data
|
2026-01-07 09:32:28 +07:00 |
|
|
VDH
|
4aeae053b9
|
for test
|
2026-01-06 19:36:22 +07:00 |
|
|
HungDK
|
e5c09167fb
|
Fix unstable reach site task completion
|
2026-01-06 16:59:14 +07:00 |
|
|
VDH
|
9fed589a9e
|
cool down skill ui
|
2026-01-06 13:35:43 +07:00 |
|
|
VDH
|
7e83b578fe
|
coool down ui
|
2026-01-05 18:25:27 +07:00 |
|
|
VDH
|
fe3eacbc91
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2026-01-05 15:30:29 +07:00 |
|
|
VDH
|
2d3c9a96ef
|
fix bug can't use skill when player is far from target
|
2026-01-05 15:27:12 +07:00 |
|
|
NguyenVanDat
|
ce03f2d38a
|
update process bar
|
2026-01-05 11:31:22 +07:00 |
|
|
NguyenVanDat
|
38348f8e10
|
add and show mining progress run with real time
|
2026-01-05 09:27:00 +07:00 |
|
|
VDH
|
a825db4122
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-12-29 17:39:33 +07:00 |
|
|
VDH
|
cc1f4a9556
|
ui skill for tesst
|
2025-12-29 17:32:48 +07:00 |
|
|
HungDK
|
53f96ff6a4
|
Merge branch 'develop' into feature/addressable-data
|
2025-12-29 11:19:17 +07:00 |
|
|
HungDK
|
ad67f50131
|
Bind button
|
2025-12-29 11:18:23 +07:00 |
|
|
HungDK
|
f95e9813aa
|
Load addressable file update
|
2025-12-26 11:42:24 +07:00 |
|
|
VDH
|
1683d61c66
|
animation
|
2025-12-22 10:53:17 +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 |
|
|
HungDK
|
585f92225e
|
Merge branch 'develop' into implement_task_UI
|
2025-12-17 11:37:07 +07:00 |
|
|
MinhHai
|
8dee1d3541
|
fix DlgTask prefab: change name
|
2025-12-17 11:23:10 +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
|
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 |
|
|
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 |
|
|
VDH
|
9b0c3b3dc0
|
fix
|
2025-12-13 15:30:53 +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
|
89c7b550f0
|
convert all skill in stub1
|
2025-12-12 18:06: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 |
|
|
MinhHai
|
09c3b5de28
|
complete mockup for DlgAward, after npc deliver award -> update runtime in Inventory
|
2025-12-11 11:41:54 +07:00 |
|
|
MinhHai
|
175790f370
|
Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award
|
2025-12-11 11:37:16 +07:00 |
|
|
VDH
|
45f69c9f44
|
skill ui
|
2025-12-10 18:17:34 +07:00 |
|
|
VDH
|
972104970d
|
copnvert
|
2025-12-09 19:53:32 +07:00 |
|
|
Chomper9981
|
5d9dd1c3d9
|
Change some shop UI
|
2025-12-09 16:37:16 +07:00 |
|
|
VDH
|
c239660cd6
|
Merge branch 'develop' into feature/skill-data
|
2025-12-08 17:51:18 +07:00 |
|
|
VungochaiC7
|
aee25a18b5
|
update detail color text item
|
2025-12-08 17:45:12 +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
|
66dc12ef4a
|
Update item detail
|
2025-12-08 09:30:59 +07:00 |
|
|
MinhHai
|
9bc02e1fef
|
add DlgAward
|
2025-12-05 22:00:00 +07:00 |
|
|
HungDK
|
16094d04cf
|
Fixing wrong command to send to server
|
2025-12-04 15:09:20 +07:00 |
|
|
HungDK
|
d4bccfb9fc
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-04 14:46:08 +07:00 |
|