Commit 4cd25b47 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 1b54802d 55a802f6
......@@ -36,6 +36,6 @@ MonoBehaviour:
m_Pivot: {x: 0, y: 0, z: 0}
m_CanChangeZPosition: 0
m_Prefabs:
- {fileID: 5614064296286347725, guid: 2fb35a3837c41a948ac614ed054b1245, type: 3}
- {fileID: 693092424377557188, guid: 2fb35a3837c41a948ac614ed054b1245, type: 3}
m_PerlinScale: 0.5
m_Anchor: {x: 0.5, y: 0.5, z: 0.5}
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -11,7 +11,7 @@ AudioImporter:
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
forceToMono: 1
normalize: 1
preloadAudioData: 1
loadInBackground: 0
......
......@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: MaxLevelNum
m_EditorClassIdentifier:
DeveloperDescription:
value: 5
value: 6
oldValue: 1
Changed: {fileID: 0}
ChangedWithHistory: {fileID: 0}
fileFormatVersion: 2
guid: 3b861e9e8deee6446a6d332e3bc0e857
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:
......@@ -7,5 +7,5 @@ PhysicsMaterial2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Box_Material
friction: 0
friction: 1
bounciness: 0.2
......@@ -47,7 +47,7 @@ MonoBehaviour:
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.5
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0
m_Intensity: 1
m_LightVolumeOpacity: 0
m_ApplyToSortingLayers: 000000002f29dbe43daa6a015ddad9dd91a77e512ff823d7d52a08736d1f0bc7f50dc471
m_LightCookieSprite: {fileID: 0}
......
......@@ -279,7 +279,7 @@ BoxCollider2D:
m_GameObject: {fileID: 3084560207374511915}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: aeb3d66660a7201429153cbf685040ef, type: 2}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
......@@ -367,7 +367,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
_tags:
- {fileID: 11400000, guid: a69d10ef5237b1c4087f87965c659df6, type: 2}
- {fileID: 0}
--- !u!114 &3084560205364937137
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -1330,7 +1330,8 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 4926732215222524554, guid: d63942dcf5d1a734cb4ac67d3646d06b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: d63942dcf5d1a734cb4ac67d3646d06b, type: 3}
--- !u!1001 &5967889755714688867
PrefabInstance:
......
This diff is collapsed.
......@@ -3563,7 +3563,7 @@ PrefabInstance:
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.z
value: -10
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
......
This diff is collapsed.
fileFormatVersion: 2
guid: 44078f07811ad3e479800a376a695a17
guid: 39487ef1a0b19f0418138fe054f6fa25
DefaultImporter:
externalObjects: {}
userData:
......
This diff is collapsed.
fileFormatVersion: 2
guid: d564ff5e870407e47bf9c6dd44e6f474
guid: f9d998af01d34324fa3756812b0c28d6
DefaultImporter:
externalObjects: {}
userData:
......
fileFormatVersion: 2
guid: 44078f07811ad3e479800a376a695a17
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
m_UseShadowmask: 0
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
......@@ -656,11 +656,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1137017617915017827, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
propertyPath: _tags.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1137017617915017825, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
propertyPath: TagPlayer2
......@@ -673,6 +668,11 @@ PrefabInstance:
value:
objectReference: {fileID: 11400000, guid: 674df06fa0b942d49871851d43cf713c,
type: 2}
- target: {fileID: 1137017617915017827, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
propertyPath: _tags.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2668928506298788669, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
propertyPath: m_ApplyToSortingLayers.Array.size
......
......@@ -729,7 +729,7 @@ PrefabInstance:
- target: {fileID: 7065370973928967965, guid: 09266e4114124974598b82a3eb8fa4dc,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7065370973928967965, guid: 09266e4114124974598b82a3eb8fa4dc,
type: 3}
......@@ -798,7 +798,7 @@ PrefabInstance:
- target: {fileID: 1137017617239168229, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1137017617239168229, guid: 195835b83616a6f4ab298b9684af5727,
type: 3}
......@@ -947,7 +947,7 @@ Transform:
m_LocalScale: {x: 119.3061, y: 70.189354, z: 9.987954}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &546090341
PrefabInstance:
......@@ -999,7 +999,7 @@ PrefabInstance:
- target: {fileID: 7061724010377381308, guid: d5ff09ff003fa294c819a3ab95c52e68,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7061724010377381308, guid: d5ff09ff003fa294c819a3ab95c52e68,
type: 3}
......@@ -1337,6 +1337,75 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 559781088}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &869130011
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3804210540415544516, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_Name
value: Main Camera
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.9
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.9
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7e7c168756c78f24c9542cba8a302829, type: 3}
--- !u!1 &944518671
GameObject:
m_ObjectHideFlags: 0
......@@ -1502,7 +1571,7 @@ PrefabInstance:
- target: {fileID: 1232958144072125810, guid: 31fc766ecf4087f4aad1da05a14dcc21,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1232958144072125810, guid: 31fc766ecf4087f4aad1da05a14dcc21,
type: 3}
......@@ -1571,7 +1640,7 @@ PrefabInstance:
- target: {fileID: 321453252782740785, guid: 959ba5cffc3bf0e4c8e2d65518c82017,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 321453252782740785, guid: 959ba5cffc3bf0e4c8e2d65518c82017,
type: 3}
......@@ -4014,80 +4083,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1680883547}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1683298539
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3804210540415544516, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_Name
value: 'Main Camera '
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.x
value: 8.91
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.y
value: -2.29
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalPosition.z
value: -10
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544523, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3804210540415544522, guid: 7e7c168756c78f24c9542cba8a302829,
type: 3}
propertyPath: orthographic size
value: 11.324451
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7e7c168756c78f24c9542cba8a302829, type: 3}
--- !u!1 &1685057804
GameObject:
m_ObjectHideFlags: 0
......@@ -4138,7 +4133,7 @@ Transform:
- {fileID: 1731970744}
- {fileID: 249572692}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1697073841
PrefabInstance:
......@@ -4714,7 +4709,7 @@ PrefabInstance:
- target: {fileID: 1979424224205209627, guid: 980e132f14f63894baf3700533737497,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1979424224205209627, guid: 980e132f14f63894baf3700533737497,
type: 3}
......@@ -5170,7 +5165,7 @@ PrefabInstance:
- target: {fileID: 3683866412138282202, guid: 4f68f60268476974db03de44c33664ec,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3683866412138282202, guid: 4f68f60268476974db03de44c33664ec,
type: 3}
......@@ -5346,7 +5341,8 @@ PrefabInstance:
propertyPath: _tags.Array.size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: -2374575964167716041, guid: c0da4ac874a4cbf478deff7a581e4f35, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: c0da4ac874a4cbf478deff7a581e4f35, type: 3}
--- !u!4 &2058679364 stripped
Transform:
......
fileFormatVersion: 2
guid: 0a5c75404443fb348aa50ccfa947936d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300