From 273325e117cc0891efc8847fd0a6b1949a6e181f Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sun, 12 Jul 2020 11:00:37 -0400 Subject: [PATCH] Tuned up some sprites and gave the enemy and player better colliders --- Assets/Prefabs/Enemy.prefab | 36 +++++-- Assets/Prefabs/Obstacle.prefab | 8 +- Assets/Scenes/Game.unity | 31 +++++- Assets/Scripts/GMScript.cs | 3 +- Assets/Sprites/Enemy.png | Bin 0 -> 1688 bytes Assets/Sprites/Enemy.png.meta | 92 ++++++++++++++++ Assets/Sprites/Enemy.xcf | Bin 0 -> 9940 bytes Assets/Sprites/Enemy.xcf.meta | 7 ++ Assets/Sprites/Obsctale.png | Bin 0 -> 532 bytes Assets/Sprites/Obsctale.png.meta | 140 +++++++++++++++++++++++++ Assets/Sprites/Obsctale.xcf | Bin 0 -> 13074 bytes Assets/Sprites/Obsctale.xcf.meta | 7 ++ Assets/Sprites/Player.png | Bin 0 -> 1738 bytes Assets/Sprites/Player.png.meta | 92 ++++++++++++++++ Assets/Sprites/Player.xcf | Bin 0 -> 12271 bytes Assets/Sprites/Player.xcf.meta | 7 ++ ProjectSettings/GraphicsSettings.asset | 119 +++++++++++---------- ProjectSettings/ProjectSettings.asset | 13 ++- 18 files changed, 482 insertions(+), 73 deletions(-) create mode 100644 Assets/Sprites/Enemy.png create mode 100644 Assets/Sprites/Enemy.png.meta create mode 100644 Assets/Sprites/Enemy.xcf create mode 100644 Assets/Sprites/Enemy.xcf.meta create mode 100644 Assets/Sprites/Obsctale.png create mode 100644 Assets/Sprites/Obsctale.png.meta create mode 100644 Assets/Sprites/Obsctale.xcf create mode 100644 Assets/Sprites/Obsctale.xcf.meta create mode 100644 Assets/Sprites/Player.png create mode 100644 Assets/Sprites/Player.png.meta create mode 100644 Assets/Sprites/Player.xcf create mode 100644 Assets/Sprites/Player.xcf.meta diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index b64aa2b..37d28b4 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3604935524688938150} - component: {fileID: 3604935524688938201} - component: {fileID: 6741981845749859313} - - component: {fileID: 8332197680746461102} + - component: {fileID: 1614877917231671591} - component: {fileID: 6716227068369250423} - component: {fileID: 917023915065383399} m_Layer: 0 @@ -74,7 +74,7 @@ SpriteRenderer: m_SortingLayerID: -886689981 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5c9800fd4ef9e33469a34c4b330cdfbd, type: 3} + m_Sprite: {fileID: 21300000, guid: 0e01acaad6f784d43b385f9c8f55676e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -106,8 +106,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!61 &8332197680746461102 -BoxCollider2D: +--- !u!60 &1614877917231671591 +PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -129,9 +129,31 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.28, y: 1.28} - m_EdgeRadius: 0 + m_Points: + m_Paths: + - - {x: 0.35999998, y: -0.31} + - {x: 0.51, y: -0.31} + - {x: 0.58, y: -0.26} + - {x: 0.58, y: -0.04} + - {x: 0.57, y: 0.02} + - {x: 0.55, y: 0.12} + - {x: 0.45999998, y: 0.21} + - {x: 0.31, y: 0.26} + - {x: 0.32999998, y: 0.62} + - {x: 0.22999999, y: 0.64} + - {x: -0.19, y: 0.64} + - {x: -0.29, y: 0.58} + - {x: -0.28, y: 0.37} + - {x: -0.51, y: 0.17999999} + - {x: -0.55, y: 0.08} + - {x: -0.55, y: -0.34} + - {x: -0.37, y: -0.38} + - {x: -0.28, y: -0.29999998} + - {x: -0.28, y: -0.35999998} + - {x: -0.37, y: -0.64} + - {x: 0.39, y: -0.64} + - {x: 0.44, y: -0.62} + - {x: 0.39999998, y: -0.47} --- !u!82 &6716227068369250423 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Obstacle.prefab b/Assets/Prefabs/Obstacle.prefab index 1ca3fcb..a339167 100644 --- a/Assets/Prefabs/Obstacle.prefab +++ b/Assets/Prefabs/Obstacle.prefab @@ -73,11 +73,11 @@ SpriteRenderer: m_SortingLayerID: -886689981 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: f0211b1cbdfe5b74098b7a13bcd17454, type: 3} + m_Sprite: {fileID: 21300000, guid: 8326c63b72803594ba0b785814f2a54a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 + m_DrawMode: 2 m_Size: {x: 1.28, y: 1.28} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 @@ -104,9 +104,9 @@ BoxCollider2D: oldSize: {x: 1.28, y: 1.28} newSize: {x: 1.28, y: 1.28} adaptiveTilingThreshold: 0.5 - drawMode: 0 + drawMode: 2 adaptiveTiling: 0 - m_AutoTiling: 0 + m_AutoTiling: 1 serializedVersion: 2 m_Size: {x: 1.28, y: 1.28} m_EdgeRadius: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5b648a7..3abc2a1 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -661,6 +661,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 459038965} m_Modifications: + - target: {fileID: 224136594384678653, guid: 839e7f2e94b70514dbc986f93edcae38, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0211b1cbdfe5b74098b7a13bcd17454, + type: 3} - target: {fileID: 4983368853276173721, guid: 839e7f2e94b70514dbc986f93edcae38, type: 3} propertyPath: m_LocalPosition.x @@ -752,6 +758,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 459038965} m_Modifications: + - target: {fileID: 224136594384678653, guid: 839e7f2e94b70514dbc986f93edcae38, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0211b1cbdfe5b74098b7a13bcd17454, + type: 3} + - target: {fileID: 1118292046829645237, guid: 839e7f2e94b70514dbc986f93edcae38, + type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 1.28 + objectReference: {fileID: 0} - target: {fileID: 4983368853276173721, guid: 839e7f2e94b70514dbc986f93edcae38, type: 3} propertyPath: m_LocalPosition.x @@ -1427,6 +1444,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 459038965} m_Modifications: + - target: {fileID: 224136594384678653, guid: 839e7f2e94b70514dbc986f93edcae38, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0211b1cbdfe5b74098b7a13bcd17454, + type: 3} - target: {fileID: 4983368853276173721, guid: 839e7f2e94b70514dbc986f93edcae38, type: 3} propertyPath: m_LocalPosition.x @@ -1518,6 +1541,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 459038965} m_Modifications: + - target: {fileID: 224136594384678653, guid: 839e7f2e94b70514dbc986f93edcae38, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0211b1cbdfe5b74098b7a13bcd17454, + type: 3} - target: {fileID: 4983368853276173721, guid: 839e7f2e94b70514dbc986f93edcae38, type: 3} propertyPath: m_LocalPosition.x @@ -1779,7 +1808,7 @@ SpriteRenderer: m_SortingLayerID: -886689981 m_SortingLayer: 2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: def040baaeb659a43ac54526f73fae70, type: 3} + m_Sprite: {fileID: 21300000, guid: ffc4352b48185d34c862ad4156b7ec67, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 82bd29f..d7cb070 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -96,7 +96,8 @@ public class GMScript : MonoBehaviour GameObject newObstacle = Instantiate(obstacle, ValidSpawn(), Quaternion.Euler(0,0,Random.Range(0.0f, 360.0f))); - newObstacle.transform.localScale = new Vector2(Random.Range(1.0f, 8.0f), 1.0f); + SpriteRenderer spriteRenderer = newObstacle.GetComponent(); + spriteRenderer.size = new Vector2(1.28f*Random.Range(1, 9), 1.28f); obstacleSpawnTime = spawnTime(); obstacleTime = 0.0f; } diff --git a/Assets/Sprites/Enemy.png b/Assets/Sprites/Enemy.png new file mode 100644 index 0000000000000000000000000000000000000000..74e2af5995dde5090722b5c48f1312930446aad0 GIT binary patch literal 1688 zcmV;J250$+P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00sa_L_t(|+U;FCZX7WTT@C~v zAgR*34B*C{kFbp|;37o;A1Q!~6uy8PAHkg)11Zy|N)C`lDS|be$w;FQC6Ux4;3Ceh zcZTor@lm6hJsc1S#JoXB!9U?=%NrR7Ds;{sxz&+^Y(Y}weP>2iO)G{2fuf0ku64o4I-cga7wd;c>m>WmjqH{0r>g} zI0XSDCEgMVmIH!?1OdY*KAbgR)+ViIwVp_z$qz_Y0ICIlq$w<&ZlC~+<5}qUT&lpa z4gm!iM3z+0POpuHrU+@4HfscW{ew|ekxS7CD z1w8g%YeX==E4T)9jDgBy3;faww%P`!83Sv6Tr8sc1!CKBMCv8fS)v)l45B9Jirgc`Q^2^oKnxK&$+R3D_P&4 zA54N@a9(V7A7qe80^+LvRPa+wA^bye9%-lo!0GGD)6%p05zQmJ6%Ytut`$%Z z1wa^S1#a{K%vhx@{ z0hn|A2}DdTY$p-SN|llh`lgz#&pYw%plVfDsQ_C~1L>gxjDJ7c(ke}&&mqFXSgBpB zU-1m?ODeThI1a#SDr54ieY7^$C8K9x5=puszsf7M^Z=fj!9@=| zz|ARxrhw7%r3HA&lg=^{{8GZ4UtXK5`cdl|H45OlPCVDtrK~^nuDZ~%^gfQIt}fOjh^}|UzL+v0Z^T(~yOqc&S(Nj+ z5~{zlRZt^EmAxT^1AJvbA8xKL_Edlv&atSNmqvh2FZ+oez*m4ss~@>j0E1cSYW~)M zrG8#)BDjBg*-`<{wmgmiA=AQbSd><|=wRIskRkDAfDc7zi92^9XdN{kfI7cVtosjD z|5_0xszj{`EHN#`Bd4b7-}3_6TfkIu&ISGs$w?~#)R?ngm8WUkRdsuKEr9n=FGYPg z=RK+5OKAhr3E;V^-@?d-7QoyZdQ_qGYZlHjz*<@pS^#sBx4_5u6dEvrokueeU{-Gc z6KG%p&^nhx0btxf0DzAcPz4wOh62C=+Bqi;r~nF%m@8yK}dp2(x!rY1lz(Z}QQ@c8&RG8g{svE; zh|AWC)asWSt%=#21j}p*uJuBVjcE7QMA8(1g8&5}Wj&h4(t3b60tijASpwi=i|qZo`3TE#dycU-iyZ{9**zr-?P^_%0W`K zOV6+G$FILp`2QR;O_~_}g$K!)^E($+8uP`aw`~I`1uf|WGJ$e$nRR8B6fBZ6d zwOXKhpDl_@*1O6MnJf1%ai;eBF;0G(sZ7;l6p5_u{m$WM!3z}QAtEb6u1o)|V^Ro3 zRIb+LLo`-LGy5VzlgD%SlF1ORz}Qg(_mRnbjNH& zJLXDs%M_y=W!vBfrVxFNg@4_+(L9kdxKH~M<-($=M7tJi(QVM9K4(gd6YB-q#kxbe z6FJmp^DbrQ=L=DO)wW^V6iqxw*_5NV#ujauXocG}S3Zk#hW`fAp>7*&8qZ>lA(XGM zd`(|wyLZ46Ti&ynx6`YQw(3x>af_yIv1F?B%abofL(^mHcbLPE+T>+|JmzfCN2XPN z7hT(rbvJU!yOi%RhRd2{mL1#Aqg|fyT-H>wWm=o+Dhb9^#QWN0%rSC;ZgiEln@AS> zjCs|z%d^h)Ti{Qy#eFkiUt7^lyRLRLrN2j?DN>~0lyVQeM_zbf>mB;JQGxt@+fNwp z<;%3wo@7&vlSALJW5hPuVJ~^+6&CD1i_GI;r+ieSZMw&s=o^f27M-YP%VTs*G`L1y zW#aoLyw)w&qN>FP_EdR}^%ShW$6P9#B3Zo2x+3O{+o%0vyhC4&_chl18{Cc~b35vr zA?@qTJz(rAKbsQu9(%~2675T6u3e+QSD9DcxnUu0DCjidXDVE`~K{gZ?M^A$NCN zH!yt|kNXYzb$D25MB5_$JjNa|UIi)G^|@GCdOi}Xb=v4I8-oo{`}Aj(jBXpK>ac_Ux|ACYRc>*)pb`&zebtMI^_VzILIn^ojagL zU)?d9BXyGE!ACULF6C9m&@Z@3fBmv6>|M@M`xTS1E*r1ww`|)oo+j;+dV%;Z*PZ?i z>gJ650e7JGGU0B#!F&-mzHZlEXT1e$lLB|YY}llo^lQw2qPuvkv|M_H`fG^{qHnL= zX|>Ef*u%={{kXx1@@u*~bnnXga^vfH-4SWMW>mgleYE=ISoKN1YV%F%H<;7Ga`J;c zMExT24&@Wuug}h9#VZzFSSir&26gh^V&i(Ei>+9fHDX=XZ&R=GRF}2Zb;S~ey*6XZ zuQ~M5-L=IWvf7E>V9q{wi1u1TzfPTlUS@y#t!tlo_My1qn2u#bbGh7I*J&@CX%G5U zDh9~L@)afae4@*?@ftN|(XJ^ji}UfEibHYUVa)ihlda_2qh#zGl*@lFo3%5$VT?*u$kgijHsE zXADQRT>qa=r8@OyuKI_W%rUwoIhEFbh|V?n+Zb(nOe*23|4odYAH~>z6600QqVaW< zBQys4rWN?66Wlf3fD@^eUDFHBN;xP-F6A-qfaS;ug!~wgSm#Dx>1ln8)xe`aC*DiS zMv$A|W>qd}GbobQgL0DYm|Eb?HDfKv&+~RftysJGvMB_Fu;8o4os@#n1P8f>9aEZk zl($V~QpjM->`$6zI%$}DmyoSVWV*DA(b_V^mLawbSw)B~t+1-_tdv7+NqLOeFvLco z5L+U#jxASuS|4LI#Fn(ba!J_;bBEY6bV-|Gk+dF`lN1|<-l1l!h55t09Z@URF0f^Y zEkkTMD}|#Owp>GOIrAvTma{?zvE>X~&amYrWNU^kX&0llrH?IrZ0WNKA6r^sRsLBi z``D857_p&`jeH@tL}DFVuJp7%#;T7kX@BLCvf<}C*wS}Nn|_hB?w6Ak8~R>HGuHfk zCvQj8inR-D>0?VDTP{leXn`%)5L+%h%CY65kU?y@z?KVac?sECU`yJ?Xl=<;V~fL4 zCt?-$sZ&p$tm;D1Q|bR!Zgcp|N_ITWt+ikg!jThw)$9_Y?pTQ*>GlZmdxZ9VjtW!4 z)xAr|7GbqZyBLoM82RAq@(;#+y^HVQ8Ts|C6*dA6GUS_J5o`r0+UVQ(M31x^ z6l}`T0K_L52kg;HC|}kOZkx^E))^TD+vXyPg3`Q6eP!Mttk_%&&# zNA3lC#$!+UfTQtb*YqbNvppG@+mpVzgRi?g>6$%!+x|rUtc5>oT7PyhsT;}tN$o-z z;?w$*s+byu&0^2RH-2&U;%kD0)9lmRS zA%BJK@LBR#2McV6++Se33uK7T>Ms)8@$Rc;A7HQ@hf%%PN>T64lyBMtG;2iHOO&j1 zsmoKQgRBGg$P4Asy5^lvy{eWfPtD8EjCld>!n9)u3sy612dUDFtnih_w=;$1)Y7%5ujvmrmfGgN>zY z%h!>pv^-BV2kS%%4?SipJmeROxSWZbpofoct1P%_I`70=rty%wFE}#)AkOUR2Cmi+ zu4ZtCH@OJ6W^hLRa0X}KUCY*%{XZ92YXKM&o z3pm4zU4&Z;IHP{JfHQEgfHS{^wu$Cit-pXXG&ozp85*1|;0z7UNa4(fvz69ez!@bS z{A}EvWq7jtsz_y z3A%XKi%_qTRIeAO!U0}fxCw56eO`I!1!s>}9vgVB?+!U|ENi&zXoKIb7X5+Cvcls7USm?z?R zJc%gs6nSoF5TVLMtal@4tA~pEN4XJkCO*M7d6Lg3dVN+zhc!;NHJZ~E`*nAch@sx)(-nq1iT>Uw$X}meC z5t)WyHH5V}tRbU0tR=EB=NVuQYx9D|&fH5d9~LO@5QU0!SWD#E9M;|=YU|Bm4J^!I zjd5~wSewHd^G2+1#TxH^R;=+1WLe{h#j-`rdN(Glg_gDC?A+v?K|ayziy}I#ai*^E zj^T1TtkFJ=TtlLiV$_frRpUHAT)-MKpiI$euz)om*1)z8YecZl8p4jvXHhXvd06A^ zPMg@(pTe5Po5C8gX$V$*SewEcGMd6#A{$elKBllXEm-VKy#(`qf$|PD6x@ zKKg^lFP?w@*+y*(=a9@<|-Z{PfvRaN2M zj&g5~%%4WluYWU&{^Q7LMqhmK>n~`^S-8M)io1X!G_c|9}bqTy@UB(}%KOsfTT$X?><>&pIworh0OA;xV{BTz`P#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-JoPmL{#?!?yq~g}w+q>5uau9F`6zf^QC1md8#%bc<^vcO2mRU8R z=QqPg!jd#pwF? z-Ln|hF|af+bZA!cB`_&~nah7X_g60fhj4-Q^RosZ=Gi3w|u%uX)B>K^yBt6kmp*pX7w>Ax=celh3}8mNDbHzOl5nGQGCF9!nkGHFaxe_t~SB?#|Yu z_4sz@*6P~w)}yWM?kxk;+iMS&x-)OjnB>UJCQY~L`oPgOZSNLmr0dh2$4krWn`_5nsrH*KOnq!|b}!SI zW_x7Bgze_1OV3ue$*3kKo29W=CI3;6CmV`My?D2iJfL37%jF%?);KDUQFVWM*g-qwP?{idpyNR zqg?~4Z9md#?4m7S`_ZCOd+L|CuIlle8u8#>?ViWO6`>i=n8-d%XRyc^c}v^MqHnCU zy==T9zx+IUU8NA@NpV#wZjkiGGExFR$|_J)2wOlPo&Z{E_jvgjKtZ7&4-VcRU`x2)=fgj{Ew&sP?m& zE4vf2J7{LjgY1sS!xzEV?ox7JpBL4BHgjcnG`oXh);!4WcszU&eC;kB_w{*E?PoJr zxuK+||01k0 zhVu8zJ@s5}q9txc!@7UC^n6&c&nnI^)=>VI$sWmlw8Y(LShoa<&HpUE^`}LpZu5u#1J#Kys``FM zwc-(VF0QGu_#EZBnxov);L5rcV&>sc(tANW?otd@o~nOkIOfrTw@j zaa#j%vt#7*?=q{C+JbNu!Bv!S6~R>mS5d+hWy6&R+w_@=;3|SEe1phv6~R>mR}pjX z8*8Ml!KiiGk82X6)sLBt@5;kdbW$^1g>V%nT!nBI!c~}XMcHuW!8U!SLbwXy3f~|! zT!nBI!d1xp`^FlnYcOh^_T!qwX!T=eWtQ;KDKD z8J$UeZ23UTTw0T_OJfY8Ys`F|Xk>L0rj9;wFhhr44C)QDHM(;;nAaIwPPGQMGkVz9 zAGESztbt~Z;xoZIn|x1rNzWOu6OXBjU~_*&&4aD|ngiu~CG{4sbJiRe9VcE8UuMm4 zcjO5K?i?yIs6cRLl<0IYuROL4H%5WrE~AirMapuAA~#Xhc9d|(nXnVV9cZ`%4R?ny z;m)XcOcMLbwABcc9_!5GLFiJ%>BaqT{0V#0x^W3*qj_6G~oHY0n-+ zY#Hv1N~H>E@vv&~okg{qC~sTC9cRlrXU2|(JFtm5&x0-OFv6Xww|Jei>9|pUxYKYa zr%7{8;XHNZt&X`K>pWA`kF{oWD$TpJRqCqi>8t7zuQ^4ZI_Oz|)=kJiS{nTtMGHm8 z4zRT^rNL(qUqut;vuba04ew2kwI1svQ`8TRGJ2HeT^cHN)pZk&c*!U_)IqNTG;JbE zI6{{UM;U}2N`ucJf+M4a_6FDR-r!j4vCc3>{op90J89mfl~Pw-AK{2se4;lUbSXf) zCgdLv<@1C77>+UsJCp{WK?p}i^X$#7;k~)B)?=Msiuzey$!k#2NvygK!jXm}bftsV z1ZdPmqEYkcR>SDe0e(nbYF9Me7)|4Mttc^||HGl=&);2I{%UP|>&a#;#h2+P!}MoR zSr=*UxkdBr@e~`yNOM0}oX`HJe~&sb(%kO}{*mBc3I1zQsl74v5B3xGq)eWEQDW+U D-=xHG literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Obsctale.xcf.meta b/Assets/Sprites/Obsctale.xcf.meta new file mode 100644 index 0000000..54659e6 --- /dev/null +++ b/Assets/Sprites/Obsctale.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da07059242b0215419c92a4192d4fd91 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player.png b/Assets/Sprites/Player.png new file mode 100644 index 0000000000000000000000000000000000000000..af90652e36dd903597f03f10644a15e1ab055481 GIT binary patch literal 1738 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 b37NxgbcYvyQ}=>@;u-q>OMU2jCn58{`>B9J literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Player.xcf.meta b/Assets/Sprites/Player.xcf.meta new file mode 100644 index 0000000..30f3bfa --- /dev/null +++ b/Assets/Sprites/Player.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe3105937f22d104fb12916406db14dd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ae52db9..4654e13 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,57 +1,62 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e34e740..1626a4b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: GMTKGameJam2020 + companyName: GregorySoup + productName: Gun Control defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -259,7 +259,14 @@ PlayerSettings: androidGamepadSupportLevel: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 5c9800fd4ef9e33469a34c4b330cdfbd, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsJobs: