Commit Graph

120 Commits

Author SHA1 Message Date
HungDK c432556ec8 Update MallUI.prefab 2025-12-25 16:40:27 +07:00
VDH 76e66cafdb debug 2025-12-23 14:19:04 +07:00
VDH b0c566bef5 fix distance stop npc 2025-12-22 15:12:20 +07:00
VDH 04cbdb4934 Merge branch 'develop' into feature/skill-data 2025-12-17 17:18:28 +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
VDH 54b1cc7127 fix animation processing 2025-12-16 09:30:09 +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
VDH 2d3f98bb2c fix after merge 2025-12-05 10:16:08 +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 31f4012bec done health bar 2025-11-25 16:20: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 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
NguyenVanDat d80f7f4f07 Merge branch 'develop' into feature/refactor-game-run 2025-11-21 11:50:36 +07:00
NguyenVanDat 8f5673c68e refactor game run and fix game flow 2025-11-21 11:48: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
HungDK c216b59c75 Update SkillUI.prefab 2025-11-19 10:36:28 +07:00
VDH a30427e3f5 Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECHostPlayer_Inventory.cs
2025-11-19 10:35:54 +07:00
HungDK af6a20f403 Add skill ui 2025-11-17 19:10:02 +07:00
Tungdv fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
2025-11-17 14:50:24 +07:00
Tungdv e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +07:00
Le Duc Anh 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-13 16:22:36 +07:00
Le Duc Anh c4a56218d8 load player model 2025-11-13 16:12:12 +07:00