diff --git a/Assets/IMG/Aseprite/Inv_Amulet.aseprite b/Assets/IMG/Aseprite/Inv_Amulet.aseprite index b9160a6..c481c3d 100644 Binary files a/Assets/IMG/Aseprite/Inv_Amulet.aseprite and b/Assets/IMG/Aseprite/Inv_Amulet.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Ring.aseprite b/Assets/IMG/Aseprite/Inv_Ring.aseprite index 1ab7daa..45b2547 100644 Binary files a/Assets/IMG/Aseprite/Inv_Ring.aseprite and b/Assets/IMG/Aseprite/Inv_Ring.aseprite differ diff --git a/Assets/IMG/Inventory/Inv_Amulet.png b/Assets/IMG/Inventory/Inv_Amulet.png index e675952..1daece8 100644 Binary files a/Assets/IMG/Inventory/Inv_Amulet.png and b/Assets/IMG/Inventory/Inv_Amulet.png differ diff --git a/Assets/IMG/Inventory/Inv_Amulet.png.meta b/Assets/IMG/Inventory/Inv_Amulet.png.meta index 2d6886b..44fecfd 100644 --- a/Assets/IMG/Inventory/Inv_Amulet.png.meta +++ b/Assets/IMG/Inventory/Inv_Amulet.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b78731a0b5ceec84e8b899d919c5ef7b +guid: c6829a39cc10d8d439b494062c576b1b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/IMG/Inventory/Inv_Ring.png b/Assets/IMG/Inventory/Inv_Ring.png index 7eded0c..f31de65 100644 Binary files a/Assets/IMG/Inventory/Inv_Ring.png and b/Assets/IMG/Inventory/Inv_Ring.png differ diff --git a/Assets/IMG/Inventory/Inv_Ring.png.meta b/Assets/IMG/Inventory/Inv_Ring.png.meta index efc7e12..653ed50 100644 --- a/Assets/IMG/Inventory/Inv_Ring.png.meta +++ b/Assets/IMG/Inventory/Inv_Ring.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f169adf814f78b4b93ddf3166588b01 +guid: 841b2159b9e89e242b36729c30904c6d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 6eac7a5..3eed825 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1641,6 +1641,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 115111470} m_CullTransparentMesh: 1 +--- !u!1 &115362920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 115362921} + - component: {fileID: 115362923} + - component: {fileID: 115362922} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &115362921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115362920} + 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: 325001632} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &115362922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115362920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 593835406b21e5e4687d705e92f57916, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &115362923 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115362920} + m_CullTransparentMesh: 1 --- !u!1 &115448904 GameObject: m_ObjectHideFlags: 0 @@ -1720,6 +1792,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 115448904} m_CullTransparentMesh: 1 +--- !u!1 &119450597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 119450598} + - component: {fileID: 119450600} + - component: {fileID: 119450599} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &119450598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119450597} + 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: 188567432} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &119450599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119450597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 9d498dbee95788245a06def264ae3b16, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &119450600 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119450597} + m_CullTransparentMesh: 1 --- !u!1 &123765786 GameObject: m_ObjectHideFlags: 0 @@ -2256,7 +2400,9 @@ RectTransform: 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_Children: + - {fileID: 1057622809} + - {fileID: 119450598} m_Father: {fileID: 2125577062} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2575,6 +2721,10 @@ PrefabInstance: propertyPath: place value: 6 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: d457be01a799c0c4b9f8955ae40b8597, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &205308212 stripped @@ -4267,6 +4417,10 @@ PrefabInstance: propertyPath: place value: 1 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: 4ae569f6fd302ed4e9d803c2b173469b, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &319341376 stripped @@ -4352,7 +4506,9 @@ RectTransform: 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_Children: + - {fileID: 1173527708} + - {fileID: 115362921} m_Father: {fileID: 2125577062} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11711,6 +11867,10 @@ PrefabInstance: propertyPath: place value: 0 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: 3e22baa97538d6d4ea02a63cf7cebe6a, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &836418978 stripped @@ -12312,6 +12472,10 @@ PrefabInstance: propertyPath: place value: 7 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: 6329549321769d140a929bf8310a7609, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &864026983 stripped @@ -15031,6 +15195,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057022354} m_CullTransparentMesh: 1 +--- !u!1 &1057622808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1057622809} + - component: {fileID: 1057622811} + - component: {fileID: 1057622810} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1057622809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057622808} + 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: 188567432} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1057622810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057622808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1057622811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057622808} + m_CullTransparentMesh: 1 --- !u!1 &1063798841 GameObject: m_ObjectHideFlags: 0 @@ -15937,6 +16173,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156480094} m_CullTransparentMesh: 1 +--- !u!1 &1168876710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1168876711} + - component: {fileID: 1168876713} + - component: {fileID: 1168876712} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1168876711 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168876710} + 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: 1446002924} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1168876712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168876710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1168876713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168876710} + m_CullTransparentMesh: 1 --- !u!1 &1172954268 GameObject: m_ObjectHideFlags: 0 @@ -16016,6 +16324,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1172954268} m_CullTransparentMesh: 1 +--- !u!1 &1173527707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1173527708} + - component: {fileID: 1173527710} + - component: {fileID: 1173527709} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1173527708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173527707} + 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: 325001632} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1173527709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173527707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1173527710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173527707} + m_CullTransparentMesh: 1 --- !u!1 &1176477999 GameObject: m_ObjectHideFlags: 0 @@ -17951,6 +18331,10 @@ PrefabInstance: propertyPath: place value: 4 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: 841b2159b9e89e242b36729c30904c6d, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &1365079344 stripped @@ -18490,6 +18874,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400711198} m_CullTransparentMesh: 1 +--- !u!1 &1420067069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1420067070} + - component: {fileID: 1420067072} + - component: {fileID: 1420067071} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1420067070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420067069} + 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: 1446002924} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1420067071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420067069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 5f308d204b3fbf14ba20f736cdb40a4d, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1420067072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1420067069} + m_CullTransparentMesh: 1 --- !u!1 &1446002923 GameObject: m_ObjectHideFlags: 0 @@ -18519,7 +18975,9 @@ RectTransform: 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_Children: + - {fileID: 1168876711} + - {fileID: 1420067070} m_Father: {fileID: 2125577062} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25892,6 +26350,10 @@ PrefabInstance: propertyPath: place value: 5 objectReference: {fileID: 0} + - target: {fileID: 206628748623723558, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} + propertyPath: m_Texture + value: + objectReference: {fileID: 2800000, guid: c6829a39cc10d8d439b494062c576b1b, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} --- !u!224 &2147336495 stripped diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index d8d485d..7e2a285 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -67,10 +67,10 @@ namespace Assets.Scripts { if (currentBag != -1) { - bags[currentBag].GetComponent().color = Color.white; + bags[currentBag].transform.Find("Selected").GetComponent().color = Color.white; } currentBag = index; - bags[currentBag].GetComponent().color = Color.cyan; + bags[currentBag].transform.Find("Selected").GetComponent().color = Color.cyan; checkInventoryColors(); foreach(GameObject slot in slots) {