diff --git a/Runtime/Reporter/DotNetStandardExceptionReporter.cs b/Runtime/Reporter/DotNetStandardExceptionReporter.cs index 69bf7c9..c29bd63 100644 --- a/Runtime/Reporter/DotNetStandardExceptionReporter.cs +++ b/Runtime/Reporter/DotNetStandardExceptionReporter.cs @@ -1,4 +1,4 @@ -using BugSplatUnity.Runtime.Client; +using BugSplatUnity.Runtime.Client; using BugSplatUnity.Runtime.Settings; using System; using System.Collections; @@ -111,7 +111,16 @@ private IEnumerator Post(string stackTrace, IReportPostOptions options = null, A var editorLogFileInfo = new FileInfo(editorLogFilePath); if (editorLogFileInfo.Exists) { - options.AdditionalAttachments.Add(editorLogFileInfo); + try + { + var tempFile = CopyLogTailToTempFile(editorLogFileInfo, clientSettings.LogFileMaxSizeMB); + options.AdditionalAttachments.Add(tempFile); + tempFiles.Add(tempFile); + } + catch (Exception ex) + { + Debug.LogException(new Exception("Could not copy log tail to temp file", ex)); + } } else { @@ -123,7 +132,16 @@ private IEnumerator Post(string stackTrace, IReportPostOptions options = null, A var editorLogFileInfo = new FileInfo(editorLogFilePath); if (editorLogFileInfo.Exists) { - options.AdditionalAttachments.Add(editorLogFileInfo); + try + { + var tempFile = CopyLogTailToTempFile(editorLogFileInfo, clientSettings.LogFileMaxSizeMB); + options.AdditionalAttachments.Add(tempFile); + tempFiles.Add(tempFile); + } + catch (Exception ex) + { + Debug.LogException(new Exception("Could not copy log tail to temp file", ex)); + } } else { @@ -164,7 +182,16 @@ private IEnumerator Post(string stackTrace, IReportPostOptions options = null, A var playerLogFileInfo = new FileInfo(playerLogFilePath); if (playerLogFileInfo.Exists) { - options.AdditionalAttachments.Add(playerLogFileInfo); + try + { + var tempFile = CopyLogTailToTempFile(playerLogFileInfo, clientSettings.LogFileMaxSizeMB); + options.AdditionalAttachments.Add(tempFile); + tempFiles.Add(tempFile); + } + catch (Exception ex) + { + Debug.LogException(new Exception("Could not copy log tail to temp file", ex)); + } } else { @@ -172,15 +199,24 @@ private IEnumerator Post(string stackTrace, IReportPostOptions options = null, A } #elif UNITY_STANDALONE_LINUX var home = Environment.GetEnvironmentVariable("HOME"); - var editorLogFilePath = Path.Combine(home, ".config", "unity3d", Application.companyName, Application.productName, "Player.log"); - var editorLogFileInfo = new FileInfo(editorLogFilePath); - if (editorLogFileInfo.Exists) + var playerLogFilePath = Path.Combine(home, ".config", "unity3d", Application.companyName, Application.productName, "Player.log"); + var playerLogFileInfo = new FileInfo(playerLogFilePath); + if (playerLogFileInfo.Exists) { - options.AdditionalAttachments.Add(editorLogFileInfo); + try + { + var tempFile = CopyLogTailToTempFile(playerLogFileInfo, clientSettings.LogFileMaxSizeMB); + options.AdditionalAttachments.Add(tempFile); + tempFiles.Add(tempFile); + } + catch (Exception ex) + { + Debug.LogException(new Exception("Could not copy log tail to temp file", ex)); + } } else { - Debug.Log($"BugSplat info: Could not find {editorLogFileInfo.FullName}, skipping..."); + Debug.Log($"BugSplat info: Could not find {playerLogFileInfo.FullName}, skipping..."); } #elif UNITY_WSA var tempState = Application.temporaryCachePath; @@ -188,7 +224,16 @@ private IEnumerator Post(string stackTrace, IReportPostOptions options = null, A var playerLogFileInfo = new FileInfo(playerLogFilePath); if (playerLogFileInfo.Exists) { - options.AdditionalAttachments.Add(playerLogFileInfo); + try + { + var tempFile = CopyLogTailToTempFile(playerLogFileInfo, clientSettings.LogFileMaxSizeMB); + options.AdditionalAttachments.Add(tempFile); + tempFiles.Add(tempFile); + } + catch (Exception ex) + { + Debug.LogException(new Exception("Could not copy log tail to temp file", ex)); + } } else { diff --git a/Samples~/my-unity-crasher/Materials/Bug.mat b/Samples~/my-unity-crasher/Materials/Bug.mat index 03c3897..4891dd7 100644 --- a/Samples~/my-unity-crasher/Materials/Bug.mat +++ b/Samples~/my-unity-crasher/Materials/Bug.mat @@ -2,78 +2,42 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bug - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _RECEIVE_SHADOWS_OFF + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: fd8cef68da0b79c45a8c1e4defcc4dac, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: fd8cef68da0b79c45a8c1e4defcc4dac, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 + - _Surface: 1 + - _Blend: 0 + - _Cull: 2 + - _ZWrite: 0 + - _AlphaClip: 0 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Samples~/my-unity-crasher/Scenes/Sample.unity b/Samples~/my-unity-crasher/Scenes/Sample.unity index f630faa..5ed122e 100644 --- a/Samples~/my-unity-crasher/Scenes/Sample.unity +++ b/Samples~/my-unity-crasher/Scenes/Sample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -148,12 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152587281} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &152587283 MonoBehaviour: @@ -184,6 +181,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} @@ -192,6 +190,10 @@ PrefabInstance: ' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_CatchExceptionAndPostNewBugSplat @@ -342,6 +344,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5305253083977984388, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &421152114 stripped RectTransform: @@ -353,12 +358,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_text value: Throw Exception objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_ThrowException @@ -481,6 +491,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5305253083977984388, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &466575637 stripped RectTransform: @@ -515,6 +528,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1029022994} - {fileID: 1823812432} @@ -525,7 +539,6 @@ RectTransform: - {fileID: 421152114} - {fileID: 806239722} m_Father: {fileID: 1145286143} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -573,6 +586,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} @@ -581,6 +595,10 @@ PrefabInstance: ' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_PureVirtualFunction @@ -706,6 +724,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 719081361} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &719081359 stripped RectTransform: @@ -735,12 +759,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_text value: 'Crash: Native iOS' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_CrashNativeIos @@ -866,6 +895,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 806239724} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &806239722 stripped RectTransform: @@ -895,8 +930,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_Abort @@ -1018,6 +1058,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 875969946} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &875969944 stripped RectTransform: @@ -1070,9 +1116,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947668028} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 2, y: 2, z: 2} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &947668030 @@ -1092,10 +1146,15 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c06aa6ec87195ca4b82468d2a752d7f4, type: 2} + - {fileID: 2100000, guid: 9a38ad85866fa48cf966ae26e1c707ae, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1113,9 +1172,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &947668031 MeshFilter: @@ -1132,12 +1193,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947668028} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1.39, z: 1.88} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &947668033 MonoBehaviour: @@ -1151,17 +1213,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7f2d31e032716bc42ab1537ddaeb2360, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1015612640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015612643} + - component: {fileID: 1015612642} + - component: {fileID: 1015612641} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1015612641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015612640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &1015612642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015612640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1015612643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015612640} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1029022993 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_text value: 'Crash: Access Violation' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_AccessViolation @@ -1291,6 +1437,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1029022996} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &1029022994 stripped RectTransform: @@ -1355,9 +1507,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1391,24 +1551,30 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1046333156} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.03, z: -2.79} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1138228618 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_text value: 'Crash: Mono Abort' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_MonoAbort @@ -1534,6 +1700,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1138228621} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &1138228619 stripped RectTransform: @@ -1634,7 +1806,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1648,11 +1822,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1305560572} - {fileID: 640478525} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1687,9 +1861,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1145286143} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1744,6 +1918,7 @@ GameObject: m_Component: - component: {fileID: 1330146948} - component: {fileID: 1330146947} + - component: {fileID: 1330146949} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -1759,15 +1934,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330146946} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 12 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 2 m_Resolution: -1 @@ -1811,8 +1985,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1330146948 Transform: m_ObjectHideFlags: 0 @@ -1820,90 +1998,59 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330146946} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1450801846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1450801849} - - component: {fileID: 1450801848} - - component: {fileID: 1450801847} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1450801847 +--- !u!114 &1330146949 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450801846} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1450801848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450801846} + m_GameObject: {fileID: 1330146946} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1450801849 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450801846} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1001 &1823812431 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 640478525} m_Modifications: - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_text value: 'Crash: Fatal Error' objectReference: {fileID: 0} + - target: {fileID: 5305253083692843789, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + propertyPath: m_ActiveFontFeatures.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} propertyPath: m_Name value: Button_FatalError @@ -2017,6 +2164,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5305253083977984383, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1823812434} m_SourcePrefab: {fileID: 100100000, guid: de657baed6ab68e4e946d741cdbe94e2, type: 3} --- !u!224 &1823812432 stripped RectTransform: @@ -2066,12 +2219,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1878188388} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -7.7891855, y: 2.7024393, z: 0.9878168} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1878188390 MonoBehaviour: @@ -2136,10 +2290,23 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2022727938} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.581355, y: 3.3833358, z: 117.29409} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1878188389} + - {fileID: 947668032} + - {fileID: 1145286143} + - {fileID: 152587282} + - {fileID: 1330146948} + - {fileID: 1046333159} + - {fileID: 2022727940} + - {fileID: 1015612643}