From 826e714797d4381282ea3fb9ef38c7dfcbbb5ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= <denis.nutiu@gmail.com>
Date: Sat, 17 Aug 2019 11:37:32 +0300
Subject: [PATCH] Changing upgrade sprites

---
 .../Ammo/BombUpgrade.prefab}                  |   6 +-
 .../Ammo/BombUpgrade.prefab.meta}             |   0
 .../Ammo}/FlameUpgrade.prefab                 |   4 +-
 .../Ammo}/FlameUpgrade.prefab.meta            |   0
 .../Ammo}/SpeedUpgrade.prefab                 |   4 +-
 .../Ammo}/SpeedUpgrade.prefab.meta            |   0
 Assets/Scripts/src/Helpers/PrefabAtlas.cs     |   6 +-
 Assets/Sprites/Ammo/upgrades.png              | Bin 0 -> 2367 bytes
 Assets/Sprites/Ammo/upgrades.png.meta         | 194 ++++++++++++++++++
 9 files changed, 204 insertions(+), 10 deletions(-)
 rename Assets/{DevMocks/Resources/DevMocks/BombsUpgrade.prefab => Resources/Ammo/BombUpgrade.prefab} (95%)
 rename Assets/{DevMocks/Resources/DevMocks/BombsUpgrade.prefab.meta => Resources/Ammo/BombUpgrade.prefab.meta} (100%)
 rename Assets/{DevMocks/Resources/DevMocks => Resources/Ammo}/FlameUpgrade.prefab (96%)
 rename Assets/{DevMocks/Resources/DevMocks => Resources/Ammo}/FlameUpgrade.prefab.meta (100%)
 rename Assets/{DevMocks/Resources/DevMocks => Resources/Ammo}/SpeedUpgrade.prefab (96%)
 rename Assets/{DevMocks/Resources/DevMocks => Resources/Ammo}/SpeedUpgrade.prefab.meta (100%)
 create mode 100644 Assets/Sprites/Ammo/upgrades.png
 create mode 100644 Assets/Sprites/Ammo/upgrades.png.meta

diff --git a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab b/Assets/Resources/Ammo/BombUpgrade.prefab
similarity index 95%
rename from Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab
rename to Assets/Resources/Ammo/BombUpgrade.prefab
index d9f443c..73276c5 100644
--- a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab
+++ b/Assets/Resources/Ammo/BombUpgrade.prefab
@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 7875732231624854186}
   - component: {fileID: 5909025813549437813}
   m_Layer: 0
-  m_Name: BombsUpgrade
+  m_Name: BombUpgrade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -70,8 +70,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3}
-  m_Color: {r: 0.9485793, g: 0, b: 1, a: 1}
+  m_Sprite: {fileID: 21300002, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
diff --git a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab.meta b/Assets/Resources/Ammo/BombUpgrade.prefab.meta
similarity index 100%
rename from Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab.meta
rename to Assets/Resources/Ammo/BombUpgrade.prefab.meta
diff --git a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab b/Assets/Resources/Ammo/FlameUpgrade.prefab
similarity index 96%
rename from Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab
rename to Assets/Resources/Ammo/FlameUpgrade.prefab
index 8b3a227..76b0346 100644
--- a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab
+++ b/Assets/Resources/Ammo/FlameUpgrade.prefab
@@ -71,8 +71,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3}
-  m_Color: {r: 1, g: 0.1812256, b: 0, a: 1}
+  m_Sprite: {fileID: 21300004, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
diff --git a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab.meta b/Assets/Resources/Ammo/FlameUpgrade.prefab.meta
similarity index 100%
rename from Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab.meta
rename to Assets/Resources/Ammo/FlameUpgrade.prefab.meta
diff --git a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab b/Assets/Resources/Ammo/SpeedUpgrade.prefab
similarity index 96%
rename from Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab
rename to Assets/Resources/Ammo/SpeedUpgrade.prefab
index 97f31ac..e8a7372 100644
--- a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab
+++ b/Assets/Resources/Ammo/SpeedUpgrade.prefab
@@ -70,8 +70,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3}
-  m_Color: {r: 0.97521883, g: 0.9811321, b: 0, a: 1}
+  m_Sprite: {fileID: 21300006, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
diff --git a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab.meta b/Assets/Resources/Ammo/SpeedUpgrade.prefab.meta
similarity index 100%
rename from Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab.meta
rename to Assets/Resources/Ammo/SpeedUpgrade.prefab.meta
diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs
index b2a7e39..cd48e83 100644
--- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs
+++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs
@@ -14,11 +14,11 @@ namespace src.Helpers
 
         /* Upgrades */
         public static readonly GameObject SpeedIncreaseUpgrade = 
-            Resources.Load<GameObject>("DevMocks/SpeedUpgrade");
+            Resources.Load<GameObject>("Ammo/SpeedUpgrade");
         public static readonly GameObject BombsIncreaseUpgrade = 
-            Resources.Load<GameObject>("DevMocks/BombsUpgrade");
+            Resources.Load<GameObject>("Ammo/BombUpgrade");
         public static readonly GameObject FlamesIncreaseUpgrade = 
-            Resources.Load<GameObject>("DevMocks/FlameUpgrade");
+            Resources.Load<GameObject>("Ammo/FlameUpgrade");
 
         /* Enemies */
         public static readonly GameObject GreenEnemy = Resources.Load<GameObject>("Enemies/SnowEnemyRandom");
diff --git a/Assets/Sprites/Ammo/upgrades.png b/Assets/Sprites/Ammo/upgrades.png
new file mode 100644
index 0000000000000000000000000000000000000000..188bda05ee9587b891f501290487dbb8cf0891a3
GIT binary patch
literal 2367
zcmV-F3BdM=P)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px-`AI}URCt{2TU}@y*%>_}OO_lt+Erv(#xl;NgakoNtUhG3E?XS(V3d$`n=XCX
zLLq^G11XEMgvCz_g{94d`(x_BF0?Nj+CWHfL!<RWunE*9eOM=TsBj*dStBo6|HNCZ
zok)?byAPv#b!X;|bZ2ZgYRLiN(VcHJlY7qhbH6)L@CrKx!W}Cw?I|4Mf963O9AqM_
z9}KRsu~&2Ze*(gNgy$#1Aj_xrleM!4$V9lNZNtIyvLB$qK>&byH>|{xi7?RDw;$e^
z?Nrti&`ZTD0n`B{pA!Lvh0uGqo(OFw!tDBn6TvG1NFWq4q;p0h@BI(%Y5)v10JCXi
zI1<45H<Qu|c4FJ0_h;c9&_%$f0($)D(E>d0ESj%X`0Ic0qXXM~l-+~00M5UeBp?5M
zR;sdfV%zBVuaVmg_}*0?|5c_oXb3d+(={OYkRA#tXlt>z@y0x&=+ID*@{*~M2+8CE
z0DudBSgd)C6I)qax^#&=d;S~%aCLmV=5IQ&tphR<uIB%?7GUK$kk1n=DNSf6Tlh{)
zLHDQ+q2x*AXYXM8-52cQP)K1>p?o8bd$*p@`apWl({l>cs2_=r0sw%{tF~MO09?7f
zvhDe;8v%GiwdEo%pKi0wtxjxZ!4vwTSj4$==WKt|iLFy~kNTLm|M>SF#G3WF_k<&W
z|ER^j_k@b_jksaV=}JJ$dKlSsUK1S!s8PT3e}E0VwNB=)$H?fXTL6lN@yn;%h*^D9
zu`;%@=!_@GpZ<JDIR52gMsaKF1idFzR^fM#`p|VF4$o_g2!{3Vt%omSeSQppWwpSN
zozV~qDahxY>GAQ>2Ktk)BRy9HP(-SSK#vM;|20+!1(3TQV^2E#(<T5w=HVtgpUDN7
zcVD@^qD+lMNaBbWi6i2hsL?n9<WoXtJV5|J?L5fF^7%YFepcLIHtZgq2cam|fJR6e
zsCeCWgh1hWXAuj-CH*)YF`T0jqI=W_Pq@H|BL|?ek^sTr8VDp(!J+n`;k)i&I}6K<
z@#OPJ9I0xBh9NcT$K}&)gg+;|wxfVVM*-t!<8@u2GoB!7=RpJc01yg=*zq2J5CNb5
z0e}PXLqhTaKv6u1?Crq5)^>|%oWK)~Ae1}_Kqr{TqYF#;e5hm@-!A%-`tPNB2n+l4
zua@1J`rYs=cH~o-ML-`&PZMJBkpn<Y5m55&U={%Y1bjg}S$u4J4UHU%;z3LE-ff8h
z022X^V|Ran-V-VS>irS49=-?wD6g#ofN-@?57V=Hq{-w0>{weaLR&84@zREy$G3n9
zAa^}Rc(P)B7o~s1P6TH1DMTXZj3>yx)^_&&Z~yp<^!@Ebz^4rgHzEk^)2C@&yU)g&
z+nWtG*%`e~FsFs>K<z3c(NTc5Ttt7;$D%G^O%HD20qn`ICjuG;0ILY>$fw{%U`KvE
z5zr_ASVbTrpSP72!M$5gP<UDf0NtzoN3k$mLg%mc8SMD*PrZM;(6Sy}O*gUC0R5zT
z2-L1JdgH-uuX2Qm<g1x6!(S)JJlw2Hem#8u=-Y<BPLR*%YmyJZwq7usnfv+_-<=u+
zU?tk@{d9Ez09}2m%squryL16+Sr1zY&>A3jJw~QRBE+p2JX0ePa&xkp+bMY>^6L?+
zM*X&xDqY9&7(W{)o$&;r#T-!eToL*8hz<CHSp6m^Jol`)VX<|R3d(D%RYC>peoDT`
z``wVA$p!SVUm+g=hEiK>9*0s}`1Q~9<Mf<@L+wHI#)IT1$#zFV5W0eh=<Rs5h<u>h
z(K16sbUpHG!Aw3N9R(N`hD)rVGlL34ME=5X3E3Hq)d)^7JzHX)u15X1n%0-(sUE`S
zH1lv1sUCu%)E3SUyv|aCY!i;TekK<%<a8Or?TB@11L!32IbDWu5wUJ;I0z@Lr2uRc
z^p-A;0r}tDhbLA0hxqUhRNKf-+QEPx{<W+JTDHWNg_&FcX9hNrd1&kqo*CH0%}GDb
z5BM=XTS9L<NIn~FWn3QrXw`Dx+6#D>kR^S$;E;3*V&1zST+=_Fb@)&$zQEzic<8-1
z0K8$awJZF(M}4eu<dpp1eV_nn!p%u9i<XIw0uo2O(9^b;jRC;TNiPx|1*GQ`^e6pL
zms={=Zb6OuF*On)W)T?TpcCRmwtNJs2a&B4;zYK51gQr*+rGa2cx&8;x5j<!O`c*=
z-{hJ9t7h?Rz)HTz#%UWE07gIE!q0z6@bTo=Z26a-Q^4136q#HA+Hw(e1Brt65A3+H
zB*L8x>u#_MVO<u=;2JP9^97n-QxNVyg}49pLnek;vx1<*w|ner23e?4KOQe_;81%|
zuLmkofG!7Vhc!K?u;pQ@hv3Y>CbOj}#Evsz3gGjKXneOp2{wD_P7+_)BM@TiKUHrH
z_n$(3_6`z%^kL(}EooBA>7&50G!}+S`1e=Nb3ffTq5Tr-$!b*3?`l_>6@>uUceSgG
zOwNl`kDm8+&Wf0xEg>POTfE0VT2(HeZX=>CMkj<*CCY47Qd@nOa0TY2AcYgc_xOW&
zy1s;#=Dkw3tKZ~An?uUr8py<j68f*{JBy*@N!I@L{Pw<dlc${h=Z?H>V-^C1-W4<o
zBh^FS8>n(e3q$iREyb=BfsKw@-VZ8*cVD3YS~K#qcbEX&bof@DJ1_o3;CE8_sGxS0
zp+^0clz>W;s5;Kq3!+s38?cK4GH~zxRoF!V8SIev^I&fS(YJc|4W4>fpC7~KCjmUT
ztGQbG$wFp#m4|3M-Z0=s1Uo@Kg&Ps<0{IjM5%2<7pC7Xo!}|Of%4@4A--zSET@A;-
zAV35EH!(w+x^jC(vFpy6!B?R5$meZqy&d%BVn!*H<nsO=e^8qIJ^mnCnp>QZ4^&nK
z`8>hrL&h#(tw=!02iz_F{@V~v25lpniRD)X=AOTdt?a8|v`24_2K=hv>H3o4T)-DJ
zw0Eg3A!TOk@{J%e5eE9N>D#}dV;=&rj{;x6{|Nv%ehKttq2|NY>L;7YbYd%uTAMYZ
lcLHT?UBIm?H#GSG@GToJbs>@ZFKYk*002ovPDHLkV1mGZg7W|X

literal 0
HcmV?d00001

diff --git a/Assets/Sprites/Ammo/upgrades.png.meta b/Assets/Sprites/Ammo/upgrades.png.meta
new file mode 100644
index 0000000..b40cb13
--- /dev/null
+++ b/Assets/Sprites/Ammo/upgrades.png.meta
@@ -0,0 +1,194 @@
+fileFormatVersion: 2
+guid: 5b4a5aab9761a49faa85fef071ef948c
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: upgrades_0
+    21300002: upgrades_1
+    21300004: upgrades_2
+    21300006: upgrades_3
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 6
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 32
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: upgrades_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 32
+        height: 32
+      alignment: 6
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 25b2f4026159f4642ba9a7e973ac63b4
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: upgrades_1
+      rect:
+        serializedVersion: 2
+        x: 32
+        y: 0
+        width: 32
+        height: 32
+      alignment: 6
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 54da74c4272e64e858f5be79168dd101
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: upgrades_2
+      rect:
+        serializedVersion: 2
+        x: 64
+        y: 0
+        width: 32
+        height: 32
+      alignment: 6
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f3ec2b9ddf3e64c068a07d3120bad65f
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: upgrades_3
+      rect:
+        serializedVersion: 2
+        x: 96
+        y: 0
+        width: 32
+        height: 32
+      alignment: 6
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: dacf66ed1d17e437291ab74d1b8329dd
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: ba1fc6bb779234f728847af2ddd7fdb4
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: