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 |
|
Chomper9981
|
7ddd60e7e1
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-25 14:41:37 +07:00 |
|
Chomper9981
|
cad727b814
|
Fix the nav bug(work around). fix the major map quest's npc load proplem.
|
2026-02-25 14:41:15 +07:00 |
|
NguyenVanDat
|
f403b24060
|
fix message box display in line
|
2026-02-25 11:12:12 +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 |
|
Le Duc Anh
|
0e6ceaf6f3
|
Play from Bootstrap scene. Move heavy logic to other Thread
|
2026-02-20 01:20:05 +07:00 |
|
Le Duc Anh
|
21754a63e7
|
Load object base on distance v1 - without loading screen
|
2026-02-16 13:46:16 +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 |
|
hoangvd
|
cb18c63c87
|
Merge pull request 'adjust UI layout add logic disable UI for quickbar UI' (#159) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/159
|
2026-02-11 09:57:56 +00:00 |
|
Le Duc Anh
|
00c0e1d88a
|
fix some minor issues
|
2026-02-11 16:43:53 +07:00 |
|
VDH
|
c04b5b1f09
|
adjust UI layout add logic disable UI for quickbar UI
|
2026-02-11 15:31:37 +07:00 |
|
NguyenVanDat
|
a66bffd9d8
|
fix clear slot index
|
2026-02-11 11:32:11 +07:00 |
|
VDH
|
b5184947f2
|
Merge branch 'develop' into feature/skill-set-shortcut
|
2026-02-11 10:50:17 +07:00 |
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
Chomper9981
|
2e04507aa6
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game
|
2026-02-10 12:16:25 +07:00 |
|
Chomper9981
|
a86e15e48a
|
Fix bug cant get "Lan xi ki di" in main quest progress
|
2026-02-10 12:14:47 +07:00 |
|
NguyenVanDat
|
e4909c1658
|
update logic clear chip
|
2026-02-10 11:51:26 +07:00 |
|
HungDK
|
a295b3402e
|
HUD and else player interact
|
2026-02-09 18:07:56 +07:00 |
|
Le Duc Anh
|
72c72bd8e5
|
modify login scene
|
2026-02-09 18:06:59 +07:00 |
|
VDH
|
7458032777
|
spawn skill 5
|
2026-02-09 18:05:37 +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 |
|
Chomper9981
|
f9c7d0f04c
|
Create UI for DlgQuest, fix the proplem with quest have deep not equal 3
|
2026-02-07 14:57:35 +07:00 |
|
VDH
|
781c5cd08d
|
done passive skill UI
|
2026-02-06 15:13:42 +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 |
|
VDH
|
b3e5f2ae61
|
done skill ui execute
|
2026-02-05 17:26:58 +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 |
|
Le Duc Anh
|
5ae8a9a51d
|
combine SDK with login UI
|
2026-02-03 14:57:23 +07:00 |
|
NguyenVanDat
|
20e53ed790
|
Merge branch 'feature/update-message-box' into develop
|
2026-02-03 10:44:59 +07:00 |
|
NguyenVanDat
|
df5e889a67
|
update message box
|
2026-02-03 10:38:59 +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 |
|
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 |
|