From 641a8bc46d791c3a637b410bb19267b149d64db9 Mon Sep 17 00:00:00 2001 From: Denis NUTIU Date: Sat, 31 Aug 2019 11:43:29 +0300 Subject: [PATCH] Change ExitDoor sprite --- .../Items/ExitDoor.prefab} | 133 +++++++++++------- .../Items/ExitDoor.prefab.meta} | 0 Assets/Scripts/src/Helpers/PrefabAtlas.cs | 2 + Assets/Scripts/src/Wall/DestructibleWall.cs | 6 +- Assets/Sprites/Ammo/ice_door.png | Bin 0 -> 563 bytes Assets/Sprites/Ammo/ice_door.png.meta | 110 +++++++++++++++ 6 files changed, 198 insertions(+), 53 deletions(-) rename Assets/{DevMocks/Resources/DevMocks/exitDoorPrefab.prefab => Resources/Items/ExitDoor.prefab} (73%) rename Assets/{DevMocks/Resources/DevMocks/exitDoorPrefab.prefab.meta => Resources/Items/ExitDoor.prefab.meta} (100%) create mode 100644 Assets/Sprites/Ammo/ice_door.png create mode 100644 Assets/Sprites/Ammo/ice_door.png.meta diff --git a/Assets/DevMocks/Resources/DevMocks/exitDoorPrefab.prefab b/Assets/Resources/Items/ExitDoor.prefab similarity index 73% rename from Assets/DevMocks/Resources/DevMocks/exitDoorPrefab.prefab rename to Assets/Resources/Items/ExitDoor.prefab index 469ff13..36052ef 100644 --- a/Assets/DevMocks/Resources/DevMocks/exitDoorPrefab.prefab +++ b/Assets/Resources/Items/ExitDoor.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3243993883904879596} - - component: {fileID: 3212428174306319952} - component: {fileID: 3858379993772342456} - component: {fileID: 1949159407646367785} m_Layer: 0 @@ -27,60 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1538214466168189615} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.299996, y: -4.6040254, z: -0.13553935} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 4532808296901133986} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3212428174306319952 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1538214466168189615} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ac1b266a61f9d43feb33de3a91647f99, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.32, y: 0.32} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!114 &3858379993772342456 MonoBehaviour: m_ObjectHideFlags: 0 @@ -119,3 +71,82 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.1, y: 0.8} m_EdgeRadius: 0 +--- !u!1 &3021161452740670333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4532808296901133986} + - component: {fileID: 191386183797221936} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4532808296901133986 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3021161452740670333} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3243993883904879596} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &191386183797221936 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3021161452740670333} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 7f28d6dcaa824294aa07212b8b0f9bc5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/DevMocks/Resources/DevMocks/exitDoorPrefab.prefab.meta b/Assets/Resources/Items/ExitDoor.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/exitDoorPrefab.prefab.meta rename to Assets/Resources/Items/ExitDoor.prefab.meta diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index 64ad272..3a60a86 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -31,6 +31,8 @@ namespace src.Helpers Resources.Load("Items/Bomb"); public static readonly GameObject BombExplosion = Resources.Load("Items/BombExplosion"); + public static readonly GameObject ExitDoor = + Resources.Load("Items/ExitDoor"); /* Enemies */ public static readonly GameObject GreenEnemy = Resources.Load("Enemies/SnowEnemyRandom"); diff --git a/Assets/Scripts/src/Wall/DestructibleWall.cs b/Assets/Scripts/src/Wall/DestructibleWall.cs index 7580ebc..47aac6e 100644 --- a/Assets/Scripts/src/Wall/DestructibleWall.cs +++ b/Assets/Scripts/src/Wall/DestructibleWall.cs @@ -11,12 +11,14 @@ namespace src.Wall private bool _spawnExit; private bool _spawnUpgrade; private UpgradeManager _upgradeManager; - public GameObject explosionPrefab; - public GameObject exitDoorPrefab; + private GameObject explosionPrefab; + private GameObject exitDoorPrefab; private void Start() { _upgradeManager = GameManager.instance.GetUpgradeManager(); + explosionPrefab = PrefabAtlas.BombExplosion; + exitDoorPrefab = PrefabAtlas.ExitDoor; } public void SpawnsExit() diff --git a/Assets/Sprites/Ammo/ice_door.png b/Assets/Sprites/Ammo/ice_door.png new file mode 100644 index 0000000000000000000000000000000000000000..6915e36faf7cac180c9f2595d1df0e87191144df GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR9JeRp$(GzEh_Kz!70T;KQ zt!nu|1}h+C?sfr}xxFnRV+GigPJ#pHGZ2E)^HLSW3Y2LWUZ(OKaN#fazQ~ILT;mpY zD-hES>Mo#6%M@5|`}cMQ$Vb8?@veE7hBS6*;ifs4biEx`z>V9_mnrc4-r@COcu}dk zfEI8qFEV_7bbf$=tIh3yd#;mJbvw8VXeQWkZa#$OK@fgv$Vf5H?~3rYKy#AmJBNLT z04*HwyI?FFaBf5Um(Y~vUeESlH}wya zso<^+{+ur6Ndin$2?2c7G{Ej?W{Y|9^Iyg!_6vltbv!$<82A7H002ovPDHLkV1fX$ B1Q7rL literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Ammo/ice_door.png.meta b/Assets/Sprites/Ammo/ice_door.png.meta new file mode 100644 index 0000000..4618196 --- /dev/null +++ b/Assets/Sprites/Ammo/ice_door.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 7f28d6dcaa824294aa07212b8b0f9bc5 +TextureImporter: + fileIDToRecycleName: {} + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 6 + 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: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ccc5de5a9d6fee444af0b231cc93c724 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: