Commit d6b26c0f authored by RaptorTwitch's avatar RaptorTwitch

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/turtle-takeover-reloaded
parents 5e38c55b ef78da35
......@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 5515192567392965344}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......
fileFormatVersion: 2
guid: edb1ccab70547614e83f76e9d42b5723
TextureImporter:
internalIDToNameTable:
- first:
213: 7462607957742354146
second: MinimapTileMap_0
- first:
213: -265039900271653478
second: MinimapTileMap_1
- first:
213: -5495016870515242573
second: MinimapTileMap_2
- first:
213: 8769727491769910242
second: MinimapTileMap_3
- first:
213: 1449938809970383084
second: MinimapTileMap_4
- first:
213: 5331665896576850131
second: MinimapTileMap_5
- first:
213: 4387955621010575744
second: MinimapTileMap_6
- first:
213: -6892041152497203600
second: MinimapTileMap_7
- first:
213: -1081069445391597211
second: MinimapTileMap_8
- first:
213: -6177966974798719106
second: MinimapTileMap_9
- first:
213: 6892645823986202014
second: MinimapTileMap_10
- first:
213: -5213997041846152463
second: MinimapTileMap_11
- first:
213: -5800989138566313338
second: MinimapTileMap_12
- first:
213: -7487148633355955395
second: MinimapTileMap_13
- first:
213: 3693307517389520566
second: MinimapTileMap_14
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: 2
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
- serializedVersion: 3
buildTarget: Standalone
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:
- serializedVersion: 2
name: MinimapTileMap_0
rect:
serializedVersion: 2
x: 0
y: 12
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6fd3be7f35188254bbec78fd163b19a3
internalID: 7462607957742354146
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_1
rect:
serializedVersion: 2
x: 4
y: 12
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3452fc2e7f4d9d44b9ca0ff8a0c699e1
internalID: -265039900271653478
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_2
rect:
serializedVersion: 2
x: 8
y: 12
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0f1602eca9e380d43aa5763934f20cfd
internalID: -5495016870515242573
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_3
rect:
serializedVersion: 2
x: 12
y: 12
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bc9e7d5cbc173914bb20970c78e90a0a
internalID: 8769727491769910242
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_4
rect:
serializedVersion: 2
x: 0
y: 8
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 073fdd5472b33a14cb9d6ca87f7ff204
internalID: 1449938809970383084
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_5
rect:
serializedVersion: 2
x: 4
y: 8
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9a69031a77addd04fb76cea587335e9d
internalID: 5331665896576850131
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_6
rect:
serializedVersion: 2
x: 8
y: 8
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 28ec8851a2a92ad4bae5440832eae209
internalID: 4387955621010575744
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_7
rect:
serializedVersion: 2
x: 12
y: 8
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5ec4704de4c8f8a439e7292818c90668
internalID: -6892041152497203600
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_8
rect:
serializedVersion: 2
x: 0
y: 4
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 20d77d3d29749dd4db9f37a2efa27ae2
internalID: -1081069445391597211
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_9
rect:
serializedVersion: 2
x: 4
y: 4
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4e8cbb0741e585441b1a48455706d2ef
internalID: -6177966974798719106
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_10
rect:
serializedVersion: 2
x: 8
y: 4
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 09d208f8148c2f44b901820fdf6a86f0
internalID: 6892645823986202014
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_11
rect:
serializedVersion: 2
x: 12
y: 4
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 183c2975857a31a41b182095f54d775d
internalID: -5213997041846152463
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_12
rect:
serializedVersion: 2
x: 4
y: 0
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8b159545a7b378546b22c0443f2907b9
internalID: -5800989138566313338
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_13
rect:
serializedVersion: 2
x: 8
y: 0
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dda6dce418352a441bb0c662e913b88d
internalID: -7487148633355955395
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MinimapTileMap_14
rect:
serializedVersion: 2
x: 12
y: 0
width: 4
height: 4
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e50f51124c396e54dab8012e8f9b9a4d
internalID: 3693307517389520566
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: dbdcd4fb49c564d4eac00267b10cb73c
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -122,7 +122,7 @@ MonoBehaviour:
PlayerModel: {fileID: 7684202323498604895}
explosionFX: {fileID: 3849051887377255970, guid: 6dfb3bf841f5c5e448b6360edfb447cb,
type: 3}
hitFX: {fileID: 1931807616638471954, guid: f1b49542c5ad6ea7a9954f01300c3246, type: 3}
hitFX: {fileID: 5515192567392965344, guid: c6768d08d6b534c4cbd1a87150cb4cc0, type: 3}
laserSFX: {fileID: 3685833347554059012}
hoverSFX: {fileID: 8118261163504278534}
pickupSFX: {fileID: 615738391135021819}
......
......@@ -175,8 +175,6 @@ MonoBehaviour:
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: 'Level:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -554,8 +552,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 35
......@@ -652,8 +648,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -732,8 +726,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 92e2b81f58a8e3847acd5613473eb3ed, type: 3}
m_Type: 0
m_PreserveAspect: 1
......@@ -944,8 +936,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &649347309
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -964,8 +954,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1039,8 +1027,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 25
......@@ -1121,8 +1107,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1267,8 +1251,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &782977230
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1287,8 +1269,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1431,8 +1411,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -1655,8 +1633,6 @@ MonoBehaviour:
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: LOADING...
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -1813,8 +1789,6 @@ MonoBehaviour:
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
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -1971,8 +1945,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -2052,8 +2024,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7d480d8f40692634f9f10d1aa5d08181, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2127,8 +2097,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 25
......@@ -2276,8 +2244,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1428618605
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2296,8 +2262,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -2352,6 +2316,8 @@ MonoBehaviour:
type: 3}
toidTurretModel: {fileID: 2784080251743448897, guid: a762565cbb15b464894d68c2f8e05d26,
type: 3}
toidSeekerModel: {fileID: 684422770152341459, guid: 5a508b83b74de9a429b940650b199a81,
type: 3}
eBullet: {fileID: 8849718972375602660, guid: 6a6f43447713fa94ba3ca2b2dee5f898, type: 3}
cam: {fileID: 307351461}
canvas: {fileID: 1049494705}
......@@ -2426,8 +2392,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls: