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

This commit is contained in:
Беляев Даниил 2022-01-19 20:27:33 +03:00
parent 589282d9e2
commit 1e2d39e0dd
24 changed files with 489 additions and 4943 deletions

Binary file not shown.

View File

@ -10,7 +10,9 @@ public class DataHolder : MonoBehaviour
public List<BattleConfig> easyLevels; public List<BattleConfig> easyLevels;
public List<BattleConfig> normalLevels; public List<BattleConfig> normalLevels;
public List<BattleConfig> hardLevels; public List<BattleConfig> hardLevels;
public List<GameObject> PlayerEquipment = new List<GameObject>(); public List<GameObject> PlayerEquipment = new List<GameObject>();
public List<GameObject> AllEquipment = new List<GameObject>();
public MissionConfig mission; public MissionConfig mission;
[SerializeField] private string _currentScene; [SerializeField] private string _currentScene;
@ -123,4 +125,9 @@ public class DataHolder : MonoBehaviour
{ {
ChangeScene("MainMenu"); ChangeScene("MainMenu");
} }
public void AddEquipmentToPlayerInvaentary(GameObject _item)
{
AllEquipment.Add(_item);
}
} }

View File

@ -28,5 +28,6 @@ public class EquipmentCharacteristic
public string description; public string description;
public Sprite sprite; public Sprite sprite;
public Place place; public Place place;
public GameObject equipmentCard;
} }

View File

@ -36,6 +36,7 @@ public class AddEquipment : MonoBehaviour
} }
DataHolder.main.PlayerEquipment = Inventory.main.playerEquipment; DataHolder.main.PlayerEquipment = Inventory.main.playerEquipment;
DataHolder.main.AllEquipment = Inventory.main.allEquipment;
EquipmentInfo.main.CardAbout(Inventory.main.lastCardNum); EquipmentInfo.main.CardAbout(Inventory.main.lastCardNum);
} }

View File

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

Binary file not shown.

View File

@ -19,9 +19,9 @@ MonoBehaviour:
width: 1920 width: 1920
height: 997 height: 997
m_ShowMode: 4 m_ShowMode: 4
m_Title: Game m_Title: Project
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 1
--- !u!114 &2 --- !u!114 &2
@ -45,10 +45,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 679, y: 342} m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 12004, y: 8042} m_MaxSize: {x: 14002, y: 14042}
vertical: 0 vertical: 0
controlID: 102 controlID: 121
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -111,7 +111,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow m_Name: ProjectBrowser
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
@ -120,14 +120,14 @@ MonoBehaviour:
y: 573 y: 573
width: 1531 width: 1531
height: 374 height: 374
m_MinSize: {x: 101, y: 121} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
m_Selected: 1 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 1
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -150,7 +150,7 @@ MonoBehaviour:
y: 0 y: 0
width: 1920 width: 1920
height: 997 height: 997
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1 m_UseTopView: 1
m_TopViewHeight: 30 m_TopViewHeight: 30
@ -223,10 +223,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
m_MinSize: {x: 403, y: 342} m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 8003, y: 8042} m_MaxSize: {x: 10001, y: 14042}
vertical: 1 vertical: 1
controlID: 103 controlID: 99
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -251,7 +251,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221} m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021} m_MaxSize: {x: 8003, y: 4021}
vertical: 0 vertical: 0
controlID: 104 controlID: 100
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -343,22 +343,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scenes - Assets/Scripts/Configs
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Scenes - Assets/Scripts/Configs
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega" m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 79} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 58550000 m_SelectedIDs: 3c430000
m_LastClickedID: 21848 m_LastClickedID: 17212
m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000a24d00003055000000ca9a3b m_ExpandedIDs: 0000000036430000384300003a4300003c4300004c43000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -386,7 +386,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000009a4800009c4800009e480000a0480000 m_ExpandedIDs: 0000000036430000384300003a4300003c430000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -411,8 +411,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: 5e780000 m_SelectedInstanceIDs:
m_LastClickedInstanceID: 30814 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: c6230000
m_RenameOverlay: m_RenameOverlay:
@ -507,9 +507,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: a0730000 m_SelectedIDs: 7e150000
m_LastClickedID: 29600 m_LastClickedID: 0
m_ExpandedIDs: 66c6ffff8eccffff04cdfffff6ceffff1ecfffff8adeffff2aebffffbef0ffff10fafffffc6300006c640000f464000012650000 m_ExpandedIDs:
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -705,7 +705,7 @@ MonoBehaviour:
m_VAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0 m_ScaleWithWindow: 0
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 1
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
@ -718,20 +718,20 @@ MonoBehaviour:
y: 21 y: 21
width: 1150 width: 1150
height: 531 height: 531
m_Scale: {x: 0.4916667, y: 0.49166667} m_Scale: {x: 0.51111114, y: 0.51111114}
m_Translation: {x: 575, y: 265.5} m_Translation: {x: 575, y: 265.49994}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -1169.4915 x: -1124.9999
y: -540 y: -519.45636
width: 2338.983 width: 2249.9998
height: 1080 height: 1038.913
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.49166667 m_defaultScale: 0.51111114
m_LastWindowPixelSize: {x: 1150, y: 552} m_LastWindowPixelSize: {x: 1150, y: 552}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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