 VuNgocHaiC7
|
b60fe6fa6f
|
update code DlgPetRec
|
2026-02-27 15:34:12 +07:00 |
|
|
VuNgocHaiC7
|
8f8607ece6
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
|
2026-02-27 13:33:08 +07:00 |
|
|
VuNgocHaiC7
|
1af61057e0
|
update code DlgPetRec
|
2026-02-27 13:32:18 +07:00 |
|
|
HungDK
|
b4cc2717c9
|
Merge branch 'develop' into feature/hp_pet
|
2026-02-27 10:34:38 +07:00 |
|
|
Tungdv
|
f85f1add54
|
fix: update logic hatch pet egg.
|
2026-02-26 20:22:07 +07:00 |
|
|
GiGiDreamsQuest
|
02be4f4656
|
currently working prefab dlgpetRec
|
2026-02-26 18:11:33 +07:00 |
|
|
HungDK
|
9592a83a37
|
Merge branch 'develop' into feature/character_info
|
2026-02-26 17:05:23 +07:00 |
|
|
Tungdv
|
708f33bfe4
|
Merge branch 'develop' into feature/hp_pet
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-26 16:39:23 +07:00 |
|
|
Tungdv
|
72ef982527
|
fix: update UI Dialog Pet List.
|
2026-02-26 15:57:36 +07:00 |
|
|
VuNgocHaiC7
|
fbfeefd4b9
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
|
2026-02-26 14:26:29 +07:00 |
|
|
VuNgocHaiC7
|
8df945151d
|
update prefab DlgPetHatch
|
2026-02-26 14:24:30 +07:00 |
|
|
HungDK
|
76e5c44e39
|
Handle hide option panel
|
2026-02-26 09:18:57 +07:00 |
|
|
NguyenVanDat
|
d1c802586e
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-25 10:50:13 +07:00 |
|
|
NguyenVanDat
|
b4b2f9ac96
|
finish clear tessera
|
2026-02-25 10:26:49 +07:00 |
|
|
HungDK
|
d066a1a541
|
Merge remote-tracking branch 'origin/develop' into feature/character_info
|
2026-02-24 11:12:38 +07:00 |
|
|
NguyenVanDat
|
cc04ace9e1
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
|
2026-02-23 15:05:51 +07:00 |
|
|
VuNgocHaiC7
|
366001be85
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall
|
2026-02-11 17:37:06 +07:00 |
|
|
VuNgocHaiC7
|
363520be53
|
update info item for dlgInstall after the merge
|
2026-02-11 17:36:16 +07:00 |
|
|
NguyenVanDat
|
a66bffd9d8
|
fix clear slot index
|
2026-02-11 11:32:11 +07:00 |
|
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
|
NguyenVanDat
|
e4909c1658
|
update logic clear chip
|
2026-02-10 11:51:26 +07:00 |
|
|
HungDK
|
45ced15f27
|
Add show option dlg
|
2026-02-09 18:04:39 +07:00 |
|
|
HungDK
|
7b7d85e0ad
|
Add other player interact options
|
2026-02-09 17:02:06 +07:00 |
|
|
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 |
|