 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 |
|
|
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 |
|
|
Chomper9981
|
b73de9553e
|
update UI. add more developed feature into UI
|
2026-02-27 17:27:26 +07:00 |
|
|
MinhHai
|
cee2eb74f7
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2026-02-27 15:56:39 +07:00 |
|
|
Chomper9981
|
2b869e5285
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-26 17:33:31 +07:00 |
|
|
Chomper9981
|
10e4cfa1d3
|
fix bug "dance" quest not working(workaround). Trigger action via action skill table. fix bug some matter object dont have collider(workaround)
|
2026-02-26 17:28:53 +07:00 |
|
|
Tungdv
|
708f33bfe4
|
Merge branch 'develop' into feature/hp_pet
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-26 16:39:23 +07:00 |
|
|
Tungdv
|
72ef982527
|
fix: update UI Dialog Pet List.
|
2026-02-26 15:57:36 +07:00 |
|
|
VDH
|
abcf251e77
|
fix micro bug
|
2026-02-26 15:27:18 +07:00 |
|
|
MinhHai
|
aa53269f35
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/Scripts/CECHostPlayer.Task.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-24 14:35:11 +07:00 |
|
|
MinhHai
|
f183544b4d
|
WIP: prepare config before send to Server
|
2026-02-24 14:29:09 +07:00 |
|
|
NguyenVanDat
|
cc04ace9e1
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
|
2026-02-23 15:05:51 +07:00 |
|
|
VDH
|
c04b5b1f09
|
adjust UI layout add logic disable UI for quickbar UI
|
2026-02-11 15:31:37 +07:00 |
|
|
MinhHai
|
125229cae5
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
|
2026-02-11 14:56:21 +07:00 |
|
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
|
NguyenVanDat
|
e4909c1658
|
update logic clear chip
|
2026-02-10 11:51:26 +07:00 |
|
|
MinhHai
|
d160df064d
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
|
2026-02-09 14:44:12 +07:00 |
|
|
VDH
|
781c5cd08d
|
done passive skill UI
|
2026-02-06 15:13:42 +07:00 |
|
|
VDH
|
b3e5f2ae61
|
done skill ui execute
|
2026-02-05 17:26:58 +07:00 |
|
|
MinhHai
|
5dd3dcf48d
|
WIP: add logic and UI
|
2026-02-04 15:17:39 +07:00 |
|
|
VDH
|
eca33817e8
|
done ui info
|
2026-02-03 15:01:57 +07:00 |
|