From d804361670b651cb5f8b7a21b41e1c2e9ab23b9a Mon Sep 17 00:00:00 2001 From: Tristan Roux Date: Sat, 1 Dec 2018 11:57:56 +0100 Subject: [PATCH] Adding some powers and changing .Net version. --- Assets/Scenes/SampleScene.unity | 374 +++++++++++++++++++++++++- Assets/Script/PlayerMovement.cs | 123 ++++++++- ProjectSettings/InputManager.asset | 218 +++------------ ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 2 +- 5 files changed, 522 insertions(+), 197 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index bffeff2..d6ee9b2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -122,9 +122,11 @@ GameObject: m_Component: - component: {fileID: 183430350} - component: {fileID: 183430349} - - component: {fileID: 183430348} - component: {fileID: 183430347} + - component: {fileID: 183430348} - component: {fileID: 183430346} + - component: {fileID: 183430351} + - component: {fileID: 183430352} m_Layer: 8 m_Name: Player m_TagString: Untagged @@ -170,10 +172,19 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 5 jumpForce: 10 + jumpDownForce: 3 groundDistance: 0.8 - groundMask: + objectMask: serializedVersion: 2 m_Bits: 55 + doubleJumpForce: 8 + hasDoubleJump: 1 + runnerSpeed: 1.5 + distanceJoint: {fileID: 183430351} + hookDistance: 5 + hookRenderer: {fileID: 1872833097} + hooked: 0 + personalty: 0 --- !u!50 &183430348 Rigidbody2D: serializedVersion: 4 @@ -184,8 +195,8 @@ Rigidbody2D: m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 1.3172154 + m_UseAutoMass: 0 + m_Mass: 1.5 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -251,8 +262,118 @@ Transform: m_LocalScale: {x: 5.7385, y: 5.7385, z: 5.7385} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!232 &183430351 +DistanceJoint2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 183430345} + m_Enabled: 0 + serializedVersion: 4 + m_EnableCollision: 1 + m_ConnectedRigidBody: {fileID: 0} + 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: 3 + m_MaxDistanceOnly: 1 +--- !u!120 &183430352 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 183430345} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 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: 0 + 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: 2 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0, g: 1, b: 0.19680667, a: 1} + key1: {r: 0, g: 0.6132076, b: 0.1925895, 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: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -330,6 +451,128 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1128696812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128696815} + - component: {fileID: 1128696814} + - component: {fileID: 1128696813} + - component: {fileID: 1128696816} + m_Layer: 0 + m_Name: New Sprite (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!50 &1128696813 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1128696812} + m_BodyType: 1 + m_Simulated: 0 + 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!212 &1128696814 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1128696812} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + 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: 0 + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, 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!4 &1128696815 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1128696812} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.34, y: 0.44, z: -0.013522891} + m_LocalScale: {x: 10.712, y: 10.712, z: 10.712} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1128696816 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1128696812} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.16, y: 0.16} + m_EdgeRadius: 0 --- !u!1 &1282951307 GameObject: m_ObjectHideFlags: 0 @@ -459,3 +702,124 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.16, y: 0.16} m_EdgeRadius: 0 +--- !u!1 &1872833096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1872833098} + - component: {fileID: 1872833097} + m_Layer: 8 + m_Name: HookRenderer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!120 &1872833097 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1872833096} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 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: 0 + 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: 2 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0, g: 1, b: 0.19680667, a: 1} + key1: {r: 0, g: 0.6132076, b: 0.1925895, 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: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!4 &1872833098 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1872833096} + 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: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Script/PlayerMovement.cs b/Assets/Script/PlayerMovement.cs index b7b4b9e..bc522f9 100644 --- a/Assets/Script/PlayerMovement.cs +++ b/Assets/Script/PlayerMovement.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; [RequireComponent(typeof(Rigidbody2D))] @@ -9,8 +10,27 @@ public class PlayerMovement : MonoBehaviour public float jumpForce = 10; public float jumpDownForce = 3; public float groundDistance = 0.8f; - public LayerMask groundMask; + public int flip = 1; + public LayerMask objectMask; + [Space] + [Header("Double Jump")] + public float doubleJumpForce = 8; + public bool hasDoubleJump = true; + + [Space] + [Header("Runner")] + public float runnerSpeed = 1.5f; + + [Space] + [Header("Hook")] + public DistanceJoint2D distanceJoint; + public float hookDistance = 5; + public LineRenderer hookRenderer; + public bool hooked = false; + + [Space] + public Personalty personalty; private bool isJumping = false; private Rigidbody2D rb; @@ -24,7 +44,7 @@ public class PlayerMovement : MonoBehaviour { get { - if (Physics2D.Raycast(transform.position, Vector2.down, groundDistance, groundMask)) + if (Physics2D.Raycast(transform.position, Vector2.down, groundDistance, objectMask)) return true; return false; @@ -33,18 +53,103 @@ public class PlayerMovement : MonoBehaviour void Update () { - rb.velocity = new Vector3(Input.GetAxis("Horizontal") * speed, rb.velocity.y, 0); + //Basic movements and runner + if(Mathf.Abs(Input.GetAxis("Horizontal")) > 0.2f) + flip = Input.GetAxis("Horizontal") > 0 ? 1 : -1; - if (Input.GetButtonDown("Jump") && IsGrounded) + if (!hooked) { - rb.AddForce(new Vector2(0, jumpForce), ForceMode2D.Impulse); - isJumping = true; + rb.velocity = new Vector3(Input.GetAxis("Horizontal") * speed * (personalty == Personalty.Run ? runnerSpeed : 1), rb.velocity.y, 0); + + if (Input.GetButtonDown("Jump") && IsGrounded) + { + rb.AddForce(new Vector2(0, jumpForce), ForceMode2D.Impulse); + isJumping = true; + } + + if (Input.GetButtonUp("Jump") && rb.velocity.y > 0.8f && !IsGrounded && isJumping) + { + isJumping = false; + rb.velocity = new Vector2(rb.velocity.x, 0); + rb.AddForce(new Vector2(0, -jumpDownForce * rb.velocity.y / 9), ForceMode2D.Impulse); + } } - if (Input.GetButtonUp("Jump") && rb.velocity.y > 0.8f && !IsGrounded && isJumping) + //Personality Switch + //if (Input.GetButtonDown("SwitchMenu")) + //{ + + //} + //else if (Input.GetButtonUp("SwitchMenu")) + //{ + + //} + + //Double Jump + if (personalty == Personalty.DoubleJump && Input.GetButtonDown("Jump") && hasDoubleJump && !IsGrounded) { - isJumping = false; - rb.AddForce(new Vector2(0, -jumpDownForce * rb.velocity.y / 5), ForceMode2D.Impulse); + rb.AddForce(new Vector2(0, doubleJumpForce), ForceMode2D.Impulse); + hasDoubleJump = false; } + + //Hook + if(personalty == Personalty.Hook) + { + CalculateHook(); + } + if (hooked) + hookRenderer.SetPosition(0, transform.position); } + + private async void CalculateHook() + { + if (Input.GetButtonDown("Action")) + { + RaycastHit2D hit = Physics2D.Raycast(transform.position, GetDirection(), hookDistance, objectMask); + if (hit.collider != null) + { + hooked = true; + distanceJoint.connectedAnchor = hit.point; + distanceJoint.distance = Vector3.Distance(hit.point, transform.position); + distanceJoint.enabled = true; + + hookRenderer.SetPositions(new Vector3[] { transform.position, hit.point }); + hookRenderer.enabled = true; + } + else + { + hookRenderer.SetPositions(new Vector3[] { transform.position, transform.position + GetDirection() * hookDistance }); + hookRenderer.enabled = true; + await Task.Delay(100); + hookRenderer.enabled = true; + } + } + if (Input.GetButtonUp("Action")) + { + distanceJoint.enabled = false; + hooked = false; + } + } + + + private void OnCollisionEnter2D(Collision2D collision) + { + if(IsGrounded) + hasDoubleJump = true; + } + + private Vector3 GetDirection() + { + float Horizontal = Input.GetAxis("Horizontal"); + float Vertical = Input.GetAxis("Vertical"); + + //if (Horizontal == 0) + // Horizontal = 1 * flip; + if (Vertical == 0) + Vertical = 1 * flip; + + return new Vector3(Horizontal, Vertical, 0).normalized; + } } + +public enum Personalty { Normal, DoubleJump, Run, Hook } diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f53..cd4f168 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -21,6 +21,22 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: Vertical descriptiveName: @@ -33,18 +49,34 @@ InputManager: dead: 0.001 sensitivity: 3 snap: 1 - invert: 0 + invert: 1 type: 0 axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Fire1 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Action descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: left ctrl altNegativeButton: - altPositiveButton: mouse 0 + altPositiveButton: joystick button 2 gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -54,29 +86,13 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 + m_Name: SwitchMenu descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: left shift altNegativeButton: - altPositiveButton: mouse 2 + altPositiveButton: joystick button 3 gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -92,166 +108,6 @@ InputManager: negativeButton: positiveButton: space altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: altPositiveButton: joystick button 0 gravity: 1000 dead: 0.001 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cdb8b21..4d50872 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -546,7 +546,7 @@ PlayerSettings: incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2ee2c93..9ed57e2 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.11f1 +m_EditorVersion: 2018.2.18f1