diff --git a/3d Prototyp/Assets/Materials/grey 1.mat b/3d Prototyp/Assets/Materials/grey 1.mat new file mode 100644 index 00000000..11a3cb5d --- /dev/null +++ b/3d Prototyp/Assets/Materials/grey 1.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: grey 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.46540874, g: 0.42589286, b: 0.42589286, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Materials/grey 1.mat.meta b/3d Prototyp/Assets/Materials/grey 1.mat.meta new file mode 100644 index 00000000..fe837c83 --- /dev/null +++ b/3d Prototyp/Assets/Materials/grey 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7472676c6611f8d46aa7ef7883ab15b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Materials/wood 1.mat b/3d Prototyp/Assets/Materials/wood 1.mat new file mode 100644 index 00000000..63e71541 --- /dev/null +++ b/3d Prototyp/Assets/Materials/wood 1.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: wood 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8805031, g: 0.72083116, b: 0.4014872, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Materials/wood 1.mat.meta b/3d Prototyp/Assets/Materials/wood 1.mat.meta new file mode 100644 index 00000000..3c7041a0 --- /dev/null +++ b/3d Prototyp/Assets/Materials/wood 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fda5a935860dd894f9e76eb28c90bcb5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta index 7f1ca23f..dcc30a1b 100644 --- a/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab similarity index 50% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab index ea2ba00e..c0db370b 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &3935261990060072114 +--- !u!1001 &4255048076057006431 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,56 +8,56 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2103754823035124799, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_Name - value: Coffee_Pickupable_Blue Variant - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalPosition.x - value: 21.409637 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalPosition.y - value: 1.2736847 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalPosition.z - value: -5.0370345 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2344414906917999555, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7277775400988020951, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} + - target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 0188b986a52a983489aab29f1630f757, type: 2} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_Name + value: CoffeMug_Blue + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab.meta similarity index 74% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab.meta index 5974f3c3..3cca8fe0 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Blue.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37e1c4b5254279141bdb120a465d20d5 +guid: da946566dd3a518488f26f0ccd547e57 PrefabImporter: externalObjects: {} userData: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab similarity index 50% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab index 055aae3f..47c0f354 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &5549134432018436932 +--- !u!1001 &2287015152359431421 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,56 +8,56 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3025757556802749331, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 584cab1673da6f9429f5001bbb67c71f, type: 2} - - target: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} - propertyPath: m_Name - value: Coffee_Pickupable_Green Variant - objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalPosition.x - value: 21.409637 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalPosition.y - value: 1.2736847 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalPosition.z - value: -5.0370345 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_Name + value: CoffeMug_Green + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab.meta similarity index 74% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab.meta index dd5f0155..c80f3424 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Green.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842 +guid: a4a282cdf62321745a8cc90b1a9e9f84 PrefabImporter: externalObjects: {} userData: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab index 92d72d02..83cfb452 100644 --- a/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642849806601844052} serializedVersion: 2 - m_LocalRotation: {x: -0.45202562, y: 0.5437581, z: 0.543758, w: 0.4520257} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 7, y: 7, z: 7} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 6557370512938168053} m_Father: {fileID: 4084511099481264227} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &6800816504686247129 MeshFilter: m_ObjectHideFlags: 0 @@ -177,9 +177,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4084511099481264227} - - component: {fileID: 976052262833531566} - - component: {fileID: 7270411851895590608} - - component: {fileID: 3825317841902353598} m_Layer: 0 m_Name: CoffeMug_Red m_TagString: Untagged @@ -196,75 +193,10 @@ Transform: m_GameObject: {fileID: 8540413964132331813} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 21.273, y: 1.2736846, z: -5.037} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2698982615918444838} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &976052262833531566 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8540413964132331813} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.08, y: 0.1, z: 0.08} - m_Center: {x: 0, y: 0.05, z: 0} ---- !u!136 &7270411851895590608 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8540413964132331813} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.07 - m_Height: 0.16 - m_Direction: 1 - m_Center: {x: 0, y: 0.08, z: 0} ---- !u!65 &3825317841902353598 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8540413964132331813} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.03, y: 0.12, z: 0.07} - m_Center: {x: 0, y: 0.08, z: 0.09} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab similarity index 50% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab index cb2e8c22..f16a1f6d 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &181638966724076986 +--- !u!1001 &4087360594576994023 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,56 +8,56 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalPosition.x - value: 21.409637 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalPosition.y - value: 1.2736847 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalPosition.z - value: -5.0370345 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1591410048139710321, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3147684308716970125, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - propertyPath: m_Name - value: Coffee_Pickupable_Yellow Variant - objectReference: {fileID: 0} - - target: {fileID: 5936590679111568485, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} + - target: {fileID: 2893721198514633483, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 59694902c73654440aab07a65436dbc3, type: 2} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_Name + value: CoffeMug_Yellow + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab.meta similarity index 74% rename from 3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta rename to 3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab.meta index 9ac3087f..dcca0269 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Yellow.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d89768246390a54ca0bc24199d7e982 +guid: 938a31826b0885c4da3932f8d394b944 PrefabImporter: externalObjects: {} userData: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab new file mode 100644 index 00000000..a9b9e564 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab @@ -0,0 +1,231 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5778247514781970299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7893531080884699271} + - component: {fileID: 8850766705489312849} + - component: {fileID: 4629894269612581168} + - component: {fileID: 6730156945272532712} + - component: {fileID: 6428708572223952086} + - component: {fileID: 1427178841018934511} + - component: {fileID: 5392139150809204757} + m_Layer: 8 + m_Name: Coffee_Pickupable_Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7893531080884699271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7855185132366827283} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8850766705489312849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 6730156945272532712} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _model: {fileID: 5587087994976919674, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + _name: Kaffee + _itemType: 1 + UsesLeft: 1 +--- !u!54 &4629894269612581168 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6730156945272532712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 0 + outlineColor: {r: 1, g: 1, b: 0, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!65 &6428708572223952086 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.08, y: 0.1, z: 0.08} + m_Center: {x: 0, y: 0.05, z: 0} +--- !u!136 &1427178841018934511 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.07 + m_Height: 0.16 + m_Direction: 1 + m_Center: {x: 0, y: 0.08, z: 0} +--- !u!65 &5392139150809204757 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.07, y: 0.12, z: 0.03} + m_Center: {x: -0.09, y: 0.08, z: 0} +--- !u!1001 &7971608665264836143 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7893531080884699271} + m_Modifications: + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5587087994976919674, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + propertyPath: m_Name + value: CoffeMug_Blue + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: da946566dd3a518488f26f0ccd547e57, type: 3} +--- !u!4 &7855185132366827283 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 262315549016375612, guid: da946566dd3a518488f26f0ccd547e57, type: 3} + m_PrefabInstance: {fileID: 7971608665264836143} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab.meta new file mode 100644 index 00000000..235426de --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9847b3330677a894da44800d037d64a8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab new file mode 100644 index 00000000..24107a05 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab @@ -0,0 +1,231 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5778247514781970299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7893531080884699271} + - component: {fileID: 8850766705489312849} + - component: {fileID: 4629894269612581168} + - component: {fileID: 6730156945272532712} + - component: {fileID: 6428708572223952086} + - component: {fileID: 1427178841018934511} + - component: {fileID: 5392139150809204757} + m_Layer: 8 + m_Name: Coffee_Pickupable_Green + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7893531080884699271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2842256026194269089} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8850766705489312849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 6730156945272532712} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _model: {fileID: 7582013836232060376, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + _name: Kaffee + _itemType: 1 + UsesLeft: 1 +--- !u!54 &4629894269612581168 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6730156945272532712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 0 + outlineColor: {r: 1, g: 1, b: 0, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!65 &6428708572223952086 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.08, y: 0.1, z: 0.08} + m_Center: {x: 0, y: 0.05, z: 0} +--- !u!136 &1427178841018934511 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.07 + m_Height: 0.16 + m_Direction: 1 + m_Center: {x: 0, y: 0.08, z: 0} +--- !u!65 &5392139150809204757 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.07, y: 0.12, z: 0.03} + m_Center: {x: -0.09, y: 0.08, z: 0} +--- !u!1001 &28074731125907263 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7893531080884699271} + m_Modifications: + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7582013836232060376, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + propertyPath: m_Name + value: CoffeMug_Green + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} +--- !u!4 &2842256026194269089 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2815318342224137374, guid: a4a282cdf62321745a8cc90b1a9e9f84, type: 3} + m_PrefabInstance: {fileID: 28074731125907263} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab.meta new file mode 100644 index 00000000..1c6a4ae2 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab index 31813d81..789a634c 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab @@ -1,173 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2366692909638124840 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4566749170246607944} - - component: {fileID: 6275547677232702803} - - component: {fileID: 5005523705496298504} - m_Layer: 0 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4566749170246607944 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2366692909638124840} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0.01714} - m_LocalScale: {x: 0.018, y: 0.001, z: 0.018} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1839388367657682940} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!33 &6275547677232702803 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2366692909638124840} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5005523705496298504 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2366692909638124840} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 43fefe435be6d2445b5f3ea806e389bd, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &5045726997220857227 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1839388367657682940} - - component: {fileID: 7234814574197454412} - - component: {fileID: 3025757556802749331} - m_Layer: 0 - m_Name: Coffee-Mug - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1839388367657682940 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045726997220857227} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: -0, z: 0} - m_LocalScale: {x: 7, y: 7, z: 7} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 4566749170246607944} - m_Father: {fileID: 7893531080884699271} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &7234814574197454412 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045726997220857227} - m_Mesh: {fileID: -257304525049604202, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3} ---- !u!23 &3025757556802749331 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045726997220857227} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 57d9d3e7a3b719145b2bbf26fd15c468, type: 2} - - {fileID: 548022048751648564, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &5778247514781970299 GameObject: m_ObjectHideFlags: 0 @@ -199,11 +31,11 @@ Transform: m_GameObject: {fileID: 5778247514781970299} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 30.877092, y: 0.576, z: -3.8830667} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1839388367657682940} + - {fileID: 2279061541069407870} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8850766705489312849 @@ -221,7 +53,7 @@ MonoBehaviour: _outline: {fileID: 6730156945272532712} _selectedColor: {r: 1, g: 1, b: 1, a: 1} _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - _model: {fileID: 7350709013579755407, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + _model: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} _name: Kaffee _itemType: 1 UsesLeft: 1 @@ -335,3 +167,65 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.07, y: 0.12, z: 0.03} m_Center: {x: -0.09, y: 0.08, z: 0} +--- !u!1001 &2814683048095438365 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7893531080884699271} + m_Modifications: + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8540413964132331813, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_Name + value: CoffeMug_Red + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} +--- !u!4 &2279061541069407870 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + m_PrefabInstance: {fileID: 2814683048095438365} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab new file mode 100644 index 00000000..965352e1 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab @@ -0,0 +1,231 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5778247514781970299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7893531080884699271} + - component: {fileID: 8850766705489312849} + - component: {fileID: 4629894269612581168} + - component: {fileID: 6730156945272532712} + - component: {fileID: 6428708572223952086} + - component: {fileID: 1427178841018934511} + - component: {fileID: 5392139150809204757} + m_Layer: 8 + m_Name: Coffee_Pickupable_Yellow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7893531080884699271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6921989200499177893} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8850766705489312849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 6730156945272532712} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _model: {fileID: 5637554067884761026, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + _name: Kaffee + _itemType: 1 + UsesLeft: 1 +--- !u!54 &4629894269612581168 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &6730156945272532712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 0 + outlineColor: {r: 1, g: 1, b: 0, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!65 &6428708572223952086 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.08, y: 0.1, z: 0.08} + m_Center: {x: 0, y: 0.05, z: 0} +--- !u!136 &1427178841018934511 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.07 + m_Height: 0.16 + m_Direction: 1 + m_Center: {x: 0, y: 0.08, z: 0} +--- !u!65 &5392139150809204757 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5778247514781970299} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.07, y: 0.12, z: 0.03} + m_Center: {x: -0.09, y: 0.08, z: 0} +--- !u!1001 &6924840207457945377 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7893531080884699271} + m_Modifications: + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5637554067884761026, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + propertyPath: m_Name + value: CoffeMug_Yellow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 938a31826b0885c4da3932f8d394b944, type: 3} +--- !u!4 &6921989200499177893 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6229808606903940, guid: 938a31826b0885c4da3932f8d394b944, type: 3} + m_PrefabInstance: {fileID: 6924840207457945377} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab.meta new file mode 100644 index 00000000..d5e9c4d6 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 00115013d00b60b4b910de00e97c8934 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 18db75df..9f80b4e0 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -998,7 +998,6 @@ GameObject: m_Component: - component: {fileID: 27597486} - component: {fileID: 27597488} - - component: {fileID: 27597487} m_Layer: 0 m_Name: Camera m_TagString: Untagged @@ -1021,14 +1020,6 @@ Transform: m_Children: [] m_Father: {fileID: 1833554290} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &27597487 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27597485} - m_Enabled: 1 --- !u!20 &27597488 Camera: m_ObjectHideFlags: 0 @@ -4159,7 +4150,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -0.83380854 + value: 1.449 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -4167,7 +4158,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.16516137 + value: -0.165 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -6916,7 +6907,6 @@ GameObject: m_Component: - component: {fileID: 200590344} - component: {fileID: 200590346} - - component: {fileID: 200590345} m_Layer: 0 m_Name: Camera m_TagString: Untagged @@ -6939,14 +6929,6 @@ Transform: m_Children: [] m_Father: {fileID: 844591826} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &200590345 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 200590343} - m_Enabled: 1 --- !u!20 &200590346 Camera: m_ObjectHideFlags: 0 @@ -7008,7 +6990,6 @@ GameObject: m_Component: - component: {fileID: 201696924} - component: {fileID: 201696926} - - component: {fileID: 201696925} m_Layer: 0 m_Name: Camera m_TagString: Untagged @@ -7031,14 +7012,6 @@ Transform: m_Children: [] m_Father: {fileID: 1097125256} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &201696925 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 201696923} - m_Enabled: 1 --- !u!20 &201696926 Camera: m_ObjectHideFlags: 0 @@ -8363,6 +8336,86 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 227820439} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &234608628 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1950804951} + m_Modifications: + - target: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_Name + value: toon_office_cabinet (9) + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalScale.x + value: 5.238891 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalScale.y + value: 0.15106568 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalScale.z + value: 1.5188794 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.x + value: 5.2656 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.y + value: 1.141 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5134 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000077486044 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4456333871451915393, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 7472676c6611f8d46aa7ef7883ab15b4, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + insertIndex: -1 + addedObject: {fileID: 1788980176} + m_SourcePrefab: {fileID: 100100000, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} --- !u!1001 &241189490 PrefabInstance: m_ObjectHideFlags: 0 @@ -17074,7 +17127,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -1.4410858 + value: 0.841 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -17082,7 +17135,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.7729786 + value: -0.772 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -30539,7 +30592,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -1.4423699 + value: 0.84 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -30547,7 +30600,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.16518335 + value: -0.165 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -31474,7 +31527,7 @@ Transform: m_GameObject: {fileID: 963194225} serializedVersion: 2 m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 3.5355341, z: -3.5355334} + m_LocalPosition: {x: 0, y: 5.6568546, z: -5.6568537} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -32973,7 +33026,7 @@ PrefabInstance: - target: {fileID: 4456333871451915393, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 2aabd3b1368fb624c8428bef2d2382bd, type: 2} + objectReference: {fileID: 2100000, guid: fda5a935860dd894f9e76eb28c90bcb5, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -35618,7 +35671,6 @@ GameObject: m_Component: - component: {fileID: 1103447785} - component: {fileID: 1103447787} - - component: {fileID: 1103447786} m_Layer: 0 m_Name: Camera m_TagString: Untagged @@ -35641,14 +35693,6 @@ Transform: m_Children: [] m_Father: {fileID: 1890638201} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!81 &1103447786 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1103447784} - m_Enabled: 1 --- !u!20 &1103447787 Camera: m_ObjectHideFlags: 0 @@ -36418,7 +36462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -0.8334122 + value: 1.449 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -36426,7 +36470,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.77348 + value: -0.773 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -38477,7 +38521,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -1.4427619 + value: 0.84 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -38485,7 +38529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: 0.44312721 + value: 0.444 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -41781,7 +41825,7 @@ MonoBehaviour: m_EditorClassIdentifier: _character: {fileID: 1573807344} _camera: {fileID: 963194227} - Distance: 5 + Distance: 8 --- !u!4 &1309782458 Transform: m_ObjectHideFlags: 0 @@ -50096,7 +50140,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0.462 objectReference: {fileID: 0} - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} propertyPath: m_LocalPosition.z @@ -50133,7 +50177,7 @@ PrefabInstance: - target: {fileID: 4456333871451915393, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 2aabd3b1368fb624c8428bef2d2382bd, type: 2} + objectReference: {fileID: 2100000, guid: fda5a935860dd894f9e76eb28c90bcb5, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -50427,7 +50471,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 1.5 + m_Radius: 1 m_Height: 4.5 m_Direction: 1 m_Center: {x: 0, y: 0.75, z: 0} @@ -50444,7 +50488,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _character: {fileID: 1573807344} - interactionRadius: 1.5 + interactionRadius: 1 _interactionCollider: {fileID: 1573807349} _interactionsInRange: [] --- !u!82 &1573807353 @@ -50682,7 +50726,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: outlineMode: 2 - outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineColor: {r: 1, g: 0.60691816, b: 0.60691816, a: 1} outlineWidth: 2 precomputeOutline: 0 bakeKeys: [] @@ -55259,7 +55303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: -0.83228976 + value: 1.45 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -55267,7 +55311,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: 0.44424143 + value: 0.445 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -57932,6 +57976,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788854034} m_Mesh: {fileID: -8834847623697427935, guid: fb5b599722b688841bd8273ae8e0c667, type: 3} +--- !u!1 &1788980174 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + m_PrefabInstance: {fileID: 234608628} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1788980175 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + m_PrefabInstance: {fileID: 234608628} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1788980176 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1788980174} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.545159, y: 0.773684, z: 0.6160697} + m_Center: {x: 0.00000047683716, y: 0.386842, z: 0.03545536} --- !u!1001 &1793902827 PrefabInstance: m_ObjectHideFlags: 0 @@ -59690,7 +59765,7 @@ PrefabInstance: - target: {fileID: 4456333871451915393, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 2aabd3b1368fb624c8428bef2d2382bd, type: 2} + objectReference: {fileID: 2100000, guid: fda5a935860dd894f9e76eb28c90bcb5, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -62267,6 +62342,7 @@ Transform: - {fileID: 1847174586} - {fileID: 1016863230} - {fileID: 1569655954} + - {fileID: 1788980175} - {fileID: 1784340855} - {fileID: 1735828524} - {fileID: 1524069538} @@ -68739,15 +68815,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} insertIndex: -1 addedObject: {fileID: 1573807344} + - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} + insertIndex: -1 + addedObject: {fileID: 1573807350} - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} insertIndex: -1 addedObject: {fileID: 1573807345} - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} insertIndex: -1 addedObject: {fileID: 1573807346} - - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} - insertIndex: -1 - addedObject: {fileID: 1573807350} - targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} insertIndex: -1 addedObject: {fileID: 1573807349} @@ -86183,7 +86259,7 @@ Transform: m_GameObject: {fileID: 7433399207928896340} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.8660251, z: -0, w: 0.5000005} - m_LocalPosition: {x: -22.364002, y: 21.50872, z: -19.841911} + m_LocalPosition: {x: -22.193, y: 21.50872, z: -19.546} m_LocalScale: {x: 0.41081876, y: 0.41081858, z: 0.41081876} m_ConstrainProportionsScale: 0 m_Children: @@ -89054,9 +89130,9 @@ MonoBehaviour: _isCooking: 0 _coffeItemPrefabs: - {fileID: 8850766705489312849, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} - - {fileID: 4023474997318283029, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} - - {fileID: 93057026199057319, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} - - {fileID: 274672791226668573, guid: 37e1c4b5254279141bdb120a465d20d5, type: 3} + - {fileID: 8850766705489312849, guid: 3fd4b333c11c70a4cb47bd0dd4c2cf9f, type: 3} + - {fileID: 8850766705489312849, guid: 9847b3330677a894da44800d037d64a8, type: 3} + - {fileID: 8850766705489312849, guid: 00115013d00b60b4b910de00e97c8934, type: 3} --- !u!114 &8946472412181576323 MonoBehaviour: m_ObjectHideFlags: 0