Completely made inventory + created a stub for using equipment

Assets/DataHolder.cs

@@ -10,6 +10,7 @@ public class DataHolder : MonoBehaviour
     public List<BattleConfig> easyLevels;
     public List<BattleConfig> normalLevels;
     public List<BattleConfig> hardLevels;
+    public List<GameObject> PlayerEquipment = new List<GameObject>();
 
     public MissionConfig mission;
     [SerializeField] private string _currentScene;

Assets/Scenes/BattleScene.unity

@@ -1410,6 +1410,7 @@ MonoBehaviour:
   - {fileID: 7221412860694950145, guid: 34091b333ae775a4e8248495b8cdae9e, type: 3}
   - {fileID: 5003711296695674289, guid: 32d0fb454e08ef24a80a73425416751b, type: 3}
   - {fileID: 1928825181468149449, guid: f73491b94287ea54ca01b9c32623daf0, type: 3}
+  equipmentParent: {fileID: 1727453463}
   player: {fileID: 5565334654496439714, guid: c0b94d336afc615439f5c5ef9c7abb16, type: 3}
   playerPosition: {fileID: 1240862618}
   playerLink: {fileID: 0}
@@ -1509,6 +1510,7 @@ GameObject:
   - component: {fileID: 559254430}
   - component: {fileID: 559254433}
   - component: {fileID: 559254432}
+  - component: {fileID: 559254434}
   m_Layer: 5
   m_Name: InventoryCanvas
   m_TagString: Untagged
@@ -1632,6 +1634,7 @@ MonoBehaviour:
   - {fileID: 4068511147674530333, guid: ca90993e80150994e905b83ffd525f53, type: 3}
   - {fileID: 726422991776119786, guid: ffde653421f3d064cbdfc3b4571a5a2a, type: 3}
   playerEquipment: []
+  localplayerEquipment: []
   imagePlug: {fileID: 21300000, guid: 5c823983cfaec90459cde31d1c98f1a9, type: 3}
   playerPlace:
   - {fileID: 1617960470}
@@ -1641,6 +1644,27 @@ MonoBehaviour:
   - {fileID: 518861538}
   - {fileID: 23443383}
   lastCardNum: 0
+--- !u!114 &559254434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559254427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  buttonPrefab: {fileID: 845954423796914200, guid: f33090d3cfbeff54cb49cc789b59da51, type: 3}
+  parent: {fileID: 1594427389}
+  allButtonLinks: []
+  distX: 30
+  distY: 30
+  maxHeroesInRow: 3
+  maxHeroesInColumn: 3
+  maxHeroButOnPage: 0
+  page: 0
 --- !u!1 &565565346
 GameObject:
   m_ObjectHideFlags: 0
@@ -4392,7 +4416,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1594427389}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
   m_Name: 
@@ -4404,6 +4428,7 @@ MonoBehaviour:
   distY: 30
   maxHeroesInRow: 3
   maxHeroesInColumn: 3
+  maxHeroButOnPage: 0
   page: 0
 --- !u!1 &1617960467
 GameObject:
@@ -4875,6 +4900,36 @@ RectTransform:
   m_AnchoredPosition: {x: 803.9999, y: 819.74}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1727453463
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1727453464}
+  m_Layer: 0
+  m_Name: EquipmentParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1727453464
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1727453463}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 752, y: 917.00024, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1761042303
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Inventory/AddEquipment.cs

@@ -15,7 +15,14 @@ public class AddEquipment : MonoBehaviour
                 {
                     Inventory.main.playerPlace[i].image.sprite = Inventory.main.imagePlug;
                     Inventory.main.playerPlace[i].GetComponent<PlaceEquipment>().equipmentNum = -1;
-                    Inventory.main.localplayerEquipment.Add(Inventory.main.allEquipment[Inventory.main.lastCardNum]);
+                    try
+                    {
+                        Inventory.main.localplayerEquipment.Insert(Inventory.main.lastCardNum, Inventory.main.allEquipment[Inventory.main.lastCardNum]);
+                    }
+                    catch
+                    {
+                        Inventory.main.localplayerEquipment.Insert(Inventory.main.localplayerEquipment.Count, Inventory.main.allEquipment[Inventory.main.lastCardNum]);
+                    }
                     Inventory.main.gameObject.GetComponent<SpawnButton>().InstantiateEquipmentButton(0, 9);
                 }
             }
@@ -28,7 +35,7 @@ public class AddEquipment : MonoBehaviour
             Inventory.main.gameObject.GetComponent<SpawnButton>().InstantiateEquipmentButton(0, 9);
         }
 
-        DataScript.PlayerEquipment = Inventory.main.playerEquipment;
+        DataHolder.main.PlayerEquipment = Inventory.main.playerEquipment;
 
         EquipmentInfo.main.CardAbout(Inventory.main.lastCardNum);
     }

Assets/Scripts/Inventory/Inventory.cs

@@ -20,7 +20,7 @@ public class Inventory : MonoBehaviour
     private void Awake()
     {
         main = this;
-        playerEquipment = DataScript.PlayerEquipment;
+        playerEquipment = DataHolder.main.PlayerEquipment;
         localplayerEquipment.AddRange(allEquipment);
     }
 

Assets/Scripts/Inventory/SpawnButton.cs

@@ -19,7 +19,6 @@ public class SpawnButton : MonoBehaviour
     public int maxHeroButOnPage;
     [SerializeField] private int page;
 
-
     private void Start()
     {
         page = 0;
@@ -47,11 +46,11 @@ public class SpawnButton : MonoBehaviour
 
     public void InstantiateEquipmentButton(int _begin, int _end)
     {
-        for (int i = 0; i < allButtonLinks.Count; i++)
-        {
-            Destroy(allButtonLinks[i]);
-        }
         allButtonLinks.Clear();
+        for (int i = 0; i < parent.transform.childCount; i++)
+        {
+            Destroy(parent.transform.GetChild(i).gameObject);
+        }
 
         float _x = 0;
         float _y = 0;
@@ -65,21 +64,29 @@ public class SpawnButton : MonoBehaviour
             }
 
             Button link = Instantiate(buttonPrefab, parent.transform);
-
             link.transform.GetComponent<EquipmentButton>().num = i;
             link.transform.localPosition = new Vector3(_x, _y, 0);
-            link.image.sprite = Inventory.main.localplayerEquipment[i].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite;
+            link.image.sprite = Inventory.main.localplayerEquipment[link.transform.GetComponent<EquipmentButton>().num].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite;
+            for (int j = 0; j < Inventory.main.allEquipment.Count; j++)
+            {
+                if(Inventory.main.allEquipment[j].GetComponent<Equipment>().equipmentConfig.equipmentCharacteristics.sprite == link.image.sprite)
+                {
+                    link.transform.GetComponent<EquipmentButton>().num = j;
+                    break;
+                }
+            }
 
-            _x += gameObject.GetComponent<RectTransform>().rect.width + distX;
+            _x += link.GetComponent<RectTransform>().rect.width + distX;
 
             _counter += 1;
             if (_counter % maxHeroesInRow == 0)
             {
                 _x = 0;
-                _y -= gameObject.GetComponent<RectTransform>().rect.height + distY;
+                _y -= link.GetComponent<RectTransform>().rect.height + distY;
             }
 
             allButtonLinks.Add(link);
         }
     }
+
 }

Assets/Scripts/Not used/DataScript.cs

@@ -4,5 +4,5 @@ using UnityEngine;
 
 public static class DataScript
 {
-    public static List<GameObject> PlayerEquipment = new List<GameObject>();
+    
 }

Assets/Scripts/Session.cs

@@ -25,6 +25,7 @@ public class Session : MonoBehaviour
     [Header("Player")]
     [Space]
 
+    [SerializeField] private GameObject equipmentParent;
     [SerializeField] private GameObject player;
     [SerializeField] private Transform playerPosition;
     [HideInInspector] public GameObject playerLink;
@@ -76,7 +77,6 @@ public class Session : MonoBehaviour
     }
     public void SecondPhase()
     {
-        
         if (!battleConfig.battleCharacteristics.SecondPhase)
         {
             Victory();
@@ -275,4 +275,12 @@ public class Session : MonoBehaviour
             return DataHolder.main.RandomLevel(DataHolder.complexityLevels.all);
         }
     }
+
+    public void UseEquipment()
+    {
+        for (int i = 0; i < DataHolder.main.PlayerEquipment.Count; i++)
+        {
+            Instantiate(DataHolder.main.PlayerEquipment[i], equipmentParent.transform);
+        }
+    }
 }

Library/CurrentLayout-default.dwlt

@@ -45,10 +45,10 @@ MonoBehaviour:
     y: 30
     width: 1920
     height: 947
-  m_MinSize: {x: 678, y: 492}
+  m_MinSize: {x: 679, y: 342}
-  m_MaxSize: {x: 14002, y: 14042}
+  m_MaxSize: {x: 12004, y: 8042}
   vertical: 0
-  controlID: 63
+  controlID: 102
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -94,8 +94,8 @@ MonoBehaviour:
     y: 0
     width: 379
     height: 573
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -111,7 +111,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -120,14 +120,14 @@ MonoBehaviour:
     y: 573
     width: 1531
     height: 374
-  m_MinSize: {x: 231, y: 271}
+  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 10001, y: 10021}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 13}
   - {fileID: 18}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -223,10 +223,10 @@ MonoBehaviour:
     y: 0
     width: 1531
     height: 947
-  m_MinSize: {x: 402, y: 492}
+  m_MinSize: {x: 403, y: 342}
-  m_MaxSize: {x: 10001, y: 14042}
+  m_MaxSize: {x: 8003, y: 8042}
   vertical: 1
-  controlID: 114
+  controlID: 103
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -248,10 +248,10 @@ MonoBehaviour:
     y: 0
     width: 1531
     height: 573
-  m_MinSize: {x: 402, y: 221}
+  m_MinSize: {x: 403, y: 221}
-  m_MaxSize: {x: 8002, y: 4021}
+  m_MaxSize: {x: 8003, y: 4021}
   vertical: 0
-  controlID: 115
+  controlID: 104
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -355,10 +355,10 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 3}
+    scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 38430000
+    m_SelectedIDs: 58550000
-    m_LastClickedID: 17208
+    m_LastClickedID: 21848
-    m_ExpandedIDs: 000000002a4300002c4300002e430000304300003a43000000ca9a3b
+    m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000a24d00003055000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -386,7 +386,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000002a4300002c4300002e43000030430000
+    m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -411,8 +411,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
+    m_SelectedInstanceIDs: 5e780000
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: 30814
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
@@ -507,23 +507,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: a0730000
-      m_LastClickedID: 0
+      m_LastClickedID: 29600
-      m_ExpandedIDs: 26a3ffffaaa6ffff8ca8ffffdca8ffff5eabffffd8abffffe8abffffdcc8fffffccbffff66ccffff66d6ffff50f3ffffc4f3ffffd0f3ffffdaf3ffff48f4ffff3ef9ffff3efbffff90420000e0550000225b00002c5b0000525c0000905c0000045e0000725e0000925e0000fa5e00005a5f0000746a0000e26a00006a6b00006e710000ec710000dc720000e872000066730000387400005674000020a300009ea3000072a4000090a40000
+      m_ExpandedIDs: 66c6ffff8eccffff04cdfffff6ceffff1ecfffff8adeffff2aebffffbef0ffff10fafffffc6300006c640000f464000012650000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: PlayerInv
+        m_Name: 
-        m_OriginalName: PlayerInv
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 29342
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 4}
       m_SearchString: 
@@ -569,9 +569,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: 0, z: 0}
+    m_Target: {x: 752, y: 917.00024, z: 0}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: 752, y: 917.00024, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -622,9 +622,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 10
+    m_Target: 109.33476
     speed: 2
-    m_Value: 10
+    m_Value: 109.33476
   m_Ortho:
     m_Target: 1
     speed: 2

Logs/ApiUpdaterCheck.txt

@@ -728,3 +728,40 @@ C# parse time         : 113ms
 candidates check time : 20ms
 console write time    : 0ms
 
+[api-updater (non-obsolete-error-filter)] 18.01.2022 14:40:38 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 113,195ms
+moved types parse time: 48ms
+candidates parse time : 11ms
+C# parse time         : 173ms
+candidates check time : 37ms
+console write time    : 0ms
+
+[api-updater (non-obsolete-error-filter)] 18.01.2022 21:34:37 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] Exception caught while loading types from E:\Projects с#\Unity\omega\Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll (some types may not be loaded)
+	Exception of type 'System.Reflection.ReflectionTypeLoadException' was thrown.
+	  at (wrapper managed-to-native) System.Reflection.Assembly.GetTypes(System.Reflection.Assembly,bool)
+  at System.Reflection.Assembly.GetTypes () [0x00000] in <695d1cc93cca45069c528c15c9fdd749>:0 
+  at APIUpdater.NonObsoleteApiUpdaterDetector.ExtraInfoParser+<LoadTypesWithMovedFromAttributeAsync>d__3.MoveNext () [0x000c8] in <68bff7873e0e4aa69a14dfc30bebbe3e>:0 
+	Could not load file or assembly 'UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null' or one of its dependencies.
+
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 107,9902ms
+moved types parse time: 37ms
+candidates parse time : 8ms
+C# parse time         : 136ms
+candidates check time : 32ms
+console write time    : 0ms
+
+[api-updater (non-obsolete-error-filter)] 18.01.2022 21:35:49 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 51,8601ms
+moved types parse time: 39ms
+candidates parse time : 8ms
+C# parse time         : 141ms
+candidates check time : 31ms
+console write time    : 0ms
+

Logs/shadercompiler-UnityShaderCompiler.exe11.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

Logs/shadercompiler-UnityShaderCompiler.exe3.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

Logs/shadercompiler-UnityShaderCompiler.exe4.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

Logs/shadercompiler-UnityShaderCompiler.exe5.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

Logs/shadercompiler-UnityShaderCompiler.exe7.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

Logs/shadercompiler-UnityShaderCompiler.exe8.log

@@ -2,5 +2,3 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler
 
 Cmd: shutdown
-
-Quitting shader compiler process

UserSettings/EditorUserSettings.asset

@@ -9,16 +9,16 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7d110203142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c7b1102163025202c2322633c133af6f9
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b1102163025202c2322633c133af6f9
+      value: 22424703114646680e0b0227036c761e0012163e233a3f7e38271427fb
       flags: 0
     RecentlyUsedScenePath-3:
       value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c761e0012163e233a3f7e38271427fb
+      value: 22424703114646680e0b0227036c7d110203142f1f2b233e2867083debf42d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650