feat: merge all on main scene ✨ (#21)

MisterAzix · Jan 20, 2023 · a536fb1 · a536fb1
1 parent bb09a54
commit a536fb1
Show file tree

Hide file tree

Showing 7 changed files with 964 additions and 32 deletions.
diff --git a/Assets/Level/Prefabs/Player.prefab b/Assets/Level/Prefabs/Player.prefab
@@ -200,8 +200,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1c6c0943eb3256b31b419a45d221a368, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  sensX: 200
-  sensY: 200
+  sensX: 500
+  sensY: 500
   player: {fileID: 7601803230581162137}
   gunPosition: {fileID: 4239183470328706560}
 --- !u!114 &8607814543266890481

diff --git a/Assets/Level/Prefabs/spawningPoint1.prefab → Assets/Level/Prefabs/SpawnPoint.prefab b/Assets/Level/Prefabs/spawningPoint1.prefab → Assets/Level/Prefabs/SpawnPoint.prefab
@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5981645854533450410}
   m_Layer: 0
-  m_Name: spawningPoint1
+  m_Name: SpawnPoint
   m_TagString: SpawningPoint
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/.../Level/Prefabs/spawningPoint1.prefab.meta → Assets/Level/Prefabs/SpawnPoint.prefab.meta b/.../Level/Prefabs/spawningPoint1.prefab.meta → Assets/Level/Prefabs/SpawnPoint.prefab.meta