 CuongNV
|
2fee354738
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-26 09:46:34 +07:00 |
|
|
Chomper9981
|
0dfff3a4ae
|
Add animation for skill
|
2026-03-25 11:19:48 +07:00 |
|
|
CuongNV
|
d21236aec7
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-24 14:34:49 +07:00 |
|
|
CuongNV
|
19820fcf2a
|
Add filter ui chat
|
2026-03-24 10:58:19 +07:00 |
|
|
Chomper9981
|
1f0da3b665
|
Add UI for Buff Icons. Refactor the UI Image Picture
|
2026-03-24 10:53:05 +07:00 |
|
|
Chomper9981
|
eef47bd6b4
|
fix null proplem in quickBar
|
2026-03-20 14:16:04 +07:00 |
|
|
VDH
|
ae02046fc7
|
Merge branch 'develop' into feature/refactor-SkillUI
|
2026-03-19 16:01:05 +07:00 |
|
|
VDH
|
92852a28a0
|
add log for build
|
2026-03-19 16:00:31 +07:00 |
|
|
cuongnv
|
4192582aad
|
Merge pull request 'Change UI Chat' (#256) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
|
2026-03-19 07:19:07 +00:00 |
|
|
Chomper9981
|
4cf015f8e5
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-19 13:52:46 +07:00 |
|
|
Chomper9981
|
9dd504d92e
|
Change some UI, UX relate to Assign Skill
|
2026-03-19 13:52:26 +07:00 |
|
|
CuongNV
|
5708f72910
|
Change UI Chat
|
2026-03-19 13:41:38 +07:00 |
|
|
MinhHai
|
147a3f0745
|
fix MiniMap: add into Main HUD
|
2026-03-19 10:24:11 +07:00 |
|
|
Chomper9981
|
34bd53b3a3
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-18 18:02:14 +07:00 |
|
|
Chomper9981
|
3a3bdfa7b3
|
Cache skill change data and save skill change data to server
|
2026-03-18 17:59:36 +07:00 |
|
|
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 |
|
|
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
|
d0eed02f47
|
Add code UI and prefab chat system
|
2026-03-18 15:55:24 +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 |
|
|
NguyenVanDat
|
a960d7a5df
|
finished refactor message box
|
2026-03-17 10:22:03 +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
|
72310e9a42
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-12 17:29:11 +07:00 |
|
|
Chomper9981
|
b5f89bb703
|
remove old skill cycle logic
|
2026-03-12 17:08:54 +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 |
|
|
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 |
|
|
VuNgocHaiC7
|
c0b879d804
|
update dlg DlgFriendList.prefab
|
2026-03-11 17:36:16 +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
|
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
|
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 |
|
|
Chomper9981
|
af987f5c3e
|
fix task trace behavior
|
2026-03-10 13:58:03 +07:00 |
|
|
NguyenVanDat
|
1e17b4108c
|
update UI logic embed stone and clear stone
|
2026-03-07 13:47:29 +07:00 |
|
|
CuongNV
|
72299d0b71
|
Add base script for chat
|
2026-03-06 16:45:35 +07:00 |
|
|
Le Duc Anh
|
fbe3e92462
|
Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain
|
2026-03-02 20:15:20 +07:00 |
|
|
VDH
|
cf6303afad
|
Merge branch 'develop' into feature/skillBehavior
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2026-03-02 11:35:31 +07:00 |
|
|
VDH
|
eb9d8cdd5f
|
fix learn skill
|
2026-03-02 11:31:43 +07:00 |
|
|
Tungdv
|
01ae1463f4
|
fix: remove debug and "using" not use.
|
2026-02-28 18:34:39 +07:00 |
|
|
VDH
|
5de380fd05
|
update check condition
|
2026-02-27 18:18:51 +07:00 |
|
|
Le Duc Anh
|
7abe98a4b1
|
Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain
|
2026-02-27 18:08:59 +07:00 |
|
|
Le Duc Anh
|
469e3f0204
|
fix the issue with terrain holder and TickTask
|
2026-02-27 17:47:26 +07:00 |
|
|
Chomper9981
|
ed4adcfaa0
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-27 17:30:14 +07:00 |
|