 VDH
|
dd36dde176
|
Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-19 13:57:04 +07:00 |
|
|
VDH
|
a726ca23cb
|
Merge branch 'develop' into feature/refactor-SkillUI
|
2026-03-19 13:54:21 +07: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 |
|
|
VDH
|
e99dcbb501
|
fix bug don't load skill
|
2026-03-19 13:52:45 +07:00 |
|
|
Chomper9981
|
9dd504d92e
|
Change some UI, UX relate to Assign Skill
|
2026-03-19 13:52:26 +07:00 |
|
|
NguyenVanDat
|
82994a9c1c
|
update dlg npc flow
|
2026-03-19 10:42:46 +07:00 |
|
|
MinhHai
|
147a3f0745
|
fix MiniMap: add into Main HUD
|
2026-03-19 10:24:11 +07:00 |
|
|
CuongNV
|
d57bbeb0df
|
fix hide tilte show chat
|
2026-03-19 09:37:24 +07:00 |
|
|
CuongNV
|
aa9007e1ba
|
fix show UI
|
2026-03-19 09:28:55 +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 |
|
|
VuNgocHaiC7
|
aec0394e79
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
|
2026-03-18 17:45:39 +07:00 |
|
|
VuNgocHaiC7
|
e51674279d
|
fix code for some dlg include one click item and fix detail info, value money
|
2026-03-18 17:43:25 +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
|
4e24e1101c
|
cheat
|
2026-03-18 17:35:52 +07:00 |
|
|
VDH
|
f28efd552f
|
cheat UI
|
2026-03-18 17:19:10 +07:00 |
|
|
cuongnv
|
2e90de643d
|
Merge pull request 'fix show ui chat' (#248) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/248
|
2026-03-18 09:45:47 +00:00 |
|
|
CuongNV
|
5a9119a752
|
fix show ui chat
|
2026-03-18 16:45:07 +07:00 |
|
|
Le Duc Anh
|
a2b24be051
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-18 16:41:30 +07:00 |
|
|
Le Duc Anh
|
62ac1ad4da
|
add Than Thu equipment
|
2026-03-18 16:39:56 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Le Duc Anh
|
90eb4ff4ce
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-17 17:39:46 +07:00 |
|
|
Le Duc Anh
|
2c5b9a9104
|
load equipment async
|
2026-03-17 17:39:28 +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 |
|
|
HungDK
|
ad505e37b9
|
Fixing metadata handle after getfriend re cause game dead
|
2026-03-17 13:59:12 +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 |
|
|
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 |
|
|
CuongNV
|
3166c91471
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-17 10:21:23 +07:00 |
|
|
CuongNV
|
2c5aeb1d08
|
add LoginScreenUI
|
2026-03-17 10:21:03 +07:00 |
|
|
CuongNV
|
a40d126d63
|
add AUI_ConvertChatString
|
2026-03-16 17:44:16 +07:00 |
|
|
HungDK
|
2870a5e309
|
Merge branch 'develop' into feature/friend
|
2026-03-16 17:40:12 +07:00 |
|
|
HungDK
|
5dfab238fa
|
Update UnityGameSession.cs
|
2026-03-16 17:39:30 +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 |
|
|
VDH
|
31176c1ad6
|
Merge branch 'develop' into feature/skillBehavior
# Conflicts:
# Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
|
2026-03-16 16:43:30 +07:00 |
|