 NguyenVanDat
|
d234076311
|
add clear emmbedded chip command
|
2026-02-03 11:00:07 +07:00 |
|
|
NguyenVanDat
|
4da6b16a8d
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
|
2026-02-03 10:55:33 +07:00 |
|
|
NguyenVanDat
|
20e53ed790
|
Merge branch 'feature/update-message-box' into develop
|
2026-02-03 10:44:59 +07:00 |
|
|
NguyenVanDat
|
fbae7a277a
|
Merge branch 'feature/update-message-box' into feature/clear-embedded-chip
|
2026-02-03 10:40:19 +07:00 |
|
|
NguyenVanDat
|
df5e889a67
|
update message box
|
2026-02-03 10:38:59 +07:00 |
|
|
NguyenVanDat
|
ef3edb750c
|
Merge branch 'feature/update-message-box' into feature/clear-embedded-chip
|
2026-02-03 10:30:51 +07:00 |
|
|
HungDK
|
4e857e9367
|
Fix use old login sdk first
|
2026-02-03 10:24:23 +07:00 |
|
|
HungDK
|
9cc0ffce45
|
Merge remote-tracking branch 'origin/develop' into feature/character_info
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
|
2026-02-03 10:10:05 +07:00 |
|
|
HungDK
|
647edc29dc
|
Logout, ConsumeNextLoginEntry, select new role ui handler
|
2026-02-03 09:50:51 +07:00 |
|
|
HungDK
|
55f73c3f2b
|
Add logout, back to select role button handler
|
2026-02-03 09:47:55 +07:00 |
|
|
HungDK
|
8b82734fcf
|
Add logout cmd type 1 and type 0
|
2026-02-03 09:47:25 +07:00 |
|
|
Le Duc Anh
|
13c6cec217
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2026-02-02 19:22:02 +07:00 |
|
|
Le Duc Anh
|
689f8a45b6
|
add Tech3CSDK
|
2026-02-02 19:21:45 +07:00 |
|
|
hainh
|
af0afcb367
|
Merge pull request 'fix UI DlgInstall.prefab' (#147) from feature/useItem into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/147
|
2026-02-02 11:19:29 +00:00 |
|
|
NguyenVanDat
|
2235beea6e
|
Merge branch 'develop' into feature/update-message-box
|
2026-02-02 18:18:33 +07:00 |
|
|
VuNgocHaiC7
|
bca7fd1c6a
|
fix UI DlgInstall.prefab
|
2026-02-02 18:18:01 +07:00 |
|
|
NguyenVanDat
|
a33ef33062
|
update box message
|
2026-02-02 17:59:33 +07:00 |
|
|
NguyenVanDat
|
775bbd7c55
|
add ClearEmbedded command
|
2026-02-02 16:29:42 +07:00 |
|
|
VuNgocHaiC7
|
f9774293de
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
|
2026-02-02 16:19:10 +07:00 |
|
|
NguyenVanDat
|
fef0ef4921
|
update logic show Install Dialogue
|
2026-02-02 15:31:03 +07:00 |
|
|
NguyenVanDat
|
b808bda60c
|
fix embed stone
|
2026-02-02 15:22:15 +07:00 |
|
|
VuNgocHaiC7
|
9e0d1a284d
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-02 14:17:20 +07:00 |
|
|
VuNgocHaiC7
|
e6faf5d2fc
|
update logic more UseItemInPack
|
2026-02-02 13:54:38 +07:00 |
|
|
VDH
|
f233ebe58b
|
fix
|
2026-02-02 10:42:50 +07:00 |
|
|
VDH
|
7091fb8d41
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-02 10:28:42 +07:00 |
|
|
VDH
|
57c2f5fb9f
|
FIX after merge
|
2026-02-02 10:23:49 +07:00 |
|
|
VDH
|
7aaed6d0d3
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
# Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-02 09:55:39 +07:00 |
|
|
HungDK
|
793eb7c030
|
Merge branch 'develop' into feature/character_info
|
2026-02-02 09:43:23 +07:00 |
|
|
VDH
|
e91a491444
|
get description skill
|
2026-02-02 09:40:39 +07:00 |
|
|
HungDK
|
53d2de6a6c
|
Fetch player, player's info in search panel
|
2026-02-02 09:25:11 +07:00 |
|
|
HungDK
|
8adf717b41
|
Add invite, kick, join, leave, change lead, dismiss, new member, member leave for both client and server
|
2026-02-02 09:22:09 +07:00 |
|
|
HungDK
|
8c53b5517e
|
Add player info ui item
|
2026-02-02 09:20:24 +07:00 |
|
|
HungDK
|
8e1ee035de
|
Add team, teamate manager dlg
|
2026-02-02 09:19:24 +07:00 |
|
|
HungDK
|
2e59be5929
|
Placeholder for 2 dlg TODO
|
2026-02-02 09:18:10 +07:00 |
|
|
HungDK
|
00296336f9
|
Show dialog "Win_ArrangeTeam"
|
2026-02-02 09:15:39 +07:00 |
|
|
Le Duc Anh
|
05694b24b9
|
update coordinate text
|
2026-02-01 15:06:13 +07:00 |
|
|
Le Duc Anh
|
ccd6564772
|
update game UI
|
2026-02-01 15:02:43 +07:00 |
|
|
Le Duc Anh
|
d6e4daeda2
|
Merge remote-tracking branch 'origin/develop' into feature/mini-map
|
2026-01-31 18:20:34 +07:00 |
|
|
Le Duc Anh
|
3a2772c739
|
finish minimap v1
|
2026-01-31 18:18:36 +07:00 |
|
|
Le Duc Anh
|
f40abb2132
|
update host player pos
|
2026-01-30 17:21:15 +07:00 |
|
|
NguyenVanDat
|
d9c3333dc9
|
Merge branch 'develop' into feature/embed-stone
|
2026-01-30 15:07:20 +07:00 |
|
|
NguyenVanDat
|
14b5a6f780
|
do embed stone
|
2026-01-30 15:06:37 +07:00 |
|
|
VDH
|
0de2995ab6
|
done ui action
|
2026-01-30 11:37:10 +07:00 |
|
|
Le Duc Anh
|
ea8e6a79f1
|
update mini map
|
2026-01-29 19:25:53 +07:00 |
|
|
VDH
|
e2e63b83f2
|
convert ui code
|
2026-01-29 19:24:42 +07:00 |
|
|
Chomper9981
|
0821e2f741
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game
|
2026-01-29 17:49:03 +07:00 |
|
|
Chomper9981
|
670c114b96
|
add missing file
|
2026-01-29 17:42:56 +07:00 |
|
|
Chomper9981
|
5aff603a47
|
Add task trace Feature. Modify task UI.
|
2026-01-29 17:42:34 +07:00 |
|
|
VuNgocHaiC7
|
8d1965653c
|
update UI of DlgProduce and DlgInstall, chage iconTask
|
2026-01-29 17:39:16 +07:00 |
|
|
VuNgocHaiC7
|
ccbe1b4a0c
|
update feature useitem
|
2026-01-29 17:08:58 +07:00 |
|