 Tungdv
|
bb28c8505d
|
fix: update logic select option in dlg npc.
|
2025-11-18 19:01:03 +07:00 |
|
|
MinhHai
|
d992dcbc5f
|
Merge remote-tracking branch 'origin/feature/hp_interact_npc_merge' into implement_task_UI
|
2025-11-17 19:14:26 +07:00 |
|
|
Tungdv
|
86c304f43a
|
fix: update logic select option dialog npc.
|
2025-11-17 18:52:07 +07:00 |
|
|
Tungdv
|
1325a8df63
|
fix: update logic select option interact npc.
|
2025-11-17 14:31:20 +07:00 |
|
|
MinhHai
|
39092a47d5
|
update logic search task
|
2025-11-16 16:46:39 +07:00 |
|
|
MinhHai
|
2c3c44de4e
|
update Task: complete read task templ, log task name and description on UI, add sprites asset
|
2025-11-12 16:56:35 +07:00 |
|
|
MinhHai
|
64c2fc234a
|
create task window
|
2025-11-04 17:39:06 +07:00 |
|
|
MinhHai
|
a8822700bb
|
fix bug missing namespace after merge from develop
|
2025-11-03 17:36:42 +07:00 |
|
|
MinhHai
|
c9cd71c3f9
|
Merge branch 'develop' into feature/convert-task-templ
# Conflicts:
# Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs
# Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs.meta
# Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs
# Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs.meta
# Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs
# Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs.meta
# Assets/PerfectWorld/Scripts/Task/SizeTest.cs
# Assets/PerfectWorld/Scripts/Task/SizeTest.cs.meta
# Assets/PerfectWorld/Scripts/Task/TaskExpAnalyser.cs
# Assets/PerfectWorld/Scripts/Task/TaskLog.txt
# Assets/PerfectWorld/Scripts/Task/TaskLog.txt.meta
# Assets/Scenes/HoangTest.unity
|
2025-11-03 17:30:47 +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
|
a7666f9aa1
|
organize folder
|
2025-10-10 15:10:36 +07:00 |
|