Browse Source

fixed merges

master
Joshua Reason 4 years ago
parent
commit
1f9f6fea67
3 changed files with 20 additions and 5 deletions
  1. +8
    -0
      Assets/LeanTween.meta
  2. +8
    -0
      Assets/Plugins.meta
  3. +4
    -5
      Assets/Scripts/Input/PlayerController.cs

+ 8
- 0
Assets/LeanTween.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 14d7fe06707e44d439f619e3b3b15386
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/Plugins.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 344646260043af4438ebc88e1102321c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 4
- 5
Assets/Scripts/Input/PlayerController.cs View File

@ -22,13 +22,13 @@ public class PlayerController : MonoBehaviour
public void UpdatePosition()
{
float HorseX, HorseZ;
HorseZ = Input.GetAxisRaw("Vertical");
HorseX = Input.GetAxisRaw("Horizontal");
HorseZ = receivedInput.y;
HorseX = receivedInput.x;
float rotateTo = RotateObject(HorseX, HorseZ);
HorseZ = Input.GetAxis("Vertical") * Time.deltaTime * walkSpeed;
HorseX = Input.GetAxis("Horizontal") * Time.deltaTime * walkSpeed;
HorseZ *= Time.deltaTime * walkSpeed;
HorseX *= Time.deltaTime * walkSpeed;
transform.Translate(HorseX, 0, HorseZ);
@ -71,7 +71,6 @@ public class PlayerController : MonoBehaviour
}
yield return new WaitForSeconds(0.5f);
}
}
// Update is called once per frame
void Update()

Loading…
Cancel
Save