added global list of maps + new method for working with it

2022-01-19 20:27:33 +03:00 · 2022-01-19 20:27:33 +03:00 · 1e2d39e0dd
parent 589282d9e2
commit 1e2d39e0dd
24 changed files with 489 additions and 4943 deletions
--- a/.vs/omega/v16/.suo
+++ b/.vs/omega/v16/.suo
--- a/Assets/DataHolder.cs
+++ b/Assets/DataHolder.cs
@ -10,7 +10,9 @@ public class DataHolder : MonoBehaviour
    public List<BattleConfig> easyLevels;
    public List<BattleConfig> normalLevels;
    public List<BattleConfig> hardLevels;
+
    public List<GameObject> PlayerEquipment = new List<GameObject>();
+    public List<GameObject> AllEquipment = new List<GameObject>();

    public MissionConfig mission;
    [SerializeField] private string _currentScene;
@ -123,4 +125,9 @@ public class DataHolder : MonoBehaviour
    {
        ChangeScene("MainMenu");
    }
+
+    public void AddEquipmentToPlayerInvaentary(GameObject _item)
+    {
+        AllEquipment.Add(_item);
+    }
 }
--- a/Assets/Scripts/Configs/EquipmentConfig.cs
+++ b/Assets/Scripts/Configs/EquipmentConfig.cs
@ -28,5 +28,6 @@ public class EquipmentCharacteristic
    public string description;
    public Sprite sprite;
    public Place place;
+    public GameObject equipmentCard;
 }

--- a/Assets/Scripts/Inventory/AddEquipment.cs
+++ b/Assets/Scripts/Inventory/AddEquipment.cs
@ -36,6 +36,7 @@ public class AddEquipment : MonoBehaviour
        }

        DataHolder.main.PlayerEquipment = Inventory.main.playerEquipment;
+        DataHolder.main.AllEquipment = Inventory.main.allEquipment;

        EquipmentInfo.main.CardAbout(Inventory.main.lastCardNum);
    }
--- a/Assets/Scripts/Inventory/Inventory.cs
+++ b/Assets/Scripts/Inventory/Inventory.cs
@ -20,7 +20,13 @@ public class Inventory : MonoBehaviour
    private void Awake()
    {
        main = this;
-        playerEquipment = DataHolder.main.PlayerEquipment;
+        if (DataHolder.main.AllEquipment.Count != 0)
+        {
+            playerEquipment = DataHolder.main.PlayerEquipment;
+            allEquipment = DataHolder.main.AllEquipment;
+        }
+
+
        localplayerEquipment.AddRange(allEquipment);
    }

--- a/Library/ArtifactDB
+++ b/Library/ArtifactDB
--- a/Library/CurrentLayout-default.dwlt
+++ b/Library/CurrentLayout-default.dwlt
@ -19,9 +19,9 @@ MonoBehaviour:
    width: 1920
    height: 997
  m_ShowMode: 4
-  m_Title: Game
+  m_Title: Project
  m_RootView: {fileID: 6}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
  m_MaxSize: {x: 10000, y: 10000}
  m_Maximized: 1
 --- !u!114 &2
@ -45,10 +45,10 @@ MonoBehaviour:
    y: 30
    width: 1920
    height: 947
-  m_MinSize: {x: 679, y: 342}
-  m_MaxSize: {x: 12004, y: 8042}
+  m_MinSize: {x: 679, y: 492}
+  m_MaxSize: {x: 14002, y: 14042}
  vertical: 0
-  controlID: 102
+  controlID: 121
 --- !u!114 &3
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -111,7 +111,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
@ -120,14 +120,14 @@ MonoBehaviour:
    y: 573
    width: 1531
    height: 374
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 13}
  m_Panes:
  - {fileID: 13}
  - {fileID: 18}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -150,7 +150,7 @@ MonoBehaviour:
    y: 0
    width: 1920
    height: 997
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
  m_TopViewHeight: 30
@ -223,10 +223,10 @@ MonoBehaviour:
    y: 0
    width: 1531
    height: 947
-  m_MinSize: {x: 403, y: 342}
-  m_MaxSize: {x: 8003, y: 8042}
+  m_MinSize: {x: 403, y: 492}
+  m_MaxSize: {x: 10001, y: 14042}
  vertical: 1
-  controlID: 103
+  controlID: 99
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -251,7 +251,7 @@ MonoBehaviour:
  m_MinSize: {x: 403, y: 221}
  m_MaxSize: {x: 8003, y: 4021}
  vertical: 0
-  controlID: 104
+  controlID: 100
 --- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -343,22 +343,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Scenes
+    - Assets/Scripts/Configs
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/Scenes
+  - Assets/Scripts/Configs
  m_LastFoldersGridSize: -1
  m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 58550000
-    m_LastClickedID: 21848
-    m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000a24d00003055000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 3c430000
+    m_LastClickedID: 17212
+    m_ExpandedIDs: 0000000036430000384300003a4300003c4300004c43000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -386,7 +386,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000
+    m_ExpandedIDs: 0000000036430000384300003a4300003c430000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -411,8 +411,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 5e780000
-    m_LastClickedInstanceID: 30814
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c6230000
    m_RenameOverlay:
@ -507,9 +507,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: a0730000
-      m_LastClickedID: 29600
-      m_ExpandedIDs: 66c6ffff8eccffff04cdfffff6ceffff1ecfffff8adeffff2aebffffbef0ffff10fafffffc6300006c640000f464000012650000
+      m_SelectedIDs: 7e150000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -705,7 +705,7 @@ MonoBehaviour:
    m_VAllowExceedBaseRangeMax: 1
    m_ScaleWithWindow: 0
    m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
    m_IgnoreScrollWheelUntilClicked: 0
    m_EnableMouseInput: 1
    m_EnableSliderZoomHorizontal: 0
@ -718,20 +718,20 @@ MonoBehaviour:
      y: 21
      width: 1150
      height: 531
-    m_Scale: {x: 0.4916667, y: 0.49166667}
-    m_Translation: {x: 575, y: 265.5}
+    m_Scale: {x: 0.51111114, y: 0.51111114}
+    m_Translation: {x: 575, y: 265.49994}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -1169.4915
-      y: -540
-      width: 2338.983
-      height: 1080
+      x: -1124.9999
+      y: -519.45636
+      width: 2249.9998
+      height: 1038.913
    m_MinimalGUI: 1
-  m_defaultScale: 0.49166667
+  m_defaultScale: 0.51111114
  m_LastWindowPixelSize: {x: 1150, y: 552}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
--- a/Library/SceneVisibilityState.asset
+++ b/Library/SceneVisibilityState.asset
--- a/Library/ScriptAssemblies/Assembly-CSharp.dll
+++ b/Library/ScriptAssemblies/Assembly-CSharp.dll
--- a/Library/ScriptAssemblies/Assembly-CSharp.pdb
+++ b/Library/ScriptAssemblies/Assembly-CSharp.pdb
--- a/Library/SourceAssetDB
+++ b/Library/SourceAssetDB
--- a/Logs/AssetImportWorker0-prev.log
+++ b/Logs/AssetImportWorker0-prev.log
--- a/Logs/AssetImportWorker0.log
+++ b/Logs/AssetImportWorker0.log
--- a/Logs/shadercompiler-AssetImportWorker0.log
+++ b/Logs/shadercompiler-AssetImportWorker0.log
@ -1,6 +0,0 @@
-Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
-Cmd: initializeCompiler
-
-Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
-
-Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe10.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe10.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe11.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe11.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe3.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe5.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe6.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe6.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe7.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe7.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe8.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe8.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/Logs/shadercompiler-UnityShaderCompiler.exe9.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe9.log
@ -2,3 +2,5 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins
 Cmd: initializeCompiler

 Cmd: shutdown
+
+Quitting shader compiler process
--- a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
+++ b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
--- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache