Commit Graph

21 Commits

Author SHA1 Message Date
MinhHai 175790f370 Merge remote-tracking branch 'origin/develop' into feature/task-npc-give-award 2025-12-11 11:37:16 +07:00
HungDK 6392baf369 Add ext description text 2025-12-08 16:15:01 +07:00
NguyenVanDat 157659d320 Merge branch 'develop' into implement_task_UI
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
2025-12-08 15:40:11 +07:00
HungDK 66dc12ef4a Update item detail 2025-12-08 09:30:59 +07:00
MinhHai 9bc02e1fef add DlgAward 2025-12-05 22:00:00 +07:00
HungDK a35cd6d0e7 Update EC_Invtr 2025-11-20 13:47:10 +07:00
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +07:00
Le Duc Anh f338899f76 initial load all equipments 2025-11-05 16:08:51 +07:00
Tungdv 3a05b94366 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HostPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_Object.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
#	Assets/PerfectWorld/Scripts/UI/pickupItem.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_Utility.cs
#	Assets/Scripts/GameController.cs
#	Assets/Scripts/InitializePlayer.cs
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-20 16:58:20 +07:00
VDH 32e42d2db8 npc leave after die 2025-10-16 10:53:05 +07:00
Tungdv 001a16cf32 fix: update namespace.
feat: add new logic EC_World.
2025-10-14 18:34:16 +07:00
HungDK 1ed01cd4c5 Clear useless log 2025-10-14 10:51:11 +07:00
HungDK 83843ce63e Fix missing parameter 2025-09-25 15:27:41 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
HungDK 1d348f3ac6 Update load icon from multi sprite file, default icon slot 2025-09-25 14:07:38 +07:00
HungDK b43b1c61c2 Add slide atlas tool 2025-09-24 18:17:49 +07:00
HungDK 960fd880b6 Update ui icon (placeholder) placed data 2025-09-24 09:28:40 +07:00
VDH 53013d7887 aniamtion processs 2025-09-18 18:07:23 +07:00
HungDK d896833754 Remove useless code 2025-09-16 10:58:02 +07:00
HungDK 2b3af4037a Add ui, font 2025-09-15 20:17:49 +07:00
HungDK f615aab877 Add own item info data handle 2025-09-13 18:34:16 +07:00