diff --git a/3d Prototyp/Assets/Animations.meta b/3d Prototyp/Assets/Animations.meta index 5cf35e1f..88a6080c 100644 --- a/3d Prototyp/Assets/Animations.meta +++ b/3d Prototyp/Assets/Animations.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta -guid: dbfdad9da5148a044b3876906e80bd1b +guid: 4e1e71220c1155642be0e1fb57d1a0b5 ======== guid: b5a1bf502fb00de4da1ab0b10ff7ca3f >>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta diff --git a/3d Prototyp/Assets/CoffeeMachine.cs b/3d Prototyp/Assets/CoffeeMachine.cs new file mode 100644 index 00000000..b9562048 --- /dev/null +++ b/3d Prototyp/Assets/CoffeeMachine.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Interaction; +using Microsoft.VisualStudio.RpcContracts.Logging; +using UnityEngine; +using Utility; + +public class CoffeeMachine : MonoBehaviour +{ + [SerializeField] + private List _coffeePlaces = new(); + + [SerializeField] + private bool _isCooking = false; + + [SerializeField] + private List _coffeItemPrefabs = new(); + + public void CookCoffee() + { + // TODO: Play beep sound + + if (_isCooking) + return; + + _isCooking = true; + + StartCoroutine(CookCoffeeRoutine()); + } + + private IEnumerator CookCoffeeRoutine() + { + // TODO: Start blinking + + Debug.Log("Blinky"); + + yield return new WaitForSeconds(2); + + // SPiele kaffeemaschinen sound + Debug.Log("Brrrrr"); + + yield return new WaitForSeconds(5); + + CoffeePlace coffeePlace = _coffeePlaces.Where(c => c.IsFree()).ToList().GetRandomElement(); + + if (coffeePlace == null) + { + // TODO: Spill coffee + Debug.Log("misty kaki"); + } + else + { + Instantiate(_coffeItemPrefabs.GetRandomElement(), coffeePlace.transform.position, Quaternion.Euler(0, Random.Range(0.0f, 360.0f), 0)); + } + + yield return new WaitForSeconds(1); + + // todo: Play pling sound + + _isCooking = false; + } +} diff --git a/3d Prototyp/Assets/CoffeeMachine.cs.meta b/3d Prototyp/Assets/CoffeeMachine.cs.meta new file mode 100644 index 00000000..3d8e9f8c --- /dev/null +++ b/3d Prototyp/Assets/CoffeeMachine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8abb9f19b2add534d97478e3ca841154 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle.meta b/3d Prototyp/Assets/Models/Consumables/Bottle.meta index 722d7b3c..0b94acd0 100644 --- a/3d Prototyp/Assets/Models/Consumables/Bottle.meta +++ b/3d Prototyp/Assets/Models/Consumables/Bottle.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta -guid: 6bc4a457dc2707f498400ffd8852bc42 +guid: 3d1f4d0b2cd9e744f95c2317495413cb ======== guid: b5a1bf502fb00de4da1ab0b10ff7ca3f >>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee.meta b/3d Prototyp/Assets/Models/Consumables/Coffee.meta new file mode 100644 index 00000000..c04a6d4b --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb61f152ca85d0f4eaf84036bc289eb8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.mat b/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.mat new file mode 100644 index 00000000..15219f3f --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.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: Blue + 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.87142855 + - _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.043137256, g: 0.123575866, b: 0.5019608, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.mat.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.mat.meta new file mode 100644 index 00000000..aa2a9d9b --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0188b986a52a983489aab29f1630f757 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab new file mode 100644 index 00000000..92d72d02 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab @@ -0,0 +1,270 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1642849806601844052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2698982615918444838} + - component: {fileID: 6800816504686247129} + - component: {fileID: 2893721198514633483} + 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 &2698982615918444838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_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} +--- !u!33 &6800816504686247129 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642849806601844052} + m_Mesh: {fileID: -257304525049604202, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3} +--- !u!23 &2893721198514633483 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642849806601844052} + 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 &6960932155585495828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6557370512938168053} + - component: {fileID: 427991449171126397} + - component: {fileID: 5677572974805434080} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6557370512938168053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960932155585495828} + 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: 2698982615918444838} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &427991449171126397 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960932155585495828} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5677572974805434080 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6960932155585495828} + 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 &8540413964132331813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4084511099481264227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_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/Models/Consumables/Coffee/CoffeMug_Red.prefab.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab.meta new file mode 100644 index 00000000..d25e1e64 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/CoffeMug_Red.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97ec47d6aa7bea54f9827393a67ed747 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx new file mode 100644 index 00000000..c16d4432 Binary files /dev/null and b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx differ diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx.meta new file mode 100644 index 00000000..42283520 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee-Mug.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 00c65ec9e68a3514a92a63f1961301cd +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.mat b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.mat new file mode 100644 index 00000000..00def637 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.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: Coffee + 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: 1 + - _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.41509432, g: 0.29522422, b: 0.15076537, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.mat.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.mat.meta new file mode 100644 index 00000000..d0478956 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Coffee.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43fefe435be6d2445b5f3ea806e389bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Green.mat b/3d Prototyp/Assets/Models/Consumables/Coffee/Green.mat new file mode 100644 index 00000000..6c854073 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Green.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: Green + 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.87142855 + - _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.074509814, g: 0.5803922, b: 0.17237274, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Green.mat.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Green.mat.meta new file mode 100644 index 00000000..4812185f --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Green.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 584cab1673da6f9429f5001bbb67c71f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Red.mat b/3d Prototyp/Assets/Models/Consumables/Coffee/Red.mat new file mode 100644 index 00000000..eb4741da --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Red.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: Red + 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.87142855 + - _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.579993, g: 0.1655249, b: 0.07613117, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Red.mat.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Red.mat.meta new file mode 100644 index 00000000..734bbdee --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Red.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57d9d3e7a3b719145b2bbf26fd15c468 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.mat b/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.mat new file mode 100644 index 00000000..1c5768c3 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.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: Yellow + 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.87142855 + - _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.76670384, g: 0.8018868, b: 0.23073156, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.mat.meta b/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.mat.meta new file mode 100644 index 00000000..b7fa9917 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Coffee/Yellow.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59694902c73654440aab07a65436dbc3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab new file mode 100644 index 00000000..ea2ba00e --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3935261990060072114 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0188b986a52a983489aab29f1630f757, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d89768246390a54ca0bc24199d7e982, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta new file mode 100644 index 00000000..dd5f0155 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Blue Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab new file mode 100644 index 00000000..055aae3f --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5549134432018436932 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3025757556802749331, guid: 2e59d9068714dce4aa9f4848ea8e9588, 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} + propertyPath: m_LocalPosition.x + value: 21.409637 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2736847 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.z + value: -5.0370345 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta new file mode 100644 index 00000000..9ac3087f --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Green Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d89768246390a54ca0bc24199d7e982 +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 new file mode 100644 index 00000000..31813d81 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab @@ -0,0 +1,337 @@ +%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 + 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_Red + 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: 30.877092, y: 0.576, z: -3.8830667} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1839388367657682940} + 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: 7350709013579755407, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, 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} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab.meta new file mode 100644 index 00000000..31703fac --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Red.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2e59d9068714dce4aa9f4848ea8e9588 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab new file mode 100644 index 00000000..cb2e8c22 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &181638966724076986 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 59694902c73654440aab07a65436dbc3, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c6dd6bd94a43ec4e9aff6cd00a8a842, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta new file mode 100644 index 00000000..5974f3c3 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Coffee_Pickupable_Yellow Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37e1c4b5254279141bdb120a465d20d5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab b/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab new file mode 100644 index 00000000..b9cd6c66 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3428056037517174209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2946670842961469382} + - component: {fileID: 4081446066902366570} + - component: {fileID: 5090313456702327843} + m_Layer: 0 + m_Name: CupPlace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2946670842961469382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428056037517174209} + serializedVersion: 2 + m_LocalRotation: {x: 0.05601872, y: 0.9430295, z: -0.20906459, w: -0.25268415} + m_LocalPosition: {x: -7.671, y: 0.762, z: 15.355} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &4081446066902366570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428056037517174209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: + _boxCollider: {fileID: 5090313456702327843} +--- !u!65 &5090313456702327843 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3428056037517174209} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.2, y: 0.3, z: 0.2} + m_Center: {x: 0, y: 0.15, z: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab.meta new file mode 100644 index 00000000..6fca553d --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/CupPlace.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a0359364728e2e4ca1ec9dfe4cebfb7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index c66a8e68..da3bacf9 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1451428, g: 0.16105962, b: 0.16197124, a: 1} + m_IndirectSpecularColor: {r: 0.14514297, g: 0.16106007, b: 0.16197146, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3691,6 +3691,79 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 116990824} m_Mesh: {fileID: 8697477560895906706, guid: d5c408595be50514dabb69674e810394, type: 3} +--- !u!1001 &119856555 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.454494 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.709 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.242 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &119856556 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 119856555} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &119856557 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 119856555} + m_PrefabAsset: {fileID: 0} --- !u!1 &124226106 GameObject: m_ObjectHideFlags: 0 @@ -7677,72 +7750,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 217874320} m_Mesh: {fileID: -942445950811305749, guid: 06922b963b921e44cbadd739dab73ab0, type: 3} ---- !u!1001 &221420671 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (6) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.671 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.762 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.355 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &221420672 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 221420671} - m_PrefabAsset: {fileID: 0} --- !u!1001 &224129694 PrefabInstance: m_ObjectHideFlags: 0 @@ -10569,72 +10576,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348498693} m_Mesh: {fileID: -2303692350411030431, guid: 0b1e524bf5adb2f4e8e617ee4e2a1878, type: 3} ---- !u!1001 &350758859 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (10) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.329494 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.801 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.438 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &350758860 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 350758859} - m_PrefabAsset: {fileID: 0} --- !u!1 &354715669 GameObject: m_ObjectHideFlags: 0 @@ -16485,6 +16426,79 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.0280004, y: 0.5, z: 2.0280004} m_Center: {x: -0.0000009536743, y: 0.25, z: -0.0000009536743} +--- !u!1001 &521128426 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.546 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.853 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.551 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &521128427 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 521128426} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &521128428 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 521128426} + m_PrefabAsset: {fileID: 0} --- !u!1001 &523081033 PrefabInstance: m_ObjectHideFlags: 0 @@ -19518,72 +19532,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 322315144} m_SourcePrefab: {fileID: 100100000, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} ---- !u!1001 &604231830 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (11) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.546 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.853 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.551 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &604231831 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 604231830} - m_PrefabAsset: {fileID: 0} --- !u!1 &604851636 GameObject: m_ObjectHideFlags: 0 @@ -24793,38 +24741,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 764068527} m_Mesh: {fileID: 5375582512751788850, guid: f47c08ee0d8c52d40bf295cd48a04da7, type: 3} ---- !u!1 &772618535 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 772618536} - m_Layer: 0 - m_Name: Kaffeemaschine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &772618536 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 772618535} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -14.580284, y: 16.353355, z: -9.246433} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7810206706393530862} - m_Father: {fileID: 1274270891} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &773449895 PrefabInstance: m_ObjectHideFlags: 0 @@ -27977,6 +27893,153 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 874630074} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &875112612 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_Name + value: Coffee_Pickupable (1) + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.x + value: 21.363348 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2736847 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.z + value: -4.759801 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2724024039376172667, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + - {fileID: 4175672024543035506, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_RemovedGameObjects: + - {fileID: 6052162890677022397, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + insertIndex: -1 + addedObject: {fileID: 1167528377} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + insertIndex: -1 + addedObject: {fileID: 875112617} + - targetCorrespondingSourceObject: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + insertIndex: -1 + addedObject: {fileID: 875112616} + - targetCorrespondingSourceObject: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + insertIndex: -1 + addedObject: {fileID: 875112615} + m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} +--- !u!4 &875112613 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_PrefabInstance: {fileID: 875112612} + m_PrefabAsset: {fileID: 0} +--- !u!1 &875112614 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_PrefabInstance: {fileID: 875112612} + m_PrefabAsset: {fileID: 0} +--- !u!65 &875112615 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875112614} + 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!136 &875112616 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875112614} + 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 &875112617 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875112614} + 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!1 &875368482 GameObject: m_ObjectHideFlags: 0 @@ -29478,12 +29541,12 @@ Transform: m_Children: - {fileID: 2115894656} - {fileID: 2033894096} - - {fileID: 221420672} - - {fileID: 1488006878} - - {fileID: 1657572731} - - {fileID: 1554324262} - - {fileID: 350758860} - - {fileID: 604231831} + - {fileID: 1129287358} + - {fileID: 119856557} + - {fileID: 1711605786} + - {fileID: 1213027563} + - {fileID: 948929553} + - {fileID: 521128428} - {fileID: 4702722} - {fileID: 870284105} m_Father: {fileID: 1274270891} @@ -29988,6 +30051,79 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} m_PrefabInstance: {fileID: 945443793} m_PrefabAsset: {fileID: 0} +--- !u!1001 &948929551 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.329494 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.801 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.438 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &948929552 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 948929551} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &948929553 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 948929551} + m_PrefabAsset: {fileID: 0} --- !u!1 &949043283 GameObject: m_ObjectHideFlags: 0 @@ -36017,6 +36153,79 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120139572} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &1129287356 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.671 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.762 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.355 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &1129287357 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1129287356} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1129287358 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1129287356} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1131000736 PrefabInstance: m_ObjectHideFlags: 0 @@ -37134,6 +37343,91 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157367439} m_Mesh: {fileID: 6481825945531470986, guid: d2a73dec0eb1d81498135676972d3278, type: 3} +--- !u!1 &1167528376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167528377} + - component: {fileID: 1167528379} + - component: {fileID: 1167528378} + 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 &1167528377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167528376} + 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: 1608284037} + m_Father: {fileID: 875112613} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!23 &1167528378 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167528376} + 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!33 &1167528379 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167528376} + m_Mesh: {fileID: -257304525049604202, guid: 00c65ec9e68a3514a92a63f1961301cd, type: 3} --- !u!1 &1172809309 GameObject: m_ObjectHideFlags: 0 @@ -38028,6 +38322,79 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5436741564957258347, guid: 6c7f06c6a702d4d41bba4b5576adc82c, type: 3} m_PrefabInstance: {fileID: 1502578683} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1213027561 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.112988 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.748 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.325 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &1213027562 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1213027561} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1213027563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1213027561} + m_PrefabAsset: {fileID: 0} --- !u!1 &1214344875 GameObject: m_ObjectHideFlags: 0 @@ -39988,6 +40355,72 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 40a09c842bcab43448ab73a7a99c47b1, type: 3} m_PrefabInstance: {fileID: 1267518459} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1267768175 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5778247514781970299, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_Name + value: Coffee_Pickupable + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.x + value: 21.256594 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2736846 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalPosition.z + value: -5.277114 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 6052162890677022397, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + insertIndex: -1 + addedObject: {fileID: 1283773952} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} +--- !u!4 &1267768176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7893531080884699271, guid: 2e59d9068714dce4aa9f4848ea8e9588, type: 3} + m_PrefabInstance: {fileID: 1267768175} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1269674422 PrefabInstance: m_ObjectHideFlags: 0 @@ -40094,7 +40527,7 @@ Transform: - {fileID: 42557774} - {fileID: 935696894} - {fileID: 1849344296} - - {fileID: 772618536} + - {fileID: 7810206706393530862} - {fileID: 3408352656291218498} - {fileID: 454538507} - {fileID: 1239494693} @@ -40267,6 +40700,72 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1281257256} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &1283773951 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1267768176} + m_Modifications: + - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_Name + value: Coffee_Model + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} +--- !u!4 &1283773952 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} + m_PrefabInstance: {fileID: 1283773951} + m_PrefabAsset: {fileID: 0} --- !u!1 &1284109246 GameObject: m_ObjectHideFlags: 0 @@ -46302,72 +46801,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485478752} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} ---- !u!1001 &1488006877 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (7) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.454494 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.709 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.242 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &1488006878 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 1488006877} - m_PrefabAsset: {fileID: 0} --- !u!1 &1491336117 GameObject: m_ObjectHideFlags: 0 @@ -49533,72 +49966,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.0274248, y: 1, z: 1.0274248} m_Center: {x: 0, y: 0.5, z: 0.00000047683716} ---- !u!1001 &1554324261 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (9) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.112988 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.748 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.325 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &1554324262 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 1554324261} - m_PrefabAsset: {fileID: 0} --- !u!1 &1557605068 GameObject: m_ObjectHideFlags: 0 @@ -51596,6 +51963,89 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.0280004, y: 0.5, z: 2.0280004} m_Center: {x: -0.0000009536743, y: 0.25, z: -0.0000009536743} +--- !u!1 &1608284036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1608284037} + - component: {fileID: 1608284039} + - component: {fileID: 1608284038} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1608284037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608284036} + 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: 1167528377} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &1608284038 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608284036} + 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!33 &1608284039 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608284036} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1610661568 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} @@ -53514,72 +53964,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654227964} m_Mesh: {fileID: 5295248781825088884, guid: 130b6028a08254146ac66813828ea5af, type: 3} ---- !u!1001 &1657572730 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 935696894} - m_Modifications: - - target: {fileID: 7425838284820148179, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_Name - value: toon_office_cup (8) - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.x - value: -7.237988 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.y - value: 0.656 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalPosition.z - value: 15.128 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.w - value: -0.25268415 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.x - value: 0.05601872 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9430295 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalRotation.z - value: -0.20906459 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} ---- !u!4 &1657572731 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7801976452085396841, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} - m_PrefabInstance: {fileID: 1657572730} - m_PrefabAsset: {fileID: 0} --- !u!1 &1661918303 GameObject: m_ObjectHideFlags: 0 @@ -55218,6 +55602,79 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1708734354} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &1711605784 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 935696894} + m_Modifications: + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.x + value: -7.237988 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.656 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalPosition.z + value: 15.128 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.w + value: -0.25268415 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.05601872 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9430295 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalRotation.z + value: -0.20906459 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3428056037517174209, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + propertyPath: m_Name + value: CupPlace 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} +--- !u!114 &1711605785 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4081446066902366570, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1711605784} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08ef16f17f8a4392aa964ae6972b86bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1711605786 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} + m_PrefabInstance: {fileID: 1711605784} + m_PrefabAsset: {fileID: 0} --- !u!1 &1714843788 GameObject: m_ObjectHideFlags: 0 @@ -77059,6 +77516,83 @@ Transform: m_Children: [] m_Father: {fileID: 7749190845662518589} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3754691243356163134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2698982615918444838, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2698982615918444838, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2698982615918444838, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2698982615918444838, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2698982615918444838, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.x + value: 21.273 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.y + value: 1.2736846 + objectReference: {fileID: 0} + - target: {fileID: 4084511099481264227, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} + propertyPath: m_LocalPosition.z + value: -5.037 + 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 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97ec47d6aa7bea54f9827393a67ed747, type: 3} --- !u!1 &3770689862098003740 GameObject: m_ObjectHideFlags: 0 @@ -85466,6 +86000,10 @@ GameObject: - component: {fileID: 7810206706393530862} - component: {fileID: 6614862114332528203} - component: {fileID: 8946472412181576321} + - component: {fileID: 8946472412181576325} + - component: {fileID: 8946472412181576324} + - component: {fileID: 8946472412181576323} + - component: {fileID: 8946472412181576322} m_Layer: 0 m_Name: Coffee Maker m_TagString: Untagged @@ -86322,13 +86860,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7433399207928896340} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.86602515, z: -0, w: 0.50000054} - m_LocalPosition: {x: -7.783716, y: 5.1553645, z: -10.59548} - m_LocalScale: {x: 0.4108186, y: 0.41081858, z: 0.4108186} + m_LocalRotation: {x: -0, y: 0.8660251, z: -0, w: 0.5000005} + m_LocalPosition: {x: -22.364002, y: 21.50872, z: -19.841911} + m_LocalScale: {x: 0.41081876, y: 0.41081858, z: 0.41081876} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7507778818469483886} - m_Father: {fileID: 772618536} + m_Father: {fileID: 1274270891} m_LocalEulerAnglesHint: {x: 0, y: 120, z: 0} --- !u!33 &7821842580824249929 MeshFilter: @@ -89107,6 +89645,97 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8946472412181576322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433399207928896340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8abb9f19b2add534d97478e3ca841154, type: 3} + m_Name: + m_EditorClassIdentifier: + _coffeePlaces: + - {fileID: 1129287357} + - {fileID: 119856556} + - {fileID: 1711605785} + - {fileID: 1213027562} + - {fileID: 948929552} + - {fileID: 521128427} + _isCooking: 0 + _coffeItem: {fileID: 8850766705489312849, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} +--- !u!114 &8946472412181576323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433399207928896340} + 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: 1, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!114 &8946472412181576324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433399207928896340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18452aa2b74a4b10aaed4635c1080c90, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 8946472412181576323} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + UseText: Kaffee kochen + OnUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8946472412181576322} + m_TargetAssemblyTypeName: CoffeeMachine, Assembly-CSharp + m_MethodName: CookCoffee + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!65 &8946472412181576325 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7433399207928896340} + 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.865345, y: 1.5992932, z: 1.2832962} + m_Center: {x: 0.000006693444, y: -0.20035192, z: -0.21280184} --- !u!23 &8984220642787203119 MeshRenderer: m_ObjectHideFlags: 0 @@ -89678,3 +90307,6 @@ SceneRoots: - {fileID: 1086008406} - {fileID: 1405922518} - {fileID: 1756968848} + - {fileID: 1267768175} + - {fileID: 3754691243356163134} + - {fileID: 875112612} diff --git a/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs b/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs new file mode 100644 index 00000000..389b0046 --- /dev/null +++ b/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +namespace Interaction +{ + public class CoffeePlace : MonoBehaviour + { + [SerializeField] + private BoxCollider _boxCollider; + + public bool IsFree() + { + Collider[] colliders = Physics.OverlapBox(_boxCollider.bounds.center, _boxCollider.bounds.extents); + + foreach (Collider c in colliders) + { + // Solbald ein Collider eines Rigidbodies im Weg ist sagen wir, dass wir nichts spawnen können + if (!c.isTrigger && c.attachedRigidbody) + { + return false; + } + } + + return true; + } + } +} \ No newline at end of file diff --git a/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs.meta b/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs.meta new file mode 100644 index 00000000..f22f6165 --- /dev/null +++ b/3d Prototyp/Assets/Scripts/Interaction/CoffeePlace.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 08ef16f17f8a4392aa964ae6972b86bd +timeCreated: 1712493618 \ No newline at end of file diff --git a/3d Prototyp/Assets/Scripts/Utility/IReadonlyListExtension.cs b/3d Prototyp/Assets/Scripts/Utility/IReadonlyListExtension.cs index 9acfe4c8..04e3b5a3 100644 --- a/3d Prototyp/Assets/Scripts/Utility/IReadonlyListExtension.cs +++ b/3d Prototyp/Assets/Scripts/Utility/IReadonlyListExtension.cs @@ -7,6 +7,9 @@ namespace Utility { public static T GetRandomElement(this IReadOnlyList list) { + if (list.Count == 0) + return default; + return list[Random.Range(0, list.Count)]; } }