From 5ef8a35f088aff7d42fbd862e1eb729b05fb342d Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sat, 11 Jul 2020 14:33:20 -0400 Subject: [PATCH] Added UI to let player know if gun is ready to fire --- Assets/Scenes/Scene.unity | 81 +++++++++++++++++++++++ Assets/Scripts/PlayerScript.cs | 17 ++++- Assets/Sprites/DraftReloaded.png | Bin 0 -> 457 bytes Assets/Sprites/DraftReloaded.png.meta | 92 ++++++++++++++++++++++++++ Assets/Sprites/DraftReloaded.xcf | Bin 0 -> 3723 bytes Assets/Sprites/DraftReloaded.xcf.meta | 7 ++ ProjectSettings/TagManager.asset | 3 + 7 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 Assets/Sprites/DraftReloaded.png create mode 100644 Assets/Sprites/DraftReloaded.png.meta create mode 100644 Assets/Sprites/DraftReloaded.xcf create mode 100644 Assets/Sprites/DraftReloaded.xcf.meta diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index 7b87bfa..2a778d7 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -202,6 +202,87 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &259324458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 259324460} + - component: {fileID: 259324459} + m_Layer: 0 + m_Name: Reloaded + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &259324459 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259324458} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -886689981 + m_SortingLayer: 2 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0410c852e2ff29f46832f05fc88f2147, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &259324460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259324458} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.25, y: -4.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &459038964 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/PlayerScript.cs index 135f700..0a68ba3 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/PlayerScript.cs @@ -13,18 +13,26 @@ public class PlayerScript : MonoBehaviour private float rotation; private float nextFire = 0.5f; private float myTime = 0.0f; + private GameObject reloaded; private Rigidbody2D rb; void Awake() { rb = this.GetComponent(); + reloaded = GameObject.Find("Reloaded"); } void Update() { + reloaded.SetActive(false); myTime += Time.deltaTime; + if(myTime > nextFire) + { + reloaded.SetActive(true); + } + if(Input.GetButton("Fire1") && myTime > nextFire) { nextFire = myTime + 0.5f; @@ -62,12 +70,19 @@ public class PlayerScript : MonoBehaviour void GunFire(float aim) { - int gunSelect = Random.Range(0,4); + int gunSelect = 0; GameObject newBullet; float scaleChange = 1.0f; Vector3 pos = PlayerCircle(transform.position); Quaternion rot = Quaternion.FromToRotation(Vector3.down, transform.position-pos); + if(Random.Range(0,10) == 0) + { + + gunSelect = Random.Range(1,4); + + } + switch(gunSelect) { diff --git a/Assets/Sprites/DraftReloaded.png b/Assets/Sprites/DraftReloaded.png new file mode 100644 index 0000000000000000000000000000000000000000..6219b1b81b8de2bb41bfa4d263cec5436cf41d43 GIT binary patch literal 457 zcmV;)0XF`LP)u3lbm!*#XNB0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbOLrFwIRCwC$n@bXdFbqS3r@P*ux9C;5SWnY6-L^9w$j5f% zSlO{dPl^H|Y>&MhCGn7we540(`@Yy-_cX$f=bH&200JO@-x544i^$`w+?jw?g#2^4 zCcUz%c$Q!m0HaT@l39Fc09WE`mv44JX7@t^&=emIfVOycKqLSb?uP+jB|ZcIOY!Ug zbO6@wLj&*-4-3FcJUajpfT#O#0KCOR0hl449Z(v!#e27%k=-9ofX1HOO!3pFz-;j< z0HPnN5DzC&-ERV*c|$1TRXd+sBsS2ee(`L7q0@KR|LxOJCy`PK1(>|Z4e2Vc#A?yi+DPVI92#vz-xY^7NyBq z;Yh0jx5Y=F=GXxQKmY`=ObM>=gA@}$0Bz#~Pq2p(VPRxotLl%A@ zrz$HyNZz9JokMG;rJ1}yrs}A_^Y`>zdcK8*qpNrMhyF$W+sWyv;poK@{z&anjRrq= zsf|}eQXKcF7PU@2h%D#b=ls`<+e0pW+@D-s4aReNBa?StO$UBHIM06{&EMv)fB5+q znc3A-M^}D0I37+%=aO-D!yL}$*O!BQHn|*~A9W5dhW*LqWSSr9a6BEp@%hQi6Fq9+ zG)^6{^i9pu#eDwXAWJ{Y-ueD$Jj_oQ_aeNm3uAWtemt7zqjCT3U?%G)7ZFxu>$o(_}f4D<%3d^%c{-D z4CZOV2MKo)&J%VCZza5)@D42ZTO1aUd&~7-L}oD0g#!oUvxFDIt&t^1^K;VlU@5sS zNAsWCQGa{C2eeonp? z^JlQ!PwFYWUc*nw+cD2!8~H1EqlO=oZ^rx)+=+YuyBf~Ow_?5zZ%2LzcWYSoV~@F= zIM-lbcIbDLzDvJX^lh%0_VOGyyA$V|>|cleZqdto+3a5I*I=9UEqI-}ALpf)dJub= zYf@jtz702$-g3V{|7D!Frkg#CykWMo{m7ffCEUrfn0L%Zb`aTdtw%L1`}sKL%T86j zyD^`P8tE}|rCOfVWaWsFo-d#oM%FS$7CA;1jD;Q}b#2NR=`m7sjMP!?iIE;7wNDu% zJw|Gdksc$JG16mXg)!1&q~;juF;W>LJw{d-BRxB)IYxSnRK`e;krkHxz(|jgI){<4 z^%z<77|A({zRfk$UY^5xjMVcnl4rCYBV#Y`Wj#h}kCD7{*<&C3WIaaey!28SslCi$ zq{m3@F_Ldm_893g(qp8~W2DDOWsLL~sf>{ccRWUFj*%WCl`+y|WQAovF;eqor&gUi z^M#QPBUh^BSWQ-r80q)|nqg!uV`PzIWWiYIFjCj1jFAo_HOELD<(^pRFjD)JG16hA z<{0TPQW+y1MphUj9Y$)7kq#r3G16gVg)!2xgPLQc!$@U}bQoD-*$<3#7^!m@30sGe zMURo3v*_DgGwtO$tiwn>A0v52>o79*@?O?qr1lueJC{B7u}{`vq|Qq(g^}9J97Z~f z)E*=GCS{M24kH~#>O4j|j8w)*hmpz{nQ+Hpq~;juFj5&K9Y$7I_7fvDUv_HMxieQ7 z88C9CT7lJM<%p4iFQ6Gl)-pyGIYt(Yg#jaVZORxKFj8}j)KTtjw?6_)+L$bgYLhmo)i7+Lff z$vKO@%{9|rp2G%=)blZtXS4w$V=wPz14e3(k-T%+V;}ou14in+^imk9z06@`z)0;e zl5bM>7|EYQ8!%GmF*0DJGDZfBRL01JI{_m#$H;(@$`~0ivcj^T7^(TPQ>)IM1u>GN z7faZE=lj17r<3>Nb7}uif4`gZLgmr@vE*V4;{WUJux5^^d$Y)IcFjKZCuRNx-fF*1 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/DraftReloaded.xcf.meta b/Assets/Sprites/DraftReloaded.xcf.meta new file mode 100644 index 0000000..27d0a29 --- /dev/null +++ b/Assets/Sprites/DraftReloaded.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0be2fc6f7fe056449151241720ebd78 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2a0d9bf..1ab18e5 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -50,3 +50,6 @@ TagManager: - name: Player uniqueID: 3408277315 locked: 0 + - name: UI + uniqueID: 2818063765 + locked: 0