Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding

# Conflicts: # UOP1_Project/Assets/Cutscenes/PathAndCave.meta # UOP1_Project/Assets/Cutscenes/PathAndCave.unity # UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta # UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset # UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta # UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
3 年前 · 40572789
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave.meta
+fileFormatVersion: 2
+guid: fb61983cc7c48c84ba6f31bb1ef1d6f7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave.unity
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave.unity
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta
+fileFormatVersion: 2
+guid: 2ca3cd003439efc4eaa3ba5ebc389c79
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta
+fileFormatVersion: 2
+guid: 357fcb53ee054a04dbb55a2b5235cd20
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta
+fileFormatVersion: 2
+guid: 73fcd01e1e5919b48b6636341f4ae2eb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta
+fileFormatVersion: 2
+guid: 1bf95b30f604ac14cbba3d090c49a467
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset
--- a/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta
+++ b/UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta
+fileFormatVersion: 2
+guid: 49e2abd9ad3cc0443a2af821bdbf1bf5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: