From ad79d9ca49274cc660fc2030a071b24314f0f210 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 29 Mar 2025 21:33:41 +0000
Subject: [PATCH] added flexalon UI and reworked inventoryUI
---
Assets/Prefabs/Ore/IronOrePickup.prefab | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 3 deletions(-)
diff --git a/Assets/Prefabs/Ore/IronOrePickup.prefab b/Assets/Prefabs/Ore/IronOrePickup.prefab
index fd00e96..f4eec60 100644
--- a/Assets/Prefabs/Ore/IronOrePickup.prefab
+++ b/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
@@ -98,7 +100,7 @@
m_Script: {fileID: 11500000, guid: fa7fec04fbeb92a41b697f2f020a7618, type: 3}
m_Name:
m_EditorClassIdentifier:
- healthRestore: 20
+ item: {fileID: 7215668260114684477, guid: ead8eea59ce41c244814a994365e1129, type: 3}
spinRotatationSpeed: {x: 0, y: 180, z: 0}
soundName: 4
--- !u!58 &7542207600701139278
@@ -130,6 +132,116 @@
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: 0
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 4
+--- !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:
+ item: {fileID: 0}
+ 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
+ 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: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
--
Gitblit v1.9.3