diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
index c60ff15..15362c0 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -1127,6 +1127,14 @@
C:\Program Files\Unity\Hub\Editor\6000.3.2f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll
False
+
+ Library\ScriptAssemblies\UnityEditor.TestRunner.dll
+ False
+
+
+ Library\ScriptAssemblies\UnityEngine.TestRunner.dll
+ False
+
Library\ScriptAssemblies\Unity.RenderPipelines.Core.Editor.dll
False
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index c3cd066..87ed0a0 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -59,15 +59,20 @@
+
+
+
+
+
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 2083e0e..da25809 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -10,6 +10,10 @@ GameObject:
m_Component:
- component: {fileID: 4372894855564474151}
- component: {fileID: 6270991334037110281}
+ - component: {fileID: 5846412999564046821}
+ - component: {fileID: 1184499778079033655}
+ - component: {fileID: 7230547540517293290}
+ - component: {fileID: 7458587233354274444}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@@ -91,3 +95,88 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
+--- !u!61 &5846412999564046821
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4365714411379426835}
+ 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, y: 0.21133333}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.28866667}
+ oldSize: {x: 1, y: 1}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Size: {x: 1, y: 1}
+ m_EdgeRadius: 0
+--- !u!114 &1184499778079033655
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4365714411379426835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cffc1654223acc54f9aa045c5a7730a3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::PlayerInventory
+--- !u!114 &7230547540517293290
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4365714411379426835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 687937cfe3daa04489c5323f36aef2e7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: '::'
+ uiAsset: {fileID: 9197481963319205126, guid: 6b3866a73cab45c429ffb420315993ca, type: 3}
+ uiPanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
+ AlwaysVisible: 1
+--- !u!114 &7458587233354274444
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4365714411379426835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 38451aa38ba98df4f939ff6b7b8214c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::InventoryScreenInvoker
diff --git a/Assets/Prefabs/Shelf.prefab b/Assets/Prefabs/Shelf.prefab
index bfa0a6b..7c9c8ca 100644
--- a/Assets/Prefabs/Shelf.prefab
+++ b/Assets/Prefabs/Shelf.prefab
@@ -12,8 +12,8 @@ GameObject:
- component: {fileID: 6329482849752991534}
- component: {fileID: 5507466453634029947}
- component: {fileID: -5117840549013073363}
- - component: {fileID: -3893633335331372781}
- component: {fileID: -3570956179444851343}
+ - component: {fileID: -1329949174847138657}
m_Layer: 0
m_Name: Shelf
m_TagString: Untagged
@@ -154,29 +154,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::InventoryHolder
type: shelf
---- !u!114 &-3893633335331372781
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4557172615047839809}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.UIDocument
- m_PanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
- m_ParentUI: {fileID: 0}
- sourceAsset: {fileID: 9197481963319205126, guid: 6b3866a73cab45c429ffb420315993ca, type: 3}
- m_SortingOrder: 0
- m_Position: 0
- m_WorldSpaceSizeMode: 1
- m_WorldSpaceWidth: 1920
- m_WorldSpaceHeight: 1080
- m_PivotReferenceSize: 0
- m_Pivot: 0
- m_WorldSpaceCollider: {fileID: 0}
--- !u!114 &-3570956179444851343
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -189,6 +166,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 687937cfe3daa04489c5323f36aef2e7, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::InfoBox
- worldOffset: {x: 0, y: 0, z: 0}
- uiDocument: {fileID: -3893633335331372781}
+ uiAsset: {fileID: 9197481963319205126, guid: 6b3866a73cab45c429ffb420315993ca, type: 3}
+ uiPanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
AlwaysVisible: 1
+--- !u!114 &-1329949174847138657
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4557172615047839809}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 38451aa38ba98df4f939ff6b7b8214c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::InventoryScreenInvoker
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index d4f4a83..b038497 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -560,6 +560,77 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2016876939
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2016876940}
+ - component: {fileID: 2016876941}
+ - component: {fileID: 2016876942}
+ m_Layer: 0
+ m_Name: InventoryScreen
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2016876940
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016876939}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -1.23016, y: -0.05425, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2016876941
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016876939}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 631c59a16a4091a4caa7b4ff24839552, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::InventoryScreen
+ uiAsset: {fileID: 9197481963319205126, guid: 3f702f69419923044856bc754559430b, type: 3}
+ uiItemAsset: {fileID: 9197481963319205126, guid: eb46dce908061864c935406ab889f172, type: 3}
+ uiPanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
+--- !u!114 &2016876942
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016876939}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.UIDocument
+ m_PanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
+ m_ParentUI: {fileID: 0}
+ sourceAsset: {fileID: 9197481963319205126, guid: 3f702f69419923044856bc754559430b, type: 3}
+ m_SortingOrder: 1
+ m_Position: 0
+ m_WorldSpaceSizeMode: 1
+ m_WorldSpaceWidth: 1920
+ m_WorldSpaceHeight: 1080
+ m_PivotReferenceSize: 0
+ m_Pivot: 0
+ m_WorldSpaceCollider: {fileID: 0}
--- !u!1001 &3377531241049282641
PrefabInstance:
m_ObjectHideFlags: 0
@@ -574,11 +645,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4372894855564474151, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
propertyPath: m_LocalPosition.x
- value: 0.359
+ value: -7.99
objectReference: {fileID: 0}
- target: {fileID: 4372894855564474151, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.05
+ value: -4.12
objectReference: {fileID: 0}
- target: {fileID: 4372894855564474151, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
propertyPath: m_LocalPosition.z
@@ -615,121 +686,8 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 4365714411379426835, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3377531241049282649}
- - targetCorrespondingSourceObject: {fileID: 4365714411379426835, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3377531241049282647}
- - targetCorrespondingSourceObject: {fileID: 4365714411379426835, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3377531241049282648}
- - targetCorrespondingSourceObject: {fileID: 4365714411379426835, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
- insertIndex: -1
- addedObject: {fileID: 3377531241049282650}
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
---- !u!1 &3377531241049282642 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 4365714411379426835, guid: 19c1ccebaf45a40478633ddde15bf4d7, type: 3}
- m_PrefabInstance: {fileID: 3377531241049282641}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &3377531241049282647
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3377531241049282642}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 687937cfe3daa04489c5323f36aef2e7, type: 3}
- m_Name:
- m_EditorClassIdentifier: '::'
- worldOffset: {x: 0, y: 0, z: 0}
- uiDocument: {fileID: 3377531241049282648}
- AlwaysVisible: 1
---- !u!114 &3377531241049282648
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3377531241049282642}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.UIDocument
- m_PanelSettings: {fileID: 11400000, guid: 7b1015287071c934bb8054c1ae46eccd, type: 2}
- m_ParentUI: {fileID: 0}
- sourceAsset: {fileID: 9197481963319205126, guid: 6b3866a73cab45c429ffb420315993ca, type: 3}
- m_SortingOrder: 0
- m_Position: 0
- m_WorldSpaceSizeMode: 1
- m_WorldSpaceWidth: 1920
- m_WorldSpaceHeight: 1080
- m_PivotReferenceSize: 0
- m_Pivot: 0
- m_WorldSpaceCollider: {fileID: 0}
---- !u!114 &3377531241049282649
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3377531241049282642}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cffc1654223acc54f9aa045c5a7730a3, type: 3}
- m_Name:
- m_EditorClassIdentifier: Assembly-CSharp::PlayerInventory
---- !u!61 &3377531241049282650
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3377531241049282642}
- 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, y: 0.21133333}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.5, y: 0.28866667}
- oldSize: {x: 1, y: 1}
- newSize: {x: 1, y: 1}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- m_Size: {x: 1, y: 1}
- m_EdgeRadius: 0
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -740,3 +698,4 @@ SceneRoots:
- {fileID: 1754384487}
- {fileID: 1009813490}
- {fileID: 339608289}
+ - {fileID: 2016876940}
diff --git a/Assets/Scripts/IInventoryHolder.cs b/Assets/Scripts/IInventoryHolder.cs
index 595a4fe..63f7dbb 100644
--- a/Assets/Scripts/IInventoryHolder.cs
+++ b/Assets/Scripts/IInventoryHolder.cs
@@ -1,4 +1,5 @@
-internal interface IInventoryHolder
+public interface IInventoryHolder
{
public Inventory Inventory { get; }
+ public string Name { get; }
}
diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs
index ab81b2e..ad497b8 100644
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
@@ -6,6 +6,8 @@ public class Player : MonoBehaviour, IInventoryHolder, IDataPersistence inventory;
+ public string Name => gameObject.name;
+
void Awake()
{
// Add("Лимонад", 5);
@@ -22,7 +24,6 @@ public class Player : MonoBehaviour, IInventoryHolder, IDataPersistence inventory;
+ public string Name => type;
+
public string type = "shelf";
void Awake()
diff --git a/Assets/Scripts/UI/InfoBox.cs b/Assets/Scripts/UI/InfoBox.cs
index 9318961..d609530 100644
--- a/Assets/Scripts/UI/InfoBox.cs
+++ b/Assets/Scripts/UI/InfoBox.cs
@@ -4,12 +4,15 @@ using UnityEngine.UIElements;
public class InfoBox : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
- // public Vector3 worldOffset = new Vector3(0, 1f, 0);
- public Vector3 worldOffset = new Vector3(0, 0, 0);
+ [SerializeField]
+ private VisualTreeAsset uiAsset;
+
+ [SerializeField]
+ private PanelSettings uiPanelSettings;
- public UIDocument uiDocument;
public bool AlwaysVisible;
+ private UIDocument uiDocument;
private Camera mainCamera;
private IInventoryHolder inventoryHolder;
private Label infoBox;
@@ -17,36 +20,31 @@ public class InfoBox : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
void Start()
{
mainCamera = Camera.main;
+ inventoryHolder = GetComponent();
- if (uiDocument != null)
- {
- infoBox = uiDocument.rootVisualElement.Q