Commit c45115d7 authored by Unknown's avatar Unknown
Browse files

Doppel Jump sollte mit Air charges funktionieren

parent 62e2b8e7
......@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: Movement States
m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
airMoveState:
jumpForce: 5
jumpForce: 10
smoothing: 0.03
airControl: 1
canSwim: 1
......@@ -49,11 +49,11 @@ MonoBehaviour:
mass: 1
gravity: 3
defaultMoveState:
jumpForce: 0
smoothing: 0
airControl: 0
canSwim: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
jumpForce: 10
smoothing: 0.03
airControl: 1
canSwim: 1
moveSpeed: 20
maxJumpCount: 1
mass: 1
gravity: 1
......@@ -12,14 +12,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
m_Name: PlayerState
m_EditorClassIdentifier:
currentInfusedElement: 2
currentInfusedElement: 0
currentMoveState:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
jumpForce: 10
smoothing: 0.03
airControl: 1
canSwim: 1
moveSpeed: 30
maxJumpCount: 5
mass: 0.1
gravity: 0.5
movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
charges: 4
charges: 0
......@@ -112,12 +112,253 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &35659234
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8187453823603247199, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_Name
value: WaterElement
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalPosition.x
value: 21.02
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalPosition.y
value: -17.53
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 599519593b27fd2448e33dcb9f69045b, type: 3}
--- !u!1001 &206656954
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6148069962227925277, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_Name
value: FireElement
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalPosition.x
value: 23.97
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalPosition.y
value: -17.53
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e79fbf1855fce6e4387f467f1fb65960, type: 3}
--- !u!1 &352228595 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
m_PrefabInstance: {fileID: 527951491}
m_PrefabAsset: {fileID: 0}
--- !u!114 &352228596
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 352228595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04143d4b812b542329f18723f680be69, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AirScale:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Time: 10
--- !u!114 &352228598 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
m_PrefabInstance: {fileID: 527951491}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 352228595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e310ba2b65602490894409ff217e2731, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &352228607
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 352228595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cd35dc826bb88514993730d585216e35, type: 3}
m_Name:
m_EditorClassIdentifier:
gameEvent: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
allResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 352228598}
m_MethodName: UpdateMovementParameters
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
airResponse:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
earthResponse:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
fireResponse:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
waterResponse:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
defaultResponse:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1001 &527951491
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -133,12 +374,12 @@ PrefabInstance:
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.x
value: -26.5
value: 18.39
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.y
value: 12.1
value: -15.9
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
......@@ -185,6 +426,22 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_fallMultiplier
value: 2.5
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: r_State
value:
objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
type: 2}
- target: {fileID: 352228602, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: onChargeChange
value:
objectReference: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6,
type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
--- !u!1 &719626315
......@@ -411,23 +668,23 @@ SpriteShapeRenderer:
m_SortingOrder: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_MaskInteraction: 0
m_ShapeTexture: {fileID: 2800000, guid: a2c0eb8194d34ed4b9dc91a9195b3ddd, type: 3}
m_ShapeTexture: {fileID: 2800000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
m_Sprites:
- {fileID: 21300000, guid: 4ad442db19b6f7c4d9397be474763f66, type: 3}
- {fileID: 21300000, guid: c00feabea0674474dbf751e72ae5f017, type: 3}
- {fileID: 21300000, guid: 23938a817d851b047b1ce17d72f2f02b, type: 3}
- {fileID: 21300000, guid: 4e19d2fc6d121fc48932202e46430f28, type: 3}
- {fileID: 21300000, guid: 1935b542e258bd64ea3915a1b59b3ef0, type: 3}
- {fileID: 21300000, guid: 0149f5afd2f419b4d9fd9e80a31a33a9, type: 3}
- {fileID: 21300000, guid: 5139251ed94400b40a574058b9ac7983, type: 3}
- {fileID: 21300000, guid: fee06510a1f7a83439b28ea3c2c45c47, type: 3}
- {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3}
- {fileID: 21300000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
- {fileID: 21300000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
- {fileID: 21300000, guid: ba99f04fad336dc4cae4bc02a82688c1, type: 3}
- {fileID: 21300000, guid: 7a33ec8d81f8de84e9bcee25c84a0a68, type: 3}
- {fileID: 21300000, guid: 12ccb39abf7fdde4489b45f7dc2ddb95, type: 3}
- {fileID: 21300000, guid: 32f1aa5b812a2a349afca26ff07162f8, type: 3}
- {fileID: 21300000, guid: 8def5351e5bb6664eb4d57cf426463d9, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_LocalAABB:
m_Center: {x: 0.9510269, y: 11.389301, z: -0.0065}
m_Extent: {x: 54.611794, y: 16.132572, z: 0.0065}
m_Center: {x: 0.9510269, y: 11.353094, z: -0.0065}
m_Extent: {x: 54.60984, y: 16.094412, z: 0.0065}
--- !u!4 &719626318
Transform:
m_ObjectHideFlags: 0
......@@ -933,9 +1190,9 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 66
orthographic: 0
orthographic size: 5
field of view: 82
orthographic: 1
orthographic size: 10
m_Depth: -1
m_CullingMask:
serializedVersion: 2
......@@ -959,7 +1216,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 731052799}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -26.6, y: 11.4, z: -10}
m_LocalPosition: {x: 8.83, y: -2.95, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -977,7 +1234,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53e622d25d5bf8b45be54c49c309108d, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 352228595}
target: {fileID: 0}
smoothSpeed: 0.5
lookAt: 0
maxDistance: 5
--- !u!1 &924553758
GameObject:
m_ObjectHideFlags: 0
......@@ -1047,3 +1307,230 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1441015606
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 100393043881132458, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_Name
value: Water
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.4
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalPosition.y
value: -9.8
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100393043881132460, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_SurfaceLevel
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 100393043881132460, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_LinearDrag
value: 5
objectReference: {fileID: 0}
- target: {fileID: 100393043881132460, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_AngularDrag
value: 5
objectReference: {fileID: 0}
- target: {fileID: 100393043881132460, guid: e9f234b3fda124fe29a2b937c13c099e,
type: 3}
propertyPath: m_Density
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9f234b3fda124fe29a2b937c13c099e, type: 3}
--- !u!1001 &1779468864
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1648869877852930880, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_Name
value: EarthElement
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalPosition.x
value: 14.71
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalPosition.y
value: -17.41
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4512b8eb550115443bbba2ecd59a960c, type: 3}
--- !u!1001 &2039631714
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4605225109116865588, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,