From 197674fc1b65ea01d30dbd7816832918232bbee4 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Sat, 14 May 2022 01:41:55 -0400 Subject: [PATCH] Fix warping on cannon WIP Ammo types skeleton --- Assets/Prefabs/Player.prefab | 215 ++++++++++++++---------- Assets/Scripts/AmmoType.meta | 8 + Assets/Scripts/AmmoType/Ammo.cs | 10 ++ Assets/Scripts/AmmoType/Ammo.cs.meta | 11 ++ Assets/Scripts/CannonScript.cs | 2 - Assets/Scripts/PlayerController.cs | 40 +++++ Assets/Scripts/PlayerController.cs.meta | 11 ++ 7 files changed, 204 insertions(+), 93 deletions(-) create mode 100644 Assets/Scripts/AmmoType.meta create mode 100644 Assets/Scripts/AmmoType/Ammo.cs create mode 100644 Assets/Scripts/AmmoType/Ammo.cs.meta create mode 100644 Assets/Scripts/PlayerController.cs create mode 100644 Assets/Scripts/PlayerController.cs.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 51488a1..f42ca13 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969840675257017922} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.258, z: 0.522} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0.51600003, z: 0.5} + m_LocalScale: {x: 1, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6969840675949508871} m_Father: {fileID: 6969840675499469969} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6969840675499469974 GameObject: @@ -41,12 +41,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6969840675499469969} - - component: {fileID: 6969840675499469970} - - component: {fileID: 6969840675499469971} - - component: {fileID: 6969840675499469972} - - component: {fileID: 6969840675499469973} - component: {fileID: 3117915759359451286} - component: {fileID: 6969840675499469968} + - component: {fileID: 1832045534445164820} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -63,93 +60,14 @@ Transform: m_GameObject: {fileID: 6969840675499469974} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 2, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1084289763269634631} - {fileID: 6969840675257017921} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6969840675499469970 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6969840675499469974} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6969840675499469971 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6969840675499469974} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - 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_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &6969840675499469972 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6969840675499469974} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &6969840675499469973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6969840675499469974} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a12feff9954dae440b01b5ac3c3749bd, type: 3} - m_Name: - m_EditorClassIdentifier: - cannon: {fileID: 6969840675257017922} - projectile: {fileID: 5630905120393344806, guid: 70e77cdd333989d4193d3d85029d8cbe, type: 3} - lookDepth: 400 - cannonForce: 1000 - fireRate: 0.5 --- !u!114 &3117915759359451286 MonoBehaviour: m_ObjectHideFlags: 0 @@ -195,7 +113,7 @@ MonoBehaviour: m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] - m_PersistentCalls: m_Calls: - - m_Target: {fileID: 6969840675499469973} + - m_Target: {fileID: 1832045534445164820} m_TargetAssemblyTypeName: CannonScript, Assembly-CSharp m_MethodName: OnLook m_Mode: 0 @@ -211,7 +129,7 @@ MonoBehaviour: m_ActionName: Player/Look[/Mouse/delta] - m_PersistentCalls: m_Calls: - - m_Target: {fileID: 6969840675499469973} + - m_Target: {fileID: 1832045534445164820} m_TargetAssemblyTypeName: CannonScript, Assembly-CSharp m_MethodName: OnFire m_Mode: 0 @@ -270,6 +188,24 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!114 &1832045534445164820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6969840675499469974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a12feff9954dae440b01b5ac3c3749bd, type: 3} + m_Name: + m_EditorClassIdentifier: + cannon: {fileID: 6969840675257017922} + projectile: {fileID: 5630905120393344806, guid: 70e77cdd333989d4193d3d85029d8cbe, type: 3} + lookDepth: 400 + cannonForce: 1000 + fireRate: 0.5 + fireTimer: 0 --- !u!1 &6969840675949508920 GameObject: m_ObjectHideFlags: 0 @@ -297,7 +233,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969840675949508920} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.59} + m_LocalPosition: {x: 0, y: 0, z: 1.5} m_LocalScale: {x: 0.35406, y: 0.18224074, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] @@ -367,3 +303,100 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8541489750845001500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1084289763269634631} + - component: {fileID: 4633718394267932718} + - component: {fileID: 5887539962872066884} + - component: {fileID: 2713817942748548729} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1084289763269634631 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8541489750845001500} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6969840675499469969} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4633718394267932718 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8541489750845001500} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5887539962872066884 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8541489750845001500} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2713817942748548729 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8541489750845001500} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/AmmoType.meta b/Assets/Scripts/AmmoType.meta new file mode 100644 index 0000000..06b2065 --- /dev/null +++ b/Assets/Scripts/AmmoType.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8f4cfd69eb82d147a0230b4a8013f1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AmmoType/Ammo.cs b/Assets/Scripts/AmmoType/Ammo.cs new file mode 100644 index 0000000..5e78d7c --- /dev/null +++ b/Assets/Scripts/AmmoType/Ammo.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class Ammo +{ + private float cost; + + abstract public void fire(); +} diff --git a/Assets/Scripts/AmmoType/Ammo.cs.meta b/Assets/Scripts/AmmoType/Ammo.cs.meta new file mode 100644 index 0000000..375cd51 --- /dev/null +++ b/Assets/Scripts/AmmoType/Ammo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e5327f6239914a49a5601462a4f619e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/CannonScript.cs b/Assets/Scripts/CannonScript.cs index 6759ff3..9e5c2ee 100644 --- a/Assets/Scripts/CannonScript.cs +++ b/Assets/Scripts/CannonScript.cs @@ -55,9 +55,7 @@ public class CannonScript : MonoBehaviour public void OnFire(InputAction.CallbackContext ctx){ if(ctx.started){//btn pressed firing = true; - Debug.Log("Start"); }else if(ctx.canceled){//btn released - Debug.Log("Release"); firing = false; } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs new file mode 100644 index 0000000..9465141 --- /dev/null +++ b/Assets/Scripts/PlayerController.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + + [SerializeField] private float points; + [SerializeField] private CannonScript cannon; + // Start is called before the first frame update + void Start() + { + points = 0; + } + + // Update is called once per frame + void Update() + { + + } + + + public float getPoints(){ + return points; + } + + public void setPoints(float nPoints){ + points = nPoints; + } + + public void spendPoints(float amount){ + if(amount <= points){ + points = points - amount; + } + } + + public void gainPoints(float amount){ + points += amount; + } +} diff --git a/Assets/Scripts/PlayerController.cs.meta b/Assets/Scripts/PlayerController.cs.meta new file mode 100644 index 0000000..e06fd99 --- /dev/null +++ b/Assets/Scripts/PlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44fc4a66977bce94dbaccf9ae1d06e2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: