Le Duc Anh
|
3984170c6f
|
remove NPC Disappeared events
|
2025-12-13 17:49:37 +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 |
|
HungDK
|
3279b322b2
|
Fixing missing task search method, get task status
|
2025-12-13 16:35:45 +07:00 |
|
NguyenVanDat
|
dd64a49dd6
|
check null shortcut
|
2025-12-13 16:10:21 +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
|
10fd731948
|
st
|
2025-12-13 10:43:00 +07:00 |
|
VDH
|
d61478f161
|
Merge branch 'develop' into feature/skill-data
|
2025-12-12 18:59:26 +07:00 |
|
tungdv
|
c6a13ee469
|
Merge pull request 'Update rotation cam' (#78) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/78
|
2025-12-12 11:17:52 +00:00 |
|
Tungdv
|
65cb2fa69d
|
Merge remote-tracking branch 'origin/develop' into feature/HP_jump
|
2025-12-12 18:15:06 +07:00 |
|
VDH
|
e629523ff1
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-12-12 18:14:14 +07:00 |
|
Tungdv
|
4c6a49c238
|
fix: update dir move HP with cam.
|
2025-12-12 18:14:01 +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 |
|
MinhHai
|
0bd16fce24
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-12-12 15:47:14 +07:00 |
|
MinhHai
|
ba94ec3416
|
add DlgTask into UI System
|
2025-12-12 15:46:38 +07:00 |
|
MinhHai
|
93698028d9
|
Merge remote-tracking branch 'origin/implement_task_UI' into feature/task-npc-give-award
|
2025-12-12 15:45:54 +07:00 |
|
Le Duc Anh
|
6c74fcf224
|
water and gfx
|
2025-12-12 11:17:55 +07:00 |
|
NguyenVanDat
|
3feced81fc
|
Merge branch 'develop' into feature/task-emote
|
2025-12-12 10:54:44 +07:00 |
|
NguyenVanDat
|
95f7a12fb7
|
Merge branch 'develop' into implement_task_UI
|
2025-12-12 10:54:15 +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 |
|
VDH
|
2c20aea277
|
save
|
2025-12-11 14:13:37 +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 |
|
MinhHai
|
175790f370
|
Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award
|
2025-12-11 11:37:16 +07:00 |
|
namth
|
0f5d8c0129
|
Merge pull request 'update detail color text item' (#75) from feature/color-text into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/75
|
2025-12-11 04:07:22 +00:00 |
|
Chomper9981
|
a7dcbd4e69
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-12-11 10:01:53 +07:00 |
|
VDH
|
45f69c9f44
|
skill ui
|
2025-12-10 18:17:34 +07:00 |
|
tungdv
|
a8c4edd9a9
|
Merge pull request 'Add rotation camera.' (#76) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/76
|
2025-12-10 10:22:30 +00:00 |
|
Tungdv
|
5ebf4fb49b
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/Scripts/CECGameRun.cs
|
2025-12-10 17:21:20 +07:00 |
|
Tungdv
|
21f41ecae1
|
feat: add rotation cam.
|
2025-12-10 17:18:38 +07:00 |
|
NguyenVanDat
|
c454eba988
|
add auto team
|
2025-12-10 13:55:52 +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 |
|
NguyenVanDat
|
c8a21a5a33
|
add auto team
|
2025-12-09 18:13:30 +07:00 |
|
Chomper9981
|
5d9dd1c3d9
|
Change some shop UI
|
2025-12-09 16:37:16 +07:00 |
|
NguyenVanDat
|
7cd12d5041
|
read dynamic task data
|
2025-12-09 11:33:18 +07:00 |
|
NguyenVanDat
|
3de0b5537d
|
read dynamic task
|
2025-12-09 09:51: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 |
|
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
|
81701772dc
|
dummy fix task
|
2025-12-08 16:07:16 +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 |
|