From 5113bab98a8ef3db01e810e414186e59056571c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= Date: Fri, 9 Aug 2019 20:55:35 +0300 Subject: [PATCH] Move DevMock enemies to Resources --- Assets/Animations/Enemies/SnowEnemy.anim | 8 +- .../Resources/DevMocks/DummyEnemy.prefab | 2 +- Assets/DevMocks/enemy1.png | Bin 515 -> 0 bytes Assets/DevMocks/enemy1.png.meta | 99 ------------------ ...umber.prefab => SnowEnemyCollision.prefab} | 4 +- ...ab.meta => SnowEnemyCollision.prefab.meta} | 0 .../Enemies/SnowEnemyRandom.prefab} | 4 +- .../Enemies/SnowEnemyRandom.prefab.meta} | 0 Assets/Scripts/src/Helpers/PrefabAtlas.cs | 4 +- Assets/Sprites/Enemies/snowenemy.png | Bin 944 -> 0 bytes Assets/Sprites/Enemies/snowenemyv2.png | Bin 0 -> 983 bytes ...nowenemy.png.meta => snowenemyv2.png.meta} | 20 ++-- 12 files changed, 21 insertions(+), 120 deletions(-) delete mode 100644 Assets/DevMocks/enemy1.png delete mode 100644 Assets/DevMocks/enemy1.png.meta rename Assets/Resources/Enemies/{Dumber.prefab => SnowEnemyCollision.prefab} (98%) rename Assets/Resources/Enemies/{Dumber.prefab.meta => SnowEnemyCollision.prefab.meta} (100%) rename Assets/{DevMocks/Resources/DevMocks/Dumb.prefab => Resources/Enemies/SnowEnemyRandom.prefab} (98%) rename Assets/{DevMocks/Resources/DevMocks/Dumb.prefab.meta => Resources/Enemies/SnowEnemyRandom.prefab.meta} (100%) delete mode 100644 Assets/Sprites/Enemies/snowenemy.png create mode 100644 Assets/Sprites/Enemies/snowenemyv2.png rename Assets/Sprites/Enemies/{snowenemy.png.meta => snowenemyv2.png.meta} (90%) diff --git a/Assets/Animations/Enemies/SnowEnemy.anim b/Assets/Animations/Enemies/SnowEnemy.anim index bca60f3..4c936ca 100644 --- a/Assets/Animations/Enemies/SnowEnemy.anim +++ b/Assets/Animations/Enemies/SnowEnemy.anim @@ -20,9 +20,9 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + value: {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3} - time: 0.16666667 - value: {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + value: {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3} attribute: m_Sprite path: classID: 212 @@ -42,8 +42,8 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} - - {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + - {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3} + - {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab b/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab index 7f9fa6d..0698252 100644 --- a/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab +++ b/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab @@ -162,7 +162,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 55fee6a02b8d5bc4e993261a717e89cc, type: 3} + m_Sprite: {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/DevMocks/enemy1.png b/Assets/DevMocks/enemy1.png deleted file mode 100644 index dd302f3115fe67c1cd7659da9ab4a6a5ddb5590a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmV+e0{s1nP)Px$y-7qtR9J=Wma%HWP!xuLi;LAk5Lyb+rQjf#SI8vYy7>;iMe!~24&B_OQ(hs0 zL%~IZB~l@S+D$v?3CYbpCpXpN;t!&jlly%+NlpUXa^;kY?$GQs4tX_;>DqW*qrxP# z*KZ?S?eO?;&whWre;Uh(8wuR&x8wiv;NfbQTEq7OQG^v}b{Yp2d`^5X&`M|pE)AC? zG6Ec&T1l}TO9XK>szgdag1@}|q!t!8K2iy4f_fkKPNK~y?(|WE0z(L!AWNgR6cvy*{ z^!Xaq*bA{c*rGewvXTH$w`u@R9RTDbw;c<VbNn0$Db#`aEK1LTyd8n;L@X+hZ2w}q zE|u9z0h~96xlv4TYCoVE#oW}&1Lw&m;qzIP9mRPP=Y)f61^z>VTCT!bflEqAa8ZCH z0P}ONLJ17~;gw7$0>lpyF$9&sg#("DevMocks/FlameUpgrade"); /* Enemies */ - public static readonly GameObject GreenEnemy = Resources.Load("Enemies/Dumber"); - public static readonly GameObject RedEnemy = Resources.Load("DevMocks/Dumb"); + public static readonly GameObject GreenEnemy = Resources.Load("Enemies/SnowEnemyRandom"); + public static readonly GameObject RedEnemy = Resources.Load("Enemies/SnowEnemyCollision"); } } \ No newline at end of file diff --git a/Assets/Sprites/Enemies/snowenemy.png b/Assets/Sprites/Enemies/snowenemy.png deleted file mode 100644 index b212f4e4885aeba019d0c2a543aab616c56b7ec2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmV;h15f;kP)Px&YDq*vRA_;WYMuohQO7$y0Fx&;;3Puu4+v zvLox(X8z}o>i)s24v!OnR!Qnzf;Mg&N&%R4iz&_m*f_rvNV6`}()`h}J&h*-?K}}q zM+*EdvP$xiXTNGCsmeN2@Czlt0(d#PPEuL{1>#LdHgC%S*;}{=+zsDe!uo`BRL`uB z`J>|w7K!S@e4W^kl@vj5GYrbv9OkH1x6dh{b zCSE?rHz*;QSI7XKfhy9f(Ih(5{NF5%{8-D=(mQ=YJ Si;n{U0000Px&kx4{BRA_Qz_XIJ+yhq2Ycv)C3k$Cw_P`E%A~TEy#49KE8Bw!=^n?eK$SbRwLfW zgBM=Tp($o=z#ui`8qqXD2vv!<_jR==6f@rf=W7w}yD_dVr+Me$k7>Tws-mjjO-;=_ zzVFzy|M+ECIZw!Th};LGHt6QqU}HbV^%$5X20Od00s)tFRk3vYt)LHUQ30Fiao@Wl z_&h+iFg$qek+AKxiz&t+H8e;K^#KAhLwbp++!l4)MU#>|{X=V!7JHDI5^m`fIOxU^ z0Bp9i`>ipe7ke>=CsPbhrX}}*>SNNE0n#|W{pyb3y6q%kHwv2xeZX7wH7idfuY^>D zeFZrrJKUEf7kgQ2!1XxXG^rT*R_=T)+n!gc!DJ!~*liVFbTq4~!B!ja8HlhK!`22( zXvOFA0~qbcgyYPF?|X4HYJ;}MhyX(!R_x{>9`G12YJ;xFkEEUw5&_LoxHU$EZd|zU z1GIS*;}F@2G%xXh=T&&+g0P&L{Jsz5dw-Ug{MfM*ORZ1*)#X%9@rM|-L4(u~uQ{{C zsJEaG+ZUw_7`2NjZV3R{d8-jwCI0oB7ABMONn){9E(ja%BHSDsZ12bTnHX#zWvyNP zkarHA0h0Lz11teMu$LH`0VUuj;`veMV%zJRhZ->X`tTCAOV~m6%4)<*=I49d?)&$* zhSXmAA!Fi-bUzu22I5So+8L2RJ2e0BBG9iD_)9{0TS5| z(R>~*zHaq_?8k~7@3y}1agbJC!p{w`XTER6d`F%O>VgA0@jmi=9<3=MnODdFy8>09 zRjouiRQy3Vjt;u9$U|dFD1NEq^p;2h)3$De8o;BMWItTi*B_sS;A^nGof5b