merge feat/level/create-level-1 : keep the most recent

2026-03-30 17:23:31 +02:00
parent 66b8ea1c3f 187c4fbf61
commit 280626bf6b
44 changed files with 25882 additions and 9954 deletions
--- a/Assets/Level/Prefabs/World/MovingDoor.prefab
+++ b/Assets/Level/Prefabs/World/MovingDoor.prefab
@@ -15,7 +15,11 @@ GameObject:
  - component: {fileID: 7987102888823411772}
  - component: {fileID: 6921400718617286756}
  m_Layer: 0
+<<<<<<<< HEAD:Assets/Level/Prefabs/World/MovingDoor.prefab
  m_Name: MovingDoor
+========
+  m_Name: BigDoor
+>>>>>>>> feat/level/create-level-1:Assets/Level/Prefabs/Interactives/BigDoor.prefab
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/Assets/Level/Prefabs/World/MovingDoor.prefab.meta
+++ b/Assets/Level/Prefabs/World/MovingDoor.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2f9e8e4a19f939f43a84c1c7d0a0e185
+guid: 1c118abd03461b8bf81ae24b3410a233
 PrefabImporter:
  externalObjects: {}
  userData: