Commit 366cbe9f authored by Patrick Stengel's avatar Patrick Stengel

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/ShowCountdown.cs
parents 8586460e 5ebca023
This diff is collapsed.
fileFormatVersion: 2
guid: 3646c105d0120da42b224c42bbd2e079
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GroundMaterial
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 758ebfbb39e1d844180222359ea1bc02, 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: 30, y: 30}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 982109afe51f54043a0fe77484a95816, type: 3}
m_Scale: {x: 30, y: 30}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: 889e5d18a09ba784b8e47ab33bcfae71, 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}
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.02
- _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}
fileFormatVersion: 2
guid: 798f87198bcd0044abecc63384dd79a5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
This image diff could not be displayed because it is too large. You can view the blob instead.
fileFormatVersion: 2
guid: 982109afe51f54043a0fe77484a95816
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
This image diff could not be displayed because it is too large. You can view the blob instead.
fileFormatVersion: 2
guid: 758ebfbb39e1d844180222359ea1bc02
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
This image diff could not be displayed because it is too large. You can view the blob instead.
fileFormatVersion: 2
guid: 889e5d18a09ba784b8e47ab33bcfae71
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -60,7 +60,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem,
Version=0.9.6.0, Culture=neutral, PublicKeyToken=null
m_NeverAutoSwitchControlSchemes: 1
m_DefaultControlScheme: Keyboard
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: 480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
......
......@@ -205,11 +205,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
canMove: 1
moveSpeed: 5
moveSpeed: 8
maxSpeed: 10
dir: {x: 0, y: 0}
interpolation: 10
turnSpeed: 200
turnSpeed: 5
--- !u!114 &1957649875713174593
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -690,6 +690,8 @@ GameObject:
- component: {fileID: 770186383286899028}
- component: {fileID: 532940879910498657}
- component: {fileID: 3201751554819008786}
- component: {fileID: 1041388776}
- component: {fileID: 1041388781}
m_Layer: 8
m_Name: body
m_TagString: BodyPlayer
......@@ -706,7 +708,7 @@ Transform:
m_GameObject: {fileID: 6045165005171275833}
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_LocalScale: {x: 3, y: 3, z: 3}
m_Children:
- {fileID: 7201478858573411899}
m_Father: {fileID: 0}
......@@ -792,6 +794,45 @@ MonoBehaviour:
m_EditorClassIdentifier:
mutation1: {fileID: 11400000, guid: 3a533c310414823458ca2a6ea6c6ddce, type: 2}
mutation2: {fileID: 11400000, guid: 674a68f9f71d2b640914ad1f3be2cbc0, type: 2}
--- !u!114 &1041388776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6045165005171275833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5dcddde29f5d3747912be55aba7420a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1041388781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6045165005171275833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 60fb516279b74524f91fcc9af2cfc4ae,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: 38732b26-d9e3-4196-a316-9054667e9b3d
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1 &6917490051661084803
GameObject:
m_ObjectHideFlags: 0
......
......@@ -95,6 +95,7 @@ GameObject:
- component: {fileID: 9070284434229523640}
- component: {fileID: 7286349345975393423}
- component: {fileID: 6099359186389172106}
- component: {fileID: 1029178051}
m_Layer: 8
m_Name: head
m_TagString: HeadPlayer
......@@ -111,7 +112,7 @@ Transform:
m_GameObject: {fileID: 6363572820684086373}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.1229997, y: -0.5966866, z: 0.8825981}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 4, y: 4, z: 4}
m_Children:
- {fileID: 4386303693745616587}
m_Father: {fileID: 0}
......@@ -138,7 +139,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6363572820684086373}
serializedVersion: 2
m_Mass: 1
m_Mass: 0.4
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
......@@ -159,8 +160,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
canMove: 1
moveSpeed: 5
maxSpeed: 10
moveSpeed: 10
maxSpeed: 20
--- !u!114 &6099359186389172106
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -175,3 +176,30 @@ MonoBehaviour:
m_EditorClassIdentifier:
mutation1: {fileID: 11400000, guid: c64ba09c4b1c0eb479ec633963cb7215, type: 2}
mutation2: {fileID: 11400000, guid: 296440bd939672349ab89b6dd84e58fe, type: 2}
--- !u!114 &1029178051
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6363572820684086373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 60fb516279b74524f91fcc9af2cfc4ae,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Keyboard
m_DefaultActionMap: 480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
This diff is collapsed.
......@@ -604,6 +604,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player1Manager
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564309, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 944714734}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -659,11 +664,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564309, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 944714734}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63e8800253376df44a1d2ea9ad6b520a, type: 3}
--- !u!1001 &6176636124327810795
......@@ -757,6 +757,11 @@ PrefabInstance:
propertyPath: m_Name
value: Player2Manager
objectReference: {fileID: 0}
- target: {fileID: 5204299803420509727, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 1655921399}
- target: {fileID: 5204299803420509725, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -822,10 +827,5 @@ PrefabInstance:
propertyPath: m_NeverAutoSwitchControlSchemes
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5204299803420509727, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 1655921399}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 276ed99a0fe19ff48b6ad175cbbec559, type: 3}
This diff is collapsed.
......@@ -1395,6 +1395,11 @@ PrefabInstance:
propertyPath: m_Name
value: Body
objectReference: {fileID: 0}
- target: {fileID: 5454309568428411407, guid: ea05ca32432105d468969c2ccef55e1a,
type: 3}
propertyPath: turnSpeed
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2301140017794985288, guid: ea05ca32432105d468969c2ccef55e1a,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1544,6 +1549,16 @@ PrefabInstance:
propertyPath: m_Name
value: Player2Manager
objectReference: {fileID: 0}
- target: {fileID: 5204299803420509727, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 1302136059}
- target: {fileID: 5204299803420509727, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: mutation
value:
objectReference: {fileID: 1302136066}
- target: {fileID: 5204299803420509725, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1609,16 +1624,6 @@ PrefabInstance:
propertyPath: m_DefaultActionMap
value: 38732b26-d9e3-4196-a316-9054667e9b3d
objectReference: {fileID: 0}
- target: {fileID: 5204299803420509727, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 1302136059}