From 86192cd54471600d50b87742458d059450358f72 Mon Sep 17 00:00:00 2001 From: MrJDunn Date: Sun, 31 Jan 2021 12:14:53 +1100 Subject: [PATCH] Merged in join scene --- Assets/Scenes/MainGameplayScene.unity | 4 ++-- Assets/Scenes/PlayerJoinScene.unity | 4 ++-- Assets/World Assets/Prefabs/Player.prefab | 8 ++++---- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index dd91a3f..7779a3d 100644 --- a/Assets/Scenes/MainGameplayScene.unity +++ b/Assets/Scenes/MainGameplayScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:879cd3be92bcf57e57a83bcd3a41280eec406bdf9d2774469395afd5b46913c6 -size 652115 +oid sha256:69828bf48a3e1b2ad75c94c5c7920507f8f8d7aa6f5483f47a889a2b527d942b +size 655013 diff --git a/Assets/Scenes/PlayerJoinScene.unity b/Assets/Scenes/PlayerJoinScene.unity index a2d10f9..2147ebf 100644 --- a/Assets/Scenes/PlayerJoinScene.unity +++ b/Assets/Scenes/PlayerJoinScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8615481614d10a6fbf0d0e29458c5676bbc21338acc548e0c9be44d1946b77 -size 40106 +oid sha256:05591abe96e3b094f1d5c86b279f58d0eeab298ebf0bddec529e05527513275f +size 40112 diff --git a/Assets/World Assets/Prefabs/Player.prefab b/Assets/World Assets/Prefabs/Player.prefab index 17918d6..df8222a 100644 --- a/Assets/World Assets/Prefabs/Player.prefab +++ b/Assets/World Assets/Prefabs/Player.prefab @@ -29,7 +29,7 @@ Transform: m_GameObject: {fileID: 2725293205319018834} 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_LocalScale: {x: 10, y: 10, z: 10} m_Children: - {fileID: 7280267804154012179} m_Father: {fileID: 0} @@ -65,7 +65,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 513431a08a8506242ba8fc3919ccf76e, type: 3} m_Name: m_EditorClassIdentifier: - m_playerSpeed: 5 + m_playerSpeed: 20 m_rotationSpeed: 10 m_turnRadius: serializedVersion: 2 @@ -125,9 +125,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3} m_Name: m_EditorClassIdentifier: - yeetVelocity: 5 + yeetVelocity: 20 yeetDuration: 2 - windupSpeed: 0.01 + windupSpeed: 0.05 m_YeetAnimator: {fileID: 7280267804803618209} --- !u!1 &6496616781582263990 GameObject: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c3df0dd..2676c4a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b860e60a2c05ee077303c4a200ab9c3192b4f54776c0dee7e78b846b41dffd4e -size 463 +oid sha256:edd4fcab3ab45f6bd4bbc4193ce3e12e36123e183ac011a15afb24b3f70433e5 +size 569