From 2708deb2b920c4ff63fbd3e44412b9ba57e49327 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 4 Feb 2024 09:19:18 +0100 Subject: [PATCH 1/5] fade not done --- Assets/Scripts/UI/Wait2SecondsToShow.cs | 42 ++++++++++++++++++++ Assets/Scripts/UI/Wait2SecondsToShow.cs.meta | 11 +++++ 2 files changed, 53 insertions(+) create mode 100644 Assets/Scripts/UI/Wait2SecondsToShow.cs create mode 100644 Assets/Scripts/UI/Wait2SecondsToShow.cs.meta diff --git a/Assets/Scripts/UI/Wait2SecondsToShow.cs b/Assets/Scripts/UI/Wait2SecondsToShow.cs new file mode 100644 index 0000000..9255ff1 --- /dev/null +++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Wait2SecondsToShow : MonoBehaviour +{ + // Reference to the Image component + private Image canvas; + + private void Start() + { + canvas = GetComponent(); + StartCoroutine(FadeOut(2f)); + } + + // Coroutine to fade out the image + public IEnumerator FadeOut(float duration) + { + // Make sure the canvas is not null + if (canvas == null) + { + yield break; // Exit if canvas is not assigned + } + + // Starting alpha value (1 is fully opaque) + float startAlpha = 1.0f; + + // Elapsed time + float time = 0; + + while (time < duration) + { + time += Time.deltaTime; // Update the time based on the time passed since last frame + float alpha = Mathf.Lerp(startAlpha, 0, time / duration); // Calculate the new alpha value + canvas.color = new Color(canvas.color.r, canvas.color.g, canvas.color.b, alpha); // Apply the new alpha value to the canvas color + yield return null; // Wait for the next frame + } + + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/UI/Wait2SecondsToShow.cs.meta b/Assets/Scripts/UI/Wait2SecondsToShow.cs.meta new file mode 100644 index 0000000..84b62ca --- /dev/null +++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55f8b539d824ad84cb0f7384c2525a2e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From ff0ee1a1b6e22607fa97b15d16ef5aa356ef6679 Mon Sep 17 00:00:00 2001 From: Sveske Juice Date: Sun, 4 Feb 2024 00:24:51 -0800 Subject: [PATCH 2/5] L --- Assets/Scripts/Player/PlayerCollideAttack.cs | 4 ++++ Assets/Scripts/Player/PlayerMovement.cs | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Player/PlayerCollideAttack.cs b/Assets/Scripts/Player/PlayerCollideAttack.cs index d41ef29..458f924 100644 --- a/Assets/Scripts/Player/PlayerCollideAttack.cs +++ b/Assets/Scripts/Player/PlayerCollideAttack.cs @@ -11,10 +11,14 @@ public class PlayerCollideAttack : MonoBehaviour public void OnCollisionEnter2D(Collision2D collision) { + if (collision.collider.tag != "Enemy") return; + HealthComponent health = collision.collider.gameObject.GetComponent(); if (health == null) health = collision.collider.transform.parent.GetComponent(); if (health == null) return; + health = collision.collider.gameObject.GetComponentInChildren(); + if (health == null) return; float speed = body.velocity.magnitude; float damage = speedToDamage.Evaluate(speed); diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 22d08b1..ea59093 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -83,11 +83,8 @@ public class PlayerMovement : MonoBehaviour void OnCollisionStay2D(Collision2D collision) { - Debug.Log("Hit other " + collision.otherCollider.gameObject.name); - Debug.Log("Hit other " + collision.collider.gameObject.name); if (collision.collider.gameObject.CompareTag("Enemy")) { // Other object is an enemy - Debug.Log("Hit enememenemy"); hp.TakeDamage(1f); } } 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 3/5] 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: From 7bdd06ab2a8008ea25f9ec29ee9a1a6c06b7abaf Mon Sep 17 00:00:00 2001 From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com> Date: Sun, 4 Feb 2024 09:28:03 +0100 Subject: [PATCH 4/5] Update PrefabTest.unity --- Assets/Scenes/PrefabTest.unity | 486 ++++++++++++++++++++++++++++++--- 1 file changed, 450 insertions(+), 36 deletions(-) diff --git a/Assets/Scenes/PrefabTest.unity b/Assets/Scenes/PrefabTest.unity index 46b8c1d..92545a5 100644 --- a/Assets/Scenes/PrefabTest.unity +++ b/Assets/Scenes/PrefabTest.unity @@ -175,11 +175,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7426119072834239927, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} + insertIndex: -1 + addedObject: {fileID: 29946017} m_SourcePrefab: {fileID: 100100000, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} +--- !u!1 &29946016 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} + m_PrefabInstance: {fileID: 29946015} + m_PrefabAsset: {fileID: 0} +--- !u!114 &29946017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29946016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &40791261 PrefabInstance: m_ObjectHideFlags: 0 @@ -232,11 +255,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2942917501068696347, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} + insertIndex: -1 + addedObject: {fileID: 40791263} m_SourcePrefab: {fileID: 100100000, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} +--- !u!1 &40791262 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} + m_PrefabInstance: {fileID: 40791261} + m_PrefabAsset: {fileID: 0} +--- !u!114 &40791263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40791262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &78004539 PrefabInstance: m_ObjectHideFlags: 0 @@ -289,11 +335,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 726348107358307867, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} + insertIndex: -1 + addedObject: {fileID: 78004541} m_SourcePrefab: {fileID: 100100000, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} +--- !u!1 &78004540 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} + m_PrefabInstance: {fileID: 78004539} + m_PrefabAsset: {fileID: 0} +--- !u!114 &78004541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78004540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &270647951 PrefabInstance: m_ObjectHideFlags: 0 @@ -346,11 +415,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1085750007062579781, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} + insertIndex: -1 + addedObject: {fileID: 270647953} m_SourcePrefab: {fileID: 100100000, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} +--- !u!1 &270647952 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} + m_PrefabInstance: {fileID: 270647951} + m_PrefabAsset: {fileID: 0} +--- !u!114 &270647953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270647952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &288771115 PrefabInstance: m_ObjectHideFlags: 0 @@ -403,11 +495,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy6V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7020523015070545769, guid: af739fea850caf944ac8c1932d2ec386, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: af739fea850caf944ac8c1932d2ec386, type: 3} + insertIndex: -1 + addedObject: {fileID: 288771117} m_SourcePrefab: {fileID: 100100000, guid: af739fea850caf944ac8c1932d2ec386, type: 3} +--- !u!1 &288771116 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: af739fea850caf944ac8c1932d2ec386, type: 3} + m_PrefabInstance: {fileID: 288771115} + m_PrefabAsset: {fileID: 0} +--- !u!114 &288771117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288771116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1 &359673318 GameObject: m_ObjectHideFlags: 0 @@ -597,11 +712,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4984464882418314514, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + insertIndex: -1 + addedObject: {fileID: 641267243} m_SourcePrefab: {fileID: 100100000, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} +--- !u!1 &641267242 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + m_PrefabInstance: {fileID: 641267241} + m_PrefabAsset: {fileID: 0} +--- !u!114 &641267243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641267242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &752623411 PrefabInstance: m_ObjectHideFlags: 0 @@ -654,11 +792,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2661459955571842845, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} + insertIndex: -1 + addedObject: {fileID: 752623413} m_SourcePrefab: {fileID: 100100000, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} +--- !u!1 &752623412 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} + m_PrefabInstance: {fileID: 752623411} + m_PrefabAsset: {fileID: 0} +--- !u!114 &752623413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752623412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &755220341 PrefabInstance: m_ObjectHideFlags: 0 @@ -711,11 +872,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy4V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8707421524367135635, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} + insertIndex: -1 + addedObject: {fileID: 755220343} m_SourcePrefab: {fileID: 100100000, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} +--- !u!1 &755220342 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} + m_PrefabInstance: {fileID: 755220341} + m_PrefabAsset: {fileID: 0} +--- !u!114 &755220343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755220342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &855086680 PrefabInstance: m_ObjectHideFlags: 0 @@ -768,11 +952,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6435009456481248358, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} + insertIndex: -1 + addedObject: {fileID: 855086682} m_SourcePrefab: {fileID: 100100000, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} +--- !u!1 &855086681 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} + m_PrefabInstance: {fileID: 855086680} + m_PrefabAsset: {fileID: 0} +--- !u!114 &855086682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855086681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &861243354 PrefabInstance: m_ObjectHideFlags: 0 @@ -825,11 +1032,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5261040920339267747, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} + insertIndex: -1 + addedObject: {fileID: 861243356} m_SourcePrefab: {fileID: 100100000, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} +--- !u!1 &861243355 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} + m_PrefabInstance: {fileID: 861243354} + m_PrefabAsset: {fileID: 0} +--- !u!114 &861243356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861243355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1063152536 PrefabInstance: m_ObjectHideFlags: 0 @@ -882,11 +1112,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3840195329144413153, guid: f808ad67f6a747241a310437e433c828, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} + insertIndex: -1 + addedObject: {fileID: 1063152538} m_SourcePrefab: {fileID: 100100000, guid: f808ad67f6a747241a310437e433c828, type: 3} +--- !u!1 &1063152537 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} + m_PrefabInstance: {fileID: 1063152536} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1063152538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063152537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1222102540 PrefabInstance: m_ObjectHideFlags: 0 @@ -939,11 +1192,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6076718436353388380, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1222102542} m_SourcePrefab: {fileID: 100100000, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} +--- !u!1 &1222102541 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} + m_PrefabInstance: {fileID: 1222102540} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1222102542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222102541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1295265087 PrefabInstance: m_ObjectHideFlags: 0 @@ -996,11 +1272,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy3V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2434603102242981559, guid: 40512b69b08d56d498aa78823087362c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295265089} m_SourcePrefab: {fileID: 100100000, guid: 40512b69b08d56d498aa78823087362c, type: 3} +--- !u!1 &1295265088 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} + m_PrefabInstance: {fileID: 1295265087} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1295265089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295265088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1408234649 PrefabInstance: m_ObjectHideFlags: 0 @@ -1053,11 +1352,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4917627866832862912, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} + insertIndex: -1 + addedObject: {fileID: 1408234651} m_SourcePrefab: {fileID: 100100000, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} +--- !u!1 &1408234650 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} + m_PrefabInstance: {fileID: 1408234649} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1408234651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408234650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1509665393 PrefabInstance: m_ObjectHideFlags: 0 @@ -1110,11 +1432,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy1V1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5147377511233184574, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1509665395} m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} +--- !u!1 &1509665394 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + m_PrefabInstance: {fileID: 1509665393} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1509665395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509665394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1 &1732151769 GameObject: m_ObjectHideFlags: 0 @@ -1235,11 +1580,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1203071559618178883, guid: f48e8133073214446b0889b26d867b03, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} + insertIndex: -1 + addedObject: {fileID: 1941423964} m_SourcePrefab: {fileID: 100100000, guid: f48e8133073214446b0889b26d867b03, type: 3} +--- !u!1 &1941423963 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} + m_PrefabInstance: {fileID: 1941423962} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1941423964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941423963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &1977605622 PrefabInstance: m_ObjectHideFlags: 0 @@ -1292,11 +1660,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy5V2 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 3469026775726075388, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977605624} m_SourcePrefab: {fileID: 100100000, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} +--- !u!1 &1977605623 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} + m_PrefabInstance: {fileID: 1977605622} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1977605624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977605623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1001 &2105330683 PrefabInstance: m_ObjectHideFlags: 0 @@ -1349,11 +1740,34 @@ PrefabInstance: propertyPath: m_Name value: Enemy2V3 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4131989739711665858, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} + insertIndex: -1 + addedObject: {fileID: 2105330685} m_SourcePrefab: {fileID: 100100000, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} +--- !u!1 &2105330684 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} + m_PrefabInstance: {fileID: 2105330683} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2105330685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105330684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cdfa33fd6ed7d647a720cbd59cea7df, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 0} + Patterns: [] --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 From 49595cfc6e6fc77ff8621c115e36456e1938e7fc Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 4 Feb 2024 09:28:49 +0100 Subject: [PATCH 5/5] facetransition --- Assets/Prefabs/UI/UI.prefab | 124 +++++++++++++++++++++++- Assets/Scenes/GameScene.unity | 86 +--------------- Assets/Scripts/UI/Wait2SecondsToShow.cs | 5 + 3 files changed, 126 insertions(+), 89 deletions(-) diff --git a/Assets/Prefabs/UI/UI.prefab b/Assets/Prefabs/UI/UI.prefab index bb6c413..54f9a6b 100644 --- a/Assets/Prefabs/UI/UI.prefab +++ b/Assets/Prefabs/UI/UI.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3315624217225912576} + - component: {fileID: 4586330195874448812} m_Layer: 5 m_Name: TimerUI m_TagString: Untagged @@ -36,6 +37,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4586330195874448812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203935764274243221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3} + m_Name: + m_EditorClassIdentifier: + timerText: {fileID: 5558345568148303310} --- !u!1 &851408572817441430 GameObject: m_ObjectHideFlags: 0 @@ -1129,6 +1143,94 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6216580377014392011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1294303342848261759} + - component: {fileID: 2160402623048284357} + - component: {fileID: 7320843173059553054} + - component: {fileID: 6190172744665135225} + m_Layer: 5 + m_Name: FadeImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1294303342848261759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2603779566095873902} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10000, y: 10000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2160402623048284357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_CullTransparentMesh: 1 +--- !u!114 &7320843173059553054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6190172744665135225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216580377014392011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55f8b539d824ad84cb0f7384c2525a2e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6910246373966366672 GameObject: m_ObjectHideFlags: 0 @@ -1217,6 +1319,7 @@ GameObject: - component: {fileID: 3829147617141221472} - component: {fileID: 8067116145730438707} - component: {fileID: 1150396837806670114} + - component: {fileID: 7577166944879627524} m_Layer: 5 m_Name: UI m_TagString: Untagged @@ -1239,6 +1342,7 @@ RectTransform: - {fileID: 5758936918037227603} - {fileID: 3315624217225912576} - {fileID: 1594701663256479489} + - {fileID: 1294303342848261759} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1309,6 +1413,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &7577166944879627524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7485285492053268969 GameObject: m_ObjectHideFlags: 0 @@ -1362,7 +1478,7 @@ MonoBehaviour: spawner: {fileID: 0} slider: {fileID: 6134467867004299163} waveText: {fileID: 5636459425788774448} - waveTextDisplayTime: 3 + waveTextDisplayTime: 1 --- !u!1 &7671763227494701576 GameObject: m_ObjectHideFlags: 0 @@ -1465,7 +1581,7 @@ RectTransform: m_GameObject: {fileID: 8343632487405850332} 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: 0.57061476, y: 0.57061476, z: 0.57061476} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1594701663256479489} @@ -1735,7 +1851,7 @@ RectTransform: m_GameObject: {fileID: 8805328679230352364} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9407643, y: 1.9407643, z: 1.9407643} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.9407643} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5330981716967833427} @@ -1754,7 +1870,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 291.11456, y: 291.1147} + m_AnchoredPosition: {x: 194.86456, y: 195} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1107145590061588416 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a8e3d9c..3cad8d2 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -780,24 +780,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &872164353 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &872164355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872164353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0e0dc4c0bfe6da44682256676d1ccef6, type: 3} - m_Name: - m_EditorClassIdentifier: - timerText: {fileID: 1785683341} --- !u!1 &941230147 GameObject: m_ObjectHideFlags: 0 @@ -3133,17 +3115,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1785683341 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5558345568148303310, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1872712129 GameObject: m_ObjectHideFlags: 0 @@ -3276,10 +3247,6 @@ PrefabInstance: propertyPath: spawner value: objectReference: {fileID: 5796191506433166634} - - target: {fileID: 1656765803503857110, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: waveTextDisplayTime - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3380,34 +3347,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.x - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.y - value: 1.2 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 194.86456 - objectReference: {fileID: 0} - - target: {fileID: 5758936918037227603, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 195 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.x - value: 0.57061476 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.y - value: 0.57061476 - objectReference: {fileID: 0} - - target: {fileID: 6089114235279588614, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - propertyPath: m_LocalScale.z - value: 0.57061476 - objectReference: {fileID: 0} - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} propertyPath: m_Name value: UI @@ -3415,31 +3354,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - insertIndex: -1 - addedObject: {fileID: 4158834148864819268} - - targetCorrespondingSourceObject: {fileID: 203935764274243221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - insertIndex: -1 - addedObject: {fileID: 872164355} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} ---- !u!1 &4158834148864819267 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - m_PrefabInstance: {fileID: 4158834148864819266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4158834148864819268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4158834148864819267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94eb4529510a25d448334415d28e7fa4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &4910321061857220295 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Wait2SecondsToShow.cs b/Assets/Scripts/UI/Wait2SecondsToShow.cs index 9255ff1..e1e77d2 100644 --- a/Assets/Scripts/UI/Wait2SecondsToShow.cs +++ b/Assets/Scripts/UI/Wait2SecondsToShow.cs @@ -11,6 +11,11 @@ public class Wait2SecondsToShow : MonoBehaviour private void Start() { canvas = GetComponent(); + Invoke(nameof(StartFade), 2.8f); + } + + void StartFade() + { StartCoroutine(FadeOut(2f)); }