 Chomper9981
|
febcaa74b2
|
add quick change skill for dev only
|
2026-03-13 10:35:13 +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 |
|
|
hainh
|
e4c25eea12
|
Merge pull request 'update clone code for DlgPetList' (#227) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/227
|
2026-03-12 10:14:19 +00: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 |
|
|
hainh
|
a41103c15d
|
Merge pull request 'feature/fix-teamate' (#226) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/226
|
2026-03-12 09:13:18 +00: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 |
|
|
hoangvd
|
7319df6660
|
Merge pull request 'feature/skillBehavior' (#225) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/225
|
2026-03-12 08:48:36 +00: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 |
|
|
MinhHai
|
511f8a8a3a
|
add TickInvoker in Boostrap scene, fix DlgMap
|
2026-03-12 14:42:09 +07:00 |
|
|
hoangvd
|
775afa6c4d
|
Merge pull request 'feature/skillBehavior' (#224) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/224
|
2026-03-12 07:28:30 +00:00 |
|
|
VDH
|
2b2120ec58
|
Merge branch 'develop' into feature/skillBehavior
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-12 14:27:42 +07:00 |
|
|
MinhHai
|
951b855c38
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
|
2026-03-12 14:18:09 +07:00 |
|
|
hainh
|
d949e4f912
|
Merge pull request 'Update UIManager.prefab' (#222) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/222
|
2026-03-12 06:54:52 +00: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 |
|
|
VuNgocHaiC7
|
e373edca9e
|
Update UIManager.prefab
|
2026-03-12 13:42:05 +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 |
|
|
hainh
|
b78d32ece3
|
Merge pull request 'feature/fix-teamate' (#220) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/220
|
2026-03-11 10:39:26 +00: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 |
|
|
namth
|
af39ebf2e8
|
Merge pull request 'feature/vu-linh-model' (#219) from feature/vu-linh-model into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/219
|
2026-03-11 10:36:21 +00:00 |
|
|
VuNgocHaiC7
|
c0b879d804
|
update dlg DlgFriendList.prefab
|
2026-03-11 17:36:16 +07:00 |
|
|
Chomper9981
|
8eb326ea25
|
Add hair for "Vu linh". animation will not loop for now.
|
2026-03-11 17:30:54 +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
|
68cc7d7745
|
Merge pull request 'remove "return" logic.' (#217) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/217
|
2026-03-11 09:05:50 +00:00 |
|
|
Tungdv
|
28c152109d
|
fix: remove "return" logic.
|
2026-03-11 16:05:21 +07:00 |
|
|
tungdv
|
f5089e140c
|
Merge pull request 'fix auto move to target when swim.' (#216) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/216
|
2026-03-11 08:42:42 +00: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 |
|
|
namth
|
5bf6f5fdb1
|
Merge pull request 'fixbug/fix-small-bug' (#215) from fixbug/fix-small-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/215
|
2026-03-10 10:15:48 +00: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 |
|
|
hainh
|
4bc1979bf2
|
Merge pull request 'feature/fix-teamate' (#214) from feature/fix-teamate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/214
|
2026-03-10 09:02:48 +00: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 |
|