Commit Graph

199 Commits

Author SHA1 Message Date
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
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 e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +07:00
tung.do@monkey.edu.vn 8bf8f3716c fix: update text dlgnpc and fix bug merge. 2025-11-13 01:51:06 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
2025-11-12 19:39:19 +07:00
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00
HungDK b287ff7902 Fix scroll 2025-11-10 10:52:21 +07:00
HungDK 8278709a45 Add prefab and ui of revive system 2025-11-04 14:30:25 +07:00
HungDK 915b11b387 Update login ui 2025-10-28 13:51:33 +07:00
HungDK 13d1283d6e Fix money and cash loader 2025-10-27 15:39:45 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
HungDK bd34b294f9 Add player currency 2025-10-25 17:07:54 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
HungDK cabb293722 Update SelectCharacterUI.prefab 2025-10-21 18:50:38 +07:00
HungDK 8a9449330f Update InventoryUI.prefab 2025-10-21 16:56:01 +07:00
HungDK f22fe3d70f Update MallUI.prefab 2025-10-17 17:54:39 +07:00
HungDK 28f67cc543 Update MallUI.prefab 2025-10-17 09:26:43 +07:00
HungDK efa0682057 Add shop ui prefabs 2025-10-16 10:24:55 +07:00
HungDK f31db71ef1 Update InventoryUI.prefab 2025-10-14 10:52:14 +07:00
HungDK 7a000797ec Update place holder item drop object 2025-10-09 17:04:07 +07:00
HungDK 2950100ecd Update InventoryUI.prefab 2025-10-06 17:57:35 +07:00
HungDK 21a31f4746 Add player preview in inventory 2025-10-02 14:15:19 +07:00
HungDK adf0aa1edd Update InventoryUI.prefab 2025-10-02 08:49:29 +07:00
HungDK 86b30afc13 Update ivtr fashion ui 2025-10-01 09:51:03 +07:00
HungDK c02f471fa6 Add select character ui 2025-09-29 16:10:45 +07:00