 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
|
12f9de6bfa
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-13 14:11:47 +07:00 |
|
|
NguyenVanDat
|
ab5eb93265
|
fix npc dialogue
|
2026-03-13 14:09:46 +07:00 |
|
|
VDH
|
c198b25989
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-13 12:34:17 +07:00 |
|
|
VDH
|
27da6c956f
|
analyzer
|
2026-03-13 12:34:01 +07:00 |
|
|
NguyenVanDat
|
56c0098a26
|
fix npc close
|
2026-03-13 12:18:52 +07:00 |
|
|
tungdv
|
ce1f1e83f6
|
Merge pull request 'update show wing and sword fly in EP' (#232) from feature/elseplayer into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/232
|
2026-03-13 04:28:09 +00: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 |
|
|
namth
|
54296e2dfb
|
Merge pull request 'fix merge bug' (#231) from feature/skill-hud into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/231
|
2026-03-13 03:51:43 +00:00 |
|
|
Chomper9981
|
2a2fa66ffa
|
fix merge bug
|
2026-03-13 10:51:02 +07:00 |
|
|
namth
|
6a6ee351a3
|
Merge pull request 'feature/skill-hud' (#230) from feature/skill-hud into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/230
|
2026-03-13 03:40:11 +00: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 |
|
|
Chomper9981
|
febcaa74b2
|
add quick change skill for dev only
|
2026-03-13 10:35:13 +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 |
|
|
Le Duc Anh
|
99b4aecb69
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-12 17:44:52 +07:00 |
|
|
Le Duc Anh
|
c8079dd9b8
|
add vfx for flywsword 14
|
2026-03-12 17:44:27 +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 |
|
|
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 |
|
|
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 |
|