diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3d77b708f..a0fb465ef 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -5807,7 +5807,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Awaiting orders... + m_text: Awaiting orders m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8b05c00a6ef1bc13d9a1ff929a4ae490, type: 2} m_sharedMaterial: {fileID: 767029329116733304, guid: 8b05c00a6ef1bc13d9a1ff929a4ae490, diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity index e52651ffb..317efacb8 100644 --- a/Assets/Scenes/LoadingScene.unity +++ b/Assets/Scenes/LoadingScene.unity @@ -656,8 +656,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278249727 + m_fontColor: {r: 1, g: 0.9107641, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Scenes/MainMenuScene.unity b/Assets/Scenes/MainMenuScene.unity index c4bee56d3..61b0067a1 100644 --- a/Assets/Scenes/MainMenuScene.unity +++ b/Assets/Scenes/MainMenuScene.unity @@ -287,8 +287,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 3791650815 - m_fontColor: {r: 1, g: 1, b: 1, a: 0.88235295} + rgba: 4278228480 + m_fontColor: {r: 0, g: 0.5882353, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -677,8 +677,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 3791124479 - m_fontColor: {r: 1, g: 0.96964943, b: 0.96964943, a: 0.88235295} + rgba: 3774873750 + m_fontColor: {r: 0.5882353, g: 0, b: 0, a: 0.88235295} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1101,7 +1101,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.24589682, g: 0.24589682, b: 0.24589682, a: 0.88235295} + m_Color: {r: 0.35855508, g: 0.35855508, b: 0.35855508, a: 0.88235295} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2036,7 +2036,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.24589682, g: 0.24589682, b: 0.24589682, a: 0.88235295} + m_Color: {r: 0.35855508, g: 0.35855508, b: 0.35855508, a: 0.88235295} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index 22510da75..e7eedfd8a 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -6406,7 +6406,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - BEVEL_ON - - GLOW_ON - OUTLINE_ON m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -6468,7 +6467,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.05 + - _OutlineWidth: 0.2 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.9 diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 9fbcea134..84e2aeb27 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/ArtifactDB-lock b/Library/ArtifactDB-lock index 73aa5d6e5..8e2b082f7 100644 Binary files a/Library/ArtifactDB-lock and b/Library/ArtifactDB-lock differ diff --git a/Library/BurstCache/JIT/BurstCacheManifest.cm b/Library/BurstCache/JIT/BurstCacheManifest.cm index 31db28c5d..ade174a9e 100644 Binary files a/Library/BurstCache/JIT/BurstCacheManifest.cm and b/Library/BurstCache/JIT/BurstCacheManifest.cm differ diff --git a/Library/EditorInstance.json b/Library/EditorInstance.json deleted file mode 100644 index 53836c40a..000000000 --- a/Library/EditorInstance.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "process_id" : 92663, - "version" : "2023.1.0a26", - "app_path" : "/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Unity", - "app_contents_path" : "/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data" -} \ No newline at end of file diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 64e1b0b1b..76c4d8a6d 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/SceneVisibilityState.asset b/Library/SceneVisibilityState.asset index 227cfff9a..42ac1e437 100644 Binary files a/Library/SceneVisibilityState.asset and b/Library/SceneVisibilityState.asset differ diff --git a/Library/Search/transactions.db b/Library/Search/transactions.db index 5899e04ba..3c936eb98 100644 Binary files a/Library/Search/transactions.db and b/Library/Search/transactions.db differ diff --git a/Library/ShaderCache.db b/Library/ShaderCache.db index acd2c6364..bfc839a19 100644 Binary files a/Library/ShaderCache.db and b/Library/ShaderCache.db differ diff --git a/Library/ShaderCache/EditorEncounteredVariants b/Library/ShaderCache/EditorEncounteredVariants index 8831f037d..acb204cff 100644 Binary files a/Library/ShaderCache/EditorEncounteredVariants and b/Library/ShaderCache/EditorEncounteredVariants differ diff --git a/Library/ShaderCache/shader/TMP_SDF8160/00/d2ee5adb303b01222ae8168390df542b.bin b/Library/ShaderCache/shader/TMP_SDF8160/00/d2ee5adb303b01222ae8168390df542b.bin new file mode 100644 index 000000000..8aaad604b Binary files /dev/null and b/Library/ShaderCache/shader/TMP_SDF8160/00/d2ee5adb303b01222ae8168390df542b.bin differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index 08b74d518..f254e0cf8 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/SourceAssetDB-lock b/Library/SourceAssetDB-lock index a9b4b2ce5..911984369 100644 Binary files a/Library/SourceAssetDB-lock and b/Library/SourceAssetDB-lock differ diff --git a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json index d3ad67719..8ef437d29 100644 --- a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json +++ b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json @@ -1 +1 @@ -{"m_ScrollY":120.0,"m_ExpandedSceneGameObjectInstanceIDs":[-3560,26080,26764],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["99c9720ab356a0642a771bea13969a05"]} \ No newline at end of file +{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]} \ No newline at end of file diff --git a/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json b/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json index 56f283f8f..3a0535904 100644 --- a/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json +++ b/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":true,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":false,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":1000.4893798828125,"y":555.1447143554688,"z":4.790337562561035},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":622.4202880859375,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":true,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":false,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":904.1072998046875,"y":566.3672485351563,"z":5.388542652130127},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":595.2538452148438,"orthographic":true} \ No newline at end of file diff --git a/Library/UndoData.bin b/Library/UndoData.bin index 7b408516c..3f71af9fa 100644 Binary files a/Library/UndoData.bin and b/Library/UndoData.bin differ diff --git a/Library/UndoStack.bin b/Library/UndoStack.bin index f81cfb3bc..921c885a9 100644 Binary files a/Library/UndoStack.bin and b/Library/UndoStack.bin differ diff --git a/Library/expandedItems b/Library/expandedItems index 5956dc83d..eff444442 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log index 60217672b..de9ecbac9 100644 --- a/Logs/AssetImportWorker0.log +++ b/Logs/AssetImportWorker0.log @@ -1978,6 +1978,294 @@ Unloading 15 unused Assets / (1.5 MB). Loaded Objects now: 4025. Memory consumption went from 145.1 MB to 143.5 MB. Total: 5.046962 ms (FindLiveObjects: 0.207881 ms CreateObjectMapping: 0.125830 ms MarkObjects: 4.421522 ms DeleteObjects: 0.290613 ms) +Prepare: number of updated asset objects reloaded= 0 +AssetImportParameters requested are different than current active one (requested -> active): + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:AudioImporter_EditorPlatform: 2f0ff77a95e0ac474e3e8eeba4e2f7cb -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> +======================================================================== +Received Prepare +Begin MonoManager ReloadAssembly +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +- Loaded All Assemblies, in 0.684 seconds +Refreshing native plugins compatible for Editor in 5.88 ms, found 0 plugins. +Native extension for LinuxStandalone target not found +Mono: successfully reloaded assembly +- Finished resetting the current domain, in 1.253 seconds +Domain Reload Profiling: 1930ms + BeginReloadAssembly (154ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (7ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (57ms) + RebuildCommonClasses (40ms) + RebuildNativeTypeToScriptingClass (9ms) + initialDomainReloadingComplete (38ms) + LoadAllAssembliesAndSetupDomain (435ms) + LoadAssemblies (238ms) + RebuildTransferFunctionScriptingTraits (0ms) + AnalyzeDomain (235ms) + TypeCache.Refresh (223ms) + TypeCache.ScanAssembly (212ms) + ScanForSourceGeneratedMonoScriptInfo (0ms) + ResolveRequiredComponents (11ms) + FinalizeReload (1254ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (0ms) + SetupLoadedEditorAssemblies (422ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (7ms) + SetLoadedEditorAssemblies (4ms) + BeforeProcessingInitializeOnLoad (101ms) + ProcessInitializeOnLoadAttributes (277ms) + ProcessInitializeOnLoadMethodAttributes (27ms) + AfterProcessingInitializeOnLoad (5ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (26ms) +Shader Hidden/ProbeVolume/VoxelizeScene is not supported: GPU does not support conservative rasterization +Refreshing native plugins compatible for Editor in 4.47 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 3129 Unused Serialized files (Serialized files now loaded: 0) +Unloading 14 unused Assets / (1.5 MB). Loaded Objects now: 4042. +Memory consumption went from 146.1 MB to 144.5 MB. +Total: 5.049782 ms (FindLiveObjects: 0.230493 ms CreateObjectMapping: 0.136288 ms MarkObjects: 4.423945 ms DeleteObjects: 0.257476 ms) + +Prepare: number of updated asset objects reloaded= 0 +AssetImportParameters requested are different than current active one (requested -> active): + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:AudioImporter_EditorPlatform: 2f0ff77a95e0ac474e3e8eeba4e2f7cb -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> +======================================================================== +Received Prepare +Begin MonoManager ReloadAssembly +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +- Loaded All Assemblies, in 0.697 seconds +Refreshing native plugins compatible for Editor in 3.97 ms, found 0 plugins. +Native extension for LinuxStandalone target not found +Mono: successfully reloaded assembly +- Finished resetting the current domain, in 1.408 seconds +Domain Reload Profiling: 2098ms + BeginReloadAssembly (161ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (7ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (60ms) + RebuildCommonClasses (41ms) + RebuildNativeTypeToScriptingClass (9ms) + initialDomainReloadingComplete (39ms) + LoadAllAssembliesAndSetupDomain (439ms) + LoadAssemblies (234ms) + RebuildTransferFunctionScriptingTraits (0ms) + AnalyzeDomain (246ms) + TypeCache.Refresh (234ms) + TypeCache.ScanAssembly (223ms) + ScanForSourceGeneratedMonoScriptInfo (0ms) + ResolveRequiredComponents (12ms) + FinalizeReload (1409ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (0ms) + SetupLoadedEditorAssemblies (476ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (6ms) + SetLoadedEditorAssemblies (5ms) + BeforeProcessingInitializeOnLoad (114ms) + ProcessInitializeOnLoadAttributes (314ms) + ProcessInitializeOnLoadMethodAttributes (31ms) + AfterProcessingInitializeOnLoad (5ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (28ms) +Shader Hidden/ProbeVolume/VoxelizeScene is not supported: GPU does not support conservative rasterization +Refreshing native plugins compatible for Editor in 4.66 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 3129 Unused Serialized files (Serialized files now loaded: 0) +Unloading 14 unused Assets / (1.5 MB). Loaded Objects now: 4059. +Memory consumption went from 147.1 MB to 145.6 MB. +Total: 5.612462 ms (FindLiveObjects: 0.214421 ms CreateObjectMapping: 0.128909 ms MarkObjects: 4.987979 ms DeleteObjects: 0.280081 ms) + +Prepare: number of updated asset objects reloaded= 0 +AssetImportParameters requested are different than current active one (requested -> active): + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:AudioImporter_EditorPlatform: 2f0ff77a95e0ac474e3e8eeba4e2f7cb -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> +======================================================================== +Received Prepare +Begin MonoManager ReloadAssembly +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +- Loaded All Assemblies, in 0.758 seconds +Refreshing native plugins compatible for Editor in 4.05 ms, found 0 plugins. +Native extension for LinuxStandalone target not found +Mono: successfully reloaded assembly +- Finished resetting the current domain, in 1.584 seconds +Domain Reload Profiling: 2332ms + BeginReloadAssembly (169ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (8ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (60ms) + RebuildCommonClasses (47ms) + RebuildNativeTypeToScriptingClass (9ms) + initialDomainReloadingComplete (42ms) + LoadAllAssembliesAndSetupDomain (480ms) + LoadAssemblies (277ms) + RebuildTransferFunctionScriptingTraits (0ms) + AnalyzeDomain (249ms) + TypeCache.Refresh (237ms) + TypeCache.ScanAssembly (224ms) + ScanForSourceGeneratedMonoScriptInfo (0ms) + ResolveRequiredComponents (12ms) + FinalizeReload (1585ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (0ms) + SetupLoadedEditorAssemblies (453ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (7ms) + SetLoadedEditorAssemblies (4ms) + BeforeProcessingInitializeOnLoad (107ms) + ProcessInitializeOnLoadAttributes (300ms) + ProcessInitializeOnLoadMethodAttributes (29ms) + AfterProcessingInitializeOnLoad (5ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (28ms) +Shader Hidden/ProbeVolume/VoxelizeScene is not supported: GPU does not support conservative rasterization +Refreshing native plugins compatible for Editor in 5.12 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 3129 Unused Serialized files (Serialized files now loaded: 0) +Unloading 14 unused Assets / (1.5 MB). Loaded Objects now: 4076. +Memory consumption went from 148.2 MB to 146.6 MB. +Total: 5.385314 ms (FindLiveObjects: 0.217203 ms CreateObjectMapping: 0.126226 ms MarkObjects: 4.538465 ms DeleteObjects: 0.501934 ms) + +Prepare: number of updated asset objects reloaded= 0 +AssetImportParameters requested are different than current active one (requested -> active): + custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> + custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> + custom:SearchIndexIgnoredProperties: e643bd26f0fe6173181afceb89e7c659 -> + custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> + custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> + custom:AudioImporter_EditorPlatform: 2f0ff77a95e0ac474e3e8eeba4e2f7cb -> + custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> + custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> + custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> +======================================================================== +Received Prepare +Begin MonoManager ReloadAssembly +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +icall.c:1842: +- Loaded All Assemblies, in 0.652 seconds +Refreshing native plugins compatible for Editor in 4.71 ms, found 0 plugins. +Native extension for LinuxStandalone target not found +Mono: successfully reloaded assembly +- Finished resetting the current domain, in 1.226 seconds +Domain Reload Profiling: 1869ms + BeginReloadAssembly (151ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (7ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (50ms) + RebuildCommonClasses (40ms) + RebuildNativeTypeToScriptingClass (10ms) + initialDomainReloadingComplete (38ms) + LoadAllAssembliesAndSetupDomain (403ms) + LoadAssemblies (213ms) + RebuildTransferFunctionScriptingTraits (0ms) + AnalyzeDomain (231ms) + TypeCache.Refresh (220ms) + TypeCache.ScanAssembly (209ms) + ScanForSourceGeneratedMonoScriptInfo (0ms) + ResolveRequiredComponents (11ms) + FinalizeReload (1226ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (0ms) + SetupLoadedEditorAssemblies (420ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (7ms) + SetLoadedEditorAssemblies (3ms) + BeforeProcessingInitializeOnLoad (106ms) + ProcessInitializeOnLoadAttributes (272ms) + ProcessInitializeOnLoadMethodAttributes (27ms) + AfterProcessingInitializeOnLoad (5ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (27ms) +Shader Hidden/ProbeVolume/VoxelizeScene is not supported: GPU does not support conservative rasterization +Refreshing native plugins compatible for Editor in 4.32 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 3129 Unused Serialized files (Serialized files now loaded: 0) +Unloading 14 unused Assets / (1.5 MB). Loaded Objects now: 4093. +Memory consumption went from 149.2 MB to 147.7 MB. +Total: 4.868647 ms (FindLiveObjects: 0.215582 ms CreateObjectMapping: 0.123899 ms MarkObjects: 4.265058 ms DeleteObjects: 0.262904 ms) + Prepare: number of updated asset objects reloaded= 0 AssetImportParameters requested are different than current active one (requested -> active): custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> diff --git a/Logs/shadercompiler-AssetImportWorker0-0.log b/Logs/shadercompiler-AssetImportWorker0-0.log index 5e190954b..ac6dc3f2f 100644 --- a/Logs/shadercompiler-AssetImportWorker0-0.log +++ b/Logs/shadercompiler-AssetImportWorker0-0.log @@ -1,3 +1,6 @@ Base path: '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data', plugins path '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4) + +Quitting shader compiler process diff --git a/Logs/shadercompiler-UnityShaderCompiler-0.log b/Logs/shadercompiler-UnityShaderCompiler-0.log index e991c571a..179b55a5e 100644 --- a/Logs/shadercompiler-UnityShaderCompiler-0.log +++ b/Logs/shadercompiler-UnityShaderCompiler-0.log @@ -7,3 +7,6 @@ Cmd: compileSnippet Cmd: compileSnippet insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=BEVEL_ON GLOW_ON dKW=UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=glcore reqs=227 mask=2 start=114 ok=1 outsize=14903 +Cmd: compileSnippet + insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=BEVEL_ON dKW=UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=glcore reqs=227 mask=2 start=114 ok=1 outsize=13525 + diff --git a/Logs/shadercompiler-UnityShaderCompiler-1.log b/Logs/shadercompiler-UnityShaderCompiler-1.log index e991c571a..179b55a5e 100644 --- a/Logs/shadercompiler-UnityShaderCompiler-1.log +++ b/Logs/shadercompiler-UnityShaderCompiler-1.log @@ -7,3 +7,6 @@ Cmd: compileSnippet Cmd: compileSnippet insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=BEVEL_ON GLOW_ON dKW=UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=glcore reqs=227 mask=2 start=114 ok=1 outsize=14903 +Cmd: compileSnippet + insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW=BEVEL_ON dKW=UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=glcore reqs=227 mask=2 start=114 ok=1 outsize=13525 + diff --git a/Temp/.fuse_hidden0000ab1000000030 b/Temp/.fuse_hidden0000ab100000003a similarity index 100% rename from Temp/.fuse_hidden0000ab1000000030 rename to Temp/.fuse_hidden0000ab100000003a diff --git a/Temp/.fuse_hidden0000df6e00000031 b/Temp/.fuse_hidden0000df6e0000003b similarity index 100% rename from Temp/.fuse_hidden0000df6e00000031 rename to Temp/.fuse_hidden0000df6e0000003b diff --git a/Temp/.fuse_hidden0000df7900000032 b/Temp/.fuse_hidden0000df790000003c similarity index 100% rename from Temp/.fuse_hidden0000df7900000032 rename to Temp/.fuse_hidden0000df790000003c diff --git a/Temp/.fuse_hidden000112c800000033 b/Temp/.fuse_hidden000112c80000003d similarity index 100% rename from Temp/.fuse_hidden000112c800000033 rename to Temp/.fuse_hidden000112c80000003d diff --git a/Temp/UnityLockfile b/Temp/.fuse_hidden0001378f0000003e similarity index 100% rename from Temp/UnityLockfile rename to Temp/.fuse_hidden0001378f0000003e diff --git a/Temp/FSTimeGet-898c7dfc8d015e9368f940e9fec08faf b/Temp/FSTimeGet-898c7dfc8d015e9368f940e9fec08faf deleted file mode 100644 index d8c975718..000000000 Binary files a/Temp/FSTimeGet-898c7dfc8d015e9368f940e9fec08faf and /dev/null differ diff --git a/Temp/FSTimeGet-dd75604ac7da03daabe19e724882bb63 b/Temp/FSTimeGet-dd75604ac7da03daabe19e724882bb63 deleted file mode 100644 index 30ce2b561..000000000 Binary files a/Temp/FSTimeGet-dd75604ac7da03daabe19e724882bb63 and /dev/null differ diff --git a/Temp/ProcessJobs/b8613a84801a46c691ba1681b66ddf56.layout b/Temp/ProcessJobs/b8613a84801a46c691ba1681b66ddf56.layout deleted file mode 100644 index 1627098e7..000000000 Binary files a/Temp/ProcessJobs/b8613a84801a46c691ba1681b66ddf56.layout and /dev/null differ diff --git a/Temp/__Backupscenes/0.backup b/Temp/__Backupscenes/0.backup deleted file mode 100644 index ce755fdb9..000000000 Binary files a/Temp/__Backupscenes/0.backup and /dev/null differ diff --git a/Temp/workerlic b/Temp/workerlic deleted file mode 100644 index 260c9e3eb..000000000 Binary files a/Temp/workerlic and /dev/null differ diff --git a/UserSettings/Layouts/default-2023.dwlt b/UserSettings/Layouts/default-2023.dwlt index 9a07ce2fc..b1ac33a99 100644 --- a/UserSettings/Layouts/default-2023.dwlt +++ b/UserSettings/Layouts/default-2023.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1027 m_ShowMode: 4 - m_Title: Console + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 31653 + controlID: 9218 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1143 + width: 1288 height: 977 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 31654 + controlID: 9219 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,8 +163,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1143 - height: 707 + width: 1288 + height: 706 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -172,6 +172,7 @@ MonoBehaviour: - {fileID: 14} - {fileID: 13} - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 --- !u!114 &8 @@ -192,13 +193,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 707 - width: 1143 - height: 270 + y: 706 + width: 1288 + height: 271 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 31677 + controlID: 9243 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -216,13 +217,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 287 - height: 270 + width: 322 + height: 271 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &10 @@ -235,24 +236,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: AnimationWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 287 + x: 322 y: 0 - width: 856 - height: 270 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + width: 966 + height: 271 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 20} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,15 +269,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1143 + x: 1288 y: 0 - width: 353 + width: 285 height: 977 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 20} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 @@ -294,16 +295,16 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1496 + x: 1573 y: 0 - width: 424 + width: 347 height: 977 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 21} - {fileID: 22} + - {fileID: 23} m_Selected: 0 m_LastSelected: 1 --- !u!114 &13 @@ -330,8 +331,8 @@ MonoBehaviour: serializedVersion: 2 x: 2559 y: 83 - width: 1142 - height: 686 + width: 1287 + height: 685 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -384,23 +385,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1142 - height: 665 - m_Scale: {x: 0.59479165, y: 0.59479165} - m_Translation: {x: 571, y: 332.5} + width: 1287 + height: 664 + m_Scale: {x: 0.6148148, y: 0.6148148} + m_Translation: {x: 643.5, y: 332} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -559.0193 - width: 1920 - height: 1118.0386 + x: -1046.6566 + y: -540 + width: 2093.3132 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.59479165 - m_LastWindowPixelSize: {x: 1142, y: 686} + m_defaultScale: 0.6148148 + m_LastWindowPixelSize: {x: 1287, y: 685} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -430,8 +431,8 @@ MonoBehaviour: serializedVersion: 2 x: 2559 y: 83 - width: 1142 - height: 686 + width: 1287 + height: 685 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -817,9 +818,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1345.9647, y: 366.84558, z: -1.803237} + m_Target: {x: 904.1073, y: 566.36725, z: 5.3885427} speed: 2 - m_Value: {x: 1345.9647, y: 366.84558, z: -1.803237} + m_Value: {x: 904.1073, y: 566.36725, z: 5.3885427} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -869,9 +870,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 144.16098 + m_Target: 595.25385 speed: 2 - m_Value: 144.16098 + m_Value: 595.25385 m_Ortho: m_Target: 1 speed: 2 @@ -933,6 +934,80 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] --- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "Animator\u200B" + m_Pos: + serializedVersion: 2 + x: 2559 + y: 83 + width: 1287 + height: 685 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5591279453715746674, guid: ac83784dad573fc1a81c2f072b55fb21, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 19.120605 + e10: 0 + e11: 1 + e12: 0 + e13: 136.78952 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: ac83784dad573fc1a81c2f072b55fb21, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5591279453715746674, guid: ac83784dad573fc1a81c2f072b55fb21, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -955,9 +1030,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2559 - y: 790 - width: 286 - height: 249 + y: 789 + width: 321 + height: 250 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -970,24 +1045,24 @@ MonoBehaviour: m_ContainerData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2e5d0100 - m_LastClickedID: 0 - m_ExpandedIDs: 7202fcfff803fcffcc52fcffd652fcffdc52fcff1253fcff3a53fcff6a53fcffb277fcffda77fcff0a78fcff3278fcff7abefcff4ce1fcff28cffeff2eddfeffccddfeff0ae6feff14e6feff32e7feff4efdfeffd44bffffd64bffffdc4bffff6e6dffffe47fffffae8400004885000080850000dec90000e4c9000002ed000016ed0000 + scrollPos: {x: 0, y: 60} + m_SelectedIDs: 5aa90000 + m_LastClickedID: 43354 + m_ExpandedIDs: a249feff8a52feffba6afeff1271fefff877feffdca9feff18f2ffffe06500008c680000749f000018a0000026a0000060a0000014a9000060ac0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: LoadingText + m_OriginalName: LoadingText m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 40840 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 9} m_SearchString: @@ -997,7 +1072,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1019,9 +1094,9 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 2846 + x: 2881 y: 790 - width: 854 + width: 964 height: 249 m_SerializedDataModeController: m_DataMode: 0 @@ -1033,7 +1108,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_ContainerData: [] ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1055,10 +1130,10 @@ MonoBehaviour: m_TextWithWhitespace: "Animation\u200B" m_Pos: serializedVersion: 2 - x: 403 - y: 1015 - width: 1395 - height: 340 + x: 2881 + y: 789 + width: 964 + height: 250 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1071,8 +1146,8 @@ MonoBehaviour: m_ContainerData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -211010 ---- !u!114 &19 + m_LastSelectedObjectID: 43354 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1256,7 +1331,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1278,9 +1353,9 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 3702 + x: 3847 y: 83 - width: 351 + width: 283 height: 956 m_SerializedDataModeController: m_DataMode: 0 @@ -1305,7 +1380,7 @@ MonoBehaviour: m_SkipHidden: 1 m_SearchArea: 1 m_Folders: - - Assets/Scripts/UI + - Assets/TextMesh Pro/Resources/Fonts & Materials m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1322,7 +1397,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 3e430000 m_LastClickedID: 17214 - m_ExpandedIDs: ffffffff000000002c710000047b0000067b00000a7b0000127b0000167b0000187b0000247b0000267b0000287b00002e7b0000307b0000327b0000367b00003a7b00003c7b00003e7b0000407b0000427b0000447b0000467b00006a7b0000c2ef0000c6ef0000 + m_ExpandedIDs: ffffffff0000000086620000506400007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008e6f0000906f0000946f0000966f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000cc6f0000f66f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1347,24 +1422,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 98} + scrollPos: {x: 0, y: 690} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000002c710000047b0000067b00000a7b0000127b0000167b0000187b0000247b0000267b0000287b00002e7b0000307b0000327b0000367b00003a7b00003c7b00003e7b0000407b0000427b0000447b0000467b00006a7b0000c2ef0000c6ef0000 + m_ExpandedIDs: ffffffff0000000086620000506400007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008e6f0000906f0000946f0000966f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000cc6f0000f66f0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TutorialUI - m_OriginalName: TutorialUI + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 89390 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 11} m_SearchString: @@ -1406,7 +1481,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 1 m_DirectoriesAreaWidth: 207 ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1428,9 +1503,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 4055 + x: 4132 y: 83 - width: 423 + width: 346 height: 956 m_SerializedDataModeController: m_DataMode: 0 @@ -1455,7 +1530,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &22 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1477,9 +1552,9 @@ MonoBehaviour: m_TextWithWhitespace: "Lighting\u200B" m_Pos: serializedVersion: 2 - x: 4204 + x: 4132 y: 83 - width: 274 + width: 346 height: 956 m_SerializedDataModeController: m_DataMode: 0