From fd63de635ca62d1f90ea8f6212b08346f3657499 Mon Sep 17 00:00:00 2001 From: MB Date: Fri, 25 Jan 2019 23:12:32 +1100 Subject: [PATCH] Changed build target to android Added in a brif character and movement controls --- .../Examples/LW SRP Samples.unitypackage.meta | 8 ----- .../Custom RT Samples.unitypackage.meta | 8 ----- .../ApplyGrassWindToTerrain.unitypackage.meta | 8 ----- .../LegacySubstanceExample.unitypackage.meta | 8 ----- .../Substance2018.unitypackage.meta | 8 ----- .../CustomRTTemplates.unitypackage.meta | 8 ----- .../HDSRPTemplates (Legacy).unitypackage.meta | 8 ----- .../SRP/HDSRPTemplates.unitypackage.meta | 8 ----- .../LWSRPTemplates (Legacy).unitypackage.meta | 8 ----- .../SRP/LWSRPTemplates.unitypackage.meta | 8 ----- ... Samples.unitypackage.meta => Scipts.meta} | 6 ++-- Assets/Scipts/CharacterMovement.cs | 29 +++++++++++++++++++ Assets/Scipts/CharacterMovement.cs.meta | 11 +++++++ ProjectSettings/ProjectVersion.txt | 2 +- 14 files changed, 44 insertions(+), 84 deletions(-) delete mode 100644 Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta rename Assets/{AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta => Scipts.meta} (53%) create mode 100644 Assets/Scipts/CharacterMovement.cs create mode 100644 Assets/Scipts/CharacterMovement.cs.meta diff --git a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta deleted file mode 100644 index 0aa21b5..0000000 --- a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6ecbfd0a046659943a69328c98ff0442 -timeCreated: 1520956522 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta deleted file mode 100644 index 248bd4f..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 88dfe89a073bdf748bf05396f5285cdd -timeCreated: 1539855222 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta deleted file mode 100644 index 4c8a2e4..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 11f44bcb01ea56742bb7177b439b1a4f -timeCreated: 1544798383 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta deleted file mode 100644 index 56174dc..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 490e8164148c52c468b633dcc1c12d57 -timeCreated: 1516214129 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta deleted file mode 100644 index 4101f3b..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: af7de8b91a27c254fa1bd24c01ae6e8e -timeCreated: 1540486619 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta deleted file mode 100644 index 0ca30b9..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 191365b4aece81443875ae2bb7243b55 -timeCreated: 1539791396 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index 36f907a..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4dc1afbcc68875c4780502f5e6b80158 -timeCreated: 1540292246 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: \ No newline at end of file diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta deleted file mode 100644 index f46c626..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9a5e61a8b3421b944863d0946e32da0a -timeCreated: 1531836588 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index e46ecb3..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b53d2f3b156ff104f90d4d7693d769c8 -timeCreated: 1540215707 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta deleted file mode 100644 index 89ca7fe..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c816894a3147d343891060451241bfe -timeCreated: 1520621352 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta b/Assets/Scipts.meta similarity index 53% rename from Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta rename to Assets/Scipts.meta index 59379f1..f9ca07b 100644 --- a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta +++ b/Assets/Scipts.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d1c0b77896049554fa4b635531caf741 -timeCreated: 1533059192 -licenseType: Store +guid: c6f5aa1cac3892c4ca8fada2784c18ec +folderAsset: yes DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scipts/CharacterMovement.cs b/Assets/Scipts/CharacterMovement.cs new file mode 100644 index 0000000..d5d8a16 --- /dev/null +++ b/Assets/Scipts/CharacterMovement.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CharacterMovement : MonoBehaviour { + + public float Speed; + + //Public movement functions :) + public void MoveLeft() + { + GetComponent().AddForce(new Vector3(-Speed, 0.0f, 0.0f)); + } + + public void MoveRight() + { + GetComponent().AddForce(new Vector3(Speed, 0.0f, 0.0f)); + } + + public void MoveUp() + { + GetComponent().AddForce(new Vector3(0.0f, 0.0f, Speed)); + } + + public void MoveDown() + { + GetComponent().AddForce(new Vector3(0.0f, 0.0f, -Speed)); + } +} diff --git a/Assets/Scipts/CharacterMovement.cs.meta b/Assets/Scipts/CharacterMovement.cs.meta new file mode 100644 index 0000000..ccc93df --- /dev/null +++ b/Assets/Scipts/CharacterMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 23d333a191cbbeb45bcbb229fd3d4f06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 96fdb1a..997bd4a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.2f1 +m_EditorVersion: 2018.2.5f1