Commit 39489d98 authored by Max's avatar Max
Browse files

Added boss prefab, most of the boss behaviours and "fade to black" to HUD

parent fedbb30f
......@@ -10,7 +10,8 @@ AnimatorState:
m_Name: Shoot
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -2812616845462557190}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -26,6 +27,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2812616845462557190
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4272770998389893544}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1919176912036080369
AnimatorStateTransition:
m_ObjectHideFlags: 1
......@@ -43,10 +66,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_ExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
......
......@@ -31,16 +31,4 @@ public class CrawlerTurnBehaviour : StateMachineBehaviour
currentRotation.y += 180;
myTransform.eulerAngles = currentRotation;
}
// OnStateMove is called right after Animator.OnAnimatorMove()
//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
//{
// // Implement code that processes and affects root motion
//}
// OnStateIK is called right after Animator.OnAnimatorIK()
//override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
//{
// // Implement code that sets up animation IK (inverse kinematics)
//}
}
......@@ -11,7 +11,10 @@ GameObject:
- component: {fileID: 329613192511979808}
- component: {fileID: 329613192511979811}
- component: {fileID: 329613192511979810}
m_Layer: 0
- component: {fileID: 2119843444864764691}
- component: {fileID: 7948462905937867563}
- component: {fileID: 5884834992861905281}
m_Layer: 13
m_Name: Boss
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -100,3 +103,86 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!61 &2119843444864764691
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 329613192511979813}
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.2}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 5.27, y: 5.12}
newSize: {x: 5.27, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 4.5, y: 4}
m_EdgeRadius: 0
--- !u!114 &7948462905937867563
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 329613192511979813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 881bc08784fef3a4eb8ed70cbdc48ea5, type: 3}
m_Name:
m_EditorClassIdentifier:
deathParticlePrefab: {fileID: 3485762114104029168, guid: 6fe80d917406c2c4a908ad0b14afc0ea,
type: 3}
healthPoints: 3
stoneLayer: 8
--- !u!114 &5884834992861905281
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 329613192511979813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 95b18208a63f1a64d9af23e7926c06b7, type: 3}
m_Name:
m_EditorClassIdentifier:
bossHealth: {fileID: 0}
health: 0
projectile: {fileID: 2702223633894697336, guid: f32f70a0ff463d14e9110eccc33a2143,
type: 3}
verticalOffset: 0
horizontalOffset: 0
timeBtwShotsPh1: 5
shotTimer1: 0
timeBtwShotsPh2: 3
spawnedEnemyPrefab: {fileID: 0}
possibleSpawnPoints: {fileID: 0}
sporeSpeedPh3: 0.5
screenShake:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
fadeToBlack:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
fadeToGame:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
timeBetweenShakeAndFade: 1
timeBetweenFades: 3
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6059313704421038625
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8373960152279224653}
- component: {fileID: 5136850966358485487}
m_Layer: 13
m_Name: SporeFloorBoss
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8373960152279224653
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6059313704421038625}
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:
- {fileID: 8980308436021746934}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &5136850966358485487
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6059313704421038625}
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}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 30, y: 20}
m_EdgeRadius: 0
--- !u!1001 &7331568646153010036
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8373960152279224653}
m_Modifications:
- target: {fileID: 8872506300990914190, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_Name
value: SporeFloorBoss
objectReference: {fileID: 0}
- target: {fileID: 8872506300990914190, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.66
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 520407f8599b43a48ab9fd88d9ce1462, type: 3}
--- !u!4 &8980308436021746934 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1810025008443058050, guid: 520407f8599b43a48ab9fd88d9ce1462,
type: 3}
m_PrefabInstance: {fileID: 7331568646153010036}
m_PrefabAsset: {fileID: 0}
fileFormatVersion: 2
guid: ed6aa0a4d3562d8408968ace885a212f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -3572,7 +3572,7 @@ ParticleSystem:
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
CollisionModule:
enabled: 1
enabled: 0
serializedVersion: 3
type: 1
collisionMode: 1
......
......@@ -289,6 +289,170 @@ MonoBehaviour:
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &176229185447250664
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1062266529232862363}
- component: {fileID: 2984446639830042919}
- component: {fileID: 8871964207655363948}
- component: {fileID: 1135154008631162080}
- component: {fileID: 6806729360369846543}
- component: {fileID: 1139858347525294794}
- component: {fileID: 4462356745360423296}
- component: {fileID: 7764652462494618012}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1062266529232862363
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
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: 4235653480055822335}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &2984446639830042919
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &8871964207655363948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &1135154008631162080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!225 &6806729360369846543
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 0
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &1139858347525294794
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cf64f76be732ab4491d7683694500d1, type: 3}
m_Name:
m_EditorClassIdentifier:
b: 1
--- !u!222 &4462356745360423296
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_CullTransparentMesh: 0
--- !u!114 &7764652462494618012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176229185447250664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 191ca67cc9f7fdc419104c53f032ef3e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4235653480055822323
GameObject:
m_ObjectHideFlags: 0
......@@ -322,6 +486,7 @@ RectTransform:
m_Children:
- {fileID: 4235653480082144181}
- {fileID: 753163125}
- {fileID: 1062266529232862363}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -562,8 +727,6 @@ MonoBehaviour:
leaf1: {fileID: 4235653481925006135}
leaf2: {fileID: 4235653481624623893}
leaf3: {fileID: 4235653480612640612}
playerObject: {fileID: 0}
can: {fileID: 0}
--- !u!1 &4235653480612640614
GameObject:
m_ObjectHideFlags: 0
......
......@@ -151,7 +151,7 @@ Transform:
- {fileID: 671354061}
- {fileID: 1652412121}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &225743466
GameObject:
......@@ -495,6 +495,7 @@ GameObject:
- component: {fileID: 382514591}
- component: {fileID: 382514590}
- component: {fileID: 382514593}
- component: {fileID: 382514594}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
......@@ -565,7 +566,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &382514593
Animator:
......@@ -586,6 +587,21 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &382514594
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382514589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06f4b3c3fa5588b4e9006efdbf018d4c, type: 3}
m_Name:
m_EditorClassIdentifier:
shakeDuration: 0
shakeMagnitude: 0.1
dampingSpeed: 1
--- !u!1001 &413952538
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -636,7 +652,7 @@ PrefabInstance:
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1088708388262890221, guid: 504d671a4858dbe4cb1f3c567bb881b4,
type: 3}
......@@ -1704,6 +1720,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6098262288883245936, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3724751736021467387, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -2683,7 +2704,7 @@ Transform:
- {fileID: 1761456133}
- {fileID: 754269808}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1761456133 stripped
Transform:
......@@ -2903,6 +2924,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1825742455 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1139858347525294794, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
m_PrefabInstance: {fileID: 2040639008}
m_PrefabAsset: {fileID: 0}