merge door to staging

2022-03-28 16:54:50 +03:00
parent 99d412b258 fb14e165d4
commit 53bd10a13c
1331 changed files with 410263 additions and 5190 deletions
--- a/Assets/Resources/Helar/Item.prefab.meta
+++ b/Assets/Resources/Helar/Item.prefab.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta
 guid: b609e3c6adb2d2b4196415d93e789ddd
 PrefabImporter:
+========
+guid: f6d31dc9e750063448915a12546cf689
+DefaultImporter:
+>>>>>>>> origin/DoorInteration:Assets/Scenes/JonasB/Dungeon.unity.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Resources/OVRBuildConfig.asset
+++ b/Assets/Resources/OVRBuildConfig.asset
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
+  m_Name: OVRBuildConfig
+  m_EditorClassIdentifier: 
--- a/Assets/Resources/OVRBuildConfig.asset.meta
+++ b/Assets/Resources/OVRBuildConfig.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e8577404adadb07429c279d26a7d458d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: