From fc927849350a3d66b3b4531226e749b1ff10f9e4 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Sun, 5 Jul 2020 15:27:29 -0400 Subject: [PATCH] Updated and cleaned up battle UI buttons --- Assets/Scenes/Battle Scene.unity | 16 ++--- Assets/Textures/AttackButton.png | Bin 0 -> 2196 bytes Assets/Textures/AttackButton.png.meta | 92 ++++++++++++++++++++++++++ Assets/Textures/AttackButton.xcf | Bin 0 -> 15618 bytes Assets/Textures/AttackButton.xcf.meta | 7 ++ Assets/Textures/BackButton.png | Bin 0 -> 3458 bytes Assets/Textures/BackButton.png.meta | 92 ++++++++++++++++++++++++++ Assets/Textures/BackButton.xcf | Bin 0 -> 9666 bytes Assets/Textures/BackButton.xcf.meta | 7 ++ 9 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 Assets/Textures/AttackButton.png create mode 100644 Assets/Textures/AttackButton.png.meta create mode 100644 Assets/Textures/AttackButton.xcf create mode 100644 Assets/Textures/AttackButton.xcf.meta create mode 100644 Assets/Textures/BackButton.png create mode 100644 Assets/Textures/BackButton.png.meta create mode 100644 Assets/Textures/BackButton.xcf create mode 100644 Assets/Textures/BackButton.xcf.meta diff --git a/Assets/Scenes/Battle Scene.unity b/Assets/Scenes/Battle Scene.unity index 4f662ad..bf83f99 100644 --- a/Assets/Scenes/Battle Scene.unity +++ b/Assets/Scenes/Battle Scene.unity @@ -2343,7 +2343,7 @@ GameObject: - component: {fileID: 1118546611} - component: {fileID: 1118546610} m_Layer: 0 - m_Name: AttackButtonDraft + m_Name: AttackButton m_TagString: Attack m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2411,10 +2411,10 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 2135489387 - m_SortingLayer: 4 + m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 6442883602cf18344bb38a8968f559db, type: 3} + m_Sprite: {fileID: 21300000, guid: 3d8bea12ecf6cbf40bf36752f77e95f2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -4176,12 +4176,12 @@ GameObject: - component: {fileID: 1635882675} - component: {fileID: 1635882674} m_Layer: 0 - m_Name: RestartButtonDraft + m_Name: RestartButton m_TagString: Restart m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!61 &1635882674 BoxCollider2D: m_ObjectHideFlags: 0 @@ -5390,7 +5390,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 3d745de936925b147ba76d79bffc9e88, type: 3} + m_Sprite: {fileID: 21300000, guid: 073c0e9fa00ae1a4bbf546001b5d011e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -5409,7 +5409,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968165634} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.5, y: 1.5, z: 0} + m_LocalPosition: {x: -7.5, y: 0, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Textures/AttackButton.png b/Assets/Textures/AttackButton.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6bcbf40970d65b666cc6e30124f5e1707e0c43 GIT binary patch literal 2196 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 literal 0 HcmV?d00001 diff --git a/Assets/Textures/AttackButton.xcf.meta b/Assets/Textures/AttackButton.xcf.meta new file mode 100644 index 0000000..c0900cd --- /dev/null +++ b/Assets/Textures/AttackButton.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d2cc3c68203f9da4d85fb1e98d6fdbf4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/BackButton.png b/Assets/Textures/BackButton.png new file mode 100644 index 0000000000000000000000000000000000000000..bff7d906f49f445e585126fd5b7ef8a34d162361 GIT binary patch literal 3458 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 V74o1xhbfdUFwim8F4J_p_BU7^Q_}zd literal 0 HcmV?d00001 diff --git a/Assets/Textures/BackButton.png.meta b/Assets/Textures/BackButton.png.meta new file mode 100644 index 0000000..a494257 --- /dev/null +++ b/Assets/Textures/BackButton.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 073c0e9fa00ae1a4bbf546001b5d011e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/BackButton.xcf b/Assets/Textures/BackButton.xcf new file mode 100644 index 0000000000000000000000000000000000000000..acb4da43d5f0bce58573091c7b358b86728c45d9 GIT binary patch literal 9666 zcmeI2O>Y~=9mdC!?AUs-Wm~rF*j84Q6iIPNEh$kX6`8hUIjMj+F>1R>TQtCOxug~m zNr9wagaV;^F5t_cy#&YyXnw%q23L$!s#24IQ`yNDxAQPw_#FzQGdmyY`tr|iWmUehT$O$WsS*E;gS^3_L`b?bpwZ}_$9mFZ-{p0>QI zTPyn2@|Ed(cVCNVr?2Mwm)jNd{g$=dbjnuMsd!gnHy`<>#40bHc-3zcT^yyVroThizuOK>Qr|cy=y_C#YNqZ@sT}s;f)a9M;I%QT}+$S{fx8gP2 zy1&sxGh_K1bq}{LS`Yo^n)UkXt=k8=!W&+-+*~{G4d3>Qj7}$0`&|6zUZb{tpT_Q0 z{bnpbzfb&~TB-TasiW8E+)5>qc4EJterM|@v3%0bEM(_$$$jqg%V(-{d#%>2CGIu6 z`i)wp;#JX*1NHJdm5l`3k+^<)6@8o7^>^UV3k^~i6xM~z#z5-T`DmbLI~g}wa^h(>wHROU(u?t&mn_ATsmy#~VLn+}Ou5f^ zn}&IAu9t(+`8p?D{=n9Z8B4Rzc)^Ej9_A8GU2!`dPiF4!HFa%u`syytP0ptZiv>Fy z&n~+7DV@bMe##VnPbZlv6jQ}?I_2%{?yb6C_N&f%bilAPi|9;u!A_+Y3tqgG;y@|D za4tPxh!<>o!Obmt8Q0r&GFaVcx{2!>8|%L7a9pGkoUzSg9c}q;)^=9r--;BPZ0D5&ZwBJX8_uRz=b0l& ze8130V^BNm;B9f23BcZsx9c#67krysr7u&HvhdO@QXvXM`P`U5)81nsp3(Nbz40Y)9 zP=`M<`iaqY`B&!n8>8QadeYo?#GD_MVfm=J{^&o#<8y2uwhQL?VsChS@wCw|L%sB# z(cc>Vz0nUswc7fTIsU}x=SIIW`i;@=LLDD4dLdLHTEp8?-=^r%IdN1khyk4vgE}dO zv@MS7IdMWK#ITNwllotT`5C&ZjSE^Iv{l6p|2^njSx{bE5M6KQ=^Eb8Y(Mz`o*!M%ce1@{W>72GSh zS8%W3UctSBdj72GShS8%W3UctSBdjR%(}1 zJJFrHA#zVAM?_X17CGG~mUORpMfZqheMnrv%SWsCuh{2?30kxS$gIYnNPTjUoxMxK#tlj&k8M3K})dD2S+UBSw=CMwa6MWhwLGP$RaX{Y$Bt`Dl&`gBE!fs zGL38_v4W64@Fm+U2j;Yq@qghvUl5}qYm zB7>G-pAU{$%Cn4OG;5JN!IYyq5Yvda_N8XWpdd5WOQw3UF-18E~H<_?Y5GxV&FEe z!R@w^t|H&I-@Us>LJMEEt;5%J>)2<)3TS~g2jn0<&VeE%$w3oI(XGj} z8LSuwJ0`%9N$_MU;0oFtFov8#n*-*c%?DDnH{eP)s%i88+SuOby_u^bTpi&m30F(F zYQohMuA*=?Wge?4X{@f~@P*kLS`l1_;CcktCAdDpbqcOmaNUCI7l>Dg$C^fuGV#F* z09OLIBEXdat`KmgfGY-wmx#wILXR}@&*Y~~)b@8Twf#NJH){>oy7NWZ{>r4bzdre1 zkN0>+8LG9v>8R~*J-*N5{hd*UFMHo{$2!$Mzr(36ogpt{Y;b&pV`SKj5sr^RthkwR z(dP*G@5d6T~eJs;*fYxDg3#K5bL`(C+TyI(ExY;X?x zQ~J|}S^j79xW#@ID)*hPFn`*JJqgcEeQ5MgM*k8j_nkV(PnfugkHhm5pBgp)KV{-; zbNsE*??atDZgk9O!f4*;n?~O?S~dE<(I-YfH2Sg8PmO+I^lPKv8vQ=hspCe+j3$ic xjlOC0U87Z_?;Cv*s^FhCoJi7