Commit 6261d508 authored by Max's avatar Max
Browse files

Merge branch 'Max'

parents 7b773d9f 56bedc08
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-3204104958677283721
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Breathing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4280757656030759606}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-1368312593391732073
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Falling
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3204104958677283721}
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: 8508eb2838e34d644aab5d09db9b2c8f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-378371908303915479
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: 4280757656030759606}
m_Position: {x: 160, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: -1368312593391732073}
m_Position: {x: 530, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 800, y: 70, z: 0}
m_EntryPosition: {x: 180, y: 10, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4280757656030759606}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FlyingPlatformAnimator
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Breathing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -378371908303915479}
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}
--- !u!1102 &4280757656030759606
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Breathing
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 9195733496730187520}
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: db047a5bff7b54f4eb266b150b408e0c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &9195733496730187520
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Breathing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1368312593391732073}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
fileFormatVersion: 2
guid: f2d744ced3cd30c44971bf6a82f6dd2c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6241724066737184100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6241724066737184101}
- component: {fileID: 6241724066737184026}
- component: {fileID: 6241724066737184024}
- component: {fileID: 6241724066737184027}
- component: {fileID: 2660195609039020677}
- component: {fileID: 5226740682805395749}
m_Layer: 8
m_Name: Flying Platform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6241724066737184101
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 1, z: 1}
m_Children:
- {fileID: 6241724066686691532}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6241724066737184026
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
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: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 191ca67cc9f7fdc419104c53f032ef3e, type: 3}
m_Color: {r: 0.055875294, g: 0.745283, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &6241724066737184024
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: f2d744ced3cd30c44971bf6a82f6dd2c, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!61 &6241724066737184027
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.25}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 0.5}
m_EdgeRadius: 0
--- !u!50 &2660195609039020677
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 3
m_LinearDrag: 0.5
m_AngularDrag: 0.05
m_GravityScale: 0.1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!114 &5226740682805395749
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6241724066737184100}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01f4d4cb97d99804c8d5c0bbf2113d0e, type: 3}
m_Name:
m_EditorClassIdentifier:
sporeBreathParticle: {fileID: 6241724066686691529}
rb: {fileID: 2660195609039020677}
animator: {fileID: 6241724066737184024}
speed: 1
breathingForce: 2
whatIsGround:
serializedVersion: 2
m_Bits: 256
maximumHeight: 4
minimumHeight: -4
--- !u!1001 &903980468320547485
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6241724066737184101}
m_Modifications:
- target: {fileID: 6490983961685056084, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_Name
value: SporeBreath
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.3
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056082, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: CollisionModule.multiplyColliderForceByParticleSize
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056082, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: CollisionModule.collisionMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6490983961685056082, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
propertyPath: CollisionModule.enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e42b5206757167a4eb0de34f54ab98ed, type: 3}
--- !u!1 &6241724066686691529 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6490983961685056084, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
m_PrefabInstance: {fileID: 903980468320547485}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6241724066686691532 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
type: 3}
m_PrefabInstance: {fileID: 903980468320547485}
m_PrefabAsset: {fileID: 0}
fileFormatVersion: 2
guid: 6033595a9ea70aa4a9700651719dc866
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 3659447474157512488}
- component: {fileID: 3659447474157512489}
m_Layer: 0
m_Name: SporeExplode
m_Name: ExplodeParticles
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1322,7 +1322,7 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0.9652157, a: 0.78431374}
key1: {r: 0.35790887, g: 0.0025364957, b: 0.5377358, a: 0.5882353}
key1: {r: 0.35790887, g: 0.0025364957, b: 0.5377358, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
......
This diff is collapsed.
fileFormatVersion: 2
guid: e42b5206757167a4eb0de34f54ab98ed
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -663,7 +663,7 @@ ParticleSystem:
angle: 25
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 0.25
radiusThickness: 0
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
......@@ -1322,14 +1322,14 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0.9652157, a: 0.78431374}
key1: {r: 0.35790887, g: 0.0025364957, b: 0.5377358, a: 0.5882353}
key1: {r: 0.35790887, g: 0.0025364957, b: 0.5377358, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 32768
ctime0: 34117
ctime1: 65535
ctime2: 0
ctime3: 0
......@@ -1337,7 +1337,7 @@ ParticleSystem:
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime0: 55705
atime1: 65535
atime2: 0
atime3: 0
......
......@@ -1077,6 +1077,8 @@ Transform:
- {fileID: 1125255220}
- {fileID: 1919109333}
- {fileID: 595907486}
- {fileID: 931486637}
- {fileID: 1821611941}
m_Father: {fileID: 131995713}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1312,8 +1314,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 725639242}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3, y: 4, z: 0}
m_LocalScale: {x: 19, y: 1, z: 1}
m_LocalPosition: {x: 1, y: 1, z: 0}
m_LocalScale: {x: 25, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473954089}
m_RootOrder: 7
......@@ -1392,6 +1394,12 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &754269808 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6241724066737184101, guid: 6033595a9ea70aa4a9700651719dc866,
type: 3}
m_PrefabInstance: {fileID: 1264896423}
m_PrefabAsset: {fileID: 0}
--- !u!1 &868614304
GameObject:
m_ObjectHideFlags: 0
......@@ -1498,6 +1506,112 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &931486636
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 931486637}
- component: {fileID: 931486639}
- component: {fileID: 931486638}
m_Layer: 8
m_Name: Wall (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &931486637
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 931486636}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 13, y: 5, z: 0}
m_LocalScale: {x: 1, y: 9, z: 1}
m_Children: []
m_Father: {fileID: 671354061}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &931486638
BoxCollider2D: