From ce68587d3ca63e25e727c8936e34277aaf303079 Mon Sep 17 00:00:00 2001 From: teascade Date: Wed, 14 Aug 2019 21:00:55 +0300 Subject: [PATCH] Make Vending Machine graphics --- Assets/Graphics/Animations/Player.meta | 8 + .../{ => Player}/PlayerBodyAnim.controller | 0 .../PlayerBodyAnim.controller.meta | 0 .../{ => Player}/PlayerHeadAnim.controller | 0 .../PlayerHeadAnim.controller.meta | 0 .../{ => Player}/PlayerHeadDown.anim | 0 .../{ => Player}/PlayerHeadDown.anim.meta | 0 .../{ => Player}/PlayerHeadRight.anim | 0 .../{ => Player}/PlayerHeadRight.anim.meta | 0 .../Animations/{ => Player}/PlayerHeadUp.anim | 0 .../{ => Player}/PlayerHeadUp.anim.meta | 0 .../{ => Player}/PlayerHorizontalBody.anim | 0 .../PlayerHorizontalBody.anim.meta | 0 .../{ => Player}/PlayerVerticalBody.anim | 0 .../{ => Player}/PlayerVerticalBody.anim.meta | 0 .../{Tilesets.meta => Environment.meta} | 0 .../OfficeSupplies.png | Bin .../OfficeSupplies.png.meta | 0 .../{Tilesets => Environment}/Tileset.png | Bin .../Tileset.png.meta | 0 .../Graphics/Environment/VendingMachine.png | Bin 0 -> 1134 bytes .../Environment/VendingMachine.png.meta | 259 ++++++++++++++++++ Assets/Prefabs/Vending Machine.prefab | 41 ++- Assets/Scenes/MainScene.unity | 5 + Assets/Scripts/Environment/VendingMachine.cs | 19 +- Raw Assets/VendingMachine.xcf | Bin 0 -> 48528 bytes 26 files changed, 323 insertions(+), 9 deletions(-) create mode 100644 Assets/Graphics/Animations/Player.meta rename Assets/Graphics/Animations/{ => Player}/PlayerBodyAnim.controller (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerBodyAnim.controller.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadAnim.controller (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadAnim.controller.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadDown.anim (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadDown.anim.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadRight.anim (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadRight.anim.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadUp.anim (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHeadUp.anim.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHorizontalBody.anim (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerHorizontalBody.anim.meta (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerVerticalBody.anim (100%) rename Assets/Graphics/Animations/{ => Player}/PlayerVerticalBody.anim.meta (100%) rename Assets/Graphics/{Tilesets.meta => Environment.meta} (100%) rename Assets/Graphics/{Tilesets => Environment}/OfficeSupplies.png (100%) rename Assets/Graphics/{Tilesets => Environment}/OfficeSupplies.png.meta (100%) rename Assets/Graphics/{Tilesets => Environment}/Tileset.png (100%) rename Assets/Graphics/{Tilesets => Environment}/Tileset.png.meta (100%) create mode 100644 Assets/Graphics/Environment/VendingMachine.png create mode 100644 Assets/Graphics/Environment/VendingMachine.png.meta create mode 100644 Raw Assets/VendingMachine.xcf diff --git a/Assets/Graphics/Animations/Player.meta b/Assets/Graphics/Animations/Player.meta new file mode 100644 index 0000000..7c97e74 --- /dev/null +++ b/Assets/Graphics/Animations/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b44c3b74dc3e5246bf6e0c89ce2e8c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Animations/PlayerBodyAnim.controller b/Assets/Graphics/Animations/Player/PlayerBodyAnim.controller similarity index 100% rename from Assets/Graphics/Animations/PlayerBodyAnim.controller rename to Assets/Graphics/Animations/Player/PlayerBodyAnim.controller diff --git a/Assets/Graphics/Animations/PlayerBodyAnim.controller.meta b/Assets/Graphics/Animations/Player/PlayerBodyAnim.controller.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerBodyAnim.controller.meta rename to Assets/Graphics/Animations/Player/PlayerBodyAnim.controller.meta diff --git a/Assets/Graphics/Animations/PlayerHeadAnim.controller b/Assets/Graphics/Animations/Player/PlayerHeadAnim.controller similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadAnim.controller rename to Assets/Graphics/Animations/Player/PlayerHeadAnim.controller diff --git a/Assets/Graphics/Animations/PlayerHeadAnim.controller.meta b/Assets/Graphics/Animations/Player/PlayerHeadAnim.controller.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadAnim.controller.meta rename to Assets/Graphics/Animations/Player/PlayerHeadAnim.controller.meta diff --git a/Assets/Graphics/Animations/PlayerHeadDown.anim b/Assets/Graphics/Animations/Player/PlayerHeadDown.anim similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadDown.anim rename to Assets/Graphics/Animations/Player/PlayerHeadDown.anim diff --git a/Assets/Graphics/Animations/PlayerHeadDown.anim.meta b/Assets/Graphics/Animations/Player/PlayerHeadDown.anim.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadDown.anim.meta rename to Assets/Graphics/Animations/Player/PlayerHeadDown.anim.meta diff --git a/Assets/Graphics/Animations/PlayerHeadRight.anim b/Assets/Graphics/Animations/Player/PlayerHeadRight.anim similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadRight.anim rename to Assets/Graphics/Animations/Player/PlayerHeadRight.anim diff --git a/Assets/Graphics/Animations/PlayerHeadRight.anim.meta b/Assets/Graphics/Animations/Player/PlayerHeadRight.anim.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadRight.anim.meta rename to Assets/Graphics/Animations/Player/PlayerHeadRight.anim.meta diff --git a/Assets/Graphics/Animations/PlayerHeadUp.anim b/Assets/Graphics/Animations/Player/PlayerHeadUp.anim similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadUp.anim rename to Assets/Graphics/Animations/Player/PlayerHeadUp.anim diff --git a/Assets/Graphics/Animations/PlayerHeadUp.anim.meta b/Assets/Graphics/Animations/Player/PlayerHeadUp.anim.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerHeadUp.anim.meta rename to Assets/Graphics/Animations/Player/PlayerHeadUp.anim.meta diff --git a/Assets/Graphics/Animations/PlayerHorizontalBody.anim b/Assets/Graphics/Animations/Player/PlayerHorizontalBody.anim similarity index 100% rename from Assets/Graphics/Animations/PlayerHorizontalBody.anim rename to Assets/Graphics/Animations/Player/PlayerHorizontalBody.anim diff --git a/Assets/Graphics/Animations/PlayerHorizontalBody.anim.meta b/Assets/Graphics/Animations/Player/PlayerHorizontalBody.anim.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerHorizontalBody.anim.meta rename to Assets/Graphics/Animations/Player/PlayerHorizontalBody.anim.meta diff --git a/Assets/Graphics/Animations/PlayerVerticalBody.anim b/Assets/Graphics/Animations/Player/PlayerVerticalBody.anim similarity index 100% rename from Assets/Graphics/Animations/PlayerVerticalBody.anim rename to Assets/Graphics/Animations/Player/PlayerVerticalBody.anim diff --git a/Assets/Graphics/Animations/PlayerVerticalBody.anim.meta b/Assets/Graphics/Animations/Player/PlayerVerticalBody.anim.meta similarity index 100% rename from Assets/Graphics/Animations/PlayerVerticalBody.anim.meta rename to Assets/Graphics/Animations/Player/PlayerVerticalBody.anim.meta diff --git a/Assets/Graphics/Tilesets.meta b/Assets/Graphics/Environment.meta similarity index 100% rename from Assets/Graphics/Tilesets.meta rename to Assets/Graphics/Environment.meta diff --git a/Assets/Graphics/Tilesets/OfficeSupplies.png b/Assets/Graphics/Environment/OfficeSupplies.png similarity index 100% rename from Assets/Graphics/Tilesets/OfficeSupplies.png rename to Assets/Graphics/Environment/OfficeSupplies.png diff --git a/Assets/Graphics/Tilesets/OfficeSupplies.png.meta b/Assets/Graphics/Environment/OfficeSupplies.png.meta similarity index 100% rename from Assets/Graphics/Tilesets/OfficeSupplies.png.meta rename to Assets/Graphics/Environment/OfficeSupplies.png.meta diff --git a/Assets/Graphics/Tilesets/Tileset.png b/Assets/Graphics/Environment/Tileset.png similarity index 100% rename from Assets/Graphics/Tilesets/Tileset.png rename to Assets/Graphics/Environment/Tileset.png diff --git a/Assets/Graphics/Tilesets/Tileset.png.meta b/Assets/Graphics/Environment/Tileset.png.meta similarity index 100% rename from Assets/Graphics/Tilesets/Tileset.png.meta rename to Assets/Graphics/Environment/Tileset.png.meta diff --git a/Assets/Graphics/Environment/VendingMachine.png b/Assets/Graphics/Environment/VendingMachine.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0d439c6b68e3f6b04cb28ffaeb7f4d1f4ab670 GIT binary patch literal 1134 zcmV-!1d;oRP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Y)ZL_t(|+U=abOXFY|#~(wm zH=W>col-^L& zOX8cKP2Rxe^MOG6CVfAT!q>M?5-S1#002-sR($)j3f=heSK_z*Bgep1ONyC0096X000C4fB*mx00062KmY*#OL!Itf35w2XMvPbpU&EJoWSd` zQj4*%=KM4`p*iv6ugY)hPT1?6iHOK>GKwuIT-;WpDZhI^wR8B7C4nEmDZix?3@0Pm zzaGhn`)^#g?;jHp*}opiUhhoydS|kKJ)a|dED8MhP5Lcex=vh?en(``ZOVx|Pfrx# zBD~@U-R9!`X~B=*v_JAHkS85zX6z4uAAgnp$N+dr@-HK4 z7*0kqoQwiRR!WUN%=F91J&(|$Ydu3J%Z5s^u|E#r1O z)nzdJ_)Yl(O|Z8_j0=)x1wVe%emklNKSvSIZd{g7D1Q7V{dQ7w;mJLjznJhb57%{N zV`C#QHl0r8`T1EoolffF@Z&GrAN&6RI)S%;sg$-T5s~e;J6RuI%FD~kV#@=5{AK&? zEb^#j=*V&8$Z-Pae*GfS+TG2)G~vf@!fz!_t}84&9!}!xyU5#g`Oky+@t5tl;?kG5 z*w&$vZ$H%1>Bo=1Y`rmv+W_K~Ry1Kgb@`oRP z(f-&bII4)a;)-m7@Z&GrZ)FjrU9OgGg7D)v<+svKnv_a^;mbBb`0<Wa}VOUpJv`0<;aD)~w&}H06(S zmg!I9EZU#dnb*(PqeHDB06+i$>dL3DMKM9#*J9wuZ_>{S0JX-BNl0#%O)`G`ru>oj z0S*oha>;LQZVE{ze*7ljAU(=(-+`~Uy|07*qoM6N<$g44w% AbN~PV literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Environment/VendingMachine.png.meta b/Assets/Graphics/Environment/VendingMachine.png.meta new file mode 100644 index 0000000..38d0842 --- /dev/null +++ b/Assets/Graphics/Environment/VendingMachine.png.meta @@ -0,0 +1,259 @@ +fileFormatVersion: 2 +guid: 0aa113ac73f3394448b77e6c4c712232 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8265045834036228682 + second: VendingMachine_0 + - first: + 213: -7095097463981226713 + second: VendingMachine_1 + - first: + 213: -5872275606889041824 + second: VendingMachine_2 + - first: + 213: 6754790859930108749 + second: VendingMachine_3 + - first: + 213: 881297774068237510 + second: VendingMachine_4 + - first: + 213: 2570391356933361261 + second: VendingMachine_5 + externalObjects: {} + serializedVersion: 10 + 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: 0 + spritePivot: {x: 0.5, y: 0.5} + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: VendingMachine_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b1139409899aa5546b2d81a56fe5da62 + internalID: 8265045834036228682 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: VendingMachine_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 404763ca50085ad4fa1ee0c3b6187eb0 + internalID: -7095097463981226713 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: VendingMachine_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 81901f7e54bf4874d8c2f971ff55884d + internalID: -5872275606889041824 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: VendingMachine_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b5fbf5de5b451324e93170572c5ace83 + internalID: 6754790859930108749 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: VendingMachine_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 21b3f1c752ff88648b5cfc2964eecfde + internalID: 881297774068237510 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: VendingMachine_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c81afef4386e70940a8a7ed6d794f43c + internalID: 2570391356933361261 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6a6b28d52a426d84a848dacb0b72a50e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Vending Machine.prefab b/Assets/Prefabs/Vending Machine.prefab index 74f6a37..f0e3f9b 100644 --- a/Assets/Prefabs/Vending Machine.prefab +++ b/Assets/Prefabs/Vending Machine.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 11699643643052995} - component: {fileID: 11699643643052996} + - component: {fileID: 7530413041674808940} m_Layer: 0 m_Name: Placeholder m_TagString: Untagged @@ -26,7 +27,7 @@ Transform: m_GameObject: {fileID: 11699643643052994} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 3, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 11699643827672082} m_RootOrder: 0 @@ -69,7 +70,8 @@ SpriteRenderer: m_SortingLayerID: 106348079 m_SortingLayer: 3 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 472874229c563e241bddc073ec2dbb90, type: 3} + m_Sprite: {fileID: 8265045834036228682, guid: 0aa113ac73f3394448b77e6c4c712232, + type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -80,6 +82,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &7530413041674808940 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11699643643052994} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e29dc16ffb250b742820ca64a9b6886f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &11699643827672081 GameObject: m_ObjectHideFlags: 0 @@ -128,11 +149,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a80c0c53597a834e9decbeebcb08434, type: 3} m_Name: m_EditorClassIdentifier: + GunLaunchForceMultiplier: 3.5 + HoleTransform: {fileID: 11699643844798483} GunsLeft: 3 PossibleGuns: - {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} - GunLaunchForceMultiplier: 3.5 - HoleTransform: {fileID: 11699643844798483} + Sprite: {fileID: 11699643643052996} + Sprites: + - {fileID: 2570391356933361261, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} + - {fileID: 881297774068237510, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} + - {fileID: 6754790859930108749, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} + - {fileID: -5872275606889041824, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} + - {fileID: -7095097463981226713, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} + - {fileID: 8265045834036228682, guid: 0aa113ac73f3394448b77e6c4c712232, type: 3} DebugExpelGun: 0 --- !u!50 &11699643827672084 Rigidbody2D: @@ -168,7 +197,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.014128566, y: -0.004709959} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -179,7 +208,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1.4901962} + m_Size: {x: 0.8587153, y: 1.7821851} m_EdgeRadius: 0 --- !u!114 &11699643827672086 MonoBehaviour: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 26d81de..d930c85 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -109387,6 +109387,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 11699643643052994, guid: 254d8b252b63a6547810dd3729ddc91b, + type: 3} + propertyPath: m_Name + value: Graphic + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 254d8b252b63a6547810dd3729ddc91b, type: 3} --- !u!1001 &592487111117925280 diff --git a/Assets/Scripts/Environment/VendingMachine.cs b/Assets/Scripts/Environment/VendingMachine.cs index 3792fa7..237b8fa 100644 --- a/Assets/Scripts/Environment/VendingMachine.cs +++ b/Assets/Scripts/Environment/VendingMachine.cs @@ -1,21 +1,33 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Animations; using Saltosion.OneWeapon.Guns; using Saltosion.OneWeapon.Utils; namespace Saltosion.OneWeapon.Environment { public class VendingMachine : MonoBehaviour { + [Header("General")] + public float GunLaunchForceMultiplier = 1; + public Transform HoleTransform; + + [Header("Gunstuff")] public int GunsLeft = 3; public List PossibleGuns = new List(); - public float GunLaunchForceMultiplier = 1; - - public Transform HoleTransform; + [Header("Graphics")] + public SpriteRenderer Sprite; + public List Sprites = new List(); + [Header("Debug")] public bool DebugExpelGun = false; + void Start() { + GunsLeft = Mathf.Clamp(GunsLeft, 0, 5); + Sprite.sprite = Sprites[GunsLeft]; + } + void Update() { if (DebugExpelGun) { ExpelGun(); @@ -35,6 +47,7 @@ namespace Saltosion.OneWeapon.Environment { Body.AddForce(DownwardForce + SidewaysForce, ForceMode2D.Impulse); } GunsLeft -= 1; + Sprite.sprite = Sprites[GunsLeft]; if (GunsLeft == 0) { Destroy(this); } diff --git a/Raw Assets/VendingMachine.xcf b/Raw Assets/VendingMachine.xcf new file mode 100644 index 0000000000000000000000000000000000000000..044c31bc766b93bcdd7fe6e5dbfbc014ccc32efc GIT binary patch literal 48528 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 literal 0 HcmV?d00001