diff --git a/3d Prototyp/Assets/Models/Pömpel.meta b/3d Prototyp/Assets/Models/Pömpel.meta new file mode 100644 index 00000000..2cc33c06 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa1792cb0390e1c489e8559b3a0ce2ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx b/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx new file mode 100644 index 00000000..f58df954 Binary files /dev/null and b/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx differ diff --git a/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx.meta b/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx.meta new file mode 100644 index 00000000..bd731f99 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/Plunger.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 86218cde5029062419ad975a35861bab +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/Pömpel/aiStandardSurface1.mat b/3d Prototyp/Assets/Models/Pömpel/aiStandardSurface1.mat new file mode 100644 index 00000000..1dc68f8e --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/aiStandardSurface1.mat @@ -0,0 +1,90 @@ +%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: aiStandardSurface1 + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _NORMALMAP + - _SPECGLOSSMAP + m_InvalidKeywords: [] + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6c66f465d82e1e44b8694c58d4ec8c05, 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: 2800000, guid: bbd9e8aa23482564e8014c5c3974dfed, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: d28b0a99e324c744f941fc5edfd9ac2c, type: 3} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 01077a7b1a49a74458640601f9602882, type: 3} + 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.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Pömpel/aiStandardSurface1.mat.meta b/3d Prototyp/Assets/Models/Pömpel/aiStandardSurface1.mat.meta new file mode 100644 index 00000000..dcd614f4 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/aiStandardSurface1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 401e37415e117db4c9ceca6df5ab36bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png new file mode 100644 index 00000000..d8715d2b Binary files /dev/null and b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png differ diff --git a/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png.meta b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png.meta new file mode 100644 index 00000000..3ec2e921 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Base_color.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: bbd9e8aa23482564e8014c5c3974dfed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + 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: 0 + 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/Pömpel/initialShadingGroup_Height.png b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Height.png new file mode 100644 index 00000000..ba9945a7 Binary files /dev/null and b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Height.png differ diff --git a/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Height.png.meta b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Height.png.meta new file mode 100644 index 00000000..2cc2b790 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Height.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 5c03b1ac75813a049b34a662377751c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + 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: 0 + 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/Pömpel/initialShadingGroup_Normal_DirectX.png b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Normal_DirectX.png new file mode 100644 index 00000000..4a79afee Binary files /dev/null and b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Normal_DirectX.png differ diff --git a/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Normal_DirectX.png.meta b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Normal_DirectX.png.meta new file mode 100644 index 00000000..64663a5c --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Normal_DirectX.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 6c66f465d82e1e44b8694c58d4ec8c05 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + 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/Pömpel/initialShadingGroup_Roughness.png b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Roughness.png new file mode 100644 index 00000000..a7f0e768 Binary files /dev/null and b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Roughness.png differ diff --git a/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Roughness.png.meta b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Roughness.png.meta new file mode 100644 index 00000000..0810e161 --- /dev/null +++ b/3d Prototyp/Assets/Models/Pömpel/initialShadingGroup_Roughness.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 01077a7b1a49a74458640601f9602882 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + 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: 0 + 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/Prefabs/Pömpel Modell.prefab b/3d Prototyp/Assets/Prefabs/Pömpel Modell.prefab new file mode 100644 index 00000000..245e13ce --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Pömpel Modell.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7587279315389620980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_Name + value: "P\xF6mpel Modell" + objectReference: {fileID: 0} + - target: {fileID: 9133924573129346064, guid: 86218cde5029062419ad975a35861bab, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 401e37415e117db4c9ceca6df5ab36bb, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86218cde5029062419ad975a35861bab, type: 3} diff --git a/3d Prototyp/Assets/Prefabs/Pömpel Modell.prefab.meta b/3d Prototyp/Assets/Prefabs/Pömpel Modell.prefab.meta new file mode 100644 index 00000000..0fd2823b --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Pömpel Modell.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc4ba00e2be1f084fa9857dcafd7ab1d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab b/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab new file mode 100644 index 00000000..6fe4bee7 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1790048668634576427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4741669976114524864} + - component: {fileID: 3223932705378672804} + - component: {fileID: 5504427255155829458} + - component: {fileID: 205941897284316911} + - component: {fileID: 5875474874406997405} + - component: {fileID: 248648264864546974} + m_Layer: 0 + m_Name: "P\xF6pel Interactible" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4741669976114524864 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.029, y: 0.5, z: 4.367} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5631811988573190903} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3223932705378672804 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + 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.3, y: 0.15, z: 0.3} + m_Center: {x: 0, y: 0.075, z: 0} +--- !u!136 &5504427255155829458 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + 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.03 + m_Height: 0.6 + m_Direction: 1 + m_Center: {x: 0, y: 0.4, z: 0} +--- !u!114 &205941897284316911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + 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 &5875474874406997405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cae243dedd2499e8326b9ed6de6e32e, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 205941897284316911} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _model: {fileID: 7316668822922633125, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + _name: "P\xF6mpel" + _itemType: 3 + UsesLeft: 2147483647 +--- !u!54 &248648264864546974 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1790048668634576427} + 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!1001 &2371672977301979112 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4741669976114524864} + m_Modifications: + - target: {fileID: 7316668822922633125, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_Name + value: "P\xF6mpel Modell" + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} +--- !u!4 &5631811988573190903 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7980896598316729631, guid: fc4ba00e2be1f084fa9857dcafd7ab1d, type: 3} + m_PrefabInstance: {fileID: 2371672977301979112} + m_PrefabAsset: {fileID: 0} diff --git a/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab.meta b/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab.meta new file mode 100644 index 00000000..6f89d997 --- /dev/null +++ b/3d Prototyp/Assets/Prefabs/Pöpel Interactible.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e09dc7e4f5983dc4ab25ba64298b6fbd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 0498378b..f2c90b76 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -2259,7 +2259,16 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1887081995} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1887081994} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1887081993} m_SourcePrefab: {fileID: 100100000, guid: 39686e9e6d2c7854982560e582f96338, type: 3} --- !u!4 &70121952 stripped Transform: @@ -17994,7 +18003,16 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1865690046} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1865690045} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1865690044} m_SourcePrefab: {fileID: 100100000, guid: 39686e9e6d2c7854982560e582f96338, type: 3} --- !u!4 &557324031 stripped Transform: @@ -34245,7 +34263,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.066 objectReference: {fileID: 0} - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} propertyPath: m_LocalPosition.z @@ -40266,7 +40284,16 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051823391} + - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051823390} + - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051823389} m_SourcePrefab: {fileID: 100100000, guid: 88a0819a59da0804681860f567cef10f, type: 3} --- !u!4 &1286457055 stripped Transform: @@ -59485,6 +59512,69 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1863574768} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &1865690041 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + m_PrefabInstance: {fileID: 557324030} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1865690044 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865690041} + 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.2815973, y: 0.7670686, z: 0.19303007} + m_Center: {x: 0.0000009511298, y: 0.82699513, z: 0.08538159} +--- !u!114 &1865690045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865690041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18452aa2b74a4b10aaed4635c1080c90, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1865690046} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + UseText: "Sp\xFChlung benutzen" + OnUse: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1865690046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865690041} + 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 &1870487855 GameObject: m_ObjectHideFlags: 0 @@ -59925,6 +60015,69 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7eb9eb6936d00480185ca21627ae4927, type: 3} m_PrefabInstance: {fileID: 2029357765} m_PrefabAsset: {fileID: 0} +--- !u!1 &1887081990 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + m_PrefabInstance: {fileID: 70121951} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1887081993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887081990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18452aa2b74a4b10aaed4635c1080c90, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 1887081994} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + UseText: "Sp\xFChlung benutzen" + OnUse: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1887081994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887081990} + 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!65 &1887081995 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887081990} + 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.2815973, y: 0.7670686, z: 0.19303007} + m_Center: {x: -0.0000009562189, y: 0.82699513, z: 0.08538111} --- !u!1 &1887129441 GameObject: m_ObjectHideFlags: 0 @@ -64809,6 +64962,69 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2042984342} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &2051823386 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + m_PrefabInstance: {fileID: 1286457054} + m_PrefabAsset: {fileID: 0} +--- !u!65 &2051823389 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051823386} + 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.4485262, y: 0.774928, z: 0.61912954} + m_Center: {x: -0.0000009514273, y: 0.38746294, z: -0.04081947} +--- !u!114 &2051823390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051823386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18452aa2b74a4b10aaed4635c1080c90, type: 3} + m_Name: + m_EditorClassIdentifier: + _outline: {fileID: 2051823391} + _selectedColor: {r: 1, g: 1, b: 1, a: 1} + _highlightColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + UseText: "Sp\xFChlung bet\xE4tigen" + OnUse: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2051823391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051823386} + 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 &2052217872 GameObject: m_ObjectHideFlags: 0 @@ -85712,6 +85928,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5982179891990613155} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &8062507695319311620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1790048668634576427, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_Name + value: "P\xF6pel Interactible" + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalPosition.x + value: 23.029 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalPosition.z + value: 4.367 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4741669976114524864, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e09dc7e4f5983dc4ab25ba64298b6fbd, type: 3} --- !u!1 &8068449481550978423 GameObject: m_ObjectHideFlags: 0 @@ -88602,3 +88875,4 @@ SceneRoots: - {fileID: 1086008406} - {fileID: 1405922518} - {fileID: 1067027570} + - {fileID: 8062507695319311620} diff --git a/3d Prototyp/Assets/Scripts/Character.cs b/3d Prototyp/Assets/Scripts/Character.cs index 3eecce6b..df9b45cc 100644 --- a/3d Prototyp/Assets/Scripts/Character.cs +++ b/3d Prototyp/Assets/Scripts/Character.cs @@ -199,6 +199,9 @@ public class Character : MonoBehaviour case ItemType.Pizza: developer.GiveFood(0.25, WantedConsumable.Pizza); break; + default: + SayItsImpossible(); + return; } item.UsesLeft--; diff --git a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs index e9b3e5f3..5e519305 100644 --- a/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs +++ b/3d Prototyp/Assets/Scripts/Interaction/PickupInteractible.cs @@ -6,7 +6,8 @@ namespace Interaction { Mate, Coffee, - Pizza + Pizza, + Plunger } public class PickupInteractible : Interactible diff --git a/3d Prototyp/License.txt b/3d Prototyp/License.txt index 33a73132..2e2273ca 100644 --- a/3d Prototyp/License.txt +++ b/3d Prototyp/License.txt @@ -1,4 +1,7 @@ TODO: Zu erwähnende Credits: "Pizza" by Rigsters: https://sketchfab.com/3d-models/pizza-40d50989fec1460f8838b608d999ccd0 "Flasche" by gelmi.com.br: https://sketchfab.com/3d-models/beer-bottle-c3de7f8b092e4092aef14d4ffc9fac7f -Vending Machine by Marcel van Duijn: https://sketchfab.com/3d-models/empty-vending-machine-5839da52996147cbb3a4a2364b1bf894 \ No newline at end of file +Vending Machine by Marcel van Duijn: https://sketchfab.com/3d-models/empty-vending-machine-5839da52996147cbb3a4a2364b1bf894 + +Sounds: +Button click microswitch by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/219015/ \ No newline at end of file