diff --git a/.vs/omega/v16/.suo b/.vs/omega/v16/.suo index 2128ef0e..372a6244 100644 Binary files a/.vs/omega/v16/.suo and b/.vs/omega/v16/.suo differ diff --git a/Assets/DataHolder.cs b/Assets/DataHolder.cs index 349b459f..1aaa4dc8 100644 --- a/Assets/DataHolder.cs +++ b/Assets/DataHolder.cs @@ -10,7 +10,9 @@ public class DataHolder : MonoBehaviour public List easyLevels; public List normalLevels; public List hardLevels; + public List PlayerEquipment = new List(); + public List AllEquipment = new List(); 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); + } } diff --git a/Assets/Inventory/AddEquipment.cs b/Assets/Inventory/AddEquipment.cs index 40bcf46d..02db4b22 100644 --- a/Assets/Inventory/AddEquipment.cs +++ b/Assets/Inventory/AddEquipment.cs @@ -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); } diff --git a/Assets/Inventory/Inventory.cs b/Assets/Inventory/Inventory.cs index 081e9dd6..57954abc 100644 --- a/Assets/Inventory/Inventory.cs +++ b/Assets/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); } diff --git a/Assets/Scripts/Configs/EquipmentConfig.cs b/Assets/Scripts/Configs/EquipmentConfig.cs index 5aec7eaf..e9d31e1b 100644 --- a/Assets/Scripts/Configs/EquipmentConfig.cs +++ b/Assets/Scripts/Configs/EquipmentConfig.cs @@ -29,5 +29,6 @@ public class EquipmentCharacteristic public string description; public Sprite sprite; public Place place; + public GameObject equipmentCard; } diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 8ed8dd0f..64706545 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -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} diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log index 9c430ad5..ad62cf29 100644 --- a/Logs/AssetImportWorker0-prev.log +++ b/Logs/AssetImportWorker0-prev.log @@ -15,11 +15,19 @@ E:/Projects с#/Unity/omega -logFile Logs/AssetImportWorker0.log -srvPort +<<<<<<< HEAD 52157 Successfully changed project path to: E:/Projects с#/Unity/omega E:/Projects с#/Unity/omega Using Asset Import Pipeline V2. Refreshing native plugins compatible for Editor in 30.61 ms, found 3 plugins. +======= +52421 +Successfully changed project path to: E:/Projects с#/Unity/omega +E:/Projects с#/Unity/omega +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 31.07 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Initialize engine version: 2020.3.19f1 (68f137dc9bbe) [Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Resources/UnitySubsystems @@ -35,6 +43,7 @@ Initialize mono Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Managed' Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/etc' +<<<<<<< HEAD Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56564 Begin MonoManager ReloadAssembly Registering precompiled unity dll's ... @@ -48,18 +57,42 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (1678ms) BeginReloadAssembly (36ms) +======= +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56968 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.001137 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 28.91 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.462 seconds +Domain Reload Profiling: + ReloadAssembly (1462ms) + BeginReloadAssembly (38ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (0ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (1ms) EndReloadAssembly (291ms) +<<<<<<< HEAD LoadAssemblies (35ms) RebuildTransferFunctionScriptingTraits (0ms) SetupTypeCache (94ms) ReleaseScriptCaches (0ms) RebuildScriptCaches (23ms) SetupLoadedEditorAssemblies (117ms) +======= + LoadAssemblies (36ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (95ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (22ms) + SetupLoadedEditorAssemblies (115ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (3ms) SetLoadedEditorAssemblies (0ms) @@ -73,6 +106,7 @@ Domain Reload Profiling: AwakeInstancesAfterBackupRestoration (0ms) Platform modules already initialized, skipping Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001313 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -82,42 +116,79 @@ Mono: successfully reloaded assembly - Completed reload, in 0.727 seconds Domain Reload Profiling: ReloadAssembly (727ms) +======= +Registered in 0.001172 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 28.62 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.104 seconds +Domain Reload Profiling: + ReloadAssembly (1105ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 BeginReloadAssembly (91ms) ExecutionOrderSort (0ms) DisableScriptedObjects (3ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (13ms) EndReloadAssembly (596ms) LoadAssemblies (57ms) +======= + CreateAndSetChildDomain (12ms) + EndReloadAssembly (975ms) + LoadAssemblies (445ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (176ms) + SetupTypeCache (173ms) ReleaseScriptCaches (0ms) RebuildScriptCaches (36ms) +<<<<<<< HEAD SetupLoadedEditorAssemblies (247ms) +======= + SetupLoadedEditorAssemblies (241ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (3ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (29ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (57ms) ProcessInitializeOnLoadAttributes (144ms) ProcessInitializeOnLoadMethodAttributes (10ms) AfterProcessingInitializeOnLoad (4ms) +======= + BeforeProcessingInitializeOnLoad (54ms) + ProcessInitializeOnLoadAttributes (141ms) + ProcessInitializeOnLoadMethodAttributes (10ms) + AfterProcessingInitializeOnLoad (3ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (5ms) + AwakeInstancesAfterBackupRestoration (4ms) Platform modules already initialized, skipping ======================================================================== Worker process is ready to serve import requests +<<<<<<< HEAD Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +======= +Launched and connected shader compiler UnityShaderCompiler.exe after 0.05 seconds +Refreshing native plugins compatible for Editor in 0.36 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2139 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 96.2 MB. System memory in use after: 96.3 MB. Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2579. +<<<<<<< HEAD Total: 2.061300 ms (FindLiveObjects: 0.119900 ms CreateObjectMapping: 0.045000 ms MarkObjects: 1.823600 ms DeleteObjects: 0.072000 ms) +======= +Total: 2.629700 ms (FindLiveObjects: 0.135900 ms CreateObjectMapping: 0.066700 ms MarkObjects: 2.347100 ms DeleteObjects: 0.079000 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -131,6 +202,7 @@ AssetImportParameters requested are different than current active one (requested custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Import Request. +<<<<<<< HEAD path: Assets/Prefabs artifactKey: Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Prefabs using Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4722b95463dd97ba4aa8d14403194875') in 0.003121 seconds @@ -167,10 +239,25 @@ Received Import Request. artifactKey: Guid(ca90993e80150994e905b83ffd525f53) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Prefabs/Equipment/Helmet.prefab using Guid(ca90993e80150994e905b83ffd525f53) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '202e276b0152f114bd8bb81fd63fca03') in 0.015030 seconds Import took 0.017270 seconds . +======= + path: Assets/Scripts/Configs/EquipmentConfig.cs + artifactKey: Guid(e99dbdebfc0206140add44c501c04f23) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/EquipmentConfig.cs using Guid(e99dbdebfc0206140add44c501c04f23) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '1f055761864e8b6a8b4f59a66bfe8257') in 0.025563 seconds + Import took 0.040060 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1118.175600 seconds. + path: Assets/Scripts/Configs/EquipmentConfig.cs + artifactKey: Guid(e99dbdebfc0206140add44c501c04f23) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/EquipmentConfig.cs using Guid(e99dbdebfc0206140add44c501c04f23) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '8da3f886624481190453efd2d3855b49') in 0.008315 seconds + Import took 0.011684 seconds . +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001173 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -181,11 +268,24 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (739ms) BeginReloadAssembly (80ms) +======= +Registered in 0.001208 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.35 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.735 seconds +Domain Reload Profiling: + ReloadAssembly (735ms) + BeginReloadAssembly (86ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (25ms) +<<<<<<< HEAD EndReloadAssembly (613ms) LoadAssemblies (59ms) RebuildTransferFunctionScriptingTraits (0ms) @@ -193,17 +293,31 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (41ms) SetupLoadedEditorAssemblies (233ms) +======= + EndReloadAssembly (608ms) + LoadAssemblies (58ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (183ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (44ms) + SetupLoadedEditorAssemblies (236ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) BeforeProcessingInitializeOnLoad (67ms) +<<<<<<< HEAD ProcessInitializeOnLoadAttributes (153ms) ProcessInitializeOnLoadMethodAttributes (4ms) +======= + ProcessInitializeOnLoadAttributes (156ms) + ProcessInitializeOnLoadMethodAttributes (5ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AfterProcessingInitializeOnLoad (4ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (8ms) + AwakeInstancesAfterBackupRestoration (9ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.31 ms, found 3 plugins. @@ -213,7 +327,11 @@ System memory in use before: 94.3 MB. System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2581. +<<<<<<< HEAD Total: 2.095300 ms (FindLiveObjects: 0.118100 ms CreateObjectMapping: 0.038700 ms MarkObjects: 1.912400 ms DeleteObjects: 0.025400 ms) +======= +Total: 1.938000 ms (FindLiveObjects: 0.122800 ms CreateObjectMapping: 0.041000 ms MarkObjects: 1.761200 ms DeleteObjects: 0.012200 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -229,6 +347,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001138 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -238,11 +357,23 @@ Mono: successfully reloaded assembly - Completed reload, in 0.738 seconds Domain Reload Profiling: ReloadAssembly (738ms) +======= +Registered in 0.001192 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.787 seconds +Domain Reload Profiling: + ReloadAssembly (787ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 BeginReloadAssembly (94ms) ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (25ms) EndReloadAssembly (600ms) LoadAssemblies (61ms) @@ -251,27 +382,50 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (45ms) SetupLoadedEditorAssemblies (237ms) +======= + CreateAndSetChildDomain (26ms) + EndReloadAssembly (649ms) + LoadAssemblies (62ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (196ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (41ms) + SetupLoadedEditorAssemblies (234ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (67ms) ProcessInitializeOnLoadAttributes (157ms) +======= + BeforeProcessingInitializeOnLoad (68ms) + ProcessInitializeOnLoadAttributes (153ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadMethodAttributes (5ms) - AfterProcessingInitializeOnLoad (4ms) + AfterProcessingInitializeOnLoad (5ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) AwakeInstancesAfterBackupRestoration (8ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.33 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.4 MB. System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2583. +<<<<<<< HEAD Total: 2.117000 ms (FindLiveObjects: 0.120700 ms CreateObjectMapping: 0.045100 ms MarkObjects: 1.936500 ms DeleteObjects: 0.013700 ms) +======= +Total: 2.323200 ms (FindLiveObjects: 0.133100 ms CreateObjectMapping: 0.056100 ms MarkObjects: 2.117000 ms DeleteObjects: 0.015900 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -287,6 +441,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001262 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -297,10 +452,23 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (826ms) BeginReloadAssembly (97ms) +======= +Registered in 0.001230 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.731 seconds +Domain Reload Profiling: + ReloadAssembly (731ms) + BeginReloadAssembly (88ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (27ms) EndReloadAssembly (680ms) LoadAssemblies (67ms) @@ -309,11 +477,25 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (51ms) SetupLoadedEditorAssemblies (238ms) +======= + CreateAndSetChildDomain (25ms) + EndReloadAssembly (602ms) + LoadAssemblies (57ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (191ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (38ms) + SetupLoadedEditorAssemblies (235ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (69ms) +======= + BeforeProcessingInitializeOnLoad (66ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadAttributes (156ms) ProcessInitializeOnLoadMethodAttributes (4ms) AfterProcessingInitializeOnLoad (3ms) @@ -329,7 +511,11 @@ System memory in use before: 94.4 MB. System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2585. +<<<<<<< HEAD Total: 1.940600 ms (FindLiveObjects: 0.121300 ms CreateObjectMapping: 0.044200 ms MarkObjects: 1.760100 ms DeleteObjects: 0.014100 ms) +======= +Total: 1.927600 ms (FindLiveObjects: 0.118400 ms CreateObjectMapping: 0.043100 ms MarkObjects: 1.753800 ms DeleteObjects: 0.011400 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -345,6 +531,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001176 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -355,11 +542,24 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (755ms) BeginReloadAssembly (95ms) +======= +Registered in 0.001199 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.38 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.715 seconds +Domain Reload Profiling: + ReloadAssembly (716ms) + BeginReloadAssembly (79ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (25ms) +<<<<<<< HEAD EndReloadAssembly (616ms) LoadAssemblies (63ms) RebuildTransferFunctionScriptingTraits (0ms) @@ -367,27 +567,52 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (43ms) SetupLoadedEditorAssemblies (233ms) +======= + EndReloadAssembly (596ms) + LoadAssemblies (58ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (182ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (38ms) + SetupLoadedEditorAssemblies (237ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (64ms) ProcessInitializeOnLoadAttributes (156ms) +======= + BeforeProcessingInitializeOnLoad (68ms) + ProcessInitializeOnLoadAttributes (157ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadMethodAttributes (4ms) AfterProcessingInitializeOnLoad (3ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) +<<<<<<< HEAD AwakeInstancesAfterBackupRestoration (9ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.36 ms, found 3 plugins. +======= + AwakeInstancesAfterBackupRestoration (7ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.4 MB. System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2587. +<<<<<<< HEAD Total: 2.506400 ms (FindLiveObjects: 0.177200 ms CreateObjectMapping: 0.075000 ms MarkObjects: 2.233700 ms DeleteObjects: 0.018900 ms) +======= +Total: 1.944600 ms (FindLiveObjects: 0.123000 ms CreateObjectMapping: 0.041200 ms MarkObjects: 1.767300 ms DeleteObjects: 0.012200 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -403,6 +628,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001223 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -413,10 +639,23 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (767ms) BeginReloadAssembly (87ms) +======= +Registered in 0.001216 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.31 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.689 seconds +Domain Reload Profiling: + ReloadAssembly (690ms) + BeginReloadAssembly (83ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) + DisableScriptedObjects (4ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (25ms) EndReloadAssembly (635ms) LoadAssemblies (63ms) @@ -425,27 +664,52 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (44ms) SetupLoadedEditorAssemblies (238ms) +======= + CreateAndSetChildDomain (22ms) + EndReloadAssembly (567ms) + LoadAssemblies (56ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (169ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (37ms) + SetupLoadedEditorAssemblies (221ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (68ms) ProcessInitializeOnLoadAttributes (156ms) ProcessInitializeOnLoadMethodAttributes (5ms) AfterProcessingInitializeOnLoad (4ms) +======= + BeforeProcessingInitializeOnLoad (65ms) + ProcessInitializeOnLoadAttributes (143ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (3ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (8ms) + AwakeInstancesAfterBackupRestoration (7ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.30 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.4 MB. System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2589. +<<<<<<< HEAD Total: 2.000700 ms (FindLiveObjects: 0.121200 ms CreateObjectMapping: 0.055000 ms MarkObjects: 1.811100 ms DeleteObjects: 0.012600 ms) +======= +Total: 1.879100 ms (FindLiveObjects: 0.120400 ms CreateObjectMapping: 0.040500 ms MarkObjects: 1.692300 ms DeleteObjects: 0.025000 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -461,6 +725,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001169 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -471,11 +736,24 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (702ms) BeginReloadAssembly (81ms) +======= +Registered in 0.001157 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.736 seconds +Domain Reload Profiling: + ReloadAssembly (736ms) + BeginReloadAssembly (94ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) + DisableScriptedObjects (4ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (24ms) +<<<<<<< HEAD EndReloadAssembly (579ms) LoadAssemblies (60ms) RebuildTransferFunctionScriptingTraits (0ms) @@ -483,12 +761,26 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (38ms) SetupLoadedEditorAssemblies (219ms) +======= + EndReloadAssembly (600ms) + LoadAssemblies (57ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (183ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (39ms) + SetupLoadedEditorAssemblies (231ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (61ms) ProcessInitializeOnLoadAttributes (146ms) +======= + BeforeProcessingInitializeOnLoad (67ms) + ProcessInitializeOnLoadAttributes (152ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadMethodAttributes (4ms) AfterProcessingInitializeOnLoad (3ms) EditorAssembliesLoaded (0ms) @@ -496,14 +788,22 @@ Domain Reload Profiling: AwakeInstancesAfterBackupRestoration (7ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.31 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.51 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.4 MB. -System memory in use after: 94.6 MB. +System memory in use after: 94.5 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2591. +<<<<<<< HEAD Total: 1.945800 ms (FindLiveObjects: 0.120800 ms CreateObjectMapping: 0.044000 ms MarkObjects: 1.767800 ms DeleteObjects: 0.012400 ms) +======= +Total: 1.994700 ms (FindLiveObjects: 0.156500 ms CreateObjectMapping: 0.059300 ms MarkObjects: 1.764000 ms DeleteObjects: 0.013900 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -519,20 +819,32 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001362 seconds. +======= +Registered in 0.001133 seconds. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found -Refreshing native plugins compatible for Editor in 0.33 ms, found 3 plugins. +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. Preloading 0 native plugins for Editor in 0.00 ms. Mono: successfully reloaded assembly +<<<<<<< HEAD - Completed reload, in 0.772 seconds Domain Reload Profiling: ReloadAssembly (772ms) BeginReloadAssembly (95ms) +======= +- Completed reload, in 0.723 seconds +Domain Reload Profiling: + ReloadAssembly (723ms) + BeginReloadAssembly (78ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (26ms) EndReloadAssembly (635ms) LoadAssemblies (60ms) @@ -541,13 +853,29 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (41ms) SetupLoadedEditorAssemblies (242ms) +======= + CreateAndSetChildDomain (23ms) + EndReloadAssembly (604ms) + LoadAssemblies (57ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (172ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (39ms) + SetupLoadedEditorAssemblies (235ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (68ms) ProcessInitializeOnLoadAttributes (162ms) ProcessInitializeOnLoadMethodAttributes (4ms) +======= + BeforeProcessingInitializeOnLoad (65ms) + ProcessInitializeOnLoadAttributes (157ms) + ProcessInitializeOnLoadMethodAttributes (5ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AfterProcessingInitializeOnLoad (4ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) @@ -557,11 +885,19 @@ Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) +<<<<<<< HEAD System memory in use before: 94.5 MB. System memory in use after: 94.6 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2593. Total: 2.300600 ms (FindLiveObjects: 0.137200 ms CreateObjectMapping: 0.046600 ms MarkObjects: 2.088500 ms DeleteObjects: 0.027000 ms) +======= +System memory in use before: 94.4 MB. +System memory in use after: 94.5 MB. + +Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2593. +Total: 1.879000 ms (FindLiveObjects: 0.122000 ms CreateObjectMapping: 0.041400 ms MarkObjects: 1.701000 ms DeleteObjects: 0.013800 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -577,6 +913,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001393 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -587,10 +924,23 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (772ms) BeginReloadAssembly (95ms) +======= +Registered in 0.001289 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.728 seconds +Domain Reload Profiling: + ReloadAssembly (729ms) + BeginReloadAssembly (84ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (24ms) EndReloadAssembly (635ms) LoadAssemblies (63ms) @@ -605,6 +955,22 @@ Domain Reload Profiling: RefreshPlugins (1ms) BeforeProcessingInitializeOnLoad (68ms) ProcessInitializeOnLoadAttributes (163ms) +======= + CreateAndSetChildDomain (23ms) + EndReloadAssembly (601ms) + LoadAssemblies (59ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (186ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (38ms) + SetupLoadedEditorAssemblies (223ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (62ms) + ProcessInitializeOnLoadAttributes (149ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadMethodAttributes (5ms) AfterProcessingInitializeOnLoad (4ms) EditorAssembliesLoaded (0ms) @@ -612,14 +978,22 @@ Domain Reload Profiling: AwakeInstancesAfterBackupRestoration (7ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 94.5 MB. +System memory in use before: 94.4 MB. System memory in use after: 94.6 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2595. +<<<<<<< HEAD Total: 2.017200 ms (FindLiveObjects: 0.121000 ms CreateObjectMapping: 0.043900 ms MarkObjects: 1.823400 ms DeleteObjects: 0.027700 ms) +======= +Total: 2.323600 ms (FindLiveObjects: 0.143900 ms CreateObjectMapping: 0.049100 ms MarkObjects: 2.112100 ms DeleteObjects: 0.017500 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -635,20 +1009,32 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001299 seconds. +======= +Registered in 0.002436 seconds. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. Preloading 0 native plugins for Editor in 0.00 ms. Mono: successfully reloaded assembly +<<<<<<< HEAD - Completed reload, in 0.734 seconds Domain Reload Profiling: ReloadAssembly (734ms) BeginReloadAssembly (92ms) +======= +- Completed reload, in 0.777 seconds +Domain Reload Profiling: + ReloadAssembly (778ms) + BeginReloadAssembly (93ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (24ms) EndReloadAssembly (603ms) LoadAssemblies (57ms) @@ -657,13 +1043,29 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (41ms) SetupLoadedEditorAssemblies (228ms) +======= + CreateAndSetChildDomain (31ms) + EndReloadAssembly (643ms) + LoadAssemblies (60ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (196ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (40ms) + SetupLoadedEditorAssemblies (244ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (62ms) ProcessInitializeOnLoadAttributes (153ms) ProcessInitializeOnLoadMethodAttributes (4ms) +======= + BeforeProcessingInitializeOnLoad (68ms) + ProcessInitializeOnLoadAttributes (158ms) + ProcessInitializeOnLoadMethodAttributes (10ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AfterProcessingInitializeOnLoad (4ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) @@ -673,11 +1075,15 @@ Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform Refreshing native plugins compatible for Editor in 0.33 ms, found 3 plugins. Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 94.5 MB. +System memory in use before: 94.4 MB. System memory in use after: 94.6 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2597. +<<<<<<< HEAD Total: 1.941800 ms (FindLiveObjects: 0.120300 ms CreateObjectMapping: 0.039100 ms MarkObjects: 1.768600 ms DeleteObjects: 0.012900 ms) +======= +Total: 2.058500 ms (FindLiveObjects: 0.126900 ms CreateObjectMapping: 0.044500 ms MarkObjects: 1.857800 ms DeleteObjects: 0.028400 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -701,6 +1107,7 @@ Start importing Assets/Scripts/Not used/BaseEnemyTurn.cs using Guid(047bd205dd84 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001303 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -711,11 +1118,24 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (758ms) BeginReloadAssembly (92ms) +======= +Registered in 0.001229 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.35 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.773 seconds +Domain Reload Profiling: + ReloadAssembly (773ms) + BeginReloadAssembly (91ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (24ms) +<<<<<<< HEAD EndReloadAssembly (622ms) LoadAssemblies (60ms) RebuildTransferFunctionScriptingTraits (0ms) @@ -723,27 +1143,51 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (46ms) SetupLoadedEditorAssemblies (227ms) +======= + EndReloadAssembly (639ms) + LoadAssemblies (61ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (184ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (42ms) + SetupLoadedEditorAssemblies (241ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) InitializePlatformSupportModulesInManaged (4ms) - SetLoadedEditorAssemblies (0ms) + SetLoadedEditorAssemblies (1ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (66ms) ProcessInitializeOnLoadAttributes (148ms) ProcessInitializeOnLoadMethodAttributes (4ms) AfterProcessingInitializeOnLoad (3ms) +======= + BeforeProcessingInitializeOnLoad (69ms) + ProcessInitializeOnLoadAttributes (158ms) + ProcessInitializeOnLoadMethodAttributes (5ms) + AfterProcessingInitializeOnLoad (4ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (7ms) + AwakeInstancesAfterBackupRestoration (8ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.35 ms, found 3 plugins. +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2120 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.5 MB. System memory in use after: 94.6 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2599. +<<<<<<< HEAD Total: 2.359500 ms (FindLiveObjects: 0.236000 ms CreateObjectMapping: 0.088300 ms MarkObjects: 2.017600 ms DeleteObjects: 0.016500 ms) +======= +Total: 1.976000 ms (FindLiveObjects: 0.126100 ms CreateObjectMapping: 0.046400 ms MarkObjects: 1.790000 ms DeleteObjects: 0.012600 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -759,6 +1203,7 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.001205 seconds. Begin MonoManager ReloadAssembly Native extension for WindowsStandalone target not found @@ -769,10 +1214,23 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (759ms) BeginReloadAssembly (80ms) +======= +Registered in 0.001192 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.726 seconds +Domain Reload Profiling: + ReloadAssembly (727ms) + BeginReloadAssembly (78ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ExecutionOrderSort (0ms) DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (25ms) EndReloadAssembly (638ms) LoadAssemblies (57ms) @@ -781,12 +1239,26 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (39ms) SetupLoadedEditorAssemblies (256ms) +======= + CreateAndSetChildDomain (22ms) + EndReloadAssembly (609ms) + LoadAssemblies (55ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (172ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (37ms) + SetupLoadedEditorAssemblies (232ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (4ms) + InitializePlatformSupportModulesInManaged (3ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) BeforeProcessingInitializeOnLoad (64ms) +<<<<<<< HEAD ProcessInitializeOnLoadAttributes (179ms) +======= + ProcessInitializeOnLoadAttributes (156ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 ProcessInitializeOnLoadMethodAttributes (4ms) AfterProcessingInitializeOnLoad (4ms) EditorAssembliesLoaded (0ms) @@ -801,6 +1273,7 @@ System memory in use before: 94.5 MB. System memory in use after: 94.6 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2601. +<<<<<<< HEAD Total: 2.259700 ms (FindLiveObjects: 0.140100 ms CreateObjectMapping: 0.046200 ms MarkObjects: 2.045300 ms DeleteObjects: 0.027300 ms) AssetImportParameters requested are different than current active one (requested -> active): @@ -1796,6 +2269,9 @@ System memory in use after: 94.7 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2635. Total: 2.104600 ms (FindLiveObjects: 0.137000 ms CreateObjectMapping: 0.048400 ms MarkObjects: 1.903600 ms DeleteObjects: 0.014400 ms) +======= +Total: 2.140700 ms (FindLiveObjects: 0.121500 ms CreateObjectMapping: 0.046500 ms MarkObjects: 1.956200 ms DeleteObjects: 0.015300 ms) +>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log similarity index 68% rename from Logs/shadercompiler-AssetImportWorker0.log rename to Logs/shadercompiler-UnityShaderCompiler.exe10.log index d13a20b0..75cc7b08 100644 --- a/Logs/shadercompiler-AssetImportWorker0.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe10.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log new file mode 100644 index 00000000..75cc7b08 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe11.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log index e2259d7d..6ecdedd5 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Logs/shadercompiler-UnityShaderCompiler.exe5.log index e2259d7d..6ecdedd5 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Logs/shadercompiler-UnityShaderCompiler.exe6.log index ac0de1bf..5237aa31 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe6.log @@ -6,3 +6,5 @@ Cmd: initializeCompiler Cmd: shutdown + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe7.log b/Logs/shadercompiler-UnityShaderCompiler.exe7.log index e2259d7d..6ecdedd5 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe7.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe8.log b/Logs/shadercompiler-UnityShaderCompiler.exe8.log new file mode 100644 index 00000000..75cc7b08 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe8.log @@ -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 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe9.log b/Logs/shadercompiler-UnityShaderCompiler.exe9.log new file mode 100644 index 00000000..75cc7b08 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe9.log @@ -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