 HungDK
|
eae2eb16d5
|
Merge branch 'develop' into feature/friend
|
2026-03-17 17:38:59 +07:00 |
|
|
HungDK
|
ad505e37b9
|
Fixing metadata handle after getfriend re cause game dead
|
2026-03-17 13:59:12 +07:00 |
|
|
hainh
|
d2fd3db327
|
Merge pull request 'override UIManager' (#240) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/240
|
2026-03-17 06:55:20 +00:00 |
|
|
VuNgocHaiC7
|
8a728cc45b
|
override UIManager
|
2026-03-17 13:54:16 +07:00 |
|
|
NguyenVanDat
|
13a08c97b3
|
end service when close DlgNpc
|
2026-03-17 11:16:11 +07:00 |
|
|
cuongnv
|
b37e29b06d
|
Merge pull request 'feature/chat' (#239) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/239
|
2026-03-17 03:29:44 +00:00 |
|
|
CuongNV
|
f4e6fa8579
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-17 10:28:59 +07:00 |
|
|
hoangvd
|
e552179a08
|
Merge pull request 'feature/skillBehavior' (#238) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/238
|
2026-03-17 03:28:24 +00:00 |
|
|
CuongNV
|
e298030709
|
Change prefab chat
|
2026-03-17 10:28:15 +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 |
|
|
hoangvd
|
7b793f1fc7
|
Merge pull request 'feature/skillBehavior' (#237) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/237
|
2026-03-16 10:01:16 +00: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 |
|
|
VDH
|
69e1b36dc6
|
done remove buff speed gfx
|
2026-03-16 16:40:04 +07:00 |
|
|
CuongNV
|
5ae3fc4252
|
fix RefreshVisible
|
2026-03-16 15:11:53 +07:00 |
|
|
namth
|
6bd65a5ab7
|
Merge pull request 'fix-bug/fix-elseplayer-gfx-proplem' (#236) from fix-bug/fix-elseplayer-gfx-proplem into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/236
|
2026-03-16 08:04:59 +00:00 |
|
|
Chomper9981
|
5e0f308e39
|
fix chat UI
|
2026-03-16 15:02:51 +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 |
|
|
hainh
|
bdb1fa475d
|
Merge pull request 'fix ui for UIManager.prefab' (#235) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/235
|
2026-03-16 07:29:06 +00:00 |
|
|
VuNgocHaiC7
|
265b5b56c6
|
fix ui for UIManager.prefab
|
2026-03-16 14:28:25 +07:00 |
|
|
CuongNV
|
abf7fd2fe8
|
Merge branch 'feature/chat' into develop
|
2026-03-16 13:32:22 +07:00 |
|
|
CuongNV
|
e406a393be
|
change prefab
|
2026-03-16 13:30:53 +07:00 |
|
|
cuongnv
|
8f2917b15c
|
Merge pull request 'feature/chat' (#234) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/234
|
2026-03-16 04:37:07 +00: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
|
d9372db024
|
add scene
|
2026-03-16 11:26:23 +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 |
|
|
hoangvd
|
19c70bb3aa
|
Merge pull request 'feature/skillBehavior' (#233) from feature/skillBehavior into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/233
|
2026-03-13 09:14:04 +00:00 |
|
|
VDH
|
fdc6579c7e
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-13 16:07:51 +07:00 |
|
|
VDH
|
5014d8947c
|
else player cast skill play gfx
|
2026-03-13 16:03:47 +07:00 |
|
|
NguyenVanDat
|
12f9de6bfa
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-13 14:11:47 +07:00 |
|
|
NguyenVanDat
|
ab5eb93265
|
fix npc dialogue
|
2026-03-13 14:09:46 +07:00 |
|
|
VDH
|
c198b25989
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-13 12:34:17 +07:00 |
|
|
VDH
|
27da6c956f
|
analyzer
|
2026-03-13 12:34:01 +07:00 |
|
|
NguyenVanDat
|
56c0098a26
|
fix npc close
|
2026-03-13 12:18:52 +07:00 |
|
|
tungdv
|
ce1f1e83f6
|
Merge pull request 'update show wing and sword fly in EP' (#232) from feature/elseplayer into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/232
|
2026-03-13 04:28:09 +00: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 |
|
|
Tungdv
|
144badd924
|
fix: update logic show wing and sword.
|
2026-03-13 10:54:46 +07:00 |
|
|
namth
|
54296e2dfb
|
Merge pull request 'fix merge bug' (#231) from feature/skill-hud into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/231
|
2026-03-13 03:51:43 +00:00 |
|
|
Chomper9981
|
2a2fa66ffa
|
fix merge bug
|
2026-03-13 10:51:02 +07:00 |
|
|
namth
|
6a6ee351a3
|
Merge pull request 'feature/skill-hud' (#230) from feature/skill-hud into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/230
|
2026-03-13 03:40:11 +00:00 |
|
|
Tungdv
|
9788d29219
|
fix: update logic show wing and sword.
|
2026-03-13 10:40:04 +07:00 |
|