 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 |
|
|
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 |
|
|
Chomper9981
|
29ac9f06a0
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-10 17:14:55 +07:00 |
|
|
Chomper9981
|
2c432b0686
|
fix some wing proplem
|
2026-03-10 17:14:18 +07:00 |
|
|
VuNgocHaiC7
|
b795dabdae
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-10 16:01:11 +07:00 |
|
|
VuNgocHaiC7
|
3ab1b23ca4
|
fix UI dlgTeamMain
|
2026-03-10 16:00:39 +07:00 |
|
|
Chomper9981
|
012b31f09e
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-10 15:58:20 +07:00 |
|
|
Chomper9981
|
ee40c62f64
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-10 15:56:31 +07:00 |
|
|
Tungdv
|
ebd44a40fc
|
feat: add move fly and swim when attack to target.
|
2026-03-10 15:54:04 +07:00 |
|
|
VuNgocHaiC7
|
e09dd9b1fb
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-10 15:16:49 +07:00 |
|
|
VuNgocHaiC7
|
d2d4845b79
|
fix some UI of dialog
|
2026-03-10 15:15:23 +07:00 |
|
|
Tungdv
|
94c20c4bdd
|
Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
# Assets/Scripts/CECPlayer_Inventory.cs
|
2026-03-10 14:47:49 +07:00 |
|
|
VDH
|
97e9381015
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-10 14:01:11 +07:00 |
|
|
VDH
|
fbcb3dc5e5
|
comment log
|
2026-03-10 14:00:49 +07:00 |
|
|
Chomper9981
|
af987f5c3e
|
fix task trace behavior
|
2026-03-10 13:58:03 +07:00 |
|
|
NguyenVanDat
|
44d0a0f2dd
|
Merge branch 'develop' into feature/ui-system-update
|
2026-03-10 11:16:38 +07:00 |
|
|
NguyenVanDat
|
10ff87c03c
|
update ui: inventory popup
|
2026-03-10 10:54:06 +07:00 |
|
|
tungdv
|
9a9f85edf5
|
Merge pull request 'add config instance for limit jump' (#211) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/211
|
2026-03-10 03:40:45 +00:00 |
|
|
NguyenVanDat
|
c60da80182
|
update ui: player stats
|
2026-03-10 10:08:00 +07:00 |
|
|
NguyenVanDat
|
68d7b3171c
|
Merge branch 'develop' into feature/ui-system-update
|
2026-03-10 09:33:24 +07:00 |
|
|
Tungdv
|
51667e8867
|
feat: add config instance.
|
2026-03-09 19:28:45 +07:00 |
|