 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 |
|
|
MinhHai
|
bb01bbb6f1
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-12 16:57:45 +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 |
|
|
NguyenVanDat
|
142fabf108
|
Merge branch 'develop' into feature/add-vfx
# Conflicts:
# Assets/PerfectWorld/Prefab/GameController.prefab
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/PlayerVisual.cs
|
2025-11-12 11:03:25 +07:00 |
|
|
VDH
|
eed08c2b13
|
bug skill data not received
|
2025-11-08 16:41:19 +07:00 |
|
|
VDH
|
38a2c0d46f
|
covnert continue
|
2025-11-06 17:29:02 +07:00 |
|