 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 |
|
|
VDH
|
414562f221
|
done excute skill bar
|
2026-02-05 11:21:49 +07:00 |
|
|
Tungdv
|
cda4e1343a
|
fix: update logic rider pet.
|
2026-02-04 19:27:01 +07:00 |
|
|
Tungdv
|
53f8829413
|
fix: update show pet rider.
|
2026-02-03 19:26:41 +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
|
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 |
|
|
VDH
|
e57899226d
|
infoskill done data
|
2026-02-02 18:16:11 +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
|
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 |
|
|
Tungdv
|
ef894f6e49
|
fix: update logic pet.
|
2026-01-31 19:23:50 +07:00 |
|
|
Le Duc Anh
|
d6e4daeda2
|
Merge remote-tracking branch 'origin/develop' into feature/mini-map
|
2026-01-31 18:20:34 +07:00 |
|
|
NguyenVanDat
|
d9c3333dc9
|
Merge branch 'develop' into feature/embed-stone
|
2026-01-30 15:07:20 +07:00 |
|
|
Tungdv
|
b5d5ae1982
|
fix: update logic pet.
|
2026-01-29 19:24:57 +07:00 |
|
|
VuNgocHaiC7
|
ccbe1b4a0c
|
update feature useitem
|
2026-01-29 17:08:58 +07:00 |
|
|
VuNgocHaiC7
|
8f916ee88c
|
use item but cooldown don't active
|
2026-01-29 13:58:15 +07:00 |
|
|
Le Duc Anh
|
8f4fc62426
|
Merge remote-tracking branch 'origin/develop' into feature/mini-map
|
2026-01-28 09:46:40 +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 |
|
|
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
|
a64b5ab79f
|
Merge branch 'develop' into feature/embed-stone
|
2026-01-26 11:05:56 +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 |
|
|
VDH
|
7d9f75de18
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-01-23 18:08:51 +07:00 |
|
|
VDH
|
3de0850a2b
|
push convert flow use skill combo
|
2026-01-23 18:01:15 +07:00 |
|
|
Chomper9981
|
46cfb747c6
|
add all item till level 20 through the quest for TIT(tien thu). fix the bug suite not count decoration data.
|
2026-01-23 09:31:55 +07:00 |
|
|
Tungdv
|
c712653b21
|
fix: update logic pet.
|
2026-01-22 20:13:46 +07:00 |
|
|
VDH
|
ef366cfc32
|
convert skill combo'
|
2026-01-22 19:23:32 +07:00 |
|
|
Chomper9981
|
98f792deb4
|
Add more item to display. fix the bug when load percent data.
|
2026-01-22 10:18:43 +07:00 |
|
|
NguyenVanDat
|
0e26b1b2dc
|
update inventory
|
2026-01-22 10:02:58 +07:00 |
|
|
Le Duc Anh
|
aec46e91d3
|
WIP: show mini map textures
|
2026-01-20 23:59:28 +07:00 |
|
|
Chomper9981
|
273f353ddc
|
add more item detail in inventory. Create some place holder for pet item so that those item can be shown
|
2026-01-20 16:31:57 +07:00 |
|
|
Chomper9981
|
093c257f74
|
Load more ItemType
|
2026-01-19 16:16:51 +07:00 |
|
|
Tungdv
|
15f9bd2a86
|
Merge branch 'develop' into feature/hp_swim
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-01-16 19:16:40 +07:00 |
|
|
HungDK
|
d4a571be87
|
Merge remote-tracking branch 'origin/develop' into feature/produce-equipment
|
2026-01-16 18:31:41 +07:00 |
|
|
Tungdv
|
0b23be64a2
|
fix: update logic cmd cache.
|
2026-01-16 18:02:39 +07:00 |
|
|
Chomper9981
|
1564586daa
|
add default state for item creatation.
|
2026-01-16 16:33:30 +07:00 |
|
|
Chomper9981
|
e37fbefad4
|
Add Suite ("Noi dung bo trang bi") to show with item in inventory. Rename some Variant that have confuse name in hostplayer.
|
2026-01-16 13:35:51 +07:00 |
|
|
VDH
|
1624864487
|
Merge branch 'develop' into feature/skill-data
|
2026-01-15 13:33:42 +07:00 |
|
|
Chomper9981
|
9167c63229
|
remove Lingq code
|
2026-01-14 17:34:27 +07:00 |
|
|
Chomper9981
|
b26e76b92f
|
fix cant choose npc in first section
|
2026-01-14 17:30:37 +07:00 |
|