 VDH
|
8bce2d6b06
|
tesst skill
|
2026-02-09 15:15:31 +07:00 |
|
|
VDH
|
b70f68fe81
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-05 17:41:50 +07:00 |
|
|
Tungdv
|
7a96c7e252
|
Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
# Assets/AddressableAssetsData/AddressableAssetSettings.asset
# Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
# Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
# Assets/Scenes/a61.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECUIManager.cs
|
2026-02-05 17:29:54 +07:00 |
|
|
VuNgocHaiC7
|
9da8ac2a50
|
UI DlgPetList.prefab
|
2026-02-05 13:46:49 +07:00 |
|
|
VDH
|
414562f221
|
done excute skill bar
|
2026-02-05 11:21:49 +07:00 |
|
|
VDH
|
0462ddaadd
|
fix bug create skill combo
|
2026-02-04 15:11:32 +07:00 |
|
|
VuNgocHaiC7
|
ca4e403513
|
fix UI DlgInstall.prefab and DlgUninstall.prefab
|
2026-02-04 14:00:31 +07:00 |
|
|
VuNgocHaiC7
|
7fdce58713
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall
|
2026-02-03 17:39:51 +07:00 |
|
|
VuNgocHaiC7
|
bcb2f61348
|
update UI DlgUninstall.prefab
|
2026-02-03 17:38:50 +07:00 |
|
|
VDH
|
5ee2b68785
|
create skill combo
|
2026-02-03 17:26:53 +07:00 |
|
|
VDH
|
ef1804f967
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
|
2026-02-03 15:09:55 +07:00 |
|
|
VDH
|
eca33817e8
|
done ui info
|
2026-02-03 15:01:57 +07:00 |
|
|
VuNgocHaiC7
|
bca7fd1c6a
|
fix UI DlgInstall.prefab
|
2026-02-02 18:18:01 +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 |
|
|
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 |
|
|
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 |
|
|
NguyenVanDat
|
d9c3333dc9
|
Merge branch 'develop' into feature/embed-stone
|
2026-01-30 15:07:20 +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
|
5aff603a47
|
Add task trace Feature. Modify task UI.
|
2026-01-29 17:42:34 +07:00 |
|
|
VuNgocHaiC7
|
d69fed7aea
|
fix conflig use item
|
2026-01-29 14:23:24 +07:00 |
|
|
NguyenVanDat
|
0c3decd408
|
Merge branch 'develop' into feature/embed-stone
|
2026-01-29 09:35:30 +07:00 |
|
|
VDH
|
a3b5a72b9c
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
|
2026-01-28 16:47:35 +07:00 |
|
|
VDH
|
6dbc543188
|
done create new skill combo
|
2026-01-28 16:40:29 +07:00 |
|
|
Tungdv
|
4c51d6bf19
|
fix: update logic dlg pet.
|
2026-01-27 19:47:15 +07:00 |
|
|
VDH
|
c22ca07a0f
|
done skill combo
|
2026-01-27 18:04:32 +07:00 |
|
|
HungDK
|
312edda4aa
|
Fix get character name logic
|
2026-01-27 17:41:33 +07:00 |
|
|
HungDK
|
af13bd5c47
|
Add DlgCharacter ui logic
|
2026-01-27 17:39:03 +07:00 |
|
|
NguyenVanDat
|
ee5e123b13
|
update logic embed stone
|
2026-01-27 11:35:03 +07:00 |
|
|
Tungdv
|
0ce6bc8c82
|
fix: update popup pet.
|
2026-01-26 19:11:15 +07:00 |
|
|
NguyenVanDat
|
b64b08ab06
|
show gold need to embed stone
|
2026-01-26 09:51:10 +07:00 |
|
|
Tungdv
|
4972735d83
|
fix: update logic dlg pet
|
2026-01-23 19:49:40 +07:00 |
|
|
Tungdv
|
c712653b21
|
fix: update logic pet.
|
2026-01-22 20:13:46 +07:00 |
|
|
Tungdv
|
d950c5a9c3
|
fix: add controller pet.
|
2026-01-21 19:17:41 +07:00 |
|
|
VuNgocHaiC7
|
de36b370d6
|
complete UI DlgInstall.prefab
|
2026-01-21 17:37:35 +07:00 |
|
|
VuNgocHaiC7
|
312d03f3e5
|
update ui DlgInstall.prefab
|
2026-01-21 16:40:25 +07:00 |
|
|
VuNgocHaiC7
|
6266fab039
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment
|
2026-01-19 18:03:35 +07:00 |
|
|
VuNgocHaiC7
|
ac3d77c3e2
|
update detail item of dlgProduce.prefab
|
2026-01-19 18:02:50 +07:00 |
|
|
VDH
|
1d43192fb1
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/Scripts/CECHostPlayer.cs
|
2026-01-19 16:22:53 +07:00 |
|
|
VDH
|
5fc98befea
|
skill ui Process
|
2026-01-16 18:01:33 +07:00 |
|
|
HungDK
|
ef362d6017
|
Merge branch 'develop' into feature/produce-equipment
|
2026-01-16 17:40:20 +07:00 |
|
|
VuNgocHaiC7
|
2f6e3c751d
|
update quantity inc, dec, max
|
2026-01-16 17:28:55 +07:00 |
|
|
VuNgocHaiC7
|
54a178ec75
|
update detail and status produce items
|
2026-01-15 17:03:29 +07:00 |
|
|
HungDK
|
dd96ccd0ed
|
Add request server to produce item
|
2026-01-15 15:05:22 +07:00 |
|
|
VDH
|
1624864487
|
Merge branch 'develop' into feature/skill-data
|
2026-01-15 13:33:42 +07:00 |
|