duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,000 Commits 13 Branches 0 Tags
develop
Commit Graph

251 Commits

Author SHA1 Message Date
NguyenVanDat 33dc5dc7b3 fix bug: can not end service when buy or create item in NPC shop 2026-03-07 14:38:50 +07:00
NguyenVanDat 1e17b4108c update UI logic embed stone and clear stone 2026-03-07 13:47:29 +07:00
NguyenVanDat bad2515394 Merge branch 'develop' into feature/ui-system-update 
# Conflicts:
#	Assets/Scripts/CECUIManager.cs
 2026-03-07 10:08:28 +07:00
VuNgocHaiC7 1c7989159e fix UI dlgTeamList auto show true 2026-03-06 18:03:17 +07:00
VuNgocHaiC7 2c0bbafb6f update code PetDetail 2026-03-06 16:55:00 +07:00
VuNgocHaiC7 01672cde16 Update DlgPetDetail for DlgPetList 2026-03-05 17:40:09 +07:00
VuNgocHaiC7 4666393214 update code dlgPetList 2026-03-05 15:37:00 +07:00
NguyenVanDat 78d29bc8cf update stack logic and document 2026-03-05 10:26:21 +07:00
NguyenVanDat 8cfab19cf6 add stack ui logic 2026-03-05 09:48:47 +07:00
VuNgocHaiC7 e33adda85f change UI DlgPetList and code test for dlg 2026-03-04 17:35:19 +07:00
VuNgocHaiC7 c8976e6d4d fix dlg TeamList, dlg PetList, dlg Install 2026-03-04 16:39:09 +07:00
VuNgocHaiC7 21f2d712c4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-03 16:46:20 +07:00
VuNgocHaiC7 9ff77591f7 update code and prefabs dlg teamList 2026-03-03 16:45:57 +07:00
Chomper9981 d5adc1542c Update UI 2026-03-02 18:02:23 +07:00
VuNgocHaiC7 46191105b4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-03-02 14:30:27 +07:00
VuNgocHaiC7 92bbee64c3 Done DlgInstall 2026-03-02 14:30:18 +07:00
Tungdv 8199d01929 fix: update dlg pet restore. 2026-02-27 18:24:11 +07:00
Tungdv a64111b1b6 fix: fix bug dlg pet hatch. 2026-02-27 17:47:10 +07:00
Tungdv 89b184f854 Merge remote-tracking branch 'origin/develop' into feature/hp_pet 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2026-02-27 17:27:16 +07:00
Tungdv 1210ff2c51 fix: update dlg pet list and dlg pet restore. 2026-02-27 17:24:26 +07:00
MinhHai cee2eb74f7 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2026-02-27 15:56:39 +07:00
MinhHai b342407c9f DONE: Fix compress method of AFILEPACKAGE 2026-02-27 15:50:32 +07:00
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
MinhHai a9eb777799 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2026-02-25 16:11:52 +07:00
MinhHai e8102b8266 WIP: change type field of struct in EC_CONFIG 2026-02-25 16:07:56 +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
MinhHai aa53269f35 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-24 14:35:11 +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
MinhHai 125229cae5 Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
 2026-02-11 14:56:21 +07:00
MinhHai 4df362fd16 add logic for SaveConfig, avoid Send to Server 2026-02-11 14:54:51 +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