From 2d97a35045c7bb1687d195da1ece0114dec727f3 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 7 Mar 2025 17:18:16 -0500 Subject: [PATCH] Bugs --- Assets/ModeSelect.cs | 2 +- Assets/Prefabs/DayNightSkyBackground.prefab | 6 +- Assets/Scripts/Damageable.cs | 2 + Assets/Sprites/Cloud Canopy.png | Bin 0 -> 1087 bytes Assets/Sprites/Cloud Canopy.png.meta | 168 ++++++++++++++++++++ 5 files changed, 174 insertions(+), 4 deletions(-) create mode 100644 Assets/Sprites/Cloud Canopy.png create mode 100644 Assets/Sprites/Cloud Canopy.png.meta diff --git a/Assets/ModeSelect.cs b/Assets/ModeSelect.cs index 5472845..e437baa 100644 --- a/Assets/ModeSelect.cs +++ b/Assets/ModeSelect.cs @@ -21,7 +21,7 @@ public class ModeSelect : MonoBehaviour { GameManager.gameMode = GameManager.GameMode.keepAway; } - else if (toggle.name == "Obstacle-Course") + else if (toggle.name == "Obstacle Course") { GameManager.gameMode = GameManager.GameMode.obstacleCourse; } diff --git a/Assets/Prefabs/DayNightSkyBackground.prefab b/Assets/Prefabs/DayNightSkyBackground.prefab index 4f04c28..df730ac 100644 --- a/Assets/Prefabs/DayNightSkyBackground.prefab +++ b/Assets/Prefabs/DayNightSkyBackground.prefab @@ -1009,7 +1009,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} @@ -1713,7 +1713,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} @@ -2143,7 +2143,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs index 3845be6..5b7c63a 100644 --- a/Assets/Scripts/Damageable.cs +++ b/Assets/Scripts/Damageable.cs @@ -42,6 +42,8 @@ public class Damageable : MonoBehaviour private void Damage(GameObject damageSource) { + if (dying) return; + float actualForce = damageSource.GetComponent().force; Block blockComponent = GetComponent(); if (blockComponent != null && blockComponent.blocking) diff --git a/Assets/Sprites/Cloud Canopy.png b/Assets/Sprites/Cloud Canopy.png new file mode 100644 index 0000000000000000000000000000000000000000..16e805f555233e1bf28190eb31005b8f0b84b885 GIT binary patch literal 1087 zcmV-F1i<@=P)DG-G)!Lc&9Me+YjP4)B}m8|KF&g>M-*69n6>+s=|l z5ug&VQY$=Uxu6j~HD`;4djQAhV!#0#dbP^oKPeKzTvYbG7(D)-BMuWf9Cra}XeE3& zA?kye=}B#jKuO4HsAX)*U2yNYXClw_8f->Vlem zaA{(ksZ%hxDYHvzAp)W$*5v+G42YZ{_93aA5furTe{I#^7Fl3x$Hoia32PRu2~G;I zme3&vnUP7rzH8cuwPZrrSiQcXEdv+;33j<@Zf)d7%(|hN4GqFyia*P{3Z=X(`+#9^ zXfUdg4&i(D8M%+zDli4E2#9ny9!R-&2efYTmV~75pZ7~uC4CkTE(4W~umO62sz`Ri z@M`V4?P4+R#7L{?fGLEZk`M##4!V}z@z+&WRyzZ@v=f3PV3v%hrGzlbYAr=QNWhX( zI%XEW#!3dvpR`12F6K1UQ{(Z#B76!=M(3(0X#f>LDvv+{qVnn{XoUau|5HOFw=xSl zgafR+UHKHx5BYEF{-86-()IYds*z?(=?~N0P1->TY1d_nZl*e!@qObU9=fge@#)N)5xq?xh}`zuekq^#gyqs0?8CLW#DMIMDAxhq z74{zd7V9*aRe5hkKo_Ic=#d#zwGV&`LyplT$GwanC?;(&C{{R8u%V8Mdx0C