From 81cd20ceef1fe0bf230fa8ca6babf9f3f719f60b Mon Sep 17 00:00:00 2001 From: Damian Date: Mon, 8 Sep 2025 12:31:34 +0200 Subject: [PATCH] Created Prefab of BurgerBuns Pushing to test collisions in quarry level. --- Assets/Data/Items/BurgerBuns.asset | 18 +++++++ Assets/Data/Items/BurgerBuns.asset.meta | 8 +++ .../{Prefabs.meta => PrefabsPLACEHOLDER.meta} | 0 .../BurgerBun.prefab | 47 +++++++++++++++++ .../BurgerBun.prefab.meta | 0 .../ChocolateBar.prefab | 0 .../ChocolateBar.prefab.meta | 0 .../Football.prefab | 0 .../Football.prefab.meta | 0 .../HeadBand.prefab | 0 .../HeadBand.prefab.meta | 0 .../Nails.prefab | 0 .../Nails.prefab.meta | 0 Assets/Scenes/Levels/Quarry.unity | 50 ++++++++++++++++++- ProjectSettings/TagManager.asset | 2 +- 15 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 Assets/Data/Items/BurgerBuns.asset create mode 100644 Assets/Data/Items/BurgerBuns.asset.meta rename Assets/Prefabs/Items/{Prefabs.meta => PrefabsPLACEHOLDER.meta} (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/BurgerBun.prefab (67%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/BurgerBun.prefab.meta (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/ChocolateBar.prefab (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/ChocolateBar.prefab.meta (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/Football.prefab (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/Football.prefab.meta (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/HeadBand.prefab (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/HeadBand.prefab.meta (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/Nails.prefab (100%) rename Assets/Prefabs/Items/{Prefabs => PrefabsPLACEHOLDER}/Nails.prefab.meta (100%) diff --git a/Assets/Data/Items/BurgerBuns.asset b/Assets/Data/Items/BurgerBuns.asset new file mode 100644 index 00000000..6b842cc2 --- /dev/null +++ b/Assets/Data/Items/BurgerBuns.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: BurgerBuns + m_EditorClassIdentifier: + itemName: BurgerBuns + description: A pack of Burguer Buns, they need to be combined with the headband + to get "Bunfflers" + mapSprite: {fileID: 4273613496703388379, guid: 1d2396d3a6e78544083da828beb20888, type: 3} diff --git a/Assets/Data/Items/BurgerBuns.asset.meta b/Assets/Data/Items/BurgerBuns.asset.meta new file mode 100644 index 00000000..c41abbad --- /dev/null +++ b/Assets/Data/Items/BurgerBuns.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c6986639ca176a419c92f5a327d95ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Items/Prefabs.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER.meta diff --git a/Assets/Prefabs/Items/Prefabs/BurgerBun.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBun.prefab similarity index 67% rename from Assets/Prefabs/Items/Prefabs/BurgerBun.prefab rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBun.prefab index d3f01142..2e7b49df 100644 --- a/Assets/Prefabs/Items/Prefabs/BurgerBun.prefab +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBun.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 4092047856540417737} - component: {fileID: 1806322732885125293} + - component: {fileID: 4193152444221369720} m_Layer: 0 m_Name: BurgerBun m_TagString: Untagged @@ -87,3 +88,49 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &4193152444221369720 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1443463278548606047} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + 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_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.0042951107, y: -0.014317036} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.76, y: 0.75} + newSize: {x: 1.76, y: 0.75} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2.0148444, y: 1.0363426} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Items/Prefabs/BurgerBun.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBun.prefab.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs/BurgerBun.prefab.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBun.prefab.meta diff --git a/Assets/Prefabs/Items/Prefabs/ChocolateBar.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/ChocolateBar.prefab similarity index 100% rename from Assets/Prefabs/Items/Prefabs/ChocolateBar.prefab rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/ChocolateBar.prefab diff --git a/Assets/Prefabs/Items/Prefabs/ChocolateBar.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/ChocolateBar.prefab.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs/ChocolateBar.prefab.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/ChocolateBar.prefab.meta diff --git a/Assets/Prefabs/Items/Prefabs/Football.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/Football.prefab similarity index 100% rename from Assets/Prefabs/Items/Prefabs/Football.prefab rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/Football.prefab diff --git a/Assets/Prefabs/Items/Prefabs/Football.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/Football.prefab.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs/Football.prefab.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/Football.prefab.meta diff --git a/Assets/Prefabs/Items/Prefabs/HeadBand.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab similarity index 100% rename from Assets/Prefabs/Items/Prefabs/HeadBand.prefab rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab diff --git a/Assets/Prefabs/Items/Prefabs/HeadBand.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs/HeadBand.prefab.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab.meta diff --git a/Assets/Prefabs/Items/Prefabs/Nails.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/Nails.prefab similarity index 100% rename from Assets/Prefabs/Items/Prefabs/Nails.prefab rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/Nails.prefab diff --git a/Assets/Prefabs/Items/Prefabs/Nails.prefab.meta b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/Nails.prefab.meta similarity index 100% rename from Assets/Prefabs/Items/Prefabs/Nails.prefab.meta rename to Assets/Prefabs/Items/PrefabsPLACEHOLDER/Nails.prefab.meta diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 87c2ce11..8688e0b6 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -440946,7 +440946,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_Name - value: BurgerBun + value: BurgerBuns + objectReference: {fileID: 0} + - target: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} + propertyPath: m_Layer + value: 0 objectReference: {fileID: 0} - target: {fileID: 4092047856540417737, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} propertyPath: m_LocalPosition.x @@ -440991,8 +440995,50 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} + insertIndex: -1 + addedObject: {fileID: 8961904863721527026} + - targetCorrespondingSourceObject: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} + insertIndex: -1 + addedObject: {fileID: 8961904863721527025} m_SourcePrefab: {fileID: 100100000, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} +--- !u!1 &8961904863721527023 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1443463278548606047, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} + m_PrefabInstance: {fileID: 8961904863721527022} + m_PrefabAsset: {fileID: 0} +--- !u!212 &8961904863721527024 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 1806322732885125293, guid: e660bbbe18c2a044f9f066822a6fd703, type: 3} + m_PrefabInstance: {fileID: 8961904863721527022} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8961904863721527025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8961904863721527023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} + m_Name: + m_EditorClassIdentifier: + itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2} + iconRenderer: {fileID: 8961904863721527024} +--- !u!114 &8961904863721527026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8961904863721527023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &9013269659960062813 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d331d62d..88875ac6 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -17,7 +17,7 @@ TagManager: - Player - Pulver - WorldBoundary - - + - Interactable - - -