From 37a75b5c15e3996edd418ece4773bff2e69a76dd Mon Sep 17 00:00:00 2001 From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com> Date: Sun, 4 Feb 2024 09:27:46 +0100 Subject: [PATCH] Sync --- Assets/Prefabs/Projective.meta | 8 ++ Assets/Prefabs/Projective/EnemyShooty0001.png | Bin 0 -> 1103 bytes .../Projective/EnemyShooty0001.png.meta | 127 ++++++++++++++++++ .../Prefabs/Projective/EnemyShooty00021.png | Bin 0 -> 1415 bytes .../Projective/EnemyShooty00021.png.meta | 127 ++++++++++++++++++ Assets/Resources/Enemies/1/Enemy1V1.prefab | 15 +++ Assets/Resources/Enemies/1/Enemy1V2.prefab | 15 +++ Assets/Resources/Enemies/1/Enemy1V3.prefab | 15 +++ Assets/Resources/Enemies/2/Enemy2V1.prefab | 15 +++ Assets/Resources/Enemies/2/Enemy2V2.prefab | 15 +++ Assets/Resources/Enemies/2/Enemy2V3.prefab | 15 +++ Assets/Resources/Enemies/3/Enemy3V1.prefab | 15 +++ Assets/Resources/Enemies/3/Enemy3V2.prefab | 15 +++ Assets/Resources/Enemies/3/Enemy3V3.prefab | 15 +++ Assets/Resources/Enemies/4/Enemy4V1.prefab | 15 +++ Assets/Resources/Enemies/4/Enemy4V2.prefab | 15 +++ Assets/Resources/Enemies/4/Enemy4V3.prefab | 15 +++ Assets/Resources/Enemies/5/Enemy5V1.prefab | 15 +++ Assets/Resources/Enemies/5/Enemy5V2.prefab | 15 +++ Assets/Resources/Enemies/5/Enemy5V3.prefab | 15 +++ Assets/Resources/Enemies/6/Enemy6V1.prefab | 15 +++ Assets/Resources/Enemies/6/Enemy6V2.prefab | 15 +++ Assets/Resources/Enemies/6/Enemy6V3.prefab | 15 +++ Assets/Scripts/Enemy/InstantiateOverTime.cs | 3 +- Assets/Scripts/Enemy/ShootingRange.cs | 24 ---- Assets/Scripts/Enemy/ShootingRange.cs.meta | 11 -- 26 files changed, 533 insertions(+), 37 deletions(-) create mode 100644 Assets/Prefabs/Projective.meta create mode 100644 Assets/Prefabs/Projective/EnemyShooty0001.png create mode 100644 Assets/Prefabs/Projective/EnemyShooty0001.png.meta create mode 100644 Assets/Prefabs/Projective/EnemyShooty00021.png create mode 100644 Assets/Prefabs/Projective/EnemyShooty00021.png.meta delete mode 100644 Assets/Scripts/Enemy/ShootingRange.cs delete mode 100644 Assets/Scripts/Enemy/ShootingRange.cs.meta diff --git a/Assets/Prefabs/Projective.meta b/Assets/Prefabs/Projective.meta new file mode 100644 index 0000000..8ec69a0 --- /dev/null +++ b/Assets/Prefabs/Projective.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3bcf0a61ba363f043882bb6a53f33995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Projective/EnemyShooty0001.png b/Assets/Prefabs/Projective/EnemyShooty0001.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9fe70ca56999a890cda4f1f54b92e1b849023a GIT binary patch literal 1103 zcmV-V1hD&wP)I#1(p2spq_vr1agd1S&+j$%m>=y$ET*`!|G?c@hg1y-YUrVy?by+i~L_W^^5 zccbtP*aY4ZIsy)n8Q_uM$t#KmCV;2f-a3Hiz$@Sp%{^=52G9#U1g-;Lfxo&-+uicn z@1)Js6<}FuBSm0}^9i-F2+ZiK7k~rr!DgNgC3pfD2d?Q2ibOBaMX0xtGv03I=^FMo zB0vN`&>PVbR)E*Ks%1QbT9BvLfLodtr-1vq&Ra?kGQ#iKtNzC0?VL}g31rB(@*R(W3@*(Y|fXdtLNYs8X2fUtM&~#QrL}vjjabRMPXwEsofaO_nIKq-f-UW4LJriwBW$8sp2 z=OXdGJ+*=!RKm+Slw;H5bD5JIj=f6RZ|?0&*1c?S6m`_1FA|ql^mf`tBu$PGOF|cg z9J17WskpS^?Ykg;kujt9f~{gTUOQUGy1mM_5p5mJ-XVKUS*DI^CFHviZGEoybPcA8 za?k6;(+4PoZy?($S!5B3Mg_}_GqO3&6*It-&?d#pChGmIIbg@Tt#hpHXoPI6mrbMg z@X7XVq;+qQy`;36L@gL(vE&FMF7|_D3#7>)p)wVgfsf`7@3xNF%XKs@^%MWrtd}bA z64=#WvW=_`{V@lEwraOfEEawuxy1#Ok1|cDRE%xlw)bF==n~2~`3oe};$(%;VnOV8 z@R?=@?N9%7e>%37zaW!>I&d$XQC3!vP+moyYhoA%p3xA}jWkQYFc}Vxrk7n#NA#;m zl1vn;Zad?M*a%rgcL_+aF=$e%D#)m=O2sgAA*oc_XTFY1G8CBwL8ubv!cam6x3tqB zgUS-n-72w-eBo*>TY^J{7C?Ow~ zwA%CgWKgUh-JE{06ZR(5kjNP&#t{AoUL`2`6`H}Q0000EWmrjOO-%qQ0000800000 V0002eQPdkL}t+qSX97e`0m_`65vED zMk-?WZonkq5H3Nvd4Fz>iBgGa!#MZdo^A8jQD1@C51^9f>LSsRU>7()Qvp-D&W&mn z%`|yW)4H}h@qN5zlh>ZdvFCBHxtV9URN+$5Tja2Cd48T-mc_M7CF`XC{N8Hu(slW< zR?F%EKA?45&r?M=U>&GQN1K?OWTsY2wQ3ele4hiy$tvDnhP9+GdWx>YyaG+>C{w!5 z?Pjwuu}SRNHc!_QwVY!Nv@hT=;qzp&3ZC28;M01YcS?f|>Q`oGxvXg%K1xr>0$>}y z?fkr}r5o@E!ewc0V}lQ?RY}vr*moRumX=c61z>arwM0wT;fVqtNd~{YwZ#Vu3!;e@ z$+Tf`?0LM}?VX4z@MovB&m|`fSeIs6pFMekX7;sg_l0omYP96GIU_nsFKd#XX4cnp zFGWS6nI<&4HV5Z zDbJ^;+>sXpr$h%rx1Q4V#JqWw%+zX3OirdXv*LeLXs^kdbbyP-v|*&WxdLV!&|*uA zL+~i0buXsUy{|-MZ52Qf-phhWIWlfp7MIKAo^7H{OVr5ZGSNfMy0Rj0ajg!z8mpHu z$Onlc5E{i&5#G;Jx_;qBPa8(+EvSH@N>k38mX+S<0w4&qhInJ}qFXsevbyBj0)EqZ zYelz4J&9qXl3`2e|AHEwR=icH!Q1HGMV|1#DX0K}V8`Ux^9DVaLhzcYA*vNGS*b0b z+cqb@-}j^j$%*gdrsv<6 ziH&;S8{h}a;`_UIB~5+6+=i1gxwj;W$LwE#ZD6-r<@tSCaZv!(czGT_{e=pSbSEXY z_Ne&UFjCL4PSHGFcXr0oQ9Wi&+S4f3?qkp6aix+)aElH@CLYx`;AaGzg`dB8F|^Hv zxE|%HWo4;GXf4CXogXGXPfK0=;q~k6*`lD|7yFLGLrr66X(^Lnx@?8@I+V{;YjSgS zl}`%(0rsOhlN|A*x(r=Qle(5)Y{Sl-@ZXALl;55`Ye)34OP6@}YR^2UE61M4f#dMq z!UDf+Zf3433Sf36q2%H;sntc%IhRAm3c<_eGS?~<@jZXy`@D4BECH$$QQ;g2>&WV$ zN5U`GapiwB$G}ReBuZlFWs*e`gtgz9%AYfrK7R#s|9~^-V)irwaK@n~weD$h*Lz15 zxAu_5`+z+LP9Cu_eO2}k(dB)@r$D=i?X5!I;fMlVH3(l=(TeC3+HdSQ6eKpL@K=-` zK>6>`@+M)`y_Vr}A8-S3$D!Ge3-{t*dB~KVz_4p50000EWmrjOO-%qQ0000800000 V0002eQ Patterns; BulletPatternSequence _CurrentSequence; @@ -42,7 +41,7 @@ public class InstantiateOverTime : MonoBehaviour private void Update() { - if (CanShootTime < Time.time && shootingRange.inRange) // We are allowed to shoot + if (CanShootTime < Time.time) // We are allowed to shoot { BulletPattern currentPattern = _CurrentSequence.sequence[_CurrentSequence.currentPattern]; diff --git a/Assets/Scripts/Enemy/ShootingRange.cs b/Assets/Scripts/Enemy/ShootingRange.cs deleted file mode 100644 index 4bdb9c4..0000000 --- a/Assets/Scripts/Enemy/ShootingRange.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ShootingRange : MonoBehaviour -{ - public float range = 5f; - public LayerMask playerLayer; - public bool inRange = false; - void Update() - { - } - private void OnTriggerEnter2D(Collider2D collision) - { - inRange = true; - //Debug.Log("in range"); - - } - - private void OnTriggerExit2D(Collider2D collision) - { - inRange=false; - } -} diff --git a/Assets/Scripts/Enemy/ShootingRange.cs.meta b/Assets/Scripts/Enemy/ShootingRange.cs.meta deleted file mode 100644 index 40c7a06..0000000 --- a/Assets/Scripts/Enemy/ShootingRange.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7b4220a52291a1140945947ce3f52531 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: