Commit Graph

76 Commits

Author SHA1 Message Date
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
Chomper9981 c069cba784 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-16 13:36:31 +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 5462a3a79f save merge dev 2026-01-15 11:40:02 +07:00
VuNgocHaiC7 4bc9a18f01 update load data for UI but Tab Btn not active 2026-01-15 00:25:19 +07:00
VDH a0d80146bd Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-14 18:14:58 +07:00
VDH 8b2a00930b save prefab 2026-01-14 18:14:17 +07:00
VDH f5a9227cc7 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Prefabs/BoostrapForTest.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 18:04:28 +07:00
MinhHai ebec0738f6 update DlgNPC: add pressed visual for btn 2026-01-13 16:20:04 +07:00
MinhHai a6b26627a2 update UI: move all window into same canvas 2026-01-13 15:36:56 +07:00
VDH 59f70616e9 ui upgrade processing 2026-01-09 18:15:09 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
VDH 4aeae053b9 for test 2026-01-06 19:36:22 +07:00
HungDK c432556ec8 Update MallUI.prefab 2025-12-25 16:40:27 +07:00
NguyenVanDat f99c516cdb Merge branch 'develop' into feature/loading-task 2025-12-16 16:55:12 +07:00
NguyenVanDat 717eef48cb finish add summy loading task UI 2025-12-16 16:53:01 +07:00
VungochaiC7 3c33170b8b update prefabs SelectCharacter (Scroll role) 2025-12-16 15:39:30 +07:00
NguyenVanDat 5a0ad3ad4f loading task ui 2025-12-16 15:39:18 +07:00
VungochaiC7 ab563a6dba Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/color-text 2025-12-15 13:38:34 +07:00
VDH 10fd731948 st 2025-12-13 10:43:00 +07:00
VungochaiC7 b4777baca3 Update Prefabs Inventory UI, add drag-and-drop equipment functionality. 2025-12-12 16:42:48 +07:00
VDH 504cdb11d6 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/World/CECWorld.cs
#	Assets/Scenes/a61.unity
2025-12-11 14:14:54 +07:00
VDH 2c20aea277 save 2025-12-11 14:13:37 +07:00
VDH 45f69c9f44 skill ui 2025-12-10 18:17:34 +07:00
VDH 972104970d copnvert 2025-12-09 19:53:32 +07:00
Chomper9981 5d9dd1c3d9 Change some shop UI 2025-12-09 16:37:16 +07:00
VDH c239660cd6 Merge branch 'develop' into feature/skill-data 2025-12-08 17:51:18 +07:00
VDH 2410af3078 done pos skill 2025-12-08 17:49:57 +07:00
VungochaiC7 aee25a18b5 update detail color text item 2025-12-08 17:45:12 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
HungDK 9993297ab5 Update Tab_Button.prefab 2025-12-08 10:33:32 +07:00
HungDK f42e1d27de Update InventoryUI.prefab 2025-12-08 10:27:45 +07:00
HungDK 16094d04cf Fixing wrong command to send to server 2025-12-04 15:09:20 +07:00
HungDK b051a86014 Add place holder item detail, buy option 2025-12-04 14:39:46 +07:00
HungDK 582d014da0 Add ui 2025-12-03 16:44:13 +07:00
HungDK f74a65f4f7 Update InventoryUI.prefab 2025-12-01 14:53:29 +07:00
HungDK 50e9d892ab Update InventoryUI.prefab 2025-12-01 14:51:24 +07:00
HungDK 7e4fb80f62 Update character preview frame 2025-11-26 10:42:41 +07:00
Le Duc Anh 4ddc1e5c78 update skill buttons 2025-11-25 17:00:55 +07:00
HungDK be3eb81d40 Update UI 2025-11-25 15:02:17 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
Tungdv 59976a4be5 fix: update dlgnpc. 2025-11-22 17:47:15 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
Tungdv 1951047c61 fix: update logic button back and close in dlgnpc. 2025-11-21 11:37:07 +07:00
HungDK a35cd6d0e7 Update EC_Invtr 2025-11-20 13:47:10 +07:00
VDH 151831d1dd add prefab 2025-11-19 10:41:12 +07:00
VDH 2e2125f428 Merge remote-tracking branch 'origin/feature/skill-data' into feature/skill-data 2025-11-19 10:40:13 +07:00