 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 |
|
|
MinhHai
|
9bc02e1fef
|
add DlgAward
|
2025-12-05 22:00:00 +07:00 |
|
|
MinhHai
|
c3ea7b7851
|
update logic send cmd TASK_NOTIFY from Client to Server
|
2025-11-25 11:25:53 +07:00 |
|
|
MinhHai
|
beb12c8723
|
update logic NotifyServer of class TaskClient
|
2025-11-22 18:58:40 +07:00 |
|
|
MinhHai
|
7ba8ca49ba
|
fix EC_Game: get GameRun, cache TaskData before playmode
|
2025-11-22 10:04:50 +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 |
|