PO/Logs/AssetImportWorker0.log

1667 lines
81 KiB
Plaintext
Raw Normal View History

Using pre-set license
Built from '2020.3/staging' branch; Version is '2020.3.19f1 (68f137dc9bbe) revision 6877495'; Using compiler version '192528614'; Build Type 'Release'
2022-01-13 15:58:33 +03:00
OS: 'Windows 10 Pro; OS build 19043.1415; Version 2009; 64bit' Language: 'ru' Physical Memory: 32637 MB
BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
COMMAND LINE ARGUMENTS:
C:\Program Files\Unity\Hub\Editor\2020.3.19f1\Editor\Unity.exe
-adb2
-batchMode
-noUpm
-name
AssetImportWorker0
-projectPath
2022-01-13 15:58:33 +03:00
E:/Projects с#/Unity/omega
-logFile
Logs/AssetImportWorker0.log
-srvPort
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
61130
Successfully changed project path to: C:/Users/Dara/Documents/1/PO
C:/Users/Dara/Documents/1/PO
Using Asset Import Pipeline V2.
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 49.27 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
51107
Successfully changed project path to: E:/Projects с#/Unity/omega
E:/Projects с#/Unity/omega
Using Asset Import Pipeline V2.
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 32.84 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
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
2022-01-13 15:58:33 +03:00
[Subsystems] Discovering subsystems at path E:/Projects с#/Unity/omega/Assets
GfxDevice: creating device client; threaded=0
Direct3D:
2022-01-13 15:58:33 +03:00
Version: Direct3D 11.0 [level 11.0]
Renderer: NVIDIA GeForce GT 730 (ID=0x1287)
Vendor:
2022-01-13 15:58:33 +03:00
VRAM: 984 MB
Driver: 30.0.14.7212
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'
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56056
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56696
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
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
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
2022-01-13 16:15:53 +03:00
Registered in 0.002366 seconds.
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 40.90 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 3.595 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (3595ms)
BeginReloadAssembly (63ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001218 seconds.
Native extension for WindowsStandalone target not found
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 31.57 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 15:58:33 +03:00
- Completed reload, in 1.326 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (1326ms)
BeginReloadAssembly (38ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
ExecutionOrderSort (0ms)
DisableScriptedObjects (0ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
CreateAndSetChildDomain (1ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
EndReloadAssembly (577ms)
LoadAssemblies (62ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (165ms)
ReleaseScriptCaches (0ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (31ms)
SetupLoadedEditorAssemblies (216ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
EndReloadAssembly (293ms)
LoadAssemblies (36ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (99ms)
ReleaseScriptCaches (0ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (20ms)
SetupLoadedEditorAssemblies (123ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (3ms)
SetLoadedEditorAssemblies (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
RefreshPlugins (41ms)
BeforeProcessingInitializeOnLoad (18ms)
ProcessInitializeOnLoadAttributes (107ms)
ProcessInitializeOnLoadMethodAttributes (43ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
RefreshPlugins (32ms)
BeforeProcessingInitializeOnLoad (12ms)
ProcessInitializeOnLoadAttributes (57ms)
ProcessInitializeOnLoadMethodAttributes (19ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AfterProcessingInitializeOnLoad (0ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
AwakeInstancesAfterBackupRestoration (0ms)
Platform modules already initialized, skipping
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.002608 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001441 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 43.18 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.196 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1197ms)
BeginReloadAssembly (166ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 32.53 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.760 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (761ms)
BeginReloadAssembly (99ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (3ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (26ms)
EndReloadAssembly (962ms)
LoadAssemblies (95ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (283ms)
ReleaseScriptCaches (0ms)
RebuildScriptCaches (48ms)
SetupLoadedEditorAssemblies (418ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (9ms)
SetLoadedEditorAssemblies (0ms)
2022-01-13 16:15:53 +03:00
RefreshPlugins (43ms)
BeforeProcessingInitializeOnLoad (74ms)
ProcessInitializeOnLoadAttributes (271ms)
ProcessInitializeOnLoadMethodAttributes (13ms)
AfterProcessingInitializeOnLoad (6ms)
2022-01-13 12:07:16 +03:00
EditorAssembliesLoaded (1ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (8ms)
Platform modules already initialized, skipping
========================================================================
Worker process is ready to serve import requests
2022-01-13 16:15:53 +03:00
Launched and connected shader compiler UnityShaderCompiler.exe after 0.09 seconds
Refreshing native plugins compatible for Editor in 0.61 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2124 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 95.7 MB.
System memory in use after: 95.8 MB.
2022-01-13 16:15:53 +03:00
Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2564.
Total: 3.456500 ms (FindLiveObjects: 0.201400 ms CreateObjectMapping: 0.082200 ms MarkObjects: 3.073300 ms DeleteObjects: 0.097200 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (14ms)
EndReloadAssembly (619ms)
LoadAssemblies (61ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (194ms)
ReleaseScriptCaches (0ms)
RebuildScriptCaches (31ms)
SetupLoadedEditorAssemblies (249ms)
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (3ms)
SetLoadedEditorAssemblies (0ms)
2022-01-13 15:58:33 +03:00
RefreshPlugins (33ms)
BeforeProcessingInitializeOnLoad (54ms)
ProcessInitializeOnLoadAttributes (145ms)
ProcessInitializeOnLoadMethodAttributes (11ms)
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (5ms)
Platform modules already initialized, skipping
========================================================================
Worker process is ready to serve import requests
2022-01-13 15:58:33 +03:00
Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds
Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 12:07:16 +03:00
Unloading 2126 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 15:58:33 +03:00
System memory in use before: 95.9 MB.
System memory in use after: 96.0 MB.
2022-01-13 12:07:16 +03:00
Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2566.
2022-01-13 15:58:33 +03:00
Total: 2.240600 ms (FindLiveObjects: 0.143900 ms CreateObjectMapping: 0.068700 ms MarkObjects: 1.970500 ms DeleteObjects: 0.056700 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Import Request.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
path: Assets/Scripts/Configs/CardConfig.cs
artifactKey: Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfig.cs using Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3890cfe4d392fc504854b2f0925cbd4d') in 0.031211 seconds
Import took 0.035034 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
path: Assets/Scripts/Configs/EnemyConfigs/Snake.asset
artifactKey: Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/EnemyConfigs/Snake.asset using Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '46001076841c0f58d0d02b36f5f35824') in 0.020750 seconds
Import took 0.023282 seconds .
========================================================================
Received Import Request.
2022-01-13 15:58:33 +03:00
Time since last request: 0.000149 seconds.
path: Assets/Scripts/Configs/EnemyConfigs/Zombie.asset
artifactKey: Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/EnemyConfigs/Zombie.asset using Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6cbb714ca8f826188fe2b42c8a6dae4d') in 0.001364 seconds
Import took 0.003799 seconds .
========================================================================
Received Import Request.
2022-01-13 15:58:33 +03:00
Time since last request: 70.076327 seconds.
path: Assets/Scripts
artifactKey: Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts using Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c25a1d281167645a33bf722f65337e25') in 0.001155 seconds
Import took 0.003904 seconds .
========================================================================
Received Import Request.
Time since last request: 1.894932 seconds.
path: Assets/Scripts/Player.cs
artifactKey: Guid(a797a7d28ee3d2d4c85df06375b9a2c7) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Player.cs using Guid(a797a7d28ee3d2d4c85df06375b9a2c7) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'de5cb48ee2fcc6e04202d0d128e1fe45') in 0.002263 seconds
Import took 0.004913 seconds .
========================================================================
Received Import Request.
Time since last request: 46.178115 seconds.
path: Assets/Scripts/Enemy.cs
artifactKey: Guid(587c6949cb7f3474e9ceb46c0268bb12) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Enemy.cs using Guid(587c6949cb7f3474e9ceb46c0268bb12) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '31bf36da221dc0048a16ecbe3a6ace85') in 0.001183 seconds
Import took 0.004222 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.002423 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001288 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.122 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1123ms)
BeginReloadAssembly (139ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (9ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (53ms)
EndReloadAssembly (918ms)
LoadAssemblies (97ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (347ms)
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (50ms)
SetupLoadedEditorAssemblies (314ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (10ms)
2022-01-13 12:07:16 +03:00
SetLoadedEditorAssemblies (0ms)
2022-01-13 16:15:53 +03:00
RefreshPlugins (0ms)
BeforeProcessingInitializeOnLoad (89ms)
ProcessInitializeOnLoadAttributes (202ms)
ProcessInitializeOnLoadMethodAttributes (7ms)
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (9ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
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
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.828 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (829ms)
BeginReloadAssembly (92ms)
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (4ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (32ms)
EndReloadAssembly (674ms)
LoadAssemblies (66ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (227ms)
ReleaseScriptCaches (1ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (49ms)
SetupLoadedEditorAssemblies (244ms)
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
2022-01-13 12:07:16 +03:00
SetLoadedEditorAssemblies (0ms)
2022-01-13 15:58:33 +03:00
RefreshPlugins (0ms)
BeforeProcessingInitializeOnLoad (74ms)
ProcessInitializeOnLoadAttributes (157ms)
ProcessInitializeOnLoadMethodAttributes (4ms)
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (8ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.0 MB.
System memory in use after: 94.1 MB.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2566.
Total: 2.988000 ms (FindLiveObjects: 0.391600 ms CreateObjectMapping: 0.123000 ms MarkObjects: 2.456700 ms DeleteObjects: 0.015500 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2568.
Total: 1.965800 ms (FindLiveObjects: 0.148500 ms CreateObjectMapping: 0.051800 ms MarkObjects: 1.752300 ms DeleteObjects: 0.012400 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
2022-01-13 16:15:53 +03:00
Received Import Request.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Time since last request: 16.201129 seconds.
path: Assets/Scripts/Configs/CardConfigs/AddStamina.asset
artifactKey: Guid(6edd37042b6a0064ba2364da30fe92c9) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/AddStamina.asset using Guid(6edd37042b6a0064ba2364da30fe92c9) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '06b9b2fe740eb471f37ffabcf9c6f0c3') in 0.033292 seconds
Import took 0.039617 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Time since last request: 16.992814 seconds.
path: Assets/Scripts/Session.cs
artifactKey: Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Session.cs using Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f044e226ab7565f6f557c819a383d86e') in 0.003285 seconds
Import took 0.005768 seconds .
========================================================================
Received Import Request.
Time since last request: 26.960590 seconds.
path: Assets/Prefabs
artifactKey: Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs using Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4722b95463dd97ba4aa8d14403194875') in 0.001027 seconds
Import took 0.003435 seconds .
========================================================================
Received Import Request.
Time since last request: 0.972055 seconds.
path: Assets/Prefabs/Enemy
artifactKey: Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Enemy using Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7fce1d80a97414ba1c8e8727fb455b85') in 0.001200 seconds
Import took 0.003817 seconds .
========================================================================
Received Import Request.
Time since last request: 0.065922 seconds.
path: Assets/Prefabs/Enemy/Enemy_1.prefab
artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '0cea2212f86d5089e033abdbce0da82f') in 0.032971 seconds
Import took 0.035549 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
2022-01-13 16:15:53 +03:00
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.002565 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001579 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.55 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.193 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1194ms)
BeginReloadAssembly (147ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (10ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (42ms)
EndReloadAssembly (900ms)
LoadAssemblies (122ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (322ms)
2022-01-13 12:07:16 +03:00
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (53ms)
SetupLoadedEditorAssemblies (290ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
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
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.779 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (779ms)
BeginReloadAssembly (100ms)
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (4ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (28ms)
EndReloadAssembly (627ms)
LoadAssemblies (65ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (209ms)
ReleaseScriptCaches (2ms)
RebuildScriptCaches (38ms)
SetupLoadedEditorAssemblies (228ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
SetLoadedEditorAssemblies (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
RefreshPlugins (1ms)
BeforeProcessingInitializeOnLoad (82ms)
ProcessInitializeOnLoadAttributes (189ms)
ProcessInitializeOnLoadMethodAttributes (6ms)
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (10ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.43 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
RefreshPlugins (0ms)
2022-01-13 15:58:33 +03:00
BeforeProcessingInitializeOnLoad (67ms)
ProcessInitializeOnLoadAttributes (147ms)
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 15:58:33 +03:00
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (7ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.0 MB.
System memory in use after: 94.1 MB.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2568.
Total: 3.008400 ms (FindLiveObjects: 0.197600 ms CreateObjectMapping: 0.080100 ms MarkObjects: 2.713700 ms DeleteObjects: 0.015900 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2570.
Total: 1.996000 ms (FindLiveObjects: 0.169400 ms CreateObjectMapping: 0.042300 ms MarkObjects: 1.753000 ms DeleteObjects: 0.030700 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.003893 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001647 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.43 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.093 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1094ms)
BeginReloadAssembly (143ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
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
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.771 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (771ms)
BeginReloadAssembly (98ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (5ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (53ms)
EndReloadAssembly (885ms)
LoadAssemblies (111ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (304ms)
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (74ms)
SetupLoadedEditorAssemblies (279ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (28ms)
EndReloadAssembly (628ms)
LoadAssemblies (73ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (216ms)
ReleaseScriptCaches (1ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (34ms)
SetupLoadedEditorAssemblies (225ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (3ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (81ms)
ProcessInitializeOnLoadAttributes (180ms)
ProcessInitializeOnLoadMethodAttributes (6ms)
AfterProcessingInitializeOnLoad (5ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
BeforeProcessingInitializeOnLoad (68ms)
ProcessInitializeOnLoadAttributes (145ms)
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 15:58:33 +03:00
AfterProcessingInitializeOnLoad (4ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (8ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.0 MB.
2022-01-13 12:07:16 +03:00
System memory in use after: 94.2 MB.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2570.
Total: 2.970200 ms (FindLiveObjects: 0.186700 ms CreateObjectMapping: 0.073800 ms MarkObjects: 2.694200 ms DeleteObjects: 0.014200 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 12:07:16 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2572.
2022-01-13 15:58:33 +03:00
Total: 2.168400 ms (FindLiveObjects: 0.119200 ms CreateObjectMapping: 0.041400 ms MarkObjects: 1.987800 ms DeleteObjects: 0.019300 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.003240 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001208 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.108 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1109ms)
BeginReloadAssembly (110ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
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
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.735 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (736ms)
BeginReloadAssembly (85ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (4ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (41ms)
EndReloadAssembly (912ms)
LoadAssemblies (83ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (356ms)
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (49ms)
SetupLoadedEditorAssemblies (308ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (24ms)
EndReloadAssembly (608ms)
LoadAssemblies (62ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (197ms)
ReleaseScriptCaches (1ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (34ms)
SetupLoadedEditorAssemblies (224ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (97ms)
ProcessInitializeOnLoadAttributes (191ms)
2022-01-13 12:07:16 +03:00
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 16:15:53 +03:00
AfterProcessingInitializeOnLoad (6ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (9ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
BeforeProcessingInitializeOnLoad (61ms)
ProcessInitializeOnLoadAttributes (150ms)
ProcessInitializeOnLoadMethodAttributes (4ms)
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (8ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.1 MB.
System memory in use after: 94.2 MB.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2572.
Total: 2.717400 ms (FindLiveObjects: 0.195100 ms CreateObjectMapping: 0.081400 ms MarkObjects: 2.422900 ms DeleteObjects: 0.017000 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 12:07:16 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2574.
2022-01-13 15:58:33 +03:00
Total: 2.452100 ms (FindLiveObjects: 0.128000 ms CreateObjectMapping: 0.048500 ms MarkObjects: 2.253600 ms DeleteObjects: 0.021100 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.002625 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.40 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.138 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1138ms)
BeginReloadAssembly (172ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (11ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (45ms)
EndReloadAssembly (890ms)
LoadAssemblies (111ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (333ms)
2022-01-13 12:07:16 +03:00
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (48ms)
SetupLoadedEditorAssemblies (278ms)
LogAssemblyErrors (0ms)
InitializePlatformSupportModulesInManaged (7ms)
SetLoadedEditorAssemblies (0ms)
2022-01-13 12:07:16 +03:00
RefreshPlugins (0ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (81ms)
ProcessInitializeOnLoadAttributes (180ms)
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 12:07:16 +03:00
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 12:07:16 +03:00
AwakeInstancesAfterBackupRestoration (9ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.1 MB.
System memory in use after: 94.2 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2574.
Total: 3.629200 ms (FindLiveObjects: 0.272600 ms CreateObjectMapping: 0.150900 ms MarkObjects: 3.179000 ms DeleteObjects: 0.025000 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Received Import Request.
Time since last request: 248.663425 seconds.
path: Assets/Scripts/Configs
artifactKey: Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs using Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ee0ede7d3d1e8288bf6e1c9db58df68f') in 0.004466 seconds
Import took 0.007723 seconds .
2022-01-13 15:58:33 +03:00
========================================================================
Received Import Request.
Time since last request: 1.321640 seconds.
path: Assets/Scripts/Configs/BattleConfigs
artifactKey: Guid(e7f3193a74c328e458d9f0e38c6f7a13) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/BattleConfigs using Guid(e7f3193a74c328e458d9f0e38c6f7a13) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '159c939416d92be392de3edaa27fe508') in 0.001058 seconds
Import took 0.003838 seconds .
========================================================================
Received Import Request.
Time since last request: 0.068002 seconds.
path: Assets/Scripts/Configs/BattleConfigs/FirstBattle.asset
artifactKey: Guid(5ecf77a7ffbea54479cfcd94f4314069) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/BattleConfigs/FirstBattle.asset using Guid(5ecf77a7ffbea54479cfcd94f4314069) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '52125e102db972ff0612d5a76a87a1f2') in 0.007889 seconds
Import took 0.010634 seconds .
========================================================================
Received Import Request.
Time since last request: 1.624825 seconds.
path: Assets/Scripts/Configs/BattleConfig.cs
artifactKey: Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/BattleConfig.cs using Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '413ed641904f78eca62b0c9b32930bda') in 0.001123 seconds
Import took 0.003661 seconds .
========================================================================
Received Import Request.
Time since last request: 58.802205 seconds.
path: Assets/Scripts/Configs/PlayerConfig.cs
artifactKey: Guid(4bf4cbb13736ac54f8e9fdca4327535f) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/PlayerConfig.cs using Guid(4bf4cbb13736ac54f8e9fdca4327535f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '65a2ee1059b4e06c8077822db5b31a71') in 0.001424 seconds
Import took 0.004606 seconds .
========================================================================
Received Import Request.
Time since last request: 33.977771 seconds.
path: Assets/Scripts/Configs/CardConfigs
artifactKey: Guid(de0abea23ac17564fa1fb5c18818f7a2) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs using Guid(de0abea23ac17564fa1fb5c18818f7a2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '873ffc677639d70fca4cb3c11cfd4d98') in 0.001323 seconds
Import took 0.003838 seconds .
========================================================================
Received Import Request.
Time since last request: 0.055693 seconds.
path: Assets/Scripts/Configs/CardConfigs/BigDamage.asset
artifactKey: Guid(5169032180a01ac43905ed44dbad9b24) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/BigDamage.asset using Guid(5169032180a01ac43905ed44dbad9b24) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '66111d77e92eea126628a45f5eb7648b') in 0.001901 seconds
Import took 0.004569 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000248 seconds.
path: Assets/Scripts/Configs/CardConfigs/BigHealing.asset
artifactKey: Guid(bcf3a6ca876cd0541958d36a4735087a) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/BigHealing.asset using Guid(bcf3a6ca876cd0541958d36a4735087a) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7554aaed1df013ce92c308c193063ec2') in 0.001435 seconds
Import took 0.003749 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000204 seconds.
path: Assets/Scripts/Configs/CardConfigs/SmallHealing.asset
artifactKey: Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/SmallHealing.asset using Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3c8d303ce3731ec0aaf0579b5d3019d7') in 0.001561 seconds
Import took 0.004413 seconds .
========================================================================
Received Import Request.
Time since last request: 0.000213 seconds.
path: Assets/Scripts/Configs/CardConfigs/SmallDamage.asset
artifactKey: Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfigs/SmallDamage.asset using Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '70f2cf701e5c8dbba2fff8e8c999af15') in 0.001932 seconds
Import took 0.004567 seconds .
========================================================================
Received Import Request.
Time since last request: 29.019930 seconds.
path: Assets/Scripts/Configs/CardConfig.cs
artifactKey: Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Configs/CardConfig.cs using Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9947db179059febc7d606fbc25afcc84') in 0.001391 seconds
Import took 0.004195 seconds .
========================================================================
Received Import Request.
Time since last request: 40.478499 seconds.
path: Assets/Scripts/Card.cs
artifactKey: Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Card.cs using Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3f7a5c9170634031f53bda92a8a9872d') in 0.000984 seconds
Import took 0.003413 seconds .
========================================================================
Received Import Request.
Time since last request: 46.772673 seconds.
path: Assets/Scripts/Card.cs
artifactKey: Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Scripts/Card.cs using Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'cc7a0712df68924727c80f3abb96ea87') in 0.001264 seconds
Import took 0.004584 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.003992 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001459 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 2.08 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.205 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1205ms)
BeginReloadAssembly (143ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.744 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (745ms)
BeginReloadAssembly (91ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (6ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (53ms)
EndReloadAssembly (992ms)
LoadAssemblies (99ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (361ms)
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (60ms)
SetupLoadedEditorAssemblies (327ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (7ms)
SetLoadedEditorAssemblies (2ms)
RefreshPlugins (2ms)
BeforeProcessingInitializeOnLoad (89ms)
ProcessInitializeOnLoadAttributes (215ms)
ProcessInitializeOnLoadMethodAttributes (6ms)
AfterProcessingInitializeOnLoad (6ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (10ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (26ms)
EndReloadAssembly (608ms)
LoadAssemblies (65ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (189ms)
ReleaseScriptCaches (1ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (34ms)
SetupLoadedEditorAssemblies (225ms)
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (0ms)
2022-01-13 15:58:33 +03:00
BeforeProcessingInitializeOnLoad (63ms)
ProcessInitializeOnLoadAttributes (150ms)
ProcessInitializeOnLoadMethodAttributes (4ms)
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (7ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
2022-01-13 15:58:33 +03:00
System memory in use after: 94.3 MB.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2576.
Total: 5.107800 ms (FindLiveObjects: 1.314300 ms CreateObjectMapping: 0.283100 ms MarkObjects: 3.484000 ms DeleteObjects: 0.023100 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 2576.
Total: 2.043200 ms (FindLiveObjects: 0.147000 ms CreateObjectMapping: 0.076100 ms MarkObjects: 1.785300 ms DeleteObjects: 0.034000 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.003408 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 12:07:16 +03:00
Refreshing native plugins compatible for Editor in 0.80 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.666 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1667ms)
BeginReloadAssembly (130ms)
ExecutionOrderSort (0ms)
2022-01-13 12:07:16 +03:00
DisableScriptedObjects (8ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (36ms)
EndReloadAssembly (1405ms)
LoadAssemblies (203ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (664ms)
ReleaseScriptCaches (4ms)
RebuildScriptCaches (62ms)
SetupLoadedEditorAssemblies (335ms)
LogAssemblyErrors (0ms)
2022-01-13 12:07:16 +03:00
InitializePlatformSupportModulesInManaged (8ms)
SetLoadedEditorAssemblies (1ms)
RefreshPlugins (1ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (114ms)
ProcessInitializeOnLoadAttributes (202ms)
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 12:07:16 +03:00
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (12ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.55 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
System memory in use after: 94.2 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2578.
Total: 3.310900 ms (FindLiveObjects: 0.246400 ms CreateObjectMapping: 0.097700 ms MarkObjects: 2.945200 ms DeleteObjects: 0.020400 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 12:07:16 +03:00
Received Import Request.
2022-01-13 15:58:33 +03:00
Time since last request: 63.495219 seconds.
path: Assets/Prefabs/Cards
artifactKey: Guid(53ea0b7335cdd21469dc3165d732f2ab) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards using Guid(53ea0b7335cdd21469dc3165d732f2ab) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd9137cc1dfb62f08ed4a20ec7765ef2b') in 0.003383 seconds
Import took 0.006093 seconds .
2022-01-13 12:07:16 +03:00
========================================================================
2022-01-13 15:58:33 +03:00
Received Import Request.
Time since last request: 0.071670 seconds.
path: Assets/Prefabs/Cards/BigDamagePrefab.prefab
artifactKey: Guid(ae1ab462daf0a5c4ca40701af32d6f47) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/BigDamagePrefab.prefab using Guid(ae1ab462daf0a5c4ca40701af32d6f47) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '17930dea7790af130fd25cf101391f07') in 0.025648 seconds
Import took 0.028443 seconds .
========================================================================
2022-01-13 15:58:33 +03:00
Received Import Request.
Time since last request: 0.000202 seconds.
path: Assets/Prefabs/Cards/SmallHealing.prefab
artifactKey: Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/SmallHealing.prefab using Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd1f4c8b0ac94f0e28761c5d13e0bb14f') in 0.004089 seconds
Import took 0.006959 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
========================================================================
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.003862 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.51 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.327 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1327ms)
BeginReloadAssembly (149ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (9ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (32ms)
EndReloadAssembly (1107ms)
LoadAssemblies (147ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (328ms)
ReleaseScriptCaches (1ms)
RebuildScriptCaches (48ms)
SetupLoadedEditorAssemblies (427ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (7ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (1ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (134ms)
ProcessInitializeOnLoadAttributes (271ms)
ProcessInitializeOnLoadMethodAttributes (7ms)
AfterProcessingInitializeOnLoad (7ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (16ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.52 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
System memory in use after: 94.2 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2580.
Total: 2.819200 ms (FindLiveObjects: 0.228700 ms CreateObjectMapping: 0.092000 ms MarkObjects: 2.476400 ms DeleteObjects: 0.020700 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Received Import Request.
Time since last request: 0.000193 seconds.
path: Assets/Prefabs/Cards/BigHealing.prefab
artifactKey: Guid(0d2efa65672e3534cbd062025129b645) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/BigHealing.prefab using Guid(0d2efa65672e3534cbd062025129b645) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5a27fe1a3145d22106b3a640d0cb5989') in 0.004661 seconds
Import took 0.007614 seconds .
2022-01-13 15:58:33 +03:00
========================================================================
Received Import Request.
Time since last request: 0.000178 seconds.
path: Assets/Prefabs/Cards/SmallDamagePrefab.prefab
artifactKey: Guid(f4414f7ff83c0354186c32ac62c7044d) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/SmallDamagePrefab.prefab using Guid(f4414f7ff83c0354186c32ac62c7044d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '29299d968bfb21ce61367b939435c264') in 0.003548 seconds
Import took 0.006192 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
========================================================================
Received Import Request.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Time since last request: 1413.187064 seconds.
path: Assets/Prefabs/Cards/Standart
artifactKey: Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/Standart using Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c3dff83632a8c4cb0a4dde2c69ad8007') in 0.019093 seconds
Import took 0.024947 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Time since last request: 6.065087 seconds.
path: Assets/Prefabs/Cards/Standart
artifactKey: Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/Standart using Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fd1e456ffc1d53380b85263f577168b1') in 0.001065 seconds
Import took 0.003584 seconds .
========================================================================
Received Import Request.
Time since last request: 0.066705 seconds.
path: Assets/Prefabs/Cards/Standart/Card.prefab
artifactKey: Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/Standart/Card.prefab using Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ec9765f8a8f3f5c73930b4533e0304f8') in 0.003273 seconds
Import took 0.005991 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.007257 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001286 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.449 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1450ms)
BeginReloadAssembly (157ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (8ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (39ms)
EndReloadAssembly (1216ms)
LoadAssemblies (134ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (434ms)
ReleaseScriptCaches (1ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (44ms)
SetupLoadedEditorAssemblies (420ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (8ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (0ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (130ms)
ProcessInitializeOnLoadAttributes (268ms)
ProcessInitializeOnLoadMethodAttributes (6ms)
AfterProcessingInitializeOnLoad (6ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (11ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.48 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
2022-01-13 16:15:53 +03:00
System memory in use after: 94.2 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2582.
Total: 5.936100 ms (FindLiveObjects: 0.575600 ms CreateObjectMapping: 0.254800 ms MarkObjects: 5.080000 ms DeleteObjects: 0.023200 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
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
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.738 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (739ms)
BeginReloadAssembly (92ms)
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (4ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (24ms)
EndReloadAssembly (604ms)
LoadAssemblies (61ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (190ms)
ReleaseScriptCaches (1ms)
2022-01-13 15:58:33 +03:00
RebuildScriptCaches (33ms)
SetupLoadedEditorAssemblies (224ms)
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
SetLoadedEditorAssemblies (0ms)
RefreshPlugins (0ms)
2022-01-13 15:58:33 +03:00
BeforeProcessingInitializeOnLoad (64ms)
ProcessInitializeOnLoadAttributes (148ms)
ProcessInitializeOnLoadMethodAttributes (5ms)
2022-01-13 15:58:33 +03:00
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (7ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 12:07:16 +03:00
Unloading 2107 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 15:58:33 +03:00
System memory in use before: 94.2 MB.
2022-01-13 12:07:16 +03:00
System memory in use after: 94.3 MB.
2022-01-13 15:58:33 +03:00
Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2578.
Total: 2.344600 ms (FindLiveObjects: 0.160600 ms CreateObjectMapping: 0.043900 ms MarkObjects: 2.103300 ms DeleteObjects: 0.036000 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
2022-01-13 16:15:53 +03:00
Received Import Request.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Time since last request: 11.811585 seconds.
path: Assets/Prefabs/Cards/Standart/Card.prefab
artifactKey: Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/Standart/Card.prefab using Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e10490832ec805b38d6c484dd3a0aceb') in 0.102136 seconds
Import took 0.106841 seconds .
========================================================================
Received Import Request.
Time since last request: 15.945949 seconds.
path: Assets/Prefabs/Cards/AddStamina.prefab
artifactKey: Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/AddStamina.prefab using Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '82f0dede4a70bad34697ccb354bd3bb7') in 0.012634 seconds
Import took 0.018811 seconds .
========================================================================
Received Import Request.
Time since last request: 16.191378 seconds.
path: Assets/Prefabs/Cards/AddStamina.prefab
artifactKey: Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/AddStamina.prefab using Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '41ff44f8353d437ce0d515ba25a0ddcb') in 0.009931 seconds
Import took 0.014468 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Time since last request: 76.175630 seconds.
path: Assets/Prefabs/Cards/BigDamage2.0.prefab
artifactKey: Guid(57646900771fe384190cb1680ecf2215) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Cards/BigDamage2.0.prefab using Guid(57646900771fe384190cb1680ecf2215) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'b2378ee4fc4e26dbac6857e61970da79') in 0.029646 seconds
Import took 0.032174 seconds .
========================================================================
Received Import Request.
Time since last request: 141.856994 seconds.
path: Assets/Graphics
artifactKey: Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Graphics using Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '2c78f3d8ddeda74415dd6ce63d344cd1') in 0.001136 seconds
Import took 0.003677 seconds .
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
2022-01-13 16:15:53 +03:00
========================================================================
Received Prepare
Registering precompiled user dll's ...
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
2022-01-13 16:15:53 +03:00
Registered in 0.004633 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Registered in 0.001294 seconds.
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
Begin MonoManager ReloadAssembly
Native extension for WindowsStandalone target not found
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 1.17 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 2.282 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (2283ms)
BeginReloadAssembly (217ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (15ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (92ms)
EndReloadAssembly (1963ms)
LoadAssemblies (127ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (542ms)
2022-01-13 12:07:16 +03:00
ReleaseScriptCaches (3ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (96ms)
SetupLoadedEditorAssemblies (797ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (14ms)
SetLoadedEditorAssemblies (1ms)
RefreshPlugins (1ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (340ms)
ProcessInitializeOnLoadAttributes (411ms)
ProcessInitializeOnLoadMethodAttributes (12ms)
AfterProcessingInitializeOnLoad (17ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (20ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 1.05 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.1 MB.
2022-01-13 16:15:53 +03:00
System memory in use after: 94.2 MB.
2022-01-13 16:15:53 +03:00
Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2584.
Total: 6.853300 ms (FindLiveObjects: 0.583800 ms CreateObjectMapping: 0.201700 ms MarkObjects: 6.035100 ms DeleteObjects: 0.030800 ms)
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.004442 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 2.65 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 2.258 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (2259ms)
BeginReloadAssembly (272ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (11ms)
BackupInstance (0ms)
2022-01-13 16:15:53 +03:00
ReleaseScriptingObjects (1ms)
CreateAndSetChildDomain (82ms)
EndReloadAssembly (1814ms)
LoadAssemblies (207ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (554ms)
ReleaseScriptCaches (2ms)
RebuildScriptCaches (91ms)
SetupLoadedEditorAssemblies (638ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (15ms)
SetLoadedEditorAssemblies (1ms)
RefreshPlugins (3ms)
BeforeProcessingInitializeOnLoad (242ms)
ProcessInitializeOnLoadAttributes (337ms)
ProcessInitializeOnLoadMethodAttributes (12ms)
AfterProcessingInitializeOnLoad (28ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (57ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 12:07:16 +03:00
Refreshing native plugins compatible for Editor in 0.88 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
2022-01-13 12:07:16 +03:00
System memory in use after: 94.3 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2586.
Total: 9.728200 ms (FindLiveObjects: 0.408100 ms CreateObjectMapping: 0.322800 ms MarkObjects: 8.958100 ms DeleteObjects: 0.036400 ms)
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
2022-01-13 16:15:53 +03:00
Received Import Request.
Time since last request: 77.011369 seconds.
path: Assets/Prefabs/Enemy/Enemy_1.prefab
artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4765ec327e2c9e40ebe772a570400461') in 0.096420 seconds
Import took 0.103332 seconds .
========================================================================
Received Import Request.
Time since last request: 36.265589 seconds.
path: Assets/Prefabs/Enemy/Enemy_1.prefab
artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c796a40942b2b9d91438e5a2b26e98a7') in 0.016804 seconds
Import took 0.022428 seconds .
========================================================================
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.005121 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 1.58 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.701 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1702ms)
BeginReloadAssembly (171ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (11ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (60ms)
EndReloadAssembly (1432ms)
LoadAssemblies (130ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (465ms)
ReleaseScriptCaches (3ms)
RebuildScriptCaches (85ms)
SetupLoadedEditorAssemblies (503ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (12ms)
SetLoadedEditorAssemblies (1ms)
RefreshPlugins (2ms)
BeforeProcessingInitializeOnLoad (147ms)
ProcessInitializeOnLoadAttributes (326ms)
ProcessInitializeOnLoadMethodAttributes (8ms)
AfterProcessingInitializeOnLoad (7ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (19ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.76 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
System memory in use before: 94.1 MB.
2022-01-13 12:07:16 +03:00
System memory in use after: 94.3 MB.
2022-01-13 16:15:53 +03:00
Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2588.
Total: 5.777900 ms (FindLiveObjects: 0.390500 ms CreateObjectMapping: 0.220400 ms MarkObjects: 5.129000 ms DeleteObjects: 0.034300 ms)
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.002297 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.63 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.665 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1665ms)
BeginReloadAssembly (160ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (6ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (77ms)
EndReloadAssembly (1391ms)
LoadAssemblies (102ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (422ms)
2022-01-13 12:07:16 +03:00
ReleaseScriptCaches (2ms)
2022-01-13 16:15:53 +03:00
RebuildScriptCaches (101ms)
SetupLoadedEditorAssemblies (501ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (10ms)
SetLoadedEditorAssemblies (1ms)
2022-01-13 12:07:16 +03:00
RefreshPlugins (1ms)
2022-01-13 16:15:53 +03:00
BeforeProcessingInitializeOnLoad (142ms)
ProcessInitializeOnLoadAttributes (332ms)
ProcessInitializeOnLoadMethodAttributes (10ms)
AfterProcessingInitializeOnLoad (5ms)
2022-01-13 12:07:16 +03:00
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 16:15:53 +03:00
AwakeInstancesAfterBackupRestoration (12ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 1.12 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.2 MB.
System memory in use after: 94.3 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2590.
Total: 4.105600 ms (FindLiveObjects: 0.394400 ms CreateObjectMapping: 0.158900 ms MarkObjects: 3.521700 ms DeleteObjects: 0.029000 ms)
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
========================================================================
Received Prepare
Registering precompiled user dll's ...
2022-01-13 16:15:53 +03:00
Registered in 0.002668 seconds.
Begin MonoManager ReloadAssembly
Native extension for LinuxStandalone target not found
Native extension for WindowsStandalone target not found
Native extension for OSXStandalone target not found
Native extension for WebGL target not found
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.73 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 16:15:53 +03:00
- Completed reload, in 1.421 seconds
Domain Reload Profiling:
2022-01-13 16:15:53 +03:00
ReloadAssembly (1422ms)
BeginReloadAssembly (164ms)
ExecutionOrderSort (0ms)
2022-01-13 16:15:53 +03:00
DisableScriptedObjects (6ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 16:15:53 +03:00
CreateAndSetChildDomain (70ms)
EndReloadAssembly (1187ms)
LoadAssemblies (116ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 16:15:53 +03:00
SetupTypeCache (375ms)
ReleaseScriptCaches (2ms)
RebuildScriptCaches (70ms)
SetupLoadedEditorAssemblies (410ms)
LogAssemblyErrors (0ms)
2022-01-13 16:15:53 +03:00
InitializePlatformSupportModulesInManaged (11ms)
SetLoadedEditorAssemblies (1ms)
RefreshPlugins (1ms)
BeforeProcessingInitializeOnLoad (111ms)
ProcessInitializeOnLoadAttributes (276ms)
2022-01-13 12:07:16 +03:00
ProcessInitializeOnLoadMethodAttributes (5ms)
AfterProcessingInitializeOnLoad (5ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 12:07:16 +03:00
AwakeInstancesAfterBackupRestoration (9ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 16:15:53 +03:00
Refreshing native plugins compatible for Editor in 0.52 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
2022-01-13 16:15:53 +03:00
Unloading 2105 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 12:07:16 +03:00
System memory in use before: 94.2 MB.
System memory in use after: 94.3 MB.
2022-01-13 16:15:53 +03:00
Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2592.
Total: 2.952000 ms (FindLiveObjects: 0.223200 ms CreateObjectMapping: 0.102600 ms MarkObjects: 2.603800 ms DeleteObjects: 0.021300 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
=======
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.37 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Mono: successfully reloaded assembly
2022-01-13 15:58:33 +03:00
- Completed reload, in 0.730 seconds
Domain Reload Profiling:
2022-01-13 15:58:33 +03:00
ReloadAssembly (731ms)
BeginReloadAssembly (91ms)
ExecutionOrderSort (0ms)
2022-01-13 15:58:33 +03:00
DisableScriptedObjects (5ms)
BackupInstance (0ms)
ReleaseScriptingObjects (0ms)
2022-01-13 15:58:33 +03:00
CreateAndSetChildDomain (25ms)
EndReloadAssembly (595ms)
LoadAssemblies (64ms)
RebuildTransferFunctionScriptingTraits (0ms)
2022-01-13 15:58:33 +03:00
SetupTypeCache (189ms)
ReleaseScriptCaches (1ms)
RebuildScriptCaches (34ms)
SetupLoadedEditorAssemblies (212ms)
LogAssemblyErrors (0ms)
2022-01-13 15:58:33 +03:00
InitializePlatformSupportModulesInManaged (4ms)
SetLoadedEditorAssemblies (0ms)
2022-01-13 15:58:33 +03:00
RefreshPlugins (0ms)
BeforeProcessingInitializeOnLoad (61ms)
ProcessInitializeOnLoadAttributes (139ms)
ProcessInitializeOnLoadMethodAttributes (4ms)
AfterProcessingInitializeOnLoad (4ms)
EditorAssembliesLoaded (0ms)
ExecutionOrderSort2 (0ms)
2022-01-13 15:58:33 +03:00
AwakeInstancesAfterBackupRestoration (7ms)
Platform modules already initialized, skipping
Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0)
2022-01-13 15:58:33 +03:00
Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins.
Preloading 0 native plugins for Editor in 0.00 ms.
Unloading 2107 Unused Serialized files (Serialized files now loaded: 0)
2022-01-13 15:58:33 +03:00
System memory in use before: 94.2 MB.
2022-01-13 12:07:16 +03:00
System memory in use after: 94.3 MB.
2022-01-13 15:58:33 +03:00
Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2580.
Total: 2.055300 ms (FindLiveObjects: 0.138500 ms CreateObjectMapping: 0.050500 ms MarkObjects: 1.841700 ms DeleteObjects: 0.023900 ms)
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8
AssetImportParameters requested are different than current active one (requested -> active):
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
2022-01-13 12:07:16 +03:00
AssetImportWorkerClient::OnTransportError - code=2 error=End of file