Commit 6d00e079 authored by Max's avatar Max
Browse files

Adjusted flying platforms in boss level a bit, credits appear after boss death now

parent c88f49ec
......@@ -8,7 +8,7 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionMode: 1
m_ConditionEvent: Breathing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
......@@ -17,9 +17,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
......@@ -46,7 +46,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8508eb2838e34d644aab5d09db9b2c8f, type: 2}
m_Motion: {fileID: 7400000, guid: 43ae567d2168f394bbc5336be83c318a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -91,7 +91,7 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -126,7 +126,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: db047a5bff7b54f4eb266b150b408e0c, type: 2}
m_Motion: {fileID: 7400000, guid: 777eb3cee6f2f224eb8dd81ba0f98c0f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -140,7 +140,7 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionMode: 2
m_ConditionEvent: Breathing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
......@@ -149,9 +149,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
......
......@@ -17,21 +17,57 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 5602368246063793955, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
- time: 0.25
value: {fileID: 3093185705210999891, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
- time: 0.5
value: {fileID: 5254658917271497152, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
- time: 0.75
value: {fileID: -2841216202386143296, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
- time: 1
value: {fileID: 8907765816488404462, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
- time: 1.25
value: {fileID: 3415276510487841553, guid: 079892c4ac40f3748911292d71e41e92,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 4
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: []
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 5602368246063793955, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
- {fileID: 3093185705210999891, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
- {fileID: 5254658917271497152, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
- {fileID: -2841216202386143296, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
- {fileID: 8907765816488404462, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
- {fileID: 3415276510487841553, guid: 079892c4ac40f3748911292d71e41e92, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 1.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-5832924819720739153
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2668591663111059309}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2668591663111059309}
--- !u!1102 &-2668591663111059309
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FlyingPlatformBreathing
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 777eb3cee6f2f224eb8dd81ba0f98c0f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FlyingPlatformBreathing_0
m_Name: FlyingPlatformBreathing
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -5832924819720739153}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
......@@ -17,15 +17,43 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 8895595579789130362, guid: c1fa17aaa5031e54cb149fd0ec2acc84,
type: 3}
- time: 0.25
value: {fileID: -1982273023083622433, guid: c1fa17aaa5031e54cb149fd0ec2acc84,
type: 3}
- time: 0.5
value: {fileID: 6027728233812326010, guid: c1fa17aaa5031e54cb149fd0ec2acc84,
type: 3}
- time: 0.75
value: {fileID: -2875887007687415270, guid: c1fa17aaa5031e54cb149fd0ec2acc84,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 4
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: []
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 8895595579789130362, guid: c1fa17aaa5031e54cb149fd0ec2acc84, type: 3}
- {fileID: -1982273023083622433, guid: c1fa17aaa5031e54cb149fd0ec2acc84, type: 3}
- {fileID: 6027728233812326010, guid: c1fa17aaa5031e54cb149fd0ec2acc84, type: 3}
- {fileID: -2875887007687415270, guid: c1fa17aaa5031e54cb149fd0ec2acc84, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8394138902907961214
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FlyingPlatformIdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 43ae567d2168f394bbc5336be83c318a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-6511559860305928450
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -8394138902907961214}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -8394138902907961214}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FlyingPlatformIdle_0
m_Name: FlyingPlatformIdle
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6511559860305928450}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
......@@ -53,7 +53,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 29e4a79a79b470fd5b3021938034169a, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......
......@@ -8066,7 +8066,7 @@ PrefabInstance:
type: 3}
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 339937315}
objectReference: {fileID: 402836157}
- target: {fileID: 8811539149977030266, guid: 388a7af523fdebaafad4a5d1ae1a896b,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -325317,40 +325317,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!84 &339937315
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1324
m_Height: 533
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &340149670
GameObject:
m_ObjectHideFlags: 0
......@@ -326671,6 +326637,16 @@ PrefabInstance:
propertyPath: sporeCloud
value:
objectReference: {fileID: 822542248}
- target: {fileID: 7948462905937867563, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
propertyPath: sceneManager
value:
objectReference: {fileID: 537876553}
- target: {fileID: 7948462905937867563, guid: f729691d7d926604eafbc77cee0d4abb,
type: 3}
propertyPath: creditsAfterDeath
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f729691d7d926604eafbc77cee0d4abb, type: 3}
--- !u!1 &360080395
......@@ -329134,6 +329110,40 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!84 &402836157
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1575
m_Height: 886
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &410088416
GameObject:
m_ObjectHideFlags: 0
......@@ -335879,26 +335889,6 @@ PrefabInstance:
propertyPath: m_Name
value: Hud Canvas
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: pauseCan
value:
objectReference: {fileID: 1732090634}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: savepointo
value:
objectReference: {fileID: 1787965777}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 1876958555}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: optionCan
value:
objectReference: {fileID: 1598043037}
- target: {fileID: 4235653480055822335, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -336004,6 +335994,26 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: pauseCan
value:
objectReference: {fileID: 1732090634}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: savepointo
value:
objectReference: {fileID: 1787965777}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 1876958555}
- target: {fileID: 4235653480055822332, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
propertyPath: optionCan
value:
objectReference: {fileID: 1598043037}
- target: {fileID: 865960383, guid: 22f087369170b3c4cbbd6bd02b1c3a5a, type: 3}
propertyPath: m_textInfo.characterCount
value: 0
......@@ -364837,13 +364847,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013677293}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1870349494}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1015750135
GameObject:
m_ObjectHideFlags: 0
......@@ -366185,21 +366195,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: maxStrength
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: exponent
value: 3.06
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: maxStrengthDistanceFactor
value: 0.093
objectReference: {fileID: 0}
- target: {fileID: 5546039070061430727, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -366220,6 +366215,21 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 232.8
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: maxStrength
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: exponent
value: 3.06
objectReference: {fileID: 0}
- target: {fileID: 6635821371766515316, guid: 5f19e99694f67a245b4244a6b9f38023,
type: 3}
propertyPath: maxStrengthDistanceFactor
value: 0.093
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5f19e99694f67a245b4244a6b9f38023, type: 3}
--- !u!4 &1033755150 stripped
......@@ -366596,7 +366606,7 @@ PrefabInstance:
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
propertyPath: breathingForce
value: 600
value: 300
objectReference: {fileID: 0}
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
......@@ -375045,7 +375055,7 @@ PrefabInstance:
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
propertyPath: breathingForce
value: 400
value: 300
objectReference: {fileID: 0}
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
......@@ -377216,7 +377226,7 @@ PrefabInstance:
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
propertyPath: breathingForce
value: 600
value: 400
objectReference: {fileID: 0}
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
......@@ -384125,7 +384135,7 @@ PrefabInstance:
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
propertyPath: breathingForce
value: 600
value: 300
objectReference: {fileID: 0}
- target: {fileID: 5226740682805395749, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
......@@ -447603,14 +447613,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2369621432931620814, guid: a1e0107a2375e1140a669c1da0647f9a,
- target: {fileID: 9062855885143663086, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: scene
propertyPath: health
value:
objectReference: {fileID: 0}
- target: {fileID: 9062855885143663086, guid: a1e0107a2375e1140a669c1da0647f9a,
- target: {fileID: 2369621432931620814, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: health
propertyPath: scene
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
......@@ -452139,16 +452149,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName