zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 

# Conflicts:
#	Library/ArtifactDB
#	Library/CurrentLayout-default.dwlt
#	Library/SceneVisibilityState.asset
#	Library/ScriptAssemblies/Assembly-CSharp.dll
#	Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Library/SourceAssetDB
#	Logs/AssetImportWorker0-prev.log
#	Logs/AssetImportWorker0.log
#	Logs/shadercompiler-UnityShaderCompiler.exe10.log
#	Logs/shadercompiler-UnityShaderCompiler.exe11.log
#	Logs/shadercompiler-UnityShaderCompiler.exe3.log
#	Logs/shadercompiler-UnityShaderCompiler.exe5.log
#	Logs/shadercompiler-UnityShaderCompiler.exe7.log
#	Logs/shadercompiler-UnityShaderCompiler.exe8.log
#	Logs/shadercompiler-UnityShaderCompiler.exe9.log
#	obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
#	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
This commit is contained in:
Залетов Федор 2022-01-19 23:49:46 +03:00
parent 39f3ef5be8 1e2d39e0dd
commit ac1950d901
15 changed files with 778 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/omega/v16/.suo
View File

Binary file not shown.

7
Assets/DataHolder.cs
View File

@ -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);
}
}

1
Assets/Inventory/AddEquipment.cs
View File

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

6
Assets/Inventory/Inventory.cs
View File

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

1
Assets/Scripts/Configs/EquipmentConfig.cs
View File

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

233
Library/CurrentLayout-default.dwlt
View File

@ -19,9 +19,15 @@ MonoBehaviour:
width: 1536
height: 780.8
m_ShowMode: 4
<<<<<<< HEAD
m_Title: Inspector
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 492}
=======
m_Title: Project
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 542}
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@ -43,6 +49,7 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
<<<<<<< HEAD
y: 0
width: 1536
height: 780.8
@ -52,6 +59,15 @@ MonoBehaviour:
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
=======
y: 30
width: 1920
height: 947
m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14002, y: 14042}
vertical: 0
controlID: 121
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -113,18 +129,37 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
<<<<<<< HEAD
m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
=======
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
<<<<<<< HEAD
y: 760.8
width: 1536
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
=======
y: 573
width: 1531
height: 374
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 1
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -144,12 +179,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
<<<<<<< HEAD
width: 827.2
height: 730.8
m_MinSize: {x: 201, y: 442}
m_MaxSize: {x: 4001, y: 8042}
vertical: 1
controlID: 1005
=======
width: 1920
height: 997
m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -219,6 +265,7 @@ MonoBehaviour:
serializedVersion: 2
x: 1260.8
y: 0
<<<<<<< HEAD
width: 275.19995
height: 730.8
m_MinSize: {x: 275, y: 50}
@ -228,6 +275,14 @@ MonoBehaviour:
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
=======
width: 1531
height: 947
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 99
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@ -245,6 +300,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
<<<<<<< HEAD
width: 827.2
height: 220.8
m_MinSize: {x: 201, y: 221}
@ -254,6 +310,14 @@ MonoBehaviour:
- {fileID: 16}
m_Selected: 0
m_LastSelected: 0
=======
width: 1531
height: 573
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
controlID: 100
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@ -409,22 +473,38 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
<<<<<<< HEAD
- Assets/Scripts/Configs/EquipmentConfigs
=======
- Assets/Scripts/Configs
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 16
m_LastFolders:
<<<<<<< HEAD
- Assets/Scripts/Configs/EquipmentConfigs
m_LastFoldersGridSize: 16
m_LastProjectPath: C:\Users\Dara\Documents\1\PO
=======
- Assets/Scripts/Configs
m_LastFoldersGridSize: -1
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 9a420000
m_LastClickedID: 17050
m_ExpandedIDs: 000000006042000062420000664200006c4200007042000000ca9a3b
=======
m_SelectedIDs: 3c430000
m_LastClickedID: 17212
m_ExpandedIDs: 0000000036430000384300003a4300003c4300004c43000000ca9a3b
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -452,7 +532,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 00000000604200006c42000000ca9a3b
=======
m_ExpandedIDs: 0000000036430000384300003a4300003c430000
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -533,6 +617,7 @@ MonoBehaviour:
width: 826.2
height: 489
m_ViewDataDictionary: {fileID: 0}
<<<<<<< HEAD
m_SerializedViewNames: []
m_SerializedViewValues: []
m_PlayModeViewName: GameView
@ -597,6 +682,37 @@ MonoBehaviour:
m_LowResolutionForAspectRatios: 00000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
=======
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 7e150000
m_LastClickedID: 0
m_ExpandedIDs:
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 7ddebfce81a55de4fa6d80ec2c90ba37
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
@ -715,6 +831,123 @@ MonoBehaviour:
m_ViewIsLockedToObject: 0
--- !u!114 &17
MonoBehaviour:
<<<<<<< HEAD
=======
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 379
y: 73
width: 1150
height: 552
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1920, y: 1080}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
m_MaximizeOnPlay: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 00000000000000000000000006000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -960
m_HBaseRangeMax: 960
m_VBaseRangeMin: -540
m_VBaseRangeMax: 540
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_VSlider: 1
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
m_UpDirection: 1
m_DrawArea:
serializedVersion: 2
x: 0
y: 21
width: 1150
height: 531
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: -1124.9999
y: -519.45636
width: 2249.9998
height: 1038.913
m_MinimalGUI: 1
m_defaultScale: 0.51111114
m_LastWindowPixelSize: {x: 1150, y: 552}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000001000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 646
width: 1530
height: 353
m_ViewDataDictionary: {fileID: 0}
--- !u!114 &19
MonoBehaviour:
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}

504
Logs/AssetImportWorker0-prev.log
View File

File diff suppressed because it is too large Load Diff

2
Logs/shadercompiler-AssetImportWorker0.log → Logs/shadercompiler-UnityShaderCompiler.exe10.log
View File

@ -1,6 +1,6 @@
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)
Cmd: shutdown
Quitting shader compiler process

6
Logs/shadercompiler-UnityShaderCompiler.exe11.log Normal file
View File

@ -0,0 +1,6 @@
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
Cmd: shutdown
Quitting shader compiler process

6
Logs/shadercompiler-UnityShaderCompiler.exe3.log
View File

@ -1,7 +1,13 @@
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
<<<<<<< HEAD
=======
Cmd: shutdown
Quitting shader compiler process
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3

6
Logs/shadercompiler-UnityShaderCompiler.exe5.log
View File

@ -1,7 +1,13 @@
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
<<<<<<< HEAD
=======
Cmd: shutdown
Quitting shader compiler process
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3

2
Logs/shadercompiler-UnityShaderCompiler.exe6.log
View File

@ -6,3 +6,5 @@ Cmd: initializeCompiler
Cmd: shutdown
Quitting shader compiler process

6
Logs/shadercompiler-UnityShaderCompiler.exe7.log
View File

@ -1,7 +1,13 @@
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
<<<<<<< HEAD
=======
Cmd: shutdown
Quitting shader compiler process
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3

6
Logs/shadercompiler-UnityShaderCompiler.exe8.log Normal file
View File

@ -0,0 +1,6 @@
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
Cmd: shutdown
Quitting shader compiler process

6
Logs/shadercompiler-UnityShaderCompiler.exe9.log Normal file
View File

@ -0,0 +1,6 @@
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
Cmd: shutdown
Quitting shader compiler process