Skip to content

Commit 4eb6510

Browse files
PaulinaCzaplaPaulinaCzapla
committed
some improvements
1 parent 3862637 commit 4eb6510

File tree

4 files changed

+352
-5
lines changed

4 files changed

+352
-5
lines changed

‎Assets/Scripts/FadeIn.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,16 @@ private void Awake()
1919

2020
}
2121

22-
private void Update()
22+
private void Update() //to refactor
2323
{
2424
if (this.enabled == false)
2525
{
2626
animationFrame = 0;
27-
Debug.Log("1");
2827
return;
2928
}
3029
else if (!canvasGroup.isActiveAndEnabled || animationFrame >= 100)
3130
{
32-
Debug.Log("2");
3331
return;
34-
3532
}
3633
else if (animationFrame < 100)
3734
{

‎Logs/AssetImportWorker0.log

+287
Original file line numberDiff line numberDiff line change
@@ -5629,6 +5629,293 @@ System memory in use after: 59.5 MB.
56295629
Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2914.
56305630
Total: 3.072200 ms (FindLiveObjects: 0.217900 ms CreateObjectMapping: 0.090600 ms MarkObjects: 2.674800 ms DeleteObjects: 0.087600 ms)
56315631

5632+
AssetImportParameters requested are different than current active one (requested -> active):
5633+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5634+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5635+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5636+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5637+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5638+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5639+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5640+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5641+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5642+
========================================================================
5643+
Received Prepare
5644+
Refreshing native plugins compatible for Editor in 3.56 ms, found 3 plugins.
5645+
Preloading 0 native plugins for Editor in 0.00 ms.
5646+
Unloading 19 Unused Serialized files (Serialized files now loaded: 0)
5647+
System memory in use before: 59.5 MB.
5648+
System memory in use after: 59.6 MB.
5649+
5650+
Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2914.
5651+
Total: 3.052200 ms (FindLiveObjects: 0.216100 ms CreateObjectMapping: 0.092600 ms MarkObjects: 2.640100 ms DeleteObjects: 0.102300 ms)
5652+
5653+
AssetImportParameters requested are different than current active one (requested -> active):
5654+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5655+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5656+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5657+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5658+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5659+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5660+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5661+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5662+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5663+
========================================================================
5664+
Received Prepare
5665+
Refreshing native plugins compatible for Editor in 3.57 ms, found 3 plugins.
5666+
Preloading 0 native plugins for Editor in 0.00 ms.
5667+
Unloading 19 Unused Serialized files (Serialized files now loaded: 0)
5668+
System memory in use before: 59.5 MB.
5669+
System memory in use after: 59.6 MB.
5670+
5671+
Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2914.
5672+
Total: 2.738500 ms (FindLiveObjects: 0.198200 ms CreateObjectMapping: 0.083800 ms MarkObjects: 2.358800 ms DeleteObjects: 0.096800 ms)
5673+
5674+
AssetImportParameters requested are different than current active one (requested -> active):
5675+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5676+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5677+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5678+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5679+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5680+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5681+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5682+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5683+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5684+
========================================================================
5685+
Received Prepare
5686+
Refreshing native plugins compatible for Editor in 3.69 ms, found 3 plugins.
5687+
Preloading 0 native plugins for Editor in 0.00 ms.
5688+
Unloading 19 Unused Serialized files (Serialized files now loaded: 0)
5689+
System memory in use before: 59.5 MB.
5690+
System memory in use after: 59.6 MB.
5691+
5692+
Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2914.
5693+
Total: 2.622100 ms (FindLiveObjects: 0.234800 ms CreateObjectMapping: 0.089300 ms MarkObjects: 2.159100 ms DeleteObjects: 0.138100 ms)
5694+
5695+
AssetImportParameters requested are different than current active one (requested -> active):
5696+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5697+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5698+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5699+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5700+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5701+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5702+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5703+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5704+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5705+
========================================================================
5706+
Received Prepare
5707+
Registering precompiled user dll's ...
5708+
Registered in 0.004372 seconds.
5709+
Begin MonoManager ReloadAssembly
5710+
Native extension for WindowsStandalone target not found
5711+
Refreshing native plugins compatible for Editor in 0.44 ms, found 3 plugins.
5712+
Preloading 0 native plugins for Editor in 0.00 ms.
5713+
Mono: successfully reloaded assembly
5714+
- Completed reload, in 0.962 seconds
5715+
Domain Reload Profiling:
5716+
ReloadAssembly (962ms)
5717+
BeginReloadAssembly (112ms)
5718+
ExecutionOrderSort (0ms)
5719+
DisableScriptedObjects (7ms)
5720+
BackupInstance (0ms)
5721+
ReleaseScriptingObjects (0ms)
5722+
CreateAndSetChildDomain (30ms)
5723+
EndReloadAssembly (792ms)
5724+
LoadAssemblies (77ms)
5725+
RebuildTransferFunctionScriptingTraits (0ms)
5726+
SetupTypeCache (302ms)
5727+
ReleaseScriptCaches (1ms)
5728+
RebuildScriptCaches (43ms)
5729+
SetupLoadedEditorAssemblies (266ms)
5730+
LogAssemblyErrors (0ms)
5731+
InitializePlatformSupportModulesInManaged (5ms)
5732+
SetLoadedEditorAssemblies (1ms)
5733+
RefreshPlugins (0ms)
5734+
BeforeProcessingInitializeOnLoad (51ms)
5735+
ProcessInitializeOnLoadAttributes (193ms)
5736+
ProcessInitializeOnLoadMethodAttributes (8ms)
5737+
AfterProcessingInitializeOnLoad (7ms)
5738+
EditorAssembliesLoaded (0ms)
5739+
ExecutionOrderSort2 (0ms)
5740+
AwakeInstancesAfterBackupRestoration (10ms)
5741+
Platform modules already initialized, skipping
5742+
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
5743+
Preloading 0 native plugins for Editor in 0.00 ms.
5744+
Unloading 2161 Unused Serialized files (Serialized files now loaded: 0)
5745+
System memory in use before: 102.0 MB.
5746+
System memory in use after: 102.1 MB.
5747+
5748+
Unloading 21 unused Assets to reduce memory usage. Loaded Objects now: 2917.
5749+
Total: 2.436800 ms (FindLiveObjects: 0.201400 ms CreateObjectMapping: 0.082800 ms MarkObjects: 2.059800 ms DeleteObjects: 0.091700 ms)
5750+
5751+
AssetImportParameters requested are different than current active one (requested -> active):
5752+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5753+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5754+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5755+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5756+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5757+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5758+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5759+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5760+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5761+
========================================================================
5762+
Received Prepare
5763+
Registering precompiled user dll's ...
5764+
Registered in 0.004152 seconds.
5765+
Begin MonoManager ReloadAssembly
5766+
Native extension for WindowsStandalone target not found
5767+
Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
5768+
Preloading 0 native plugins for Editor in 0.00 ms.
5769+
Mono: successfully reloaded assembly
5770+
- Completed reload, in 1.009 seconds
5771+
Domain Reload Profiling:
5772+
ReloadAssembly (1010ms)
5773+
BeginReloadAssembly (111ms)
5774+
ExecutionOrderSort (0ms)
5775+
DisableScriptedObjects (6ms)
5776+
BackupInstance (0ms)
5777+
ReleaseScriptingObjects (0ms)
5778+
CreateAndSetChildDomain (31ms)
5779+
EndReloadAssembly (837ms)
5780+
LoadAssemblies (81ms)
5781+
RebuildTransferFunctionScriptingTraits (0ms)
5782+
SetupTypeCache (299ms)
5783+
ReleaseScriptCaches (1ms)
5784+
RebuildScriptCaches (48ms)
5785+
SetupLoadedEditorAssemblies (288ms)
5786+
LogAssemblyErrors (0ms)
5787+
InitializePlatformSupportModulesInManaged (5ms)
5788+
SetLoadedEditorAssemblies (1ms)
5789+
RefreshPlugins (1ms)
5790+
BeforeProcessingInitializeOnLoad (52ms)
5791+
ProcessInitializeOnLoadAttributes (215ms)
5792+
ProcessInitializeOnLoadMethodAttributes (8ms)
5793+
AfterProcessingInitializeOnLoad (7ms)
5794+
EditorAssembliesLoaded (0ms)
5795+
ExecutionOrderSort2 (0ms)
5796+
AwakeInstancesAfterBackupRestoration (11ms)
5797+
Platform modules already initialized, skipping
5798+
Refreshing native plugins compatible for Editor in 0.42 ms, found 3 plugins.
5799+
Preloading 0 native plugins for Editor in 0.00 ms.
5800+
Unloading 2161 Unused Serialized files (Serialized files now loaded: 0)
5801+
System memory in use before: 102.0 MB.
5802+
System memory in use after: 102.1 MB.
5803+
5804+
Unloading 21 unused Assets to reduce memory usage. Loaded Objects now: 2920.
5805+
Total: 2.579000 ms (FindLiveObjects: 0.221800 ms CreateObjectMapping: 0.090100 ms MarkObjects: 2.116700 ms DeleteObjects: 0.149500 ms)
5806+
5807+
AssetImportParameters requested are different than current active one (requested -> active):
5808+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5809+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5810+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5811+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5812+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5813+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5814+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5815+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5816+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5817+
========================================================================
5818+
Received Prepare
5819+
Registering precompiled user dll's ...
5820+
Registered in 0.004198 seconds.
5821+
Begin MonoManager ReloadAssembly
5822+
Native extension for WindowsStandalone target not found
5823+
Refreshing native plugins compatible for Editor in 0.44 ms, found 3 plugins.
5824+
Preloading 0 native plugins for Editor in 0.00 ms.
5825+
Mono: successfully reloaded assembly
5826+
- Completed reload, in 0.994 seconds
5827+
Domain Reload Profiling:
5828+
ReloadAssembly (994ms)
5829+
BeginReloadAssembly (123ms)
5830+
ExecutionOrderSort (0ms)
5831+
DisableScriptedObjects (6ms)
5832+
BackupInstance (0ms)
5833+
ReleaseScriptingObjects (0ms)
5834+
CreateAndSetChildDomain (31ms)
5835+
EndReloadAssembly (802ms)
5836+
LoadAssemblies (88ms)
5837+
RebuildTransferFunctionScriptingTraits (0ms)
5838+
SetupTypeCache (276ms)
5839+
ReleaseScriptCaches (1ms)
5840+
RebuildScriptCaches (43ms)
5841+
SetupLoadedEditorAssemblies (281ms)
5842+
LogAssemblyErrors (0ms)
5843+
InitializePlatformSupportModulesInManaged (5ms)
5844+
SetLoadedEditorAssemblies (1ms)
5845+
RefreshPlugins (1ms)
5846+
BeforeProcessingInitializeOnLoad (52ms)
5847+
ProcessInitializeOnLoadAttributes (207ms)
5848+
ProcessInitializeOnLoadMethodAttributes (8ms)
5849+
AfterProcessingInitializeOnLoad (7ms)
5850+
EditorAssembliesLoaded (0ms)
5851+
ExecutionOrderSort2 (0ms)
5852+
AwakeInstancesAfterBackupRestoration (11ms)
5853+
Platform modules already initialized, skipping
5854+
Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins.
5855+
Preloading 0 native plugins for Editor in 0.00 ms.
5856+
Unloading 2161 Unused Serialized files (Serialized files now loaded: 0)
5857+
System memory in use before: 102.0 MB.
5858+
System memory in use after: 102.1 MB.
5859+
5860+
Unloading 21 unused Assets to reduce memory usage. Loaded Objects now: 2923.
5861+
Total: 2.658000 ms (FindLiveObjects: 0.196200 ms CreateObjectMapping: 0.074000 ms MarkObjects: 2.257600 ms DeleteObjects: 0.129400 ms)
5862+
5863+
AssetImportParameters requested are different than current active one (requested -> active):
5864+
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
5865+
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
5866+
custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
5867+
custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
5868+
custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
5869+
custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
5870+
custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
5871+
custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5872+
custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
5873+
========================================================================
5874+
Received Prepare
5875+
Registering precompiled user dll's ...
5876+
Registered in 0.004223 seconds.
5877+
Begin MonoManager ReloadAssembly
5878+
Native extension for WindowsStandalone target not found
5879+
Refreshing native plugins compatible for Editor in 0.44 ms, found 3 plugins.
5880+
Preloading 0 native plugins for Editor in 0.00 ms.
5881+
Mono: successfully reloaded assembly
5882+
- Completed reload, in 0.963 seconds
5883+
Domain Reload Profiling:
5884+
ReloadAssembly (964ms)
5885+
BeginReloadAssembly (116ms)
5886+
ExecutionOrderSort (0ms)
5887+
DisableScriptedObjects (6ms)
5888+
BackupInstance (0ms)
5889+
ReleaseScriptingObjects (0ms)
5890+
CreateAndSetChildDomain (31ms)
5891+
EndReloadAssembly (782ms)
5892+
LoadAssemblies (83ms)
5893+
RebuildTransferFunctionScriptingTraits (0ms)
5894+
SetupTypeCache (283ms)
5895+
ReleaseScriptCaches (1ms)
5896+
RebuildScriptCaches (43ms)
5897+
SetupLoadedEditorAssemblies (266ms)
5898+
LogAssemblyErrors (0ms)
5899+
InitializePlatformSupportModulesInManaged (5ms)
5900+
SetLoadedEditorAssemblies (1ms)
5901+
RefreshPlugins (0ms)
5902+
BeforeProcessingInitializeOnLoad (53ms)
5903+
ProcessInitializeOnLoadAttributes (192ms)
5904+
ProcessInitializeOnLoadMethodAttributes (8ms)
5905+
AfterProcessingInitializeOnLoad (7ms)
5906+
EditorAssembliesLoaded (0ms)
5907+
ExecutionOrderSort2 (0ms)
5908+
AwakeInstancesAfterBackupRestoration (11ms)
5909+
Platform modules already initialized, skipping
5910+
Refreshing native plugins compatible for Editor in 0.95 ms, found 3 plugins.
5911+
Preloading 0 native plugins for Editor in 0.00 ms.
5912+
Unloading 2161 Unused Serialized files (Serialized files now loaded: 0)
5913+
System memory in use before: 102.0 MB.
5914+
System memory in use after: 102.1 MB.
5915+
5916+
Unloading 21 unused Assets to reduce memory usage. Loaded Objects now: 2926.
5917+
Total: 2.778700 ms (FindLiveObjects: 0.207500 ms CreateObjectMapping: 0.087800 ms MarkObjects: 2.381900 ms DeleteObjects: 0.100700 ms)
5918+
56325919
AssetImportParameters requested are different than current active one (requested -> active):
56335920
custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
56345921
custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->

0 commit comments

Comments
 (0)