From af07a29f402fc31e707cacafeee1af6bb3831b03 Mon Sep 17 00:00:00 2001 From: HelarJ Date: Mon, 28 Mar 2022 17:00:22 +0300 Subject: [PATCH] final changes --- .../Scenes/LowPolyDungeons_Demo.unity.meta | 2 +- .../Scenes/LowPolyDungeons_Overview.unity.meta | 2 +- Assets/Project Files/Prefabs/Arlo.meta | 8 ++++++++ Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta | 2 +- .../Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta | 2 +- .../Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta | 2 +- Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta | 2 +- Assets/Project Files/Shaders/Arlo.meta | 8 ++++++++ Assets/QuickOutline.meta | 8 ++++++++ Assets/QuickOutline/Resources.meta | 2 +- .../QuickOutline/Samples/Scenes/QuickOutline.unity.meta | 2 +- Assets/Scenes/JonasB/Dungeon.unity.meta | 2 +- 12 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 Assets/Project Files/Prefabs/Arlo.meta create mode 100644 Assets/Project Files/Shaders/Arlo.meta create mode 100644 Assets/QuickOutline.meta diff --git a/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta b/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta index a04b98a8..b8392377 100644 --- a/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta +++ b/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta -guid: f23712c79adc910408e872b127e825cf +guid: 96e0f305ff8e6e24fa04570a5e239535 timeCreated: 1522615825 licenseType: Store ======== diff --git a/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta b/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta index b2cde3d5..49a60965 100644 --- a/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta +++ b/Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/QuickOutline/Resources.meta -guid: 70fd40674751a8042a8b9b2e8d9f915f +guid: 3e7161d0fb662244a9a6c1e02c2df1d5 folderAsset: yes timeCreated: 1522559128 licenseType: Store diff --git a/Assets/Project Files/Prefabs/Arlo.meta b/Assets/Project Files/Prefabs/Arlo.meta new file mode 100644 index 00000000..1fd75376 --- /dev/null +++ b/Assets/Project Files/Prefabs/Arlo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf9fd337edc6b034da268d1306e045a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta b/Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta index e5c4a720..62875068 100644 --- a/Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta +++ b/Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta -guid: d427f0f5ff0359f4c92a56ed37a11542 +guid: c89fd30ca0b56fb41a415d285d87b219 ======== guid: 8f5582064724dbc45bc5c3432899f9c1 >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta diff --git a/Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta b/Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta index 77aa51a9..69a7e22f 100644 --- a/Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta +++ b/Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta -guid: c509c0c7d8d7f2942a05792798d31fc0 +guid: 215fe2a51d12ecc43ba8f86d3dc3ae54 folderAsset: yes DefaultImporter: ======== diff --git a/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta index 6754d0a1..9f0be171 100644 --- a/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta +++ b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Resources/Helar.meta -guid: af818d2fbe0b12e4794f02d093a8d1c5 +guid: 551c14077760549478d9927a77d319ee folderAsset: yes DefaultImporter: ======== diff --git a/Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta b/Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta index e5c4a720..5e422eb0 100644 --- a/Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta +++ b/Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta -guid: d427f0f5ff0359f4c92a56ed37a11542 +guid: cb8b19b563b3d224897e3b3d94c353aa ======== guid: 8f5582064724dbc45bc5c3432899f9c1 >>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta diff --git a/Assets/Project Files/Shaders/Arlo.meta b/Assets/Project Files/Shaders/Arlo.meta new file mode 100644 index 00000000..d4974567 --- /dev/null +++ b/Assets/Project Files/Shaders/Arlo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4eb55eb68b1d974a97ac0f260dcf964 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QuickOutline.meta b/Assets/QuickOutline.meta new file mode 100644 index 00000000..05646bb2 --- /dev/null +++ b/Assets/QuickOutline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e2a31ff500d2574b958693daad5e3e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QuickOutline/Resources.meta b/Assets/QuickOutline/Resources.meta index b2cde3d5..d90f8d1f 100644 --- a/Assets/QuickOutline/Resources.meta +++ b/Assets/QuickOutline/Resources.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/QuickOutline/Resources.meta -guid: 70fd40674751a8042a8b9b2e8d9f915f +guid: 7d0f280d232462b4d962e047022e5e3c folderAsset: yes timeCreated: 1522559128 licenseType: Store diff --git a/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta b/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta index a04b98a8..9b725efc 100644 --- a/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta +++ b/Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta -guid: f23712c79adc910408e872b127e825cf +guid: 4e04f58b1862b1d4f91c80b974e32fe8 timeCreated: 1522615825 licenseType: Store ======== diff --git a/Assets/Scenes/JonasB/Dungeon.unity.meta b/Assets/Scenes/JonasB/Dungeon.unity.meta index 3db91780..faca26e5 100644 --- a/Assets/Scenes/JonasB/Dungeon.unity.meta +++ b/Assets/Scenes/JonasB/Dungeon.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Resources/Helar/Item.prefab.meta -guid: b609e3c6adb2d2b4196415d93e789ddd +guid: d28d613c510a3b449a9070c2eb2b61c0 PrefabImporter: ======== guid: f6d31dc9e750063448915a12546cf689