diff --git a/3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta b/3d Prototyp/Assets/Models/Consumables/Bottle.meta similarity index 67% rename from 3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta rename to 3d Prototyp/Assets/Models/Consumables/Bottle.meta index 51cb9f68..68d47509 100644 --- a/3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta +++ b/3d Prototyp/Assets/Models/Consumables/Bottle.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 73951a4b66414d24999d439134425a40 +guid: b5a1bf502fb00de4da1ab0b10ff7ca3f +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx new file mode 100644 index 00000000..1fae5d18 Binary files /dev/null and b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx differ diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta new file mode 100644 index 00000000..7f1ca23f --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/GARRAFA.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 846bac74573ba79459f8b268e9147c0e +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: 0 + 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/Bottle/GOTAS_NORMAL.jpg b/3d Prototyp/Assets/Models/Consumables/Bottle/GOTAS_NORMAL.jpg new file mode 100644 index 00000000..e367e121 Binary files /dev/null and b/3d Prototyp/Assets/Models/Consumables/Bottle/GOTAS_NORMAL.jpg differ diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/GOTAS_NORMAL.jpg.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/GOTAS_NORMAL.jpg.meta new file mode 100644 index 00000000..ba3c1c85 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/GOTAS_NORMAL.jpg.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 6f8818c0ff2b70c43a51d7af88722c0e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat b/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat new file mode 100644 index 00000000..ab295655 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat @@ -0,0 +1,85 @@ +%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: LIMITE LIQUIDO + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 1.5999999 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.7220273, g: 0.7220273, b: 0.7220273, a: 0.275211} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat.meta new file mode 100644 index 00000000..5bd2de17 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/LIMITE LIQUIDO.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b1b81102275cff469a5ee35f2a29f2a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat b/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat new file mode 100644 index 00000000..8824053c --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat @@ -0,0 +1,85 @@ +%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: LIQUIDO + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 1.5999999 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.9150943, g: 0.8568532, b: 0.2719384, a: 0.3859084} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat.meta new file mode 100644 index 00000000..9cf0f187 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/LIQUIDO.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3216b72dcb217a745b46df478803c92a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.mat b/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.mat new file mode 100644 index 00000000..c3419b97 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.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: TAMPA + 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: 5.5715237 + - _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.06123638, g: 0, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.mat.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.mat.meta new file mode 100644 index 00000000..7801aa67 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/TAMPA.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cadd0146fce1d44ea797f27b2988ef5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat new file mode 100644 index 00000000..fa760ee2 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat @@ -0,0 +1,85 @@ +%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: VIDRO DENTRO + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 1.5999999 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 0.76722} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat.meta new file mode 100644 index 00000000..3403e156 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO DENTRO.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92f311636e7653341807b9ec8b9f41a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat new file mode 100644 index 00000000..2fc2afd0 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat @@ -0,0 +1,86 @@ +%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: VIDRO FORA + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6f8818c0ff2b70c43a51d7af88722c0e, type: 3} + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 1.5999999 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 0.76722866} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat.meta b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat.meta new file mode 100644 index 00000000..5d648b6d --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Bottle/VIDRO FORA.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14c0fa28676f34844863d7f08275271b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab new file mode 100644 index 00000000..9dc5b050 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7350709013579755407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3232200667758096719} + - component: {fileID: 1532383854098139471} + - component: {fileID: 7427603816938809845} + m_Layer: 0 + m_Name: Mate_Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3232200667758096719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7350709013579755407} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1532383854098139471 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7350709013579755407} + m_Mesh: {fileID: -5086207809832937298, guid: 846bac74573ba79459f8b268e9147c0e, type: 3} +--- !u!23 &7427603816938809845 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7350709013579755407} + 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: 14c0fa28676f34844863d7f08275271b, type: 2} + - {fileID: 2100000, guid: 92f311636e7653341807b9ec8b9f41a3, type: 2} + - {fileID: 2100000, guid: 3216b72dcb217a745b46df478803c92a, type: 2} + - {fileID: 2100000, guid: 7cadd0146fce1d44ea797f27b2988ef5, type: 2} + - {fileID: 2100000, guid: 4b1b81102275cff469a5ee35f2a29f2a, 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} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab.meta new file mode 100644 index 00000000..f59b98d3 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Model.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab new file mode 100644 index 00000000..6f5651d5 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5778247514781970299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7893531080884699271} + - component: {fileID: 8850766705489312849} + - component: {fileID: 4629894269612581168} + - component: {fileID: 6730156945272532712} + - component: {fileID: 4175672024543035506} + - component: {fileID: 2724024039376172667} + m_Layer: 8 + m_Name: Mate_Pickupable + 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: 1811706619167535229} + 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: Blub Mate + _itemType: 0 + 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!136 &4175672024543035506 +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.48 + m_Direction: 1 + m_Center: {x: 0, y: 0.24, z: 0} +--- !u!65 &2724024039376172667 +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.06, z: 0.07} + m_Center: {x: 0, y: 0.03, z: 0} +--- !u!1001 &3890948396759122226 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7893531080884699271} + m_Modifications: + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7350709013579755407, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + propertyPath: m_Name + value: Mate_Model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} +--- !u!4 &1811706619167535229 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3232200667758096719, guid: 1fac20f2fc7c5e44b9fc8e14f1cb65c8, type: 3} + m_PrefabInstance: {fileID: 3890948396759122226} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab.meta b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab.meta new file mode 100644 index 00000000..ef6f1add --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Consumables/Mate_Pickupable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8340beb716b45e84790c45ac5bcc7117 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Consumables/Pizza_Pickupable.prefab b/3d Prototyp/Assets/Prefabs/Consumables/Pizza_Pickupable.prefab index 018bdbcd..7936171c 100644 --- a/3d Prototyp/Assets/Prefabs/Consumables/Pizza_Pickupable.prefab +++ b/3d Prototyp/Assets/Prefabs/Consumables/Pizza_Pickupable.prefab @@ -54,7 +54,8 @@ MonoBehaviour: _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} _model: {fileID: 5778247514781970299, guid: c3e6a58c9ab23be44a0ae88dd246b3c4, type: 3} _name: Pizza - _interactibleType: 0 + _itemType: 2 + UsesLeft: 8 --- !u!65 &2286779905131135538 BoxCollider: m_ObjectHideFlags: 0 diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index f1824d4b..3b8d9d13 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -1058,6 +1058,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} insertIndex: -1 addedObject: {fileID: 1961302932} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302935} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302934} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302936} m_SourcePrefab: {fileID: 100100000, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} --- !u!4 &30470408 stripped Transform: @@ -3522,11 +3531,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110615556} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} ---- !u!1 &116801754 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - m_PrefabInstance: {fileID: 2012477064} - m_PrefabAsset: {fileID: 0} --- !u!1 &116990824 GameObject: m_ObjectHideFlags: 0 @@ -9538,11 +9542,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 325085000} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} ---- !u!1 &327014526 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - m_PrefabInstance: {fileID: 489964253} - m_PrefabAsset: {fileID: 0} --- !u!1 &328966083 GameObject: m_ObjectHideFlags: 0 @@ -14767,104 +14766,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484375971} m_Mesh: {fileID: -942445950811305749, guid: 06922b963b921e44cbadd739dab73ab0, type: 3} ---- !u!1001 &489964253 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 801575156} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_RootOrder - value: 47 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalPosition.x - value: 1.6042393 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalPosition.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalPosition.z - value: 17.101248 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalRotation.y - value: -0.70710677 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: fcdb7a99237c6417a9e5766d641a824c, type: 2} - - target: {fileID: 919132149155446097, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_Name - value: toon_office_tile_ground_low (7) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - propertyPath: m_Layer - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - insertIndex: -1 - addedObject: {fileID: 489964257} - m_SourcePrefab: {fileID: 100100000, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} ---- !u!4 &489964254 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 959e3ae9e7e6b41338aa0f89fc764001, type: 3} - m_PrefabInstance: {fileID: 489964253} - m_PrefabAsset: {fileID: 0} ---- !u!65 &489964257 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 327014526} - 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: 1.0274248, y: 0.5, z: 1.0274248} - m_Center: {x: -0.0000009536743, y: 0.25, z: 0.0000009536743} --- !u!1 &490829068 GameObject: m_ObjectHideFlags: 0 @@ -16446,6 +16347,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} insertIndex: -1 addedObject: {fileID: 1295157951} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157954} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157953} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157955} m_SourcePrefab: {fileID: 100100000, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} --- !u!4 &523081034 stripped Transform: @@ -25596,7 +25506,6 @@ Transform: - {fileID: 823470096} - {fileID: 1352616888} - {fileID: 1226937442} - - {fileID: 489964254} - {fileID: 184757220} - {fileID: 529549730} - {fileID: 709444249} @@ -33236,6 +33145,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: UsesLeft + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8850766705489312849, guid: 09f4bc67b20a96d47a944bffc3be651a, type: 3} + propertyPath: _itemType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -39867,7 +39784,7 @@ Transform: - {fileID: 935696894} - {fileID: 1849344296} - {fileID: 772618536} - - {fileID: 2140874704} + - {fileID: 3408352656291218498} - {fileID: 454538507} - {fileID: 1239494693} - {fileID: 2902118231096288688} @@ -40462,7 +40379,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6dcc72027d5c35441a351fdb5140b0f8, type: 3} m_Name: m_EditorClassIdentifier: - _name: + _name: Enno _baseStats: BaseEfficiency: 1 Fingers: 10 @@ -40488,6 +40405,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1295157950 AudioSource: @@ -40602,8 +40520,65 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!114 &1295157953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1295157955} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 1295157948} +--- !u!136 &1295157954 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + 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.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} +--- !u!114 &1295157955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + 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!4 &1298233948 stripped Transform: m_CorrespondingSourceObject: {fileID: 5737504958030667471, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3} @@ -46373,6 +46348,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!114 &1502578688 MonoBehaviour: @@ -46539,11 +46515,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7e417f330c4dd845a8f3dc744dff25a, type: 3} m_Name: m_EditorClassIdentifier: - Needs: - - {fileID: 2907046783514947559, guid: 92b71cfc6a2687d44b165ead746233f0, type: 3} - - {fileID: 3355435593704932208, guid: b31fb59d198e53b459943bf898293618, type: 3} - - {fileID: 7697340910557049827, guid: 5d809e3a343d45f4185615db92384dc7, type: 3} - - {fileID: 2405502523364773131, guid: b396df2098c22e1488c2c2769c6ddcd6, type: 3} --- !u!114 &1502578696 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46561,7 +46532,7 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: --- !u!1001 &1502597417 PrefabInstance: @@ -56131,6 +56102,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755034156} m_Mesh: {fileID: -2385820668052547965, guid: 0a8a49a1980943a4a9919b8f64a7c75e, type: 3} +--- !u!1001 &1756968848 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5778247514781970299, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_Name + value: Mate_Pickupable + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalPosition.x + value: 30.877092 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalPosition.y + value: 0.576 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalPosition.z + value: -3.8830667 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7893531080884699271, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} --- !u!1001 &1760197703 PrefabInstance: m_ObjectHideFlags: 0 @@ -60109,7 +60137,7 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: --- !u!82 &1891423493 AudioSource: @@ -62290,7 +62318,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6dcc72027d5c35441a351fdb5140b0f8, type: 3} m_Name: m_EditorClassIdentifier: - _name: + _name: Richard _baseStats: BaseEfficiency: 1 Fingers: 10 @@ -62316,6 +62344,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1961302931 AudioSource: @@ -62430,8 +62459,65 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!136 &1961302934 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + 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.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} +--- !u!114 &1961302935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1961302936} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 1961302929} +--- !u!114 &1961302936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + 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!1 &1961564159 GameObject: m_ObjectHideFlags: 0 @@ -64625,100 +64711,11 @@ Transform: - {fileID: 6948887825727686023} m_Father: {fileID: 1849344296} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2012477064 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 801575156} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalPosition.x - value: 7.1042433 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalPosition.z - value: 2.801247 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: fcdb7a99237c6417a9e5766d641a824c, type: 2} - - target: {fileID: 919132149155446097, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - propertyPath: m_Name - value: toon_office_tile_wall (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - insertIndex: -1 - addedObject: {fileID: 2012477068} - m_SourcePrefab: {fileID: 100100000, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} --- !u!4 &2012477065 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 661d685e026c547f0a6c2f2d0c859fe7, type: 3} - m_PrefabInstance: {fileID: 2012477064} + m_CorrespondingSourceObject: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + m_PrefabInstance: {fileID: 7121489856951985765} m_PrefabAsset: {fileID: 0} ---- !u!65 &2012477068 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 116801754} - 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: 2, y: 2, z: 0.5} - m_Center: {x: -0.9999995, y: 1, z: -0.000000007450581} --- !u!1 &2014679952 GameObject: m_ObjectHideFlags: 0 @@ -66285,6 +66282,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} insertIndex: -1 addedObject: {fileID: 2100999003} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999006} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999005} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999007} m_SourcePrefab: {fileID: 100100000, guid: c161c997c07308740af96a685231f764, type: 3} --- !u!4 &2100998998 stripped Transform: @@ -66303,7 +66309,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6dcc72027d5c35441a351fdb5140b0f8, type: 3} m_Name: m_EditorClassIdentifier: - _name: + _name: Mike _baseStats: BaseEfficiency: 1 Fingers: 10 @@ -66329,6 +66335,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &2100999002 AudioSource: @@ -66443,8 +66450,65 @@ MonoBehaviour: speakingSpeed: 1.1 playSound: 0 generate: 0 - newVoiceAndGenerate: 0 + newVoice: 0 Voice: +--- !u!114 &2100999005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c62dfbaefa34afca6b4a8378b9c9083, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 2100999007} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _developer: {fileID: 2100999000} +--- !u!136 &2100999006 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + 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.3 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0.82, z: 0} +--- !u!114 &2100999007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + 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!1 &2101876026 GameObject: m_ObjectHideFlags: 0 @@ -67884,38 +67948,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2138717972} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} ---- !u!1 &2140874703 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2140874704} - m_Layer: 0 - m_Name: "K\xFChlschrank" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2140874704 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140874703} - 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: 3408352656291218498} - m_Father: {fileID: 1274270891} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2141187334 GameObject: m_ObjectHideFlags: 0 @@ -73903,8 +73935,12 @@ GameObject: - component: {fileID: 3408352656291218498} - component: {fileID: 1793344402474683367} - component: {fileID: 4541821342070128429} + - component: {fileID: 4541821342070128432} + - component: {fileID: 4541821342070128431} + - component: {fileID: 4541821342070128430} + - component: {fileID: 4541821342070128433} m_Layer: 0 - m_Name: Fridge_SBS + m_Name: Fridge m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -74756,13 +74792,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3335358744152573438} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.60876125, z: -0, w: 0.79335356} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.51067257, y: -0.78133404, z: 0.14922343} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408352656291218498} - m_LocalEulerAnglesHint: {x: 0, y: -75, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2961722748853513695 Transform: m_ObjectHideFlags: 0 @@ -75669,9 +75705,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2596103093926960888} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.96592593, z: -0, w: 0.2588186} - m_LocalPosition: {x: -3.3015718, y: 4.822365, z: -5.8367014} - m_LocalScale: {x: 1.3213, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0.965926, z: -0, w: 0.2588186} + m_LocalPosition: {x: -17.881855, y: 21.17572, z: -15.083136} + m_LocalScale: {x: 1.3212997, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2209803254344915835} @@ -75681,7 +75717,7 @@ Transform: - {fileID: 8203466137599407013} - {fileID: 7484903971509066950} - {fileID: 6175129556946042427} - m_Father: {fileID: 2140874704} + m_Father: {fileID: 1274270891} m_LocalEulerAnglesHint: {x: 0, y: -150, z: 0} --- !u!1 &3417189514158218933 GameObject: @@ -78349,6 +78385,89 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &4541821342070128430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2596103093926960888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a871a66f73c5ad41835fb81866b6cb4, type: 3} + m_Name: + m_EditorClassIdentifier: + _matePrefab: {fileID: 8850766705489312849, guid: 8340beb716b45e84790c45ac5bcc7117, type: 3} +--- !u!114 &4541821342070128431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2596103093926960888} + 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 &4541821342070128432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2596103093926960888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18452aa2b74a4b10aaed4635c1080c90, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 4541821342070128431} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + UseText: Blub Mate nehmen + OnUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4541821342070128430} + m_TargetAssemblyTypeName: Fridge, Assembly-CSharp + m_MethodName: GetMateFromFridge + 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 &4541821342070128433 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2596103093926960888} + 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.9007017, y: 1.7352507, z: 0.5438301} + m_Center: {x: -0.05087163, y: 0.08629131, z: -0.12269098} --- !u!1 &4552128902397409459 GameObject: m_ObjectHideFlags: 0 @@ -84014,6 +84133,63 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &7121489856951985765 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 801575156} + m_Modifications: + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalPosition.x + value: 7.1042433 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalPosition.z + value: 2.801247 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3988380084199094857, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4328594908762710259, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} + propertyPath: m_Name + value: toon_office_tile_wall (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bd66cb211eed644bb969b2145b61c45, type: 3} --- !u!1 &7123802503700260750 GameObject: m_ObjectHideFlags: 0 @@ -88990,3 +89166,4 @@ SceneRoots: - {fileID: 1040416642} - {fileID: 1086008406} - {fileID: 1405922518} + - {fileID: 1756968848} diff --git a/3d Prototyp/Assets/Scripts/Character.cs b/3d Prototyp/Assets/Scripts/Character.cs index 4c131540..3eecce6b 100644 --- a/3d Prototyp/Assets/Scripts/Character.cs +++ b/3d Prototyp/Assets/Scripts/Character.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using Data; using Interaction; +using TMPro.Examples; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; @@ -182,11 +183,32 @@ public class Character : MonoBehaviour { Debug.Log($"Gebe {_carriedInteractible.Name} an {developer.Name}"); - Interactible item = _carriedInteractible; + PickupInteractible item = _carriedInteractible; + + if (item == null) + return; - PickupItem(null); + switch (item.ItemType) + { + case ItemType.Coffee: + developer.GiveDrink(0.4, WantedConsumable.Drink); + break; + case ItemType.Mate: + developer.GiveDrink(0.4, WantedConsumable.Mate); + break; + case ItemType.Pizza: + developer.GiveFood(0.25, WantedConsumable.Pizza); + break; + } + + item.UsesLeft--; + + if (item.UsesLeft <= 0) + { + PickupItem(null); - Destroy(item.gameObject); + Destroy(item.gameObject); + } } public void SayItsImpossible() diff --git a/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs b/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs new file mode 100644 index 00000000..eac89a2c --- /dev/null +++ b/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using Interaction; +using UnityEngine; + +public class Fridge : MonoBehaviour +{ + [SerializeField] + private PickupInteractible _matePrefab; + + public void GetMateFromFridge() + { + PickupInteractible mate = Instantiate(_matePrefab); + GameManager.Instance.Player.PickupItem(mate); + } +} diff --git a/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs.meta b/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs.meta new file mode 100644 index 00000000..c2d32037 --- /dev/null +++ b/3d Prototyp/Assets/Scripts/Interaction/Fridge.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a871a66f73c5ad41835fb81866b6cb4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/InteractionHandler.cs b/3d Prototyp/Assets/Scripts/Interaction/InteractionHandler.cs similarity index 100% rename from 3d Prototyp/Assets/InteractionHandler.cs rename to 3d Prototyp/Assets/Scripts/Interaction/InteractionHandler.cs diff --git a/3d Prototyp/Assets/InteractionHandler.cs.meta b/3d Prototyp/Assets/Scripts/Interaction/InteractionHandler.cs.meta similarity index 100% rename from 3d Prototyp/Assets/InteractionHandler.cs.meta rename to 3d Prototyp/Assets/Scripts/Interaction/InteractionHandler.cs.meta diff --git a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs index c8237f7c..e9b3e5f3 100644 --- a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs +++ b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs @@ -2,6 +2,13 @@ namespace Interaction { + public enum ItemType + { + Mate, + Coffee, + Pizza + } + public class PickupInteractible : Interactible { [SerializeField] @@ -9,10 +16,17 @@ namespace Interaction [SerializeField] private string _name; + + [SerializeField] + private ItemType _itemType; + + public int UsesLeft = 1; public GameObject Model => _model; public string Name => _name; + public ItemType ItemType => _itemType; + } } \ No newline at end of file diff --git a/3d Prototyp/License.txt b/3d Prototyp/License.txt index e69de29b..99f2dae6 100644 --- a/3d Prototyp/License.txt +++ b/3d Prototyp/License.txt @@ -0,0 +1,2 @@ +TODO: Zu erwähnende Credits: +"Pizza" by Rigsters: https://sketchfab.com/3d-models/pizza-40d50989fec1460f8838b608d999ccd0 \ No newline at end of file