Commit 888bafc5 authored by Sebastian Frey's avatar Sebastian Frey
Browse files

Merge remote-tracking branch 'origin/master'

parents 1d45bcee 5eebc1cc
fileFormatVersion: 2
guid: c1e3ffb5baa9daa44a8e96a1707f043f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ed602ea5cd2f2824e9c01e116a1d7787
guid: 327b7295867d04a409011baf97cc325c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......
fileFormatVersion: 2
guid: c5088d79e0ded2e45a653b76e584ce41
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: df22061a1ae2ea04da52179196f747a4
guid: e72783143bb9534459fa57abf198a023
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 114326583413855364}
- component: {fileID: 114716552753954768}
- component: {fileID: 7710007422906786959}
m_Layer: 13
m_Layer: 14
m_Name: Erd-Gegner
m_TagString: Enemy
m_Icon: {fileID: 0}
......@@ -133,8 +133,8 @@ MonoBehaviour:
weight: 1
isPerformingAction: 0
movementSpeed: 5
aggroRange: 0
dropAggroRange: 0
aggroRange: 6
dropAggroRange: 7
--- !u!58 &7710007422906786959
CircleCollider2D:
m_ObjectHideFlags: 0
......@@ -162,7 +162,7 @@ GameObject:
- component: {fileID: 5151316259711694663}
- component: {fileID: 7574451920411087056}
- component: {fileID: 5069815732207941033}
m_Layer: 13
m_Layer: 14
m_Name: Erdangriff
m_TagString: Untagged
m_Icon: {fileID: 0}
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 212219553255752332}
- component: {fileID: 114326583413855364}
- component: {fileID: 5627041003248903908}
m_Layer: 13
m_Layer: 14
m_Name: Feuer-Gegner
m_TagString: Fire
m_Icon: {fileID: 0}
......@@ -51,7 +51,7 @@ Rigidbody2D:
m_Mass: 10000
m_LinearDrag: 5
m_AngularDrag: 0.05
m_GravityScale: 0
m_GravityScale: 3
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
......@@ -160,7 +160,6 @@ MonoBehaviour:
isPerformingAction: 0
Cooldown: 2
attackRange: 8
destroyTime: 1
damage: 1
fireBall: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c, type: 3}
volleySize: 3
......@@ -176,7 +175,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2944414297440889058}
m_Layer: 13
m_Layer: 14
m_Name: ShotSpawn
m_TagString: Untagged
m_Icon: {fileID: 0}
......
......@@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 7642390674257080637}
- component: {fileID: 2887302863579586647}
- component: {fileID: 380768153646748734}
m_Layer: 13
m_Layer: 14
m_Name: Wasser-Gegner
m_TagString: Water
m_Icon: {fileID: 0}
......@@ -201,7 +201,7 @@ GameObject:
- component: {fileID: 4632333845714261479}
- component: {fileID: 630870635}
- component: {fileID: 630870634}
m_Layer: 13
m_Layer: 14
m_Name: GroundCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
......
......@@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 114716552753954768}
- component: {fileID: 8582909611794385439}
- component: {fileID: 879798643589630551}
m_Layer: 13
m_Layer: 14
m_Name: Wind-Gegner
m_TagString: Enemy
m_Icon: {fileID: 0}
......@@ -178,7 +178,7 @@ MonoBehaviour:
weight: 1
isPerformingAction: 0
patrolRange: 5
targetPos: {fileID: 0}
targetPos: {fileID: 1344694553418298308}
moveTime: 2
chillTime: 0.5
--- !u!114 &879798643589630551
......@@ -211,7 +211,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1344694553418298308}
m_Layer: 13
m_Layer: 14
m_Name: Patrolspot
m_TagString: Untagged
m_Icon: {fileID: 0}
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 212152556601460820}
- component: {fileID: 53005818070376170}
m_Layer: 0
m_Name: Pre_WindAttacke
m_Name: EnemyWindAttack
m_TagString: EnemyShot
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -131,5 +131,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7e39d42d43f2d404ba22f886e573cae1, type: 3}
m_Name:
m_EditorClassIdentifier:
destroyTime: 1
thrust: 10
destroyTime: 0
thrust: 0
damage: 0
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3565338863107458340
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3565338863107458341}
- component: {fileID: 3565338863107458343}
- component: {fileID: 3565338863107458342}
m_Layer: 0
m_Name: BackgroundCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3565338863107458341
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863107458340}
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: 3565338863782319726}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &3565338863107458343
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863107458340}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_GateFitMode: 2
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 10
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 8192
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &3565338863107458342
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863107458340}
m_Enabled: 0
--- !u!1 &3565338863782320019
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3565338863782319726}
- component: {fileID: 3565338863782319725}
- component: {fileID: 3565338863782319724}
- component: {fileID: 3565338863782319727}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3565338863782319726
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863782320019}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 77.08, y: 49.679996, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3565338863107458341}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &3565338863782319725
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863782320019}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_GateFitMode: 2
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 66
orthographic: 1
orthographic size: 8
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 24375
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &3565338863782319724
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863782320019}
m_Enabled: 1
--- !u!114 &3565338863782319727
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3565338863782320019}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 53e622d25d5bf8b45be54c49c309108d, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 0}
smoothSpeed: 0.5
lookAt: 0
maxDistance: 5
fileFormatVersion: 2
guid: d467d6f6bef5f8a44a20713cc2de4025
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -1183,7 +1183,7 @@ Transform:
m_LocalScale: {x: 4.749867, y: 10.27617, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &132361120
PrefabInstance:
......@@ -3872,7 +3872,7 @@ Transform:
- {fileID: 1694643540}
- {fileID: 2080599826}
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &268156081
PrefabInstance:
......@@ -4001,7 +4001,7 @@ Transform:
- {fileID: 1401599868}
- {fileID: 2060524169}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &332050589
GameObject:
......@@ -6896,7 +6896,7 @@ PrefabInstance:
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
......@@ -7022,7 +7022,7 @@ Transform:
m_Children:
- {fileID: 602143163}
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &554033098 stripped
Transform:
......@@ -8841,7 +8841,7 @@ Transform:
- {fileID: 1884291994}
- {fileID: 240417423}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &670026445
GameObject:
......@@ -10256,7 +10256,7 @@ PrefabInstance:
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
......@@ -10454,7 +10454,7 @@ Transform:
- {fileID: 635980250}
- {fileID: 632331631}
m_Father: {fileID: 0}
m_RootOrder: 15