| Assets/Prefabs/Ore/IronOrePickup.prefab | ●●●●● patch | view | raw | blame | history | |
| Assets/Scenes/GameplayScene.unity | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/Managers/GameManager.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/Pickup.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/PlayerController.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Sprites/Ore.meta | ●●●●● patch | view | raw | blame | history | |
| Assets/Sprites/Ore/IronOre.png | patch | view | raw | blame | history | |
| Assets/Sprites/Ore/IronOre.png.meta | ●●●●● patch | view | raw | blame | history | |
| Assets/Sprites/sprite_atlas.spriteatlasv2 | ●●●●● patch | view | raw | blame | history |
Assets/Prefabs/Ore/IronOrePickup.prefab
@@ -12,6 +12,7 @@ - component: {fileID: 1402301655574187689} - component: {fileID: 7365313445004679860} - component: {fileID: 7542207600701139278} - component: {fileID: 4218649777792693614} m_Layer: 10 m_Name: IronOrePickup m_TagString: Untagged @@ -31,7 +32,8 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.75, y: 0.75, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] m_Children: - {fileID: 5127692608686646361} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1402301655574187689 @@ -75,7 +77,7 @@ m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: e4f16322cf13bfe45be37ce9446c921c, type: 3} m_Sprite: {fileID: 21300000, guid: f50e6fb94d4860344ba0425b09fb0ef8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -116,7 +118,117 @@ m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 m_Bits: 128 m_LayerOverridePriority: 0 m_ForceSendLayers: serializedVersion: 2 m_Bits: 4294967295 m_ForceReceiveLayers: serializedVersion: 2 m_Bits: 4294967295 m_ContactCaptureLayers: serializedVersion: 2 m_Bits: 4294967295 m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.5 --- !u!50 &4218649777792693614 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2334861655815823944} m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 m_Bits: 128 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 --- !u!1 &6159761526896924523 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 5127692608686646361} - component: {fileID: 1527558536165589641} - component: {fileID: 5133974203632430370} m_Layer: 10 m_Name: Collider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &5127692608686646361 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6159761526896924523} serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3069410814361871794} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1527558536165589641 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6159761526896924523} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fa7fec04fbeb92a41b697f2f020a7618, type: 3} m_Name: m_EditorClassIdentifier: healthRestore: 20 spinRotatationSpeed: {x: 0, y: 180, z: 0} soundName: 4 --- !u!58 &5133974203632430370 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6159761526896924523} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 m_Bits: 128 m_LayerOverridePriority: 0 m_ForceSendLayers: serializedVersion: 2 Assets/Scenes/GameplayScene.unity
@@ -4512,25 +4512,25 @@ e33: 0 - m_RefCount: 0 m_Data: e00: 5.0497e-41 e00: 0 e01: 0 e02: 5.5000076 e03: 5.5000076 e02: 1.616307e-38 e03: 1.616307e-38 e10: 0 e11: 0 e12: 5.55e-43 e13: 5.55e-43 e20: 0.000116169685 e21: 8.914042e-18 e22: -8.137887e-29 e23: -1.1375036e-19 e12: 6.99e-43 e13: 6.99e-43 e20: -464782340 e21: 4.8868747e+30 e22: -7.2632837e-29 e23: -1.1956524e-19 e30: 4.5904e-41 e31: 5.58e-43 e32: 5.55e-43 e33: 5.58e-43 e31: 7.02e-43 e32: 6.99e-43 e33: 7.02e-43 m_TileColorArray: - m_RefCount: 0 m_Data: {r: 4.2084e-41, g: 4.2084e-41, b: 4.2084e-41, a: 4.2084e-41} m_Data: {r: 4.2134e-41, g: 4.2134e-41, b: 4.2134e-41, a: 4.2134e-41} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} Assets/Scripts/Managers/GameManager.cs
@@ -139,7 +139,8 @@ cellWorldPosition.y += 0.5f; if (tileGameObject?.GetComponent<Dropable>()?.isDropable ?? false) { Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform); // Change no drops, only inventory //Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform); //Debug.Log(.name); } Assets/Scripts/Pickup.cs
@@ -24,7 +24,7 @@ if (damageable.Heal(healthRestore)) { SoundManager.instance.PlaySoundAtPoint(gameObject, soundName); Destroy(gameObject); Destroy(transform.parent.gameObject); } } } Assets/Scripts/PlayerController.cs
@@ -1,6 +1,7 @@ using Assets.Scripts.Enums; using Assets.Scripts.Helpers; using System; using System.Linq; using UnityEngine; using UnityEngine.InputSystem; @@ -301,9 +302,9 @@ break; } //Debug.Log(contactPoints[0].otherRigidbody?.gameObject.name); if (contactPoints[0].otherRigidbody?.name == "Tilemap") if (contactPoints.Any(x => x.otherRigidbody?.name == "Tilemap")) { CharacterEvents.characterDrill.Invoke(contactPoints[0], drillDirection); CharacterEvents.characterDrill.Invoke(contactPoints.Single(x => x.otherRigidbody?.name == "Tilemap"), drillDirection); } }
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: d463b62d71b878e4f8b75b04fde7f8b0 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Assets/Sprites/Ore/IronOre.png
New file @@ -0,0 +1,127 @@ fileFormatVersion: 2 guid: f50e6fb94d4860344ba0425b09fb0ef8 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 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 flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 filterMode: 0 aniso: 1 mipBias: 0 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: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: Assets/Sprites/sprite_atlas.spriteatlasv2
@@ -14,4 +14,5 @@ - {fileID: 2800000, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3} - {fileID: 2800000, guid: 118553c8864a2bf4abaf757c357494e5, type: 3} - {fileID: 2800000, guid: 83ee72e0f385a7641b729c9f5c288e74, type: 3} - {fileID: 2800000, guid: f50e6fb94d4860344ba0425b09fb0ef8, type: 3} m_IsVariant: 0
