Ladder mobile controls implemented

Assets/Prefabs/Player.prefab

@@ -138,7 +138,7 @@ MonoBehaviour:
   clips:
   - name: MainTheme
     clip: {fileID: 8300000, guid: 23f58ffff5e98424b82e0a34bfeb8a77, type: 3}
-    volume: 0.5
+    volume: 0.25
     pitch: 1
     loop: 1
     source: {fileID: 0}

Assets/Scenes/Levels/Level2_Release.unity

@@ -1934,7 +1934,7 @@ PrefabInstance:
     - target: {fileID: 2773067093461657725, guid: 712671f8cf5fa684cbcb1159d45b0057,
         type: 3}
       propertyPath: nextSceneName
-      value: FinalMenu
+      value: Level3_Release
       objectReference: {fileID: 0}
     - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057,
         type: 3}
@@ -3109,11 +3109,46 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 3972560853011912468, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: clips.Array.data[3].clip
+      value: 
+      objectReference: {fileID: 8300000, guid: ebff1b1b6619bdf48a334db25b73db57, type: 3}
+    - target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Radius
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6182518231170453917, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: m_Center.y
+      value: -0.1
+      objectReference: {fileID: 0}
     - target: {fileID: 7094923891560833857, guid: e4d82994b58b7304b91c915c597b71f8,
         type: 3}
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+    - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: speed
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: dashTime
+      value: 0.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: runSpeed
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: dashPower
+      value: 8
+      objectReference: {fileID: 0}
     - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
         type: 3}
       propertyPath: powerImage

Assets/Scenes/Menu/FinalMenu.unity

@@ -545,6 +545,142 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 393393098}
   m_CullTransparentMesh: 0
+--- !u!1 &482342330
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 482342333}
+  - component: {fileID: 482342332}
+  - component: {fileID: 482342331}
+  m_Layer: 0
+  m_Name: AudioManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &482342331
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: c29860436d5147346b6e77bc7a49c405, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    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
+--- !u!81 &482342332
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_Enabled: 1
+--- !u!4 &482342333
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482342330}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 582, y: 293.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &760805001
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/AudioManager.cs

@@ -22,13 +22,15 @@ public class AudioManager : MonoBehaviour
     }
 
     // Update is called once per frame
-    public void Play(string name)
+    public void Play(string name, bool checkIfPlay = false)
     {
         AudioSound s = Array.Find(clips, sound => sound.name == name);
         if (s == null) {
             return;
         }
         Debug.Log("Sound is playng");
+        if (!s.source.isPlaying || !checkIfPlay) {
             s.source.Play();
         }
+    }
 }

Assets/Scripts/MainMenu.cs

@@ -35,7 +35,7 @@ public class MainMenu : MonoBehaviour
 
     public void Score()
     {
-        StartCoroutine(GetText("dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
+        StartCoroutine(GetText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php"));
     }
 
     public void BackToMainMenu()
@@ -60,7 +60,7 @@ public class MainMenu : MonoBehaviour
         form.AddField("name", name.text);
         form.AddField("score", DataManager.Score().ToString());
 
-        StartCoroutine(PostText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php", form));
+        StartCoroutine(PostText("https://dev.steelants.cz/GGJ2021/GeorgeJones/Server/api.php", form));
         DataManager.Level(0);
         SceneManager.LoadScene(0);
     }

Assets/Scripts/ObjectManager.cs

@@ -170,7 +170,7 @@ public class ObjectManager : MonoBehaviour
                 playerManager = collision.gameObject.GetComponent<PlayerManager>();
                 if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 2)
                 {
-                    meshRenderer.materials[1].SetFloat("_Outline", 0.1f);
+                    meshRenderer.materials[1].SetFloat("_Outline", 0.01f);
                 } 
                 else
                 {

Assets/Scripts/PlayerManager.cs

@@ -1,4 +1,6 @@
-using System.Collections;
+#define testing //Remove this line to disable testing mode
+
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -20,12 +22,16 @@ public class PlayerManager : MonoBehaviour
     private Rigidbody rigidBody;
     private PowerCubeManager powerCubeManager;
     private bool interact = false;
+    private float moveDirection = 0f; //Mobile phone equivalent of Input.GetAxis("Horizontal")
+    private float climbDirection = 0f;//Mobile phone equivalent of Input.GetAxis("Vertical")
+    private bool wantToJump = false; //Mobile phone equivalent of Input.GetAxis("Jump")
 
     public List<int> activeAbility = new List<int>(); //without ability=0 or null, dubleJump = 1, push/pull = 2, dash = 3, ladder = 4
     public List<GameObject> PowerPrefabs = new List<GameObject>(); //dubleJump = 0, push/pull = 1, dash = 2, ladder = 3
     public List<Sprite> powerIcons = new List<Sprite>(); //dubleJump = 0, push/pull = 1, dash = 2, ladder = 3
     public Image powerImage;
     private bool dubleJump = true;
+    [SerializeField]
     private GameObject pushPullObject;
     private float pushPullObjectDistance;
     public float dashPower = 40f;
@@ -46,6 +52,8 @@ public class PlayerManager : MonoBehaviour
     private Vector3 saveCameraPosition;
     private float savePower;
 
+    public GameObject[] upNdownLadder;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -67,14 +75,16 @@ public class PlayerManager : MonoBehaviour
         if (Input.GetKeyDown(KeyCode.Escape))
         {
             DataManager.Level(SceneManager.GetActiveScene().buildIndex);
-            SceneManager.LoadScene(6);
+            SceneManager.LoadScene(5);
         }
         if (actualHealth <= 0 || gameObject.transform.position.y < -400.0f)
         {
             cannotMove = true;
             playerAnimator.Play("Die");
-            FindObjectOfType<AudioManager>().Play("lose");
+            FindObjectOfType<AudioManager>().Play("Lose");
         }
+
+#if UNITY_STANDALONE || UNITY_EDITOR
         if (interact)
         {
             if (powerCubeManager != null && (
@@ -92,6 +102,22 @@ public class PlayerManager : MonoBehaviour
                 }
             }
         }
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE || testing //testing is defined at line 0
+        if(onLadder && upNdownLadder[0].active == false)
+        {
+            upNdownLadder[0].SetActive(true);
+            upNdownLadder[1].SetActive(true);
+        }
+        else
+        if(onLadder == false && upNdownLadder[0].active == true)
+        {
+            upNdownLadder[0].SetActive(false);
+            upNdownLadder[1].SetActive(false);
+        }
+#endif
+
         AbilityAction();
         DeactivePowerCube();
         if (!cannotMove) {
@@ -114,13 +140,30 @@ public class PlayerManager : MonoBehaviour
         }
     }
 
+#if UNITY_ANDROID || UNITY_IPHONE || testing //testing is defined at line 0
+    public void pickupAbility() //Mobile controls
+    {
+        if (interact)
+        {
+            if (powerCubeManager != null && (
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.DubleJump ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.PushPull ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Dash ||
+                powerCubeManager.powerType == PowerCubeManager.PowerType.Ladder
+            ))
+            {
+                    FindObjectOfType<AudioManager>().Play("Pickup");
+                    playerAnimator.SetTrigger("Eat");
+                    interact = false;
+            }
+        }
+    }
+#endif
+
     private void FixedUpdate()
     {
-        if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
+        JumpAction();
-        {
-            Jump();
-            FindObjectOfType<AudioManager>().Play("Jump");
-        }
     }
 
     private void AbilityAction()
@@ -247,7 +290,7 @@ public class PlayerManager : MonoBehaviour
     void Animation()
     {
         float localSpeed = 5f;
-        if (Input.GetAxis("Horizontal") > 0)
+        if (Input.GetAxis("Horizontal") > 0 || moveDirection > 0)
         {
             playerAnimator.SetBool("Walk", true);
             if (pushPullObject == null) {
@@ -258,7 +301,7 @@ public class PlayerManager : MonoBehaviour
                 );
             }
         }
-        else if (Input.GetAxis("Horizontal") < 0)
+        else if (Input.GetAxis("Horizontal") < 0 || moveDirection < 0)
         {
             playerAnimator.SetBool("Walk", true);
             if (pushPullObject == null)
@@ -276,18 +319,76 @@ public class PlayerManager : MonoBehaviour
         }
     }
 
+    
+    public void changeMoveDirection(float input) //Mobile phone controls
+    {
+        //Debug.Log(input);
+        moveDirection += input;
+    }
+
+    public void changeClimbDirection(float input) //Mobile phone controls
+    {
+        climbDirection += input;
+    }
+
     void Move()
     {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && (!testing)
+        if (Input.GetAxis("Horizontal") != 0 || moveDirection != 0)
+        {
+            if (!run) {
+                FindObjectOfType<AudioManager>().Play("Walk", true);
+            }
+            else
+            {
+                FindObjectOfType<AudioManager>().Play("Run", true);
+            }
+        }
         rigidBody.MovePosition(
             transform.position +
             (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +
-            (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime)
+            (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal")   * Time.deltaTime) //TODO: uncomment Input.GetAxis after testing
-        );;
+        );
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE || testing
+        if(moveDirection != 0)
+    {
+        if(!run)
+        {
+            FindObjectOfType<AudioManager>().Play("Walk", true);
+        }
+        else
+        {
+            FindObjectOfType<AudioManager>().Play("Run", true);
+        }
+    }
+    rigidBody.MovePosition(
+            transform.position +
+            (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * climbDirection * Time.deltaTime) : Vector3.zero) +
+            (transform.right * (run ? runSpeed : speed) * moveDirection * Time.deltaTime)
+        );
+#endif
+
+    }
+
+    public void JumpAction()
+    {
+        if (!cannotMove && (!onLadder || (onLadder && (activeAbility.Count < 0 || activeAbility[0] != 4))))
+        {
+            Jump();
+        }
+    }
+
+    public void Jump_Mobile(bool b) //Mobile phone controls
+    {
+        wantToJump = b;
     }
 
     void Jump()
     {
-        if (Input.GetAxisRaw("Jump") > 0)
+#if UNITY_STANDALONE
+        if (Input.GetAxisRaw("Jump") > 0 || wantToJump)
         {
             if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
             {
@@ -295,13 +396,36 @@ public class PlayerManager : MonoBehaviour
                 {
                     dubleJump = false;
                 }
+                FindObjectOfType<AudioManager>().Play("Jump");
                 pushPullObject = null;
                 rigidBody.AddForce(
                     (transform.up * jump * 10 * Time.deltaTime), 
                     ForceMode.VelocityChange
                 );
+                FindObjectOfType<AudioManager>().Play("Jump");
             }
         }
+#endif
+
+#if UNITY_ANDROID || UNITY_IPHONE
+    if (wantToJump)
+    {
+        if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1)) )
+        {
+            if (!onGround)
+            {
+                dubleJump = false;
+            }
+            FindObjectOfType<AudioManager>().Play("Jump");
+            pushPullObject = null;
+            rigidBody.AddForce(
+                (transform.up * jump * 10 * Time.deltaTime), 
+                ForceMode.VelocityChange
+            );
+            FindObjectOfType<AudioManager>().Play("Jump");
+        }
+    }
+#endif
     }
 
     private void DropPower()
@@ -316,6 +440,7 @@ public class PlayerManager : MonoBehaviour
     {
         if ((powerType.GetHashCode() - 1) == 3)
         {
+            DataManager.Score(DataManager.Score() + 10);
             DataManager.Level(SceneManager.GetSceneByName(nextSceneName).buildIndex);
             SceneManager.LoadScene(nextSceneName);
         }
@@ -364,7 +489,7 @@ public class PlayerManager : MonoBehaviour
 
                 speed += power;
                 runSpeed += power;
-                FindObjectOfType<AudioManager>().Play("Jump");
+    
             }
             else if (powerType == PowerCubeManager.PowerType.Jumper)
             {

Assets/Scripts/PowerCubeManager.cs

@@ -48,11 +48,11 @@ public class PowerCubeManager : MonoBehaviour
             {
                 meshRenderer.materials[0].EnableKeyword("_EMISSION");
                 meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
-                meshRenderer.materials[1].SetFloat("_Outline", 0.4f);
+                meshRenderer.materials[1].SetFloat("_Outline", 0.04f);
             }
             else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder)
             {
-                meshRenderer.materials[1].SetFloat("_Outline", 6f);
+                meshRenderer.materials[1].SetFloat("_Outline",0.6f);
                 meshRenderer.materials[0].EnableKeyword("_EMISSION");
                 meshRenderer.materials[0].SetColor("_EmissionColor", new Color(0.2735849f, 0.2018939f, 0.09162514f) * 0.8f);
             }

Assets/Shaders/Border.shader

@@ -58,7 +58,7 @@ Shader "Outlined/Silhouette Only" {
 			Name "OUTLINE"
 			Tags { "LightMode" = "Always" }
 			Cull Off
-			Offset 5,5
+			Offset 15,15
 
 
 		// you can choose what kind of blending mode you want for the outline