Commit f4eb9b16 authored by Domm29's avatar Domm29
Browse files

Merge branch 'mergeTemp'

# Conflicts:
#	.idea/.idea.seedling/.idea/contentModel.xml
#	.idea/.idea.seedling/.idea/workspace.xml
#	Assets/Prefabs/player.prefab
#	ProjectSettings/TagManager.asset
parents d5953702 2c4ad23a
......@@ -120,135 +120,12 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &282168667
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Name
value: player
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.661
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.171
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.x
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.y
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.border.x
value: 0.049999997
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.border.y
value: 0.049999997
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.border.z
value: 0.049999997
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.border.w
value: 0.049999997
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.oldSize.x
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.oldSize.y
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.newSize.x
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_SpriteTilingProperty.newSize.y
value: 0.16
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
--- !u!1 &18636829 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4235653480082144180, guid: 22f087369170b3c4cbbd6bd02b1c3a5a,
type: 3}
m_PrefabInstance: {fileID: 4235653481145002678}
m_PrefabAsset: {fileID: 0}
--- !u!1 &399140765
GameObject:
m_ObjectHideFlags: 0
......@@ -387,7 +264,7 @@ PrefabInstance:
- target: {fileID: 258479075904060255, guid: 3af84264fc3607b4db6eca24eb9c88dc,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 258479075904060255, guid: 3af84264fc3607b4db6eca24eb9c88dc,
type: 3}
......@@ -470,7 +347,436 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &749252329
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Name
value: player
objectReference: {fileID: 0}
- target: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.661
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.171
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: ebcf6b0ec2d767a4d8f077cd3cf9a29f,
type: 3}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1547779244, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
propertyPath: crouchDisableCollider
value:
objectReference: {fileID: 1228530900}
- target: {fileID: 1547779244, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
propertyPath: rigidbody
value:
objectReference: {fileID: 1228530898}
- target: {fileID: 1547779244, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
propertyPath: jumpForce
value: 20
objectReference: {fileID: 0}
- target: {fileID: 1547779244, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
propertyPath: swingForce
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1547779245, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
propertyPath: ropesys
value:
objectReference: {fileID: 1228530891}
- target: {fileID: 264577552299148762, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 264577552399682108, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1036972048130055170, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8691157065451763958, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: hud
value:
objectReference: {fileID: 18636829}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
--- !u!1 &1228530890 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 749252329}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1228530891
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228530890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d4b70711c6e5574d805e961de17d126, type: 3}
m_Name:
m_EditorClassIdentifier:
ropeRenderer: {fileID: 1228530893}
ropeLayerMask:
serializedVersion: 2
m_Bits: 1281
ropeHingeAnchor: {fileID: 1488179763}
ropeJoint: {fileID: 1228530892}
pullRope: {fileID: 1228530894}
player: {fileID: 1228530897}
climbSpeed: 3
ropeMaxCastDistance: 8
initialJump: 0.2
--- !u!232 &1228530892
DistanceJoint2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228530890}
m_Enabled: 1
serializedVersion: 4
m_EnableCollision: 0
m_ConnectedRigidBody: {fileID: 1488179765}
m_BreakForce: Infinity
m_BreakTorque: Infinity
m_AutoConfigureConnectedAnchor: 0
m_Anchor: {x: 0, y: 0}
m_ConnectedAnchor: {x: 0, y: 0}
m_AutoConfigureDistance: 0
m_Distance: 0.005
m_MaxDistanceOnly: 0
--- !u!120 &1228530893
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228530890}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1}
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.8
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.0068715364
value: 0.031969063
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
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: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 2
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 1
m_Loop: 0
--- !u!231 &1228530894
SpringJoint2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228530890}
m_Enabled: 0
serializedVersion: 4
m_EnableCollision: 1
m_ConnectedRigidBody: {fileID: 1228530898}
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!114 &1228530897 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1547779244, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 749252329}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228530890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eff681ef17b34b34e8e2ad0af641fa6d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!50 &1228530898 stripped
Rigidbody2D:
m_CorrespondingSourceObject: {fileID: 264577551908436830, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 749252329}
m_PrefabAsset: {fileID: 0}
--- !u!61 &1228530900 stripped
BoxCollider2D:
m_CorrespondingSourceObject: {fileID: 264577551908436768, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 749252329}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1228530902 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 264577551908436770, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 749252329}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1488179763
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1488179766}
- component: {fileID: 1488179765}
- component: {fileID: 1488179764}
m_Layer: 9
m_Name: RopeHingeAnchor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &1488179764
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1488179763}
m_Enabled: 0
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: 2
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Color: {r: 0.7169812, g: 0, b: 0.13794921, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.16, y: 0.16}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &1488179765
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1488179763}
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!4 &1488179766
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1488179763}
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: 1228530902}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1662232169
GameObject:
......@@ -576,12 +882,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1699736303 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 264577551908436831, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
m_PrefabInstance: {fileID: 282168667}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4235653481145002678
PrefabInstance: