 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 |
|