Commit 9f3e0e20 authored by Skydiver3's avatar Skydiver3

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
parents 4cd25b47 622271cf
......@@ -41,6 +41,15 @@ Tilemap:
m_GameObject: {fileID: 1197705938063106251}
m_Enabled: 1
m_Tiles:
- first: {x: 0, y: -5, z: 0}
second:
m_TileIndex: 38
m_TileSpriteIndex: 32
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 9, y: -5, z: 0}
second:
m_TileIndex: 32
......@@ -50,6 +59,15 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 0, y: -4, z: 0}
second:
m_TileIndex: 37
m_TileSpriteIndex: 31
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 4, y: -4, z: 0}
second:
m_TileIndex: 33
......@@ -59,6 +77,33 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 7, y: -4, z: 0}
second:
m_TileIndex: 35
m_TileSpriteIndex: 29
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 8, y: -4, z: 0}
second:
m_TileIndex: 36
m_TileSpriteIndex: 30
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -3, y: -3, z: 0}
second:
m_TileIndex: 40
m_TileSpriteIndex: 34
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -2, y: -2, z: 0}
second:
m_TileIndex: 31
......@@ -122,6 +167,24 @@ Tilemap:
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: 10, y: -2, z: 0}
second:
m_TileIndex: 34
m_TileSpriteIndex: 28
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -3, y: -1, z: 0}
second:
m_TileIndex: 39
m_TileSpriteIndex: 33
m_TileMatrixIndex: 1
m_TileColorIndex: 1
m_ObjectToInstantiate: {fileID: 0}
m_TileFlags: 1
m_ColliderType: 1
- first: {x: -2, y: -1, z: 0}
second:
m_TileIndex: 30
......@@ -482,6 +545,20 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 94b2e70fc87938e4d9dd759f7e3cf6e3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 858821f0f5e0352438b406bf293f6e1d, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e6c31a3b5a101ec4898185111898730b, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e2ddc34d078427f4c829fe1d950a9ce7, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b221b496792d622459058d929db626af, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 98b83d77237b1674cb67fef42f80e188, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 0c67acdfb66c41a4497bf1da7a63283d, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 054c460bb39fc054b82b5ccd3da5b0d2, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 3f8380b8d5bb7274aab593d05354fa86, type: 2}
m_TileSpriteArray:
- m_RefCount: 2
m_Data: {fileID: 21300000, guid: d1437ec4bed411a49a338fc5c40e237f, type: 3}
......@@ -551,6 +628,21 @@ Tilemap:
m_Data: {fileID: 21300000, guid: cc7f2c6799d969a41b4be7ba0671ad38, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 9015fed7337719942a32a6f15d9b19b0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 1bd24b3a196160248bf7e229e59aa079, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 49ade4c17fcf47e4197db6064a68bd0a, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: ad59f43bee28e764f967a8ddff3eb1d1, type: 3}
- m_RefCount: 1
m_Data: {fileID: 485943122201092573, guid: d896bbff379dc644e9b3ed89dc8593c4, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2628660662528760312, guid: d896bbff379dc644e9b3ed89dc8593c4,
type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: daff5529abe4a074f9e49ba93cbaf1fd, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 6cd654b720bd9cc4a8e739a8b09ce9d9, type: 3}
m_TileMatrixArray:
- m_RefCount: 0
m_Data:
......@@ -570,7 +662,7 @@ Tilemap:
e31: 0
e32: 8.59e-43
e33: 0
- m_RefCount: 35
- m_RefCount: 42
m_Data:
e00: 1
e01: 0
......@@ -591,12 +683,12 @@ Tilemap:
m_TileColorArray:
- m_RefCount: 0
m_Data: {r: -1401.4805, g: -1401.4805, b: -1401.4805, a: -1401.4805}
- m_RefCount: 35
- m_RefCount: 42
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -2, y: -5, z: 0}
m_Size: {x: 15, y: 8, z: 1}
m_Origin: {x: -3, y: -5, z: 0}
m_Size: {x: 16, y: 8, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
......@@ -702,7 +794,7 @@ Grid:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7442557404944784672}
m_Enabled: 1
m_CellSize: {x: 1, y: 1, z: 0}
m_CellSize: {x: 2, y: 1, z: 0}
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: fensterbrokenglass
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 1bd24b3a196160248bf7e229e59aa079, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
fileFormatVersion: 2
guid: e6c31a3b5a101ec4898185111898730b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1bd24b3a196160248bf7e229e59aa079
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: 64
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
- serializedVersion: 3
buildTarget: Android
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: WebGL
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!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: kronleuchterA
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 49ade4c17fcf47e4197db6064a68bd0a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
fileFormatVersion: 2
guid: e2ddc34d078427f4c829fe1d950a9ce7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 49ade4c17fcf47e4197db6064a68bd0a
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: 64
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
- serializedVersion: 3
buildTarget: Android
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: WebGL
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!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: kronleuchterB
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: ad59f43bee28e764f967a8ddff3eb1d1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
fileFormatVersion: 2
guid: b221b496792d622459058d929db626af
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ad59f43bee28e764f967a8ddff3eb1d1
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: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1