 VDH
|
fdc6579c7e
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-13 16:07:51 +07:00 |
|
|
VDH
|
5014d8947c
|
else player cast skill play gfx
|
2026-03-13 16:03:47 +07:00 |
|
|
NguyenVanDat
|
ab5eb93265
|
fix npc dialogue
|
2026-03-13 14:09:46 +07:00 |
|
|
NguyenVanDat
|
56c0098a26
|
fix npc close
|
2026-03-13 12:18:52 +07:00 |
|
|
Tungdv
|
e6c2981ebb
|
Merge remote-tracking branch 'origin/develop' into feature/elseplayer
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
|
2026-03-13 11:27:06 +07:00 |
|
|
Tungdv
|
144badd924
|
fix: update logic show wing and sword.
|
2026-03-13 10:54:46 +07:00 |
|
|
Tungdv
|
9788d29219
|
fix: update logic show wing and sword.
|
2026-03-13 10:40:04 +07:00 |
|
|
Chomper9981
|
67acf39b7a
|
fix not open skill UI when click on empty quick bar slot
|
2026-03-13 10:38:51 +07:00 |
|
|
Chomper9981
|
34e5b569ed
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-13 10:36:48 +07:00 |
|
|
anhld
|
87e3695171
|
Merge pull request 'Equip data change' (#229) from feature/wings-flysword into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/229
|
2026-03-13 03:33:37 +00:00 |
|
|
Le Duc Anh
|
dd3755c6e0
|
Equip data change
|
2026-03-13 10:32:47 +07:00 |
|
|
anhld
|
fa92a237e7
|
Merge pull request 'Fly sword and else player equipment' (#228) from feature/wings-flysword into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/228
|
2026-03-12 17:22:56 +00:00 |
|
|
Le Duc Anh
|
5b31865962
|
WIP:show equipment for else player
|
2026-03-13 00:21:52 +07:00 |
|
|
Le Duc Anh
|
dc0092eab0
|
add equip dat
|
2026-03-12 21:24:20 +07:00 |
|
|
Le Duc Anh
|
4ebf4cf169
|
update equipement data
|
2026-03-12 21:14:07 +07:00 |
|
|
Tungdv
|
65c0b00011
|
fix: update logic show wing and sword fly.
|
2026-03-12 19:27:19 +07:00 |
|
|
Le Duc Anh
|
67220287db
|
move EDITOR scripts to proper tag
|
2026-03-12 18:11:00 +07:00 |
|
|
Chomper9981
|
ee9855ccb3
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-12 17:15:38 +07:00 |
|
|
VuNgocHaiC7
|
6243736c70
|
update clone code for DlgPetList
|
2026-03-12 17:13:31 +07:00 |
|
|
Chomper9981
|
c9ad4fe2a8
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-12 17:12:26 +07:00 |
|
|
Chomper9981
|
b5f89bb703
|
remove old skill cycle logic
|
2026-03-12 17:08:54 +07:00 |
|
|
Tungdv
|
e2c8dd4d44
|
Merge remote-tracking branch 'origin/develop' into feature/elseplayer
|
2026-03-12 16:51:45 +07:00 |
|
|
Tungdv
|
f5be092c15
|
fix: update init data EP.
|
2026-03-12 16:51:30 +07:00 |
|
|
VuNgocHaiC7
|
74d02c8fe4
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-12 16:12:00 +07:00 |
|
|
VuNgocHaiC7
|
772af07696
|
fix code for UI dlgTeamList
|
2026-03-12 16:11:09 +07:00 |
|
|
VDH
|
d3a9683795
|
fix dupUI
|
2026-03-12 15:47:35 +07:00 |
|
|
MinhHai
|
1452e0cf0b
|
fix DdlgQuickBar: i <= a_pSCS.Count -> i < a_pSCS.Count
|
2026-03-12 14:58:44 +07:00 |
|
|
VuNgocHaiC7
|
66fb5b7263
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-12 14:55:19 +07:00 |
|
|
VuNgocHaiC7
|
fad41e507b
|
fix code some ui and teamlist
|
2026-03-12 14:54:21 +07:00 |
|
|
MinhHai
|
850b44fd1d
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
|
2026-03-12 14:49:03 +07:00 |
|
|
VDH
|
2b2120ec58
|
Merge branch 'develop' into feature/skillBehavior
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-12 14:27:42 +07:00 |
|
|
MinhHai
|
b487798110
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-12 13:53:54 +07:00 |
|
|
MinhHai
|
f8a8d3d9d4
|
DONE: save skill combo
|
2026-03-12 13:50:41 +07:00 |
|
|
MinhHai
|
e81797def4
|
change MiniMapUI class to DlgMap
|
2026-03-12 13:49:03 +07:00 |
|
|
VDH
|
3f57f648ce
|
disable UI
|
2026-03-12 10:26:00 +07:00 |
|
|
NguyenVanDat
|
f8a6300e1e
|
fix close DlgNPC
|
2026-03-12 10:03:28 +07:00 |
|
|
Le Duc Anh
|
a13ac49467
|
add 7 fly sword
|
2026-03-11 23:14:12 +07:00 |
|
|
anhld
|
980e8df778
|
Merge pull request 'attack fly sword to correct pos' (#221) from feature/fly-devices into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/221
|
2026-03-11 12:32:46 +00:00 |
|
|
Le Duc Anh
|
2aee6f6141
|
attack fly sword to correct pos
|
2026-03-11 19:31:14 +07:00 |
|
|
VuNgocHaiC7
|
b0d1ec8926
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-11 17:38:17 +07:00 |
|
|
VuNgocHaiC7
|
c0b879d804
|
update dlg DlgFriendList.prefab
|
2026-03-11 17:36:16 +07:00 |
|
|
Chomper9981
|
b5e017f39c
|
Add skills gfx for "Vu Linh". fix minor bug about DlgNPC
|
2026-03-11 17:07:24 +07:00 |
|
|
MinhHai
|
af23389192
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
|
2026-03-11 16:43:26 +07:00 |
|
|
MinhHai
|
0af8844948
|
WIP: open comment Save User Layout
|
2026-03-11 16:43:10 +07:00 |
|
|
VDH
|
5feb313867
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-11 16:08:01 +07:00 |
|
|
VDH
|
230bb83e6f
|
add more handle protocol
|
2026-03-11 16:05:54 +07:00 |
|
|
Tungdv
|
28c152109d
|
fix: remove "return" logic.
|
2026-03-11 16:05:21 +07:00 |
|
|
Tungdv
|
748874fa84
|
fix: fix auto move to target when swim.
|
2026-03-11 15:41:39 +07:00 |
|
|
VDH
|
18b32f6d5f
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/skillBehavior
|
2026-03-11 11:09:40 +07:00 |
|
|
VDH
|
3fc7106e76
|
switch skill shortcut
|
2026-03-10 18:01:47 +07:00 |
|