Commit dbfb95e1 authored by Markus Schlösser's avatar Markus Schlösser

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/supergame-box

# Conflicts:
#	Assets/_Game/MainMenu/MainMenu.unity
parents 0e8e93be d6f6f33e
fileFormatVersion: 2
guid: 5493d805d35485641ba83e3e5431195e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!58 &535105288
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2857735847091246098}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.335
--- !u!1001 &1603891778570535068
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3596859392753652878, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_Name
value: Coin Pickup
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652878, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_TagString
value: Pickup
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.23
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.74
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652876, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3596859392753652877, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: eed00a09704276a43aeff05360be487d,
type: 3}
m_RemovedComponents:
- {fileID: 6794876885339999450, guid: d4dc941ce73b9a94e9f084d2f16f034c, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: d4dc941ce73b9a94e9f084d2f16f034c, type: 3}
--- !u!1 &2857735847091246098 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3596859392753652878, guid: d4dc941ce73b9a94e9f084d2f16f034c,
type: 3}
m_PrefabInstance: {fileID: 1603891778570535068}
m_PrefabAsset: {fileID: 0}
fileFormatVersion: 2
guid: b036cd19324fb1e42b2e590833b6b325
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &6194933069629254380
MonoBehaviour:
--- !u!66 &4120614078558203620
CompositeCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240251066884864952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36f1c439f4fa92445a02889ca64c210e, type: 3}
m_Name:
m_EditorClassIdentifier:
spawner: {fileID: 0}
--- !u!58 &6351929298726417157
CircleCollider2D:
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_GeometryType: 0
m_GenerationType: 0
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 1731305110514455394}
m_ColliderPaths:
- - X: 14720131
Y: -4216072
- X: 14720131
Y: 4216068
- X: -15404996
Y: 4216039
- X: -15404967
Y: -4216072
m_CompositePaths:
m_Paths:
- - {x: 1.4720103, y: -0.4216072}
- {x: 1.4720103, y: 0.4216068}
- {x: -1.5404996, y: 0.421601}
- {x: -1.5404938, y: -0.4216072}
m_VertexDistance: 0.0005
m_OffsetDistance: 0.000005
--- !u!61 &1731305110514455394
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
......@@ -25,11 +48,21 @@ CircleCollider2D:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 4.0897546, y: -0.030345917}
m_UsedByComposite: 1
m_Offset: {x: -0.09783363, y: -0.0000004172325}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 10.99, y: 2.88}
newSize: {x: 10.99, y: 2.88}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Radius: 1.2696362
--- !u!58 &8961970157278434693
m_Size: {x: 8.607187, y: 2.409183}
m_EdgeRadius: 0
--- !u!58 &6351929298726417157
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -42,11 +75,11 @@ CircleCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -4.0769267, y: -0.0007016318}
m_Offset: {x: 4.0897546, y: -0.030345917}
serializedVersion: 2
m_Radius: 1.2818868
--- !u!61 &1731305110514455394
BoxCollider2D:
m_Radius: 1.2696362
--- !u!58 &8961970157278434693
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
......@@ -57,56 +90,23 @@ BoxCollider2D:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 1
m_Offset: {x: -0.09783363, y: -0.0000004172325}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 10.91, y: 2.65}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_UsedByComposite: 0
m_Offset: {x: -4.0769267, y: -0.0007016318}
serializedVersion: 2
m_Size: {x: 8.607187, y: 2.409183}
m_EdgeRadius: 0
--- !u!66 &4120614078558203620
CompositeCollider2D:
m_Radius: 1.2818868
--- !u!114 &6194933069629254380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240251066884864952}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_GeometryType: 0
m_GenerationType: 0
m_EdgeRadius: 0
m_ColliderPaths:
- m_Collider: {fileID: 1731305110514455394}
m_ColliderPaths:
- - X: 14720131
Y: -4216072
- X: 14720131
Y: 4216068
- X: -15404996
Y: 4216039
- X: -15404967
Y: -4216072
m_CompositePaths:
m_Paths:
- - {x: 1.4720103, y: -0.4216072}
- {x: 1.4720103, y: 0.4216068}
- {x: -1.5404996, y: 0.421601}
- {x: -1.5404938, y: -0.4216072}
m_VertexDistance: 0.0005
m_OffsetDistance: 0.000005
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36f1c439f4fa92445a02889ca64c210e, type: 3}
m_Name:
m_EditorClassIdentifier:
spawner: {fileID: 0}
--- !u!1001 &2924925599344292916
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -195,6 +195,16 @@ PrefabInstance:
value:
objectReference: {fileID: 21300000, guid: b8a14511a68818442a248368b036792c,
type: 3}
- target: {fileID: 4152650444531060623, guid: f3b874b1e2494af42a3deea4070489f2,
type: 3}
propertyPath: m_Size.x
value: 10.99
objectReference: {fileID: 0}
- target: {fileID: 4152650444531060623, guid: f3b874b1e2494af42a3deea4070489f2,
type: 3}
propertyPath: m_Size.y
value: 2.88
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f3b874b1e2494af42a3deea4070489f2, type: 3}
--- !u!1 &1240251066884864952 stripped
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2319135134976169360
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2319135134976169365}
- component: {fileID: 2319135134976169366}
- component: {fileID: 2319135134976169367}
m_Layer: 5
m_Name: TMP SubMeshUI [ARCADECLASSIC SDF Material + LiberationSans SDF Atlas]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2319135134976169365
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135134976169360}
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_Children: []
m_Father: {fileID: 2319135135643061416}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &2319135134976169366
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135134976169360}
m_CullTransparentMesh: 0
--- !u!114 &2319135134976169367
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135134976169360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_spriteAsset: {fileID: 0}
m_material: {fileID: 0}
m_sharedMaterial: {fileID: 0}
m_isDefaultMaterial: 0
m_padding: 1.25
m_canvasRenderer: {fileID: 2319135134976169366}
m_TextComponent: {fileID: 2319135135643061423}
m_materialReferenceIndex: 1
--- !u!1 &2319135135643061417
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2319135135643061416}
- component: {fileID: 2319135135643061422}
- component: {fileID: 2319135135643061423}
- component: {fileID: 2319135135643061421}
m_Layer: 5
m_Name: Score
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2319135135643061416
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135135643061417}
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_Children:
- {fileID: 2319135134976169365}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -175, y: 367}
m_SizeDelta: {x: 350, y: 50}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &2319135135643061422
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135135643061417}
m_CullTransparentMesh: 0
--- !u!114 &2319135135643061423
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2319135135643061417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Score: 0'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: b5d724c874bb3824283482e0fca21c9f, type: 2}
m_sharedMaterial: {fileID: -2204466376032302039, guid: b5d724c874bb3824283482e0fca21c9f,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_VertexBufferAutoSizeReduction: 1