Commit ff8fb112 authored by Christopher Benes's avatar Christopher Benes
Browse files

MainLevel Update

parents b4679731 a4ffa24e
fileFormatVersion: 2
guid: 83b2ccd8caab22846876189bc6815151
guid: bb8c54259e3f99e4db55ef49ac5b5072
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: AirMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: d8ddf6924a883e94583c59a55fd11f8d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: DefaultMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 11203796b90159848b6c5f4217eed3ec
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: EarthMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 92286a125406f3643b98aa3f886d53b1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: FireMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 805f35d42b113b841b2c8f64adf50f4a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: WaterMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: b76e74a09da3f224f99559ac3d31fc0c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -132,9 +132,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e310ba2b65602490894409ff217e2731, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 5
GroundDist: 0.5
layer: 0
m_JumpForce: 400
m_MovementSmoothing: 0.05
m_AirControl: 0
m_WhatIsGround:
serializedVersion: 2
m_Bits: 0
m_GroundCheck: {fileID: 0}
OnLandEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &5143124933316929978
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -147,7 +156,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2f8415a7fda2c084e87b3caa1b43ffbf, type: 3}
m_Name:
m_EditorClassIdentifier:
state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
onAirInfused: {fileID: 11400000, guid: b0928121a3619584c9612f68610a97a5, type: 2}
onFireInfused: {fileID: 11400000, guid: f553df1a50d464e48837fbb6cb99b7e5, type: 2}
onEarthInfused: {fileID: 11400000, guid: 59d96edea2ecb434999c09413da7449a, type: 2}
onFireInfused: {fileID: 11400000, guid: f553df1a50d464e48837fbb6cb99b7e5, type: 2}
onWaterInfused: {fileID: 11400000, guid: ca31b08da78cb134086d7688bbb50628, type: 2}
fileFormatVersion: 2
guid: f269cf4fe2b91024083d105b25622a8e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &395035932932740994
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 395035932932740992}
- component: {fileID: 395035932932740995}
- component: {fileID: 395035932932740993}
m_Layer: 0
m_Name: SavePoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &395035932932740992
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395035932932740994}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.34, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!58 &395035932932740995
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395035932932740994}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1.39
--- !u!114 &395035932932740993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395035932932740994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9627da6bb4534054e8a7065f1c4974f3, type: 3}
m_Name:
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: 3ff4cf871f5edaa40b0530c80a9ff9df
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -112,66 +112,75 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &533869316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 533869318}
- component: {fileID: 533869317}
- component: {fileID: 533869319}
m_Layer: 0
m_Name: SavePoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!58 &533869317
CircleCollider2D:
--- !u!1001 &726887643
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533869316}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1.39
--- !u!4 &533869318
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533869316}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.34, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &533869319
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533869316}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9627da6bb4534054e8a7065f1c4974f3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 395035932932740994, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_Name
value: SavePoint (2)
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.6338824
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.023614883
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.z
value: -22.677734
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ff4cf871f5edaa40b0530c80a9ff9df, type: 3}
--- !u!1 &1428709948
GameObject:
m_ObjectHideFlags: 0
......@@ -290,7 +299,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &1428709954
Rigidbody2D:
......@@ -313,6 +322,75 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1001 &1456034893
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 395035932932740994, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_Name
value: SavePoint (1)
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.x
value: 5.1062307
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.12993002
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalPosition.z
value: -22.677734
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 395035932932740992, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ff4cf871f5edaa40b0530c80a9ff9df, type: 3}
--- !u!1 &1817897560
GameObject:
m_ObjectHideFlags: 0
......@@ -380,7 +458,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1826260685
GameObject:
......@@ -464,63 +542,72 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1990119847
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1990119850}
- component: {fileID: 1990119849}
- component: {fileID: 1990119848}
m_Layer: 0
m_Name: SavePoint (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1990119848
MonoBehaviour:
--- !u!1001 &395035933204456582
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1990119847}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9627da6bb4534054e8a7065f1c4974f3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!58 &1990119849
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1990119847}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1.39
--- !u!4 &1990119850
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1990119847}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.4, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 395035932932740994, guid: 3ff4cf871f5edaa40b0530c80a9ff9df,
type: 3}
propertyPath: m_Name
value: SavePoint