Commit 58985806 authored by Tommé Nöll's avatar Tommé Nöll
Browse files

changes from Chris branch commit 748dcb3a

parent 69d2878f
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1030426031
--- !u!1 &3109150749726334622
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -8,9 +8,118 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1030426034}
- component: {fileID: 1030426033}
- component: {fileID: 1030426032}
- component: {fileID: 7244929154000840531}
- component: {fileID: 2582774183178569381}
m_Layer: 9
m_Name: GroundCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7244929154000840531
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3109150749726334622}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0}
m_Children: []
m_Father: {fileID: 3724751736021467387}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2582774183178569381
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3109150749726334622}
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: 0}
m_Color: {r: 1, g: 1, b: 1, 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: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &5087694558853776705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5132821308292831780}
m_Layer: 9
m_Name: CeilingCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5132821308292831780
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5087694558853776705}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.038, z: -29.228271}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3724751736021467387}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7396327853969230246
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8538912969352576084}
- component: {fileID: 905362154437276376}
- component: {fileID: 6675591703041896020}
m_Layer: 9
m_Name: RopeHingeAnchor
m_TagString: Untagged
......@@ -18,28 +127,28 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1030426034
--- !u!4 &8538912969352576084
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1030426031}
m_GameObject: {fileID: 7396327853969230246}
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: 264577551908436770}
m_Father: {fileID: 3724751736021467387}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &1030426033
--- !u!50 &905362154437276376
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1030426031}
m_GameObject: {fileID: 7396327853969230246}
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
......@@ -53,13 +162,13 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!212 &1030426032
--- !u!212 &6675591703041896020
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1030426031}
m_GameObject: {fileID: 7396327853969230246}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -101,7 +210,7 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &264577551908436831
--- !u!1 &8849362558915370004
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -109,18 +218,18 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 264577551908436770}
- component: {fileID: 264577551908436771}
- component: {fileID: 264577551908436768}
- component: {fileID: 264577551908436769}
- component: {fileID: 264577551908436830}
- component: {fileID: 1547779244}
- component: {fileID: 1547779245}
- component: {fileID: -8691157065451763958}
- component: {fileID: 2099994438}
- component: {fileID: 2099994439}
- component: {fileID: 2099994441}
- component: {fileID: 2099994440}
- component: {fileID: 3724751736021467387}
- component: {fileID: 5455753061226113413}
- component: {fileID: 7524024936898048702}
- component: {fileID: 1324611464004098323}
- component: {fileID: 8984181927896648757}
- component: {fileID: 7207841027803033579}
- component: {fileID: 6215545398099280194}
- component: {fileID: 7850922825727753780}
- component: {fileID: 930798346278949732}
- component: {fileID: 6910672580576760399}
- component: {fileID: 6818121494711655588}
- component: {fileID: 9051096322378570992}
m_Layer: 9
m_Name: player
m_TagString: Player
......@@ -128,30 +237,30 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &264577551908436770
--- !u!4 &3724751736021467387
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.661, y: -0.171, z: 0}
m_LocalPosition: {x: -6.05, y: -1.8539673, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 264577552299148765}
- {fileID: 264577552399682111}
- {fileID: 1030426034}
- {fileID: 7244929154000840531}
- {fileID: 5132821308292831780}
- {fileID: 8538912969352576084}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &264577551908436771
--- !u!212 &5455753061226113413
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -182,24 +291,24 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 72de0c64f2c6a498096698322c976a67, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
m_Color: {r: 1, g: 0.049562424, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.33, y: 0.32}
m_Size: {x: 0.64, y: 0.64}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &264577551908436768
--- !u!61 &7524024936898048702
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
......@@ -210,8 +319,8 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.33, y: 0.32}
newSize: {x: 0.33, y: 0.32}
oldSize: {x: 0.2, y: 0.2}
newSize: {x: 0.64, y: 0.64}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
......@@ -219,13 +328,13 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.15528658, y: 0.12617421}
m_EdgeRadius: 0
--- !u!58 &264577551908436769
--- !u!58 &1324611464004098323
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
......@@ -235,14 +344,14 @@ CircleCollider2D:
m_Offset: {x: 0, y: -0.08}
serializedVersion: 2
m_Radius: 0.07746029
--- !u!50 &264577551908436830
--- !u!50 &8984181927896648757
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
......@@ -256,24 +365,24 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 1
m_Constraints: 4
--- !u!114 &1547779244
--- !u!114 &7207841027803033579
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eff681ef17b34b34e8e2ad0af641fa6d, type: 3}
m_Name:
m_EditorClassIdentifier:
rigidbody: {fileID: 264577551908436830}
rigidbody: {fileID: 8984181927896648757}
movementSmoothing: 0.05
jumpForce: 20
groundCheck: {fileID: 264577552299148765}
ceilingCheck: {fileID: 264577552399682111}
crouchDisableCollider: {fileID: 264577551908436768}
groundCheck: {fileID: 7244929154000840531}
ceilingCheck: {fileID: 5132821308292831780}
crouchDisableCollider: {fileID: 7524024936898048702}
crouchSpeed: 0.36
runSpeed: 40
whatIsGround:
......@@ -288,61 +397,41 @@ MonoBehaviour:
ropeHook: {x: 0, y: 0}
swingForce: 3
maxSwingForce: 10
--- !u!114 &1547779245
--- !u!114 &6215545398099280194
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a352a34217cb91f1b66575ce2ebc3c5, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1547779244}
player: {fileID: 7207841027803033579}
scene: {fileID: 0}
ropesys: {fileID: 2099994440}
--- !u!114 &-8691157065451763958
ropesys: {fileID: 6818121494711655588}
--- !u!114 &7850922825727753780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c743841288d9cf14a9657ed0dca8f72b, type: 3}
m_Name:
m_EditorClassIdentifier:
life: 0
--- !u!231 &2099994438
SpringJoint2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_Enabled: 0
serializedVersion: 4
m_EnableCollision: 1
m_ConnectedRigidBody: {fileID: 264577551908436830}
m_BreakForce: Infinity
m_BreakTorque: Infinity
m_AutoConfigureConnectedAnchor: 1
m_Anchor: {x: 0, y: 0}
m_ConnectedAnchor: {x: 0, y: 0}
m_AutoConfigureDistance: 0
m_Distance: 0.005
m_DampingRatio: 0
m_Frequency: 1
--- !u!120 &2099994439
life: 3
--- !u!120 &930798346278949732
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
......@@ -431,17 +520,17 @@ LineRenderer:
generateLightingData: 0
m_UseWorldSpace: 1
m_Loop: 0
--- !u!232 &2099994441
--- !u!232 &6910672580576760399
DistanceJoint2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
serializedVersion: 4
m_EnableCollision: 0
m_ConnectedRigidBody: {fileID: 1030426033}
m_ConnectedRigidBody: {fileID: 905362154437276376}
m_BreakForce: Infinity
m_BreakTorque: Infinity
m_AutoConfigureConnectedAnchor: 0
......@@ -450,135 +539,48 @@ DistanceJoint2D:
m_AutoConfigureDistance: 0
m_Distance: 0.005
m_MaxDistanceOnly: 0
--- !u!114 &2099994440
--- !u!114 &6818121494711655588
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577551908436831}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d4b70711c6e5574d805e961de17d126, type: 3}
m_Name:
m_EditorClassIdentifier:
ropeRenderer: {fileID: 2099994439}
ropeRenderer: {fileID: 930798346278949732}
ropeLayerMask:
serializedVersion: 2
m_Bits: 1281
ropeHingeAnchor: {fileID: 1030426031}
ropeJoint: {fileID: 2099994441}
pullRope: {fileID: 2099994438}
player: {fileID: 1547779244}
ropeHingeAnchor: {fileID: 7396327853969230246}
ropeJoint: {fileID: 6910672580576760399}
springJoint: {fileID: 9051096322378570992}
player: {fileID: 7207841027803033579}
climbSpeed: 3
ropeMaxCastDistance: 8
initialJump: 0.2
--- !u!1 &264577552299148762
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 264577552299148765}
- component: {fileID: 264577552299148764}
m_Layer: 9
m_Name: GroundCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &264577552299148765
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577552299148762}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0}
m_Children: []
m_Father: {fileID: 264577551908436770}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &264577552299148764
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577552299148762}
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: 0}
m_Color: {r: 1, g: 1, b: 1, 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: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &264577552399682108
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 264577552399682111}
m_Layer: 9
m_Name: CeilingCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &264577552399682111
Transform:
pullSpeed: 1
lightPullingForce: 5
heavyPullingForce: 10
--- !u!231 &9051096322378570992
SpringJoint2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 264577552399682108}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.038, z: -29.228271}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 264577551908436770}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_GameObject: {fileID: 8849362558915370004}
m_Enabled: 0
serializedVersion: 4
m_EnableCollision: 0
m_ConnectedRigidBody: {fileID: 0}
m_BreakForce: Infinity
m_BreakTorque: Infinity
m_AutoConfigureConnectedAnchor: 0
m_Anchor