 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 |
|
|
HungDK
|
6faf18dc5e
|
Merge branch 'develop' into feature/friend
|
2026-03-18 14:48:27 +07:00 |
|
|
HungDK
|
e4f674a750
|
Update friend delete, handle server sending
|
2026-03-18 14:38:54 +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 |
|
|
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 |
|
|
hungdk
|
f5a822f2e6
|
Merge pull request 'feature/friend' (#242) from feature/friend into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/242
|
2026-03-17 10:40:07 +00: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 |
|
|
NguyenVanDat
|
13a08c97b3
|
end service when close DlgNpc
|
2026-03-17 11:16:11 +07:00 |
|
|
CuongNV
|
f4e6fa8579
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-17 10:28:59 +07:00 |
|
|
NguyenVanDat
|
a960d7a5df
|
finished refactor message box
|
2026-03-17 10:22:03 +07:00 |
|
|
CuongNV
|
2c5aeb1d08
|
add LoginScreenUI
|
2026-03-17 10:21:03 +07:00 |
|
|
HungDK
|
2870a5e309
|
Merge branch 'develop' into feature/friend
|
2026-03-16 17:40:12 +07:00 |
|
|
HungDK
|
8655b96353
|
Handle getfriend_re so the game didnt died and add friend request handle
|
2026-03-16 17:39:25 +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 |
|
|
NguyenVanDat
|
ab5eb93265
|
fix npc dialogue
|
2026-03-13 14:09:46 +07:00 |
|
|
NguyenVanDat
|
56c0098a26
|
fix npc close
|
2026-03-13 12:18:52 +07:00 |
|
|
Chomper9981
|
67acf39b7a
|
fix not open skill UI when click on empty quick bar slot
|
2026-03-13 10:38:51 +07:00 |
|
|
HungDK
|
2015dbf73e
|
Add PROTOCOL_ADDFRIEND and enable add friend request
|
2026-03-12 20:58:29 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
MinhHai
|
e81797def4
|
change MiniMapUI class to DlgMap
|
2026-03-12 13:49:03 +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 |
|
|
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 |
|
|
VuNgocHaiC7
|
c0b879d804
|
update dlg DlgFriendList.prefab
|
2026-03-11 17:36:16 +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
|
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 |
|
|
VuNgocHaiC7
|
3ab1b23ca4
|
fix UI dlgTeamMain
|
2026-03-10 16:00:39 +07:00 |
|