From b55bc192f403826120d4721630934f27e028edba Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Mon, 31 Mar 2025 18:21:39 +0000
Subject: [PATCH] #28 added inventory description UI scrollbar
---
Assets/UI/Fonts/m5x7 SDF.asset | 4
Assets/Scenes/GameplayScene.unity | 797 +++++++++++++++++++++++++++++++++++++++++++++--------
Assets/Scripts/Inventory/ItemUIScript.cs | 2
Assets/Scripts/Inventory/InventoryDisplay.cs | 50 +++
Assets/Prefabs/Ore/IronOreItem.prefab | 36 ++
5 files changed, 761 insertions(+), 128 deletions(-)
diff --git a/Assets/Prefabs/Ore/IronOreItem.prefab b/Assets/Prefabs/Ore/IronOreItem.prefab
index 4c5f820..2e8879b 100644
--- a/Assets/Prefabs/Ore/IronOreItem.prefab
+++ b/Assets/Prefabs/Ore/IronOreItem.prefab
@@ -46,6 +46,40 @@
m_EditorClassIdentifier:
itemName: Iron Ore
itemIcon: {fileID: 21300000, guid: f50e6fb94d4860344ba0425b09fb0ef8, type: 3}
- itemDescription: Iron Ore description
+ itemDescription: 'Iron ore is a common metallic resource found in various geological
+ formations. It appears as a rusty reddish-brown rock with darker striations and
+ occasional metallic gleams. Iron ore deposits are typically found in mountainous
+ regions, hillsides, and sometimes in cave systems. Iron ore is a common metallic
+ resource found in various geological formations. It appears as a rusty reddish-brown
+ rock with darker striations and occasional metallic gleams. Iron ore deposits
+ are typically found in mountainous regions, hillsides, and sometimes in cave
+ systems. Iron ore is a common metallic resource found in various geological formations.
+ It appears as a rusty reddish-brown rock with darker striations and occasional
+ metallic gleams. Iron ore deposits are typically found in mountainous regions,
+ hillsides, and sometimes in cave systems. Iron ore is a common metallic resource
+ found in various geological formations. It appears as a rusty reddish-brown rock
+ with darker striations and occasional metallic gleams. Iron ore deposits are
+ typically found in mountainous regions, hillsides, and sometimes in cave systems.
+ Iron ore is a common metallic resource found in various geological formations.
+ It appears as a rusty reddish-brown rock with darker striations and occasional
+ metallic gleams. Iron ore deposits are typically found in mountainous regions,
+ hillsides, and sometimes in cave systems. Iron ore is a common metallic resource
+ found in various geological formations. It appears as a rusty reddish-brown rock
+ with darker striations and occasional metallic gleams. Iron ore deposits are
+ typically found in mountainous regions, hillsides, and sometimes in cave systems.
+ Iron ore is a common metallic resource found in various geological formations.
+ It appears as a rusty reddish-brown rock with darker striations and occasional
+ metallic gleams. Iron ore deposits are typically found in mountainous regions,
+ hillsides, and sometimes in cave systems. Iron ore is a common metallic resource
+ found in various geological formations. It appears as a rusty reddish-brown rock
+ with darker striations and occasional metallic gleams. Iron ore deposits are
+ typically found in mountainous regions, hillsides, and sometimes in cave systems.
+ Iron ore is a common metallic resource found in various geological formations.
+ It appears as a rusty reddish-brown rock with darker striations and occasional
+ metallic gleams. Iron ore deposits are typically found in mountainous regions,
+ hillsides, and sometimes in cave systems. Iron ore is a common metallic resource
+ found in various geological formations. It appears as a rusty reddish-brown rock
+ with darker striations and occasional metallic gleams. Iron ore deposits are
+ typically found in mountainous regions, hillsides, and sometimes in cave systems. '
isStackable: 1
maxStackSize: 100
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index ccee56c..dc43a1c 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -123,6 +123,155 @@
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &32697240
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 32697241}
+ - component: {fileID: 32697243}
+ - component: {fileID: 32697242}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &32697241
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 32697240}
+ 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: 845242600}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.27253783}
+ 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 &32697242
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 32697240}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 0d4c2a6104ce7414aad2595892f9fd87, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 2
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &32697243
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 32697240}
+ m_CullTransparentMesh: 1
+--- !u!1 &167023767
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 167023768}
+ - component: {fileID: 167023771}
+ - component: {fileID: 167023772}
+ - component: {fileID: 167023773}
+ m_Layer: 5
+ m_Name: ItemContentDescription
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &167023768
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 167023767}
+ 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:
+ - {fileID: 7504627771183317384}
+ m_Father: {fileID: 1955008395}
+ 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: -485.1518}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &167023771
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 167023767}
+ m_CullTransparentMesh: 1
+--- !u!114 &167023772
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 167023767}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 519c952913e3ff344a7b23eb0020d6ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ itemUIType: 1
+--- !u!114 &167023773
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 167023767}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!4 &254538002 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2368348636056148999, guid: c220ec455fce341408d66d880b464cad, type: 3}
@@ -614,7 +763,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 220.00002, y: 25, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 440.00003, y: 0, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: 0, y: -310.0759, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -1105,6 +1254,244 @@
- {fileID: 734382261}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &808172310
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 808172311}
+ - component: {fileID: 808172314}
+ - component: {fileID: 808172313}
+ - component: {fileID: 808172312}
+ - component: {fileID: 808172316}
+ - component: {fileID: 808172315}
+ m_Layer: 5
+ m_Name: Scroll View
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &808172311
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ 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:
+ - {fileID: 1955008395}
+ - {fileID: 1826729470}
+ m_Father: {fileID: 1952062087741509814}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 440, y: 505.1518}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &808172312
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 7504627771183317384}
+ m_Horizontal: 0
+ m_Vertical: 1
+ m_MovementType: 2
+ m_Elasticity: 0.1
+ m_Inertia: 0
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 4
+ m_Viewport: {fileID: 1955008395}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 1826729471}
+ m_HorizontalScrollbarVisibility: 2
+ m_VerticalScrollbarVisibility: 0
+ m_HorizontalScrollbarSpacing: -3
+ m_VerticalScrollbarSpacing: -3
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &808172313
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &808172314
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ m_CullTransparentMesh: 1
+--- !u!114 &808172315
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 00b0da67f6b3c9a4e84ed47af9da4884, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _version: 4
+ _widthType: 1
+ _width: 100
+ _widthOfParent: 1
+ _heightType: 1
+ _height: 100
+ _heightOfParent: 1
+ _depthType: 2
+ _depth: 1
+ _depthOfParent: 1
+ _minWidthType: 0
+ _minWidth: 0
+ _minWidthOfParent: 0
+ _minHeightType: 0
+ _minHeight: 0
+ _minHeightOfParent: 0
+ _minDepthType: 0
+ _minDepth: 0
+ _minDepthOfParent: 0
+ _maxWidthType: 0
+ _maxWidth: 100
+ _maxWidthOfParent: 1
+ _maxHeightType: 0
+ _maxHeight: 100
+ _maxHeightOfParent: 1
+ _maxDepthType: 0
+ _maxDepth: 1
+ _maxDepthOfParent: 1
+ _offset: {x: 0, y: 0, z: 0}
+ _scale: {x: 1, y: 1, z: 1}
+ _rotation: {x: 0, y: 0, z: 0, w: 1}
+ _marginLeft: 0
+ _marginRight: 0
+ _marginTop: 0
+ _marginBottom: 0
+ _marginFront: 0
+ _marginBack: 0
+ _paddingLeft: 0
+ _paddingRight: 0
+ _paddingTop: 0
+ _paddingBottom: 0
+ _paddingFront: 0
+ _paddingBack: 0
+ _skipLayout: 0
+--- !u!114 &808172316
+MonoBehaviour:
+ m_ObjectHideFlags: 2
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 808172310}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 994c66b6148109b489689ed705d244cd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Parent: {fileID: 0}
+ SiblingIndex: 0
+ LayoutPosition: {x: 0, y: 0, z: 0}
+ LayoutRotation: {x: 0, y: 0, z: 0, w: 1}
+ AdapterBounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 220.00002, y: 252.5759, z: 0}
+ LayoutBounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 220.00002, y: 252.5759, z: 0}
+ RotatedAndScaledBounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 220.00002, y: 252.5759, z: 0}
+ ComponentScale: {x: 1, y: 1, z: 1}
+ FillSize: {x: 440.00003, y: 505.1518, z: 0}
+ ShrinkSize: {x: 999999, y: 999999, z: 999999}
+ TargetPosition: {x: 0, y: 0, z: 0}
+ TargetRotation: {x: 0, y: 0, z: 0, w: 1}
+ TargetScale: {x: 1, y: 1, z: 1}
+ TargetRectSize: {x: 440.00003, y: 505.1518, z: 0}
+ TransformPosition: {x: 0, y: 0, z: 0}
+ TransformRotation: {x: 0, y: 0, z: 0, w: 1}
+ TransformScale: {x: 1, y: 1, z: 1}
+ TransformRectSize: {x: 440, y: 505.1518}
+--- !u!1 &845242599
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 845242600}
+ m_Layer: 5
+ m_Name: Sliding Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &845242600
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 845242599}
+ 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:
+ - {fileID: 32697241}
+ m_Father: {fileID: 1826729470}
+ 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!1 &977175855 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2271361204546697504, guid: 1727dce3407104540a6bf21deb2957a8, type: 3}
@@ -2732,6 +3119,132 @@
m_Script: {fileID: 11500000, guid: 1a8a05de0ac134f4f9d01bef6b9da077, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1826729469
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1826729470}
+ - component: {fileID: 1826729473}
+ - component: {fileID: 1826729472}
+ - component: {fileID: 1826729471}
+ m_Layer: 5
+ m_Name: Scrollbar Vertical
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1826729470
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1826729469}
+ 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:
+ - {fileID: 845242600}
+ m_Father: {fileID: 808172311}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -0.000015258789, y: 0}
+ m_SizeDelta: {x: 20, y: 0}
+ m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &1826729471
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1826729469}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 0
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 32697242}
+ m_HandleRect: {fileID: 32697241}
+ m_Direction: 2
+ m_Value: 1
+ m_Size: 0.7274622
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &1826729472
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1826729469}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: -638214032, guid: 72b121c093172294289f7c76e4948c7d, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1826729473
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1826729469}
+ m_CullTransparentMesh: 1
--- !u!1 &1919262556
GameObject:
m_ObjectHideFlags: 0
@@ -3109,6 +3622,96 @@
tile: {fileID: 11400000, guid: 4d8deb60103293942a07fd9361be5e8f, type: 2}
maxSpawnHeight: 250
minSpawnHeight: 150
+--- !u!1 &1955008394
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1955008395}
+ - component: {fileID: 1955008398}
+ - component: {fileID: 1955008397}
+ - component: {fileID: 1955008396}
+ m_Layer: 5
+ m_Name: Viewport
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1955008395
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1955008394}
+ 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:
+ - {fileID: 167023768}
+ m_Father: {fileID: 808172311}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -10, y: 0}
+ m_SizeDelta: {x: -40, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1955008396
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1955008394}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
+--- !u!114 &1955008397
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1955008394}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1955008398
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1955008394}
+ m_CullTransparentMesh: 1
--- !u!1 &2010473985
GameObject:
m_ObjectHideFlags: 0
@@ -3781,7 +4384,24 @@
m_text: Iron ore is a common metallic resource found in various geological formations.
It appears as a rusty reddish-brown rock with darker striations and occasional
metallic gleams. Iron ore deposits are typically found in mountainous regions,
- hillsides, and sometimes in cave systems.
+ hillsides, and sometimes in cave systems.Iron ore is a common metallic resource
+ found in various geological formations. It appears as a rusty reddish-brown rock
+ with darker striations and occasional metallic gleams. Iron ore deposits are
+ typically found in mountainous regions, hillsides, and sometimes in cave systems.Iron
+ ore is a common metallic resource found in various geological formations. It
+ appears as a rusty reddish-brown rock with darker striations and occasional metallic
+ gleams. Iron ore deposits are typically found in mountainous regions, hillsides,
+ and sometimes in cave systems.Iron ore is a common metallic resource found in
+ various geological formations. It appears as a rusty reddish-brown rock with
+ darker striations and occasional metallic gleams. Iron ore deposits are typically
+ found in mountainous regions, hillsides, and sometimes in cave systems.Iron ore
+ is a common metallic resource found in various geological formations. It appears
+ as a rusty reddish-brown rock with darker striations and occasional metallic
+ gleams. Iron ore deposits are typically found in mountainous regions, hillsides,
+ and sometimes in cave systems.Iron ore is a common metallic resource found in
+ various geological formations. It appears as a rusty reddish-brown rock with
+ darker striations and occasional metallic gleams. Iron ore deposits are typically
+ found in mountainous regions, hillsides, and sometimes in cave systems.
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dfaa183353a3e5c4bbc9aabee7dd8268, type: 2}
m_sharedMaterial: {fileID: -8621457483150523135, guid: dfaa183353a3e5c4bbc9aabee7dd8268, type: 2}
@@ -3826,7 +4446,7 @@
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
- m_overflowMode: 3
+ m_overflowMode: 4
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
@@ -3844,7 +4464,7 @@
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_margin: {x: 5, y: 5, z: 10, w: 5}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@@ -4076,8 +4696,9 @@
- component: {fileID: 8752919613801712088}
- component: {fileID: 237387558192229442}
- component: {fileID: 635602168352669469}
+ - component: {fileID: 8752919613801712089}
m_Layer: 5
- m_Name: ItemDescriptionText
+ m_Name: ItemTextDescription
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4213,25 +4834,6 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &747847174927498198
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7171393997671139661}
- 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: 1952062087741509814}
- 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 &777578668198508057
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4682,36 +5284,6 @@
TransformRotation: {x: 0, y: 0, z: 0, w: 1}
TransformScale: {x: 1, y: 1, z: 1}
TransformRectSize: {x: 440.00003, y: 505.1518}
---- !u!114 &1179163092344749656
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7171393997671139661}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.47058824}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: ee4fb235c7b0280489a009cd8810dfd7, type: 3}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 2
--- !u!224 &1249761801454750281
RectTransform:
m_ObjectHideFlags: 0
@@ -5035,14 +5607,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1901413943316119649}
m_CullTransparentMesh: 1
---- !u!222 &1592290552893329958
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7171393997671139661}
- m_CullTransparentMesh: 1
--- !u!114 &1612373749559752667
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5244,7 +5808,7 @@
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000061035156}
- m_SizeDelta: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: -610.1518}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1808165083591296092
MonoBehaviour:
@@ -5311,7 +5875,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 230.00002, y: 335.0759, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 460.00003, y: 670.1518, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: 0, y: 0, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -5404,8 +5968,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 7504627771183317384}
- - {fileID: 747847174927498198}
+ - {fileID: 808172311}
m_Father: {fileID: 1249761801454750281}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -5595,8 +6158,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -6.4000244, y: 0}
- m_SizeDelta: {x: -32.799965, y: -20}
+ m_AnchoredPosition: {x: -6.500001, y: 0}
+ m_SizeDelta: {x: -33, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &2261651748780065887
RectTransform:
@@ -5991,7 +6554,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 220.00002, y: 335.0759, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 460.00003, y: 670.1518, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: 240.00002, y: 0, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -6478,7 +7041,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 460.00003, y: 335.0759, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 960.00006, y: 720.1518, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: 0, y: 0, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -8497,7 +9060,7 @@
m_Father: {fileID: 2809235511260443067}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: -0.5}
m_SizeDelta: {x: 20, y: 0.80810547}
m_Pivot: {x: 0.5, y: 0.5}
@@ -9255,7 +9818,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 230.00002, y: 335.0759, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 460.00003, y: 670.1518, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: -230.00002, y: 0, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -9503,7 +10066,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &6897305761424568721
GameObject:
m_ObjectHideFlags: 0
@@ -9579,26 +10142,6 @@
_paddingFront: 0
_paddingBack: 0
_skipLayout: 0
---- !u!114 &6908630171964696106
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7171393997671139661}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreLayout: 1
- m_MinWidth: -1
- m_MinHeight: -1
- m_PreferredWidth: -1
- m_PreferredHeight: -1
- m_FlexibleWidth: -1
- m_FlexibleHeight: -1
- m_LayoutPriority: 1
--- !u!224 &6914115817181910326
RectTransform:
m_ObjectHideFlags: 0
@@ -9800,25 +10343,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7201439883163704860}
m_CullTransparentMesh: 1
---- !u!1 &7171393997671139661
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 747847174927498198}
- - component: {fileID: 1592290552893329958}
- - component: {fileID: 1179163092344749656}
- - component: {fileID: 6908630171964696106}
- m_Layer: 5
- m_Name: Border
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &7201439883163704860
GameObject:
m_ObjectHideFlags: 0
@@ -9972,7 +10496,7 @@
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 220.00002, y: 37.5, z: 0}
ComponentScale: {x: 1, y: 1, z: 1}
- FillSize: {x: 440.00003, y: 0, z: 0}
+ FillSize: {x: 0, y: 0, z: 0}
ShrinkSize: {x: 999999, y: 999999, z: 999999}
TargetPosition: {x: 0, y: 297.5759, z: 0}
TargetRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -10018,7 +10542,7 @@
itemContent: {fileID: 3821031153187883792}
itemUIPrefab: {fileID: 1536595002982607090, guid: e3c75e717a72154478a8806cd96eb126, type: 3}
itemNameDescription: {fileID: 5479754380044115795}
- itemDescription: {fileID: 5518989482989945374}
+ itemDescription: {fileID: 167023767}
itemDeleteButton: {fileID: 530984087}
itemUIs: []
--- !u!114 &7412360115378337142
@@ -10127,13 +10651,13 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1952062087741509814}
+ m_Father: {fileID: 167023768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -40, y: -40}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -0.000030517578, y: 242.57593}
+ m_SizeDelta: {x: 0, y: 666.91}
+ m_Pivot: {x: 0.5, y: 1}
--- !u!114 &7528358003487979299
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11650,10 +12174,27 @@
m_GameObject: {fileID: 5518989482989945374}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 519c952913e3ff344a7b23eb0020d6ca, type: 3}
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- itemUIType: 1
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.47058824}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: ee4fb235c7b0280489a009cd8810dfd7, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 2
--- !u!114 &8621093811241709656
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11805,6 +12346,20 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 463125649053011195}
m_CullTransparentMesh: 1
+--- !u!114 &8752919613801712089
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 463125649053011195}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!114 &8787311766086638381
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Inventory/InventoryDisplay.cs b/Assets/Scripts/Inventory/InventoryDisplay.cs
index a7d3fad..dfd4f32 100644
--- a/Assets/Scripts/Inventory/InventoryDisplay.cs
+++ b/Assets/Scripts/Inventory/InventoryDisplay.cs
@@ -152,18 +152,19 @@
//}
if (itemNameDescription.GetComponent<ItemUIScript>()?.InventorySlot?.item?.itemName == inventorySlot.item.itemName)
{
- itemDescription.SetActive(!itemNameDescription.activeSelf);
+ itemDescription.transform.parent.parent.parent.gameObject.SetActive(!itemNameDescription.activeSelf);
itemDeleteButton.SetActive(!itemNameDescription.activeSelf);
itemNameDescription.SetActive(!itemNameDescription.activeSelf);
}
else
{
- itemDescription.SetActive(true);
+ itemDescription.transform.parent.parent.parent.gameObject.SetActive(true);
itemDeleteButton.SetActive(true);
itemNameDescription.SetActive(true);
}
itemNameDescription.GetComponent<ItemUIScript>().InventorySlot = inventorySlot;
itemDescription.GetComponent<ItemUIScript>().InventorySlot = inventorySlot;
+ ResetScrollbarForDescription();
}
public void OnItemDeleteClick()
{
@@ -173,10 +174,53 @@
inventory.RemoveItem(inventorySlot.item, inventorySlot.quantity);
itemNameDescription.SetActive(false);
itemDeleteButton.SetActive(false);
- itemDescription.SetActive(false);
+ ResetScrollbarForDescription();
+ itemDescription.transform.parent.parent.parent.gameObject.SetActive(false);
}
}
+ private void ResetScrollbarForDescription()
+ {
+ //var scrollRect = itemDescription.transform.parent.parent.GetComponent<ScrollRect>();
+ //if (scrollRect != null)
+ //{
+ // // Reset the scroll position
+ // scrollRect.normalizedPosition = Vector2.one; // (1,1) = top, (0,0) = bottom
+
+ // // Force the scroll view to refresh its layout
+ // LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content);
+
+ // // Reset the content's position
+ // var content = itemDescription.transform.Find("ItemTextDescription");
+ // if (content != null)
+ // {
+ // RectTransform rectTransform = content.GetComponent<RectTransform>();
+ // if (rectTransform != null)
+ // {
+ // rectTransform.anchoredPosition = Vector2.zero;
+ // }
+ // }
+ //}
+ // Reset the scroll position
+ var scrollrect = itemDescription.transform.parent.parent.GetComponent<ScrollRect>();
+ if (scrollrect != null)
+ {
+ Debug.Log("Resetting scroll position");
+ scrollrect.verticalNormalizedPosition = 1; // 0 = top, 1 = bottom
+ }
+ // Reset the content's position
+ // transform.Find("ItemTextDescription")
+ //var content = itemDescription.transform.Find("ItemTextDescription");
+ //if (content != null)
+ //{
+ // RectTransform rectTransform = content.GetComponent<RectTransform>();
+ // if (rectTransform != null)
+ // {
+ // rectTransform.anchoredPosition = Vector2.zero;
+ // }
+ //}
+ }
+
private void UpdateItemContentList()
{
// First, deactivate all existing itemUIs
diff --git a/Assets/Scripts/Inventory/ItemUIScript.cs b/Assets/Scripts/Inventory/ItemUIScript.cs
index 768fbbb..d58b250 100644
--- a/Assets/Scripts/Inventory/ItemUIScript.cs
+++ b/Assets/Scripts/Inventory/ItemUIScript.cs
@@ -31,7 +31,7 @@
gameObject.transform.Find("ItemIcon").GetComponent<Image>().sprite = inventorySlot.item.itemIcon;
break;
case ItemUIType.ItemDescription:
- gameObject.transform.Find("ItemDescriptionText").GetComponent<TextMeshProUGUI>().text = inventorySlot.item.itemDescription;
+ gameObject.transform.Find("ItemTextDescription").GetComponent<TextMeshProUGUI>().text = inventorySlot.item.itemDescription;
break;
}
}
diff --git a/Assets/UI/Fonts/m5x7 SDF.asset b/Assets/UI/Fonts/m5x7 SDF.asset
index ae2605e..7651f86 100644
--- a/Assets/UI/Fonts/m5x7 SDF.asset
+++ b/Assets/UI/Fonts/m5x7 SDF.asset
@@ -85,8 +85,8 @@
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
+ - _StencilReadMask: 1
+ - _StencilWriteMask: 0
- _TextureHeight: 1024
- _TextureWidth: 1024
- _UnderlayDilate: 0.292
--
Gitblit v1.10.0