From 320575a27c7f04295f14a568acb05864e1781fab Mon Sep 17 00:00:00 2001 From: Spencer Date: Mon, 3 May 2021 08:51:43 -0500 Subject: [PATCH] Fifth Powerup Icon Added --- .../Assets/Sprites/5th Powerup Icon.png | Bin 2473 -> 2472 bytes .../Assets/Sprites/5th Powerup Icon.png~ | Bin 0 -> 2473 bytes .../UserSettings/EditorUserSettings.asset | 51 ------------------ 3 files changed, 51 deletions(-) create mode 100644 MuseumGame/Assets/Sprites/5th Powerup Icon.png~ delete mode 100644 MuseumGame/UserSettings/EditorUserSettings.asset diff --git a/MuseumGame/Assets/Sprites/5th Powerup Icon.png b/MuseumGame/Assets/Sprites/5th Powerup Icon.png index 810b296e921b5f8d28f5b07627e8b5fb313ba08e..69905140aff67abfd44c15651eccd1b9f94b230b 100644 GIT binary patch delta 2438 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 Ef;gG4FaQ7m diff --git a/MuseumGame/Assets/Sprites/5th Powerup Icon.png~ b/MuseumGame/Assets/Sprites/5th Powerup Icon.png~ new file mode 100644 index 0000000000000000000000000000000000000000..810b296e921b5f8d28f5b07627e8b5fb313ba08e GIT binary patch literal 2473 zcmV;a30C%rP)cY_jYoNU#-bECLpy zjjzIgpsir5AP9;eV&fn1)rhQjTp>Ypmf8DpX3k~i38?FBGm+%q@qR-<)$0M(>;HX!j)rB!)ge$PJfho9L3m7faMQbe*31$i$|BgO$kRFX)@yN7quu|4XLK+hJ0B{ zD)--cy5{hZ-@P#gwGW>65{2*qz3dszbCOjWQ(>%0ZLH(ki)z3Odw~$>0|4>?2#^h>zfbHzbG@5h6f{FW?V&fd~|M;b#zt2nj7wHk)LU%-C(}+P2%{aeJ}n z5~UN%Gj@-=tInxY)$NVU2DR(2-7--W(P8j^9GkfO9j`;n^W5Y%H(8n)3!mWvUxUNK z^{;QgA8ZvragFWTm7h#98lk-vj=HjxHU7qqGM*108|w?wwO(GwYb~ z<)81iI)O)BM-z%OoZ$yC!W|KP9*uw<;JBkp7tQethi0@hB1eAy>aAAGR>pwqum8f6 z!I-5m&Sml=x{Q;iGZ=#{k+U)&1)5{a(v;4KG_>gW@)3Ur7FY-ebVvsG?w*`76Rb5i z{&=U+5vycC8EJ}ZNAFgg8aw19n)naS_{=P|B%FuG&odLiAsDJWlW219D-SM19C)n25Au57>9(jbGQrfWf1T42z&{pzxxCNVS%k zu>ahCqu#Le4$v^qV@sfbA%(WA-pPnbmuH*>P^Gb9LBp2FWSG<@PxynC`oP`hYy#S{ zN9Xy2skwjlAfHUe5wRz?;)vYLXLFZTd{c)E0WrZJlD|_4J3vEcbD3;w&b@Z!=h}#a zF~9->Sk5ZKn({0lk8K2^PpHoYX>o{V37ar8Vk_A|*8ysR^hfGr8w(Sr4Hz;uwlI8F}^S+!)b*`3}9uv`pQl7&EFrmxeTHKpI-i9_0U(L z&9NXtCZO?iTqTk-xDfm7r5|1I-g6WfPwdwb{M8)l0ybQ{lo7@k?AfL)g z@7a?X-GYh|bbtjBt3`B%e%HR={_~+3E(B`Pw%QA9FfNh+c?kty0}!ks98jUZ4ysgB zHIAr8#IWSEuIb~LW7&E!Uu*&JC!e}SJ)v5Vk_ut1p$?#Z6i)~T(SX%ry>v9NT?KG) zRvLl<3uja~Ue+xl6Hz9JYM!^%9Uxpolp(Kd1`&n$wlYW=ruBsMXw6))HY508EXZpYlr2cqzNEu#7!Gq^5y$mEPo|1TkwvtAz_Sz|kYPG$ zK*?yeW~uT;I+FeyhobP!Tco50iv!gF<(wFxLONKF!j7G&(R7`5Y7bg%*eYz`3|uxj98on zFwU{X5$`a;TLfVaFbLmIhWKorKMv`(ReiENHF&g!z$Y($PXxfu*c4gajg_~({I-Yg zH!-1l-68KG4GD^#qj?>+GwHjIuV=lkT2NfC?*1apu_eNQG-3wK>|?-c`F(tBr^1X2m7$dh z8q12HicVd9VtqlFVomxe{$^^HQ nt~p0p5bCvO{hoQ?>G8mS;aYcLn?i{Y00000NkvXXu0mjf1sky6 literal 0 HcmV?d00001 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset deleted file mode 100644 index 48c9605..0000000 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ /dev/null @@ -1,51 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!162 &1 -EditorUserSettings: - m_ObjectHideFlags: 0 - serializedVersion: 4 - m_ConfigSettings: - RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a - flags: 0 - vcSharedLogLevel: - value: 0d5e400f0650 - flags: 0 - m_VCAutomaticAdd: 1 - m_VCDebugCom: 0 - m_VCDebugCmd: 0 - m_VCDebugOut: 0 - m_SemanticMergeMode: 2 - m_VCShowFailedCheckout: 1 - m_VCOverwriteFailedCheckoutAssets: 1 - m_VCProjectOverlayIcons: 1 - m_VCHierarchyOverlayIcons: 1 - m_VCOtherOverlayIcons: 1 - m_VCAllowAsyncUpdate: 1