From 3b72247e14b80427272c4564a81766fd0baf8cf9 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 4 Mar 2023 12:54:49 +1100 Subject: [PATCH] Finish building --- .erp | 2 +- ProjectSettings/BurstAotSettings_WebGL.json | 16 ++ ProjectSettings/QualitySettings.asset | 130 ++------------ UserSettings/Layouts/default-2022.dwlt | 181 ++++++++++++-------- 4 files changed, 141 insertions(+), 188 deletions(-) create mode 100644 ProjectSettings/BurstAotSettings_WebGL.json diff --git a/.erp b/.erp index 5420c2a..8889c06 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677894498 + 1677898274 8108933050827143283 false \ No newline at end of file diff --git a/ProjectSettings/BurstAotSettings_WebGL.json b/ProjectSettings/BurstAotSettings_WebGL.json new file mode 100644 index 0000000..eed54c3 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WebGL.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index cc28cec..cd19172 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,106 +4,8 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 0 m_QualitySettings: - - serializedVersion: 3 - name: Performant - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - globalTextureMipmapLimit: 0 - textureMipmapLimitSettings: [] - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - useLegacyDetailDistribution: 1 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - enableLODCrossFade: 1 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574, - type: 2} - terrainQualityOverrides: 0 - terrainPixelError: 1 - terrainDetailDensityScale: 1 - terrainBasemapDistance: 1000 - terrainDetailDistance: 80 - terrainTreeDistance: 5000 - terrainBillboardStart: 50 - terrainFadeLength: 5 - terrainMaxTrees: 50 - excludedTargetPlatforms: [] - - serializedVersion: 3 - name: Balanced - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 4 - globalTextureMipmapLimit: 0 - textureMipmapLimitSettings: [] - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - useLegacyDetailDistribution: 1 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - enableLODCrossFade: 1 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, - type: 2} - terrainQualityOverrides: 0 - terrainPixelError: 1 - terrainDetailDensityScale: 1 - terrainBasemapDistance: 1000 - terrainDetailDistance: 80 - terrainTreeDistance: 5000 - terrainBillboardStart: 50 - terrainFadeLength: 5 - terrainMaxTrees: 50 - excludedTargetPlatforms: [] - serializedVersion: 3 name: High Fidelity pixelLightCount: 2 @@ -155,19 +57,19 @@ QualitySettings: excludedTargetPlatforms: [] m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: - Android: 1 - CloudRendering: 2 - GameCoreScarlett: 2 - GameCoreXboxOne: 2 - Lumin: 2 - Nintendo Switch: 2 - PS4: 2 - PS5: 2 + Android: 0 + CloudRendering: 0 + GameCoreScarlett: 0 + GameCoreXboxOne: 0 + Lumin: 0 + Nintendo Switch: 0 + PS4: 0 + PS5: 0 Server: 0 - Stadia: 2 - Standalone: 2 - WebGL: 1 - Windows Store Apps: 2 - XboxOne: 2 - iPhone: 1 - tvOS: 1 + Stadia: 0 + Standalone: 0 + WebGL: 0 + Windows Store Apps: 0 + XboxOne: 0 + iPhone: 0 + tvOS: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 3c1dfea..9ea25e8 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Scene + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 94 + controlID: 19 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 95 + controlID: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,15 +188,15 @@ MonoBehaviour: y: 0 width: 1875 height: 958 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} - - {fileID: 13} - {fileID: 15} + - {fileID: 14} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -221,7 +221,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 58 + controlID: 259 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,9 +243,9 @@ MonoBehaviour: height: 341 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 &11 @@ -258,7 +258,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -267,15 +267,15 @@ MonoBehaviour: y: 0 width: 1453 height: 341 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 1 - m_LastSelected: 0 + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -295,16 +295,52 @@ MonoBehaviour: y: 0 width: 685 height: 1299 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 20} - {fileID: 21} - {fileID: 22} + - {fileID: 23} + - {fileID: 13} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 3 --- !u!114 &13 +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: 12079, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 390, y: 390} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Lighting + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1875 + y: 73 + width: 684 + height: 1278 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -345,7 +381,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_TargetSize: {x: 2560, y: 1440} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -354,16 +390,16 @@ MonoBehaviour: m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 05000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 + m_HBaseRangeMin: -1280 + m_HBaseRangeMax: 1280 + m_VBaseRangeMin: -720 + m_VBaseRangeMax: 720 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -372,7 +408,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -383,27 +419,27 @@ MonoBehaviour: y: 21 width: 1874 height: 916 - m_Scale: {x: 0.84814817, y: 0.84814817} - m_Translation: {x: 937, y: 458} + m_Scale: {x: 0.63611114, y: 0.63611114} + m_Translation: {x: 937, y: 457.99994} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1104.7598 - y: -540 - width: 2209.5195 - height: 1080 + x: -1473.0131 + y: -719.9999 + width: 2946.0261 + height: 1439.9999 m_MinimalGUI: 1 - m_defaultScale: 0.84814817 + m_defaultScale: 0.63611114 m_LastWindowPixelSize: {x: 1874, y: 937} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -742,14 +778,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.1023293, y: -0.46711683, z: 10.028083} + m_Target: {x: 1219.717, y: 738.8682, z: -85.6585} speed: 2 - m_Value: {x: -4.1023293, y: -0.46711683, z: 10.028083} + m_Value: {x: 1219.717, y: 738.8682, z: -85.6585} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,7 +794,7 @@ MonoBehaviour: m_ValidateTrueMetals: 0 m_DoValidateTrueMetals: 0 m_SceneViewState: - m_AlwaysRefresh: 0 + m_AlwaysRefresh: 1 showFog: 1 showSkybox: 1 showFlares: 1 @@ -777,17 +813,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -795,20 +831,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.10798761, y: -0.17032483, z: 0.018700315, w: 0.9793352} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.10798761, y: 0.17032485, z: -0.018700315, w: -0.9793352} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.62771 + m_Target: 1023.9837 speed: 2 - m_Value: 12.62771 + m_Value: 1023.9837 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: - m_Speed: 1.2003998 - m_SpeedNormalized: 0.5999999 + m_Speed: 2 + m_SpeedNormalized: 1 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -819,14 +855,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.121280015, y: 0.061311577, z: -0.0075469506, w: 0.99074113} + m_LastSceneViewRotation: {x: 0.20048605, y: -0.020569755, z: 0.0042217094, w: 0.97948205} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -967,7 +1003,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1007,7 +1043,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0afbffff + m_ExpandedIDs: 8ab3fdff42b4fdff74bffdffe2bffdff86c2fdff6206feff7607feff9212feff9c12feff4215fefff01bfeff941cfeffcc27feffd627feff7c2afeff5ebfffffb2ddffff64e4ffff0afbfffff4ffffff96980000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1023,7 +1059,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1031,7 +1067,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} @@ -1078,8 +1114,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 1 m_SearchArea: 1 - m_Folders: - - Assets/Animations + m_Folders: [] m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1095,7 +1130,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 118} m_SelectedIDs: 3c6f0000 m_LastClickedID: 28476 - m_ExpandedIDs: 000000004674000048740000 + m_ExpandedIDs: 00000000588100005a810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1120,10 +1155,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: f48ef4ff + scrollPos: {x: 0, y: 60} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004674000048740000 + m_ExpandedIDs: ffffffff0000000058810000c2830000c6830000ce830000da830000c0a30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1148,8 +1183,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f48ef4ff - m_LastClickedInstanceID: -749836 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000ea050000 m_RenameOverlay: @@ -1179,7 +1214,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 1 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1214,7 +1249,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1252,7 +1287,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: -751012 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1300,7 +1335,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1335,7 +1370,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &22 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0}