Commit 044c1c50 authored by mthiele2's avatar mthiele2
Browse files

Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it

# Conflicts:
#	Assets/Neuer Ordner.meta
parents 24f694d7 2b7d9b35
stages:
- License
- Build
- Build [Release]
- Deploy
- Release
variables:
PROJECT_NAME: "suck-it"
UNITY_VERSION: "2018.3.7f1"
NEXTCLOUD_SHARE_PATH: "$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
.non_release_build:
only:
variables:
- $RUN_NON_RELEASE_BUILDS
include:
# Base
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml
# Platforms
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/windows64.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/osx.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/linux.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml
# Deploy
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/all-to-nextcloud.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml
# Release
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud.yml
stages:
- License
- Build
- Build [Release]
- Deploy
- Release
variables:
PROJECT_NAME: "suck-it"
UNITY_VERSION: "2018.3.7f1"
NEXTCLOUD_FILE_BASE_URL: "$NEXTCLOUD_DOWNLOAD_BASE_URL/$PROJECT_NAME"
NEXTCLOUD_DEPLOY_PATH: "$NEXTCLOUD_USERNAME/$NEXTCLOUD_DEPLOY_BASE_PATH/$PROJECT_NAME"
.non_release_build:
only:
variables:
- $RUN_NON_RELEASE_BUILDS
include:
# Base
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/build-base.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/license.yml
# Platforms
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/windows64.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/osx.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/linux.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/platforms/webgl.yml
# Deploy
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/all-to-nextcloud.yml
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/deploy/webgl-to-pages.yml
# Release
- https://gitlab.dragonixx.de/Dragonixx/gitlab-ci-toolbox/raw/master/scripts/unity/release/all-nextcloud-no-share.yml
fileFormatVersion: 2
guid: 83b2ccd8caab22846876189bc6815151
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 52145075018362291}
- component: {fileID: 52145075018362284}
- component: {fileID: 52145075018362287}
m_Layer: 0
m_Layer: 10
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
......@@ -119,6 +119,8 @@ MonoBehaviour:
m_GroundedOffset: {x: 0, y: -1}
m_SecondsWaitToJump: 0.5
m_MaxJumpCount: 1
m_fallMultiplier: 2.5
m_lowJumpMultiplier: 2
OnLandEvent:
m_PersistentCalls:
m_Calls: []
......
......@@ -68,7 +68,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ecc204495234d40f091d828790c56287, type: 3}
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -76,6 +76,6 @@ SpriteRenderer:
m_Size: {x: 2.875, y: 1.75}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
......@@ -7237,6 +7237,125 @@ EdgeCollider2D:
- {x: 49.0804, y: -4.7116}
- {x: 51.994, y: -4.71233}
- {x: 51.99631, y: -4.71232}
--- !u!1001 &726305653
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7766137271154010154, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_Name
value: Levelauswahl 1
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_RootOrder
value: 49
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
--- !u!1 &731052799
GameObject:
m_ObjectHideFlags: 0
......@@ -7333,6 +7452,129 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
player: {fileID: 352228595}
--- !u!1001 &779134158
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8474030530107407617, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Name
value: Minimap
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_RootOrder
value: 50
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 574052652, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
propertyPath: player
value:
objectReference: {fileID: 352228595}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
--- !u!1 &852283141
GameObject:
m_ObjectHideFlags: 0
......@@ -10377,6 +10619,125 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1427363346
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2362585431789937785, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Name
value: PauseMenu
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_RootOrder
value: 51
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3}
--- !u!1 &1475757358
GameObject:
m_ObjectHideFlags: 0
......@@ -14263,6 +14624,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6649025744541164929, guid: 612c05bc8661c2146947c42effb20f77,
type: 3}
propertyPath: m_Name
value: StartPoint
objectReference: {fileID: 0}
- target: {fileID: 6649025744541164928, guid: 612c05bc8661c2146947c42effb20f77,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -14318,11 +14684,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6649025744541164929, guid: 612c05bc8661c2146947c42effb20f77,
type: 3}
propertyPath: m_Name
value: StartPoint
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 612c05bc8661c2146947c42effb20f77, type: 3}
--- !u!1 &1963318613
......
......@@ -402,7 +402,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 392034771}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.5, y: -0.25, z: 0}
m_LocalPosition: {x: 1.25, y: -0.25, z: 0}
m_LocalScale: {x: 1, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 1876157337}
......@@ -806,7 +806,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
cooldown: 3
volleySize: 1
launchPower: 20
launchPower: 10
attackSpeed: 0.1
shotSpawn: {fileID: 392034772}
elementalAttack: {fileID: 7588789901055592565, guid: c916ffaff3c476b448f67d9d827b3e7e,
......@@ -823,13 +823,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 83eb4399ff535ee4cbc76de3b8a32e46, type: 3}
m_Name:
m_EditorClassIdentifier:
cooldown: 2
Cooldown: 0
volleySize: 10
launchPower: 20
attackSpeed: 0.1
shotSpawn: {fileID: 1992150795}
elementalAttack: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c,
type: 3}
fireBall: {fileID: 0}
--- !u!114 &1876157329
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -16,6 +16,8 @@ public class MovementController : MonoBehaviour {
[SerializeField] private Vector2 m_GroundedOffset = Vector2.zero;
[SerializeField] private float m_SecondsWaitToJump = 0.3f;
[SerializeField] private int m_MaxJumpCount = 1;
[SerializeField] private float m_fallMultiplier = 2.5f;
[SerializeField] private float m_lowJumpMultiplier = 2.0f;
private bool m_Grounded; // Whether or not the player is grounded.
private bool m_Airborn;
......@@ -89,10 +91,19 @@ public class MovementController : MonoBehaviour {
// Add a vertical force to the player.
m_Grounded = false;
m_TempJumpCount--;
m_Rigidbody2D.AddForce (new Vector2 (0f, m_JumpForce));
//m_Rigidbody2D.AddForce (new Vector2 (0f, m_JumpForce));
m_Rigidbody2D.velocity = Vector2.up * m_JumpForce;
StartCoroutine(Wait(m_SecondsWaitToJump));
}
}
if (m_Rigidbody2D.velocity.y < 0)
{
m_Rigidbody2D.velocity += Vector2.up * Physics2D.gravity.y * (m_fallMultiplier - 1) * Time.deltaTime;
} else if (m_Rigidbody2D.velocity.y > 0 && !Input.GetButton("Jump"))
{
m_Rigidbody2D.velocity += Vector2.up * Physics2D.gravity.y * (m_lowJumpMultiplier - 1) * Time.deltaTime;
}
}
private IEnumerator Wait(float s)
......
......@@ -8,13 +8,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/_Game/Scenes/MainMenu.unity
guid: d4b377a492668494e968d8ae1f9a9b0c