Merge conflict patch and map texture update

This commit is contained in:
2026-05-17 22:50:01 +02:00
parent 843c121666
commit c2566b8db0
13 changed files with 517 additions and 1237 deletions

View File

@@ -6,7 +6,7 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/SampleScene.unity
path: Assets/Scenes/MainScene.unity
guid: 8afa6ce05eb7dba4c894b910786e3baf
- enabled: 1
path: Assets/Scenes/Client.unity