 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 |
|
|
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 |
|
|
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 |
|
|
Le Duc Anh
|
a13ac49467
|
add 7 fly sword
|
2026-03-11 23:14:12 +07:00 |
|
|
Le Duc Anh
|
2aee6f6141
|
attack fly sword to correct pos
|
2026-03-11 19:31:14 +07:00 |
|
|
VDH
|
230bb83e6f
|
add more handle protocol
|
2026-03-11 16:05:54 +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 |
|
|
Chomper9981
|
2c432b0686
|
fix some wing proplem
|
2026-03-10 17:14:18 +07:00 |
|
|
VuNgocHaiC7
|
b795dabdae
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-10 16:01:11 +07:00 |
|
|
VuNgocHaiC7
|
3ab1b23ca4
|
fix UI dlgTeamMain
|
2026-03-10 16:00:39 +07:00 |
|
|
VuNgocHaiC7
|
e09dd9b1fb
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate
|
2026-03-10 15:16:49 +07:00 |
|
|
VuNgocHaiC7
|
d2d4845b79
|
fix some UI of dialog
|
2026-03-10 15:15:23 +07:00 |
|
|
Tungdv
|
94c20c4bdd
|
Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
# Assets/Scripts/CECPlayer_Inventory.cs
|
2026-03-10 14:47:49 +07:00 |
|
|
VDH
|
97e9381015
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-10 14:01:11 +07:00 |
|
|
VDH
|
fbcb3dc5e5
|
comment log
|
2026-03-10 14:00:49 +07:00 |
|
|
NguyenVanDat
|
44d0a0f2dd
|
Merge branch 'develop' into feature/ui-system-update
|
2026-03-10 11:16:38 +07:00 |
|
|
tungdv
|
9a9f85edf5
|
Merge pull request 'add config instance for limit jump' (#211) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/211
|
2026-03-10 03:40:45 +00:00 |
|
|
NguyenVanDat
|
68d7b3171c
|
Merge branch 'develop' into feature/ui-system-update
|
2026-03-10 09:33:24 +07:00 |
|
|
Tungdv
|
51667e8867
|
feat: add config instance.
|
2026-03-09 19:28:45 +07:00 |
|
|
VDH
|
dbb1cac4a6
|
Merge branch 'develop' into feature/skillBehavior
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2026-03-09 17:53:02 +07:00 |
|
|
VDH
|
574fc0c8c6
|
fix bug flash move skill
|
2026-03-09 17:50:32 +07:00 |
|
|
CuongNV
|
5cb958a25f
|
add new input
|
2026-03-09 17:32:16 +07:00 |
|
|
Chomper9981
|
b19ea07f49
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-09 17:10:56 +07:00 |
|
|
Chomper9981
|
f4ad63f525
|
change game object logic to using CECPlayer instead. fix dlgaward not gen enough data. fix wave hand invalid
|
2026-03-09 17:10:14 +07:00 |
|
|
CuongNV
|
b744546442
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-09 16:58:49 +07:00 |
|
|
CuongNV
|
22aaec888a
|
add player in server
|
2026-03-09 16:56:24 +07:00 |
|
|
VuNgocHaiC7
|
564e27b6b8
|
fix show dlgTeamList continuous
|
2026-03-09 15:29:21 +07:00 |
|
|
NguyenVanDat
|
950ea7370d
|
Merge branch 'develop' into feature/ui-system-update
|
2026-03-09 09:58:12 +07:00 |
|
|
Chomper9981
|
1ec660c957
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-07 15:22:46 +07:00 |
|
|
VDH
|
5228f357f1
|
done phap su gfx
|
2026-03-07 14:33:50 +07:00 |
|
|
NguyenVanDat
|
1e17b4108c
|
update UI logic embed stone and clear stone
|
2026-03-07 13:47:29 +07:00 |
|
|
Chomper9981
|
b46907c460
|
fix act not synch with dmg. add loop for some "Than Thu" animation
|
2026-03-07 11:28:40 +07:00 |
|
|
CuongNV
|
95d8228a75
|
fix EC_GameRun
|
2026-03-07 10:38:26 +07:00 |
|
|
CuongNV
|
4da68f5721
|
Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/EC_GameRun.cs
|
2026-03-07 10:37:26 +07:00 |
|
|
NguyenVanDat
|
bad2515394
|
Merge branch 'develop' into feature/ui-system-update
# Conflicts:
# Assets/Scripts/CECUIManager.cs
|
2026-03-07 10:08:28 +07:00 |
|
|
CuongNV
|
85e138fdbc
|
Add bug for chat
|
2026-03-07 10:05:46 +07:00 |
|
|
VDH
|
811712deae
|
Merge branch 'develop' into feature/skillBehavior
|
2026-03-07 09:55:03 +07:00 |
|
|
VDH
|
a184aa0ed5
|
fix use skill buff
|
2026-03-07 09:54:02 +07:00 |
|
|
MinhHai
|
7e5fd02e1f
|
Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic
|
2026-03-06 17:33:37 +07:00 |
|
|
Tungdv
|
2e03de644d
|
fix: update fly with sword and wing.
|
2026-03-06 17:33:20 +07:00 |
|
|
MinhHai
|
56e385ab88
|
DONE: logout full and logout half login
|
2026-03-06 17:33:14 +07:00 |
|