 VDH
|
dc589a8e8d
|
Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-18 17:39:04 +07:00 |
|
|
VDH
|
f28efd552f
|
cheat UI
|
2026-03-18 17:19:10 +07:00 |
|
|
Tungdv
|
40cddc645d
|
Merge remote-tracking branch 'origin/develop' into feature/elseplayer
|
2026-03-18 16:35:33 +07:00 |
|
|
Tungdv
|
0ccc726e3d
|
fix: update wing for HP.
|
2026-03-18 16:34:31 +07:00 |
|
|
CuongNV
|
ee6d880333
|
Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
# Assets/Scripts/EC_GameRun.cs
|
2026-03-18 16:05:54 +07:00 |
|
|
CuongNV
|
4d462c119d
|
add GameSession and logic handle chat
|
2026-03-18 15:56:53 +07:00 |
|
|
HungDK
|
6faf18dc5e
|
Merge branch 'develop' into feature/friend
|
2026-03-18 14:48:27 +07:00 |
|
|
VDH
|
3259d297d8
|
Merge branch 'develop' into feature/ComboSkill
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-18 13:50:49 +07:00 |
|
|
VDH
|
c6506ce6eb
|
done combo includer normal attack and loop
|
2026-03-18 13:49:49 +07:00 |
|
|
Chomper9981
|
81f0824e1d
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-18 13:41:25 +07:00 |
|
|
Chomper9981
|
7f6395522f
|
Modify skill quickbar
|
2026-03-18 13:40:27 +07:00 |
|
|
Tungdv
|
c800b48d52
|
Merge branch 'develop' into feature/elseplayer
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
|
2026-03-18 12:54:34 +07:00 |
|
|
Tungdv
|
8cf3144761
|
fix: update world when teleport.
|
2026-03-18 11:44:46 +07:00 |
|
|
HungDK
|
2adc3ede59
|
Add logic update friend UI, friend status
|
2026-03-18 11:39:26 +07:00 |
|
|
Le Duc Anh
|
bc7db7f58d
|
get correct armor for elseplayer
|
2026-03-17 22:01:36 +07:00 |
|
|
VuNgocHaiC7
|
d33568d373
|
fix bug info item server return for dlgUninstall and use item for two dlg
|
2026-03-17 17:24:49 +07:00 |
|
|
VDH
|
4bb8306661
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-17 10:24:49 +07:00 |
|
|
VDH
|
0f55a32f97
|
adjust skill find the issue cause logic handle remove gfx faild
|
2026-03-17 10:24:30 +07:00 |
|
|
NguyenVanDat
|
a960d7a5df
|
finished refactor message box
|
2026-03-17 10:22:03 +07:00 |
|
|
Chomper9981
|
91b5c6fb51
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-16 14:46:41 +07:00 |
|
|
Chomper9981
|
db65447df2
|
Fix bug about elseplayer cast skill.
|
2026-03-16 14:46:16 +07:00 |
|
|
CuongNV
|
f58b6381d8
|
Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-16 11:28:14 +07:00 |
|
|
CuongNV
|
37bc21271b
|
add handlr input
|
2026-03-16 11:25:31 +07:00 |
|
|
Le Duc Anh
|
6effe9c706
|
get other player equipment
|
2026-03-13 20:20:22 +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 |
|
|
Chomper9981
|
2a2fa66ffa
|
fix merge bug
|
2026-03-13 10:51:02 +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 |
|
|
Le Duc Anh
|
67220287db
|
move EDITOR scripts to proper tag
|
2026-03-12 18:11:00 +07:00 |
|
|
CuongNV
|
72310e9a42
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-12 17:29:11 +07:00 |
|
|
CuongNV
|
e32ff4631b
|
add UI chat
|
2026-03-12 17:26:24 +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 |
|
|
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 |
|
|
Le Duc Anh
|
a13ac49467
|
add 7 fly sword
|
2026-03-11 23:14:12 +07:00 |
|
|
Le Duc Anh
|
2aee6f6141
|
attack fly sword to correct pos
|
2026-03-11 19:31:14 +07:00 |
|
|
VDH
|
230bb83e6f
|
add more handle protocol
|
2026-03-11 16:05:54 +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 |
|