Commit 795b16cc authored by Isa's avatar Isa
Browse files
parents 08d5dae7 c7a51212
......@@ -38,7 +38,7 @@ MonoBehaviour:
moveSpeed: 30
maxJumpCount: 0
mass: 1
gravity: 3
gravity: 5
waterMoveState:
jumpForce: 15
smoothing: 0.03
......
fileFormatVersion: 2
guid: c8cb9794b39691c4b97290d4816afd9b
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: 128
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:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Character_Jump_2
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 221d267e96aa14665b205e5fe655e35f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -670,7 +670,7 @@ MonoBehaviour:
F um das Element zu benutzen
E zum Speichern bei einem Checkpoint
E zum Interagieren bei einem Checkpoint, Elemente, usw.
T zum Teleportieren bei einem Checkpoint
......@@ -720,7 +720,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 93
m_firstOverflowCharacterIndex: 107
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
......@@ -743,12 +743,12 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 4648838426561617750}
characterCount: 152
characterCount: 171
spriteCount: 0
spaceCount: 26
wordCount: 27
spaceCount: 28
wordCount: 29
linkCount: 0
lineCount: 5
lineCount: 6
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
......
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.12731715, g: 0.13414736, b: 0.12107852, a: 1}
m_IndirectSpecularColor: {r: 0.12731716, g: 0.13414739, b: 0.12107863, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -184,12 +184,12 @@ PrefabInstance:
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalPosition.x
value: 56.550827
value: 49.8
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalPosition.y
value: -55.30213
value: -55.66
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
......@@ -291,7 +291,7 @@ GameObject:
- component: {fileID: 19278836}
m_Layer: 9
m_Name: MovingPlatform (3)
m_TagString: Untagged
m_TagString: Moving
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -960,8 +960,8 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 0.13271621, y: 0.47751495, z: -0.0005}
m_Extent: {x: 0.704124, y: 0.4480689, z: 0.0005}
m_Center: {x: 0.13271624, y: 0.47751498, z: -0.0005}
m_Extent: {x: 0.7041239, y: 0.44806892, z: 0.0005}
--- !u!1 &56322120
GameObject:
m_ObjectHideFlags: 0
......@@ -992,7 +992,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 731052802}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &56322122
AudioListener:
......@@ -1028,7 +1028,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 12
orthographic size: 13
m_Depth: -1
m_CullingMask:
serializedVersion: 2
......@@ -1302,7 +1302,7 @@ GameObject:
- component: {fileID: 74979456}
m_Layer: 9
m_Name: MovingPlatform
m_TagString: Untagged
m_TagString: Moving
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -1631,6 +1631,186 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 6.051317, y: 2.37}
m_EdgeRadius: 0
--- !u!1 &83266204
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 83266205}
- component: {fileID: 83266208}
- component: {fileID: 83266207}
- component: {fileID: 83266206}
m_Layer: 9
m_Name: New SpriteShapeController (41)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &83266205
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83266204}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -306.47, y: 38.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 320155739}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!68 &83266206
EdgeCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83266204}
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_EdgeRadius: 0
m_Points:
- {x: -10.05947, y: 0.73277}
- {x: -7.1517, y: 0.79494}
- {x: -7.14494, y: 0.79534}
- {x: -5.32016, y: 0.97233}
- {x: -5.31665, y: 0.97274}
- {x: -3.4255, y: 1.23151}
- {x: -3.42478, y: 1.23161}
- {x: -1.66556, y: 1.48698}
- {x: -0.23663, y: 1.65417}
- {x: 1.20094, y: 1.73452}
- {x: 2.80465, y: 1.7872}
- {x: 4.10916, y: 1.81597}
- {x: 4.82695, y: 1.82759}
- {x: 4.82112, y: 2.18754}
- {x: 4.10249, y: 2.17591}
- {x: 4.10197, y: 2.1759}
- {x: 2.79589, y: 2.1471}
- {x: 2.79492, y: 2.14707}
- {x: 1.18588, y: 2.09422}
- {x: 1.18381, y: 2.09413}
- {x: -0.26489, y: 2.01316}
- {x: -0.27033, y: 2.01269}
- {x: -1.71102, y: 1.84412}
- {x: -1.71348, y: 1.84379}
- {x: -3.4749, y: 1.58811}
- {x: -5.36021, y: 1.33014}
- {x: -7.16957, y: 1.15465}
- {x: -10.06423, y: 1.09275}
- {x: -14.21452, y: 1.09562}
- {x: -17.93525, y: 1.12529}
- {x: -19.72917, y: 1.1457}
- {x: -19.73327, y: 0.78572}
- {x: -17.93919, y: 0.76531}
- {x: -17.93889, y: 0.76531}
- {x: -14.21582, y: 0.73562}
- {x: -14.21516, y: 0.73562}
- {x: -10.06145, y: 0.73275}
- {x: -10.05947, y: 0.73277}
--- !u!114 &83266207
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83266204}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90539df1cd5704abcb25fec9f3f5f84b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Spline:
m_IsOpenEnded: 1
m_ControlPoints:
- position: {x: 0.09439087, y: -0.3515587, z: 0}
leftTangent: {x: -0.27543926, y: 0.011722565, z: 0}
rightTangent: {x: 0.27543926, y: -0.011722565, z: 0}
mode: 1
height: 1
bevelCutoff: 0
bevelSize: 0
spriteIndex: 0
corner: 0
- position: {x: 1.624054, y: -0.40356064, z: 0}
leftTangent: {x: -0.23016357, y: -0.02394867, z: 0}
rightTangent: {x: 0.23016357, y: 0.02394867, z: 0}
mode: 1
height: 1
bevelCutoff: 0
bevelSize: 0
spriteIndex: 0
corner: 0
m_SpriteShape: {fileID: 11400000, guid: 47f91cca3221eda42bcfda1b0ac45675, type: 2}
m_SplineDetail: 16
m_AdaptiveUV: 1
m_UpdateCollider: 0
m_ColliderDetail: 4
m_ColliderOffset: 0.18
m_ColliderCornerType: 0
--- !u!1971053207 &83266208
SpriteShapeRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83266204}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -480944179
m_SortingLayer: 2
m_SortingOrder: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 0}
m_Sprites:
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 0.82609665, y: -0.3786632, z: -0.0005}
m_Extent: {x: 0.8256048, y: 0.45572385, z: 0.0005}
--- !u!1 &93644850
GameObject:
m_ObjectHideFlags: 0
......@@ -1910,7 +2090,7 @@ GameObject:
- component: {fileID: 114394541}
- component: {fileID: 114394540}
- component: {fileID: 114394539}
m_Layer: 13
m_Layer: 17
m_Name: CaveBackgroundSpriteShape
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2089,7 +2269,7 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 82.236404, y: 0.14201021, z: -0.001}
m_Center: {x: 82.236404, y: 0.14200997, z: -0.001}
m_Extent: {x: 28.338562, y: 4.8344164, z: 0.001}
--- !u!4 &114394541
Transform:
......@@ -2610,7 +2790,7 @@ SpriteShapeRenderer:
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: -15.122349, y: 0.5946479, z: -0.0005}
m_Center: {x: -15.122349, y: 0.59464777, z: -0.0005}
m_Extent: {x: 5.0150857, y: 0.77487075, z: 0.0005}
--- !u!4 &153492802
Transform:
......@@ -2626,101 +2806,7 @@ Transform:
m_Father: {fileID: 2027679588}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &153931242
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1822592771}
m_Modifications:
- target: {fileID: 4605225109116865588, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_Name
value: AirElement (8)
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalPosition.x
value: 35.67
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalPosition.y
value: 36.06
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_RootOrder
value: 24
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalScale.x
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_LocalScale.y
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 105682324961186856, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_SortingLayerID
value: -480944179
objectReference: {fileID: 0}
- target: {fileID: 105682324961186856, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_SortingLayer
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1116401710732013377, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: _cooldown
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
--- !u!1 &192643540
--- !u!1 &153746047
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -2728,38 +2814,312 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 192643541}
- component: {fileID: 192643544}
- component: {fileID: 192643543}
- component: {fileID: 192643542}
- component: {fileID: 153746048}
- component: {fileID: 153746051}
- component: {fileID: 153746050}
- component: {fileID: 153746049}
m_Layer: 9
m_Name: New SpriteShapeController (31)
m_Name: New SpriteShapeController (35)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &192643541
--- !u!4 &153746048
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 192643540}
m_GameObject: {fileID: 153746047}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -9.19, y: 3.87, z: 0}
m_LocalPosition: {x: -6.9699936, y: 1.3600006, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 354720272}
m_RootOrder: 0
m_Father: {fileID: 1678195927}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}