From c8554e500cd4e80fc2734a52fe288a5b2e9eb8fb Mon Sep 17 00:00:00 2001 From: katboi01 Date: Thu, 27 Mar 2025 13:12:01 +0100 Subject: [PATCH] Fixed division by zero error when downloading assets Fixed exporting multiple MMD models --- .gitignore | 1 + .../UMAUniversalRenderPipelineAsset.asset | 54 +- .../UI/Common/Common_Atlas.spriteatlas | 33 ++ Assets/Scripts/Exporters/ModelExporter.cs | 14 + Assets/Scripts/UmaSceneController.cs | 2 +- Assets/Scripts/UmaViewerDownload.cs | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- UserSettings/Layouts/default-2022.dwlt | 513 +++++++----------- 8 files changed, 269 insertions(+), 352 deletions(-) diff --git a/.gitignore b/.gitignore index 7ba06b6..07d2263 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ Config.json /Assets/Plugins/RootMotion/FinalIK/_Integration /Poses /Assets/AmplifyShaderEditor.meta +/BuildDev diff --git a/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset b/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset index 404b6d0..e324473 100644 --- a/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset +++ b/Assets/Resources/RenderPipeline/UMAUniversalRenderPipelineAsset.asset @@ -82,33 +82,33 @@ MonoBehaviour: m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/Resources/UI/Common/Common_Atlas.spriteatlas b/Assets/Resources/UI/Common/Common_Atlas.spriteatlas index 2465f67..921ee52 100644 --- a/Assets/Resources/UI/Common/Common_Atlas.spriteatlas +++ b/Assets/Resources/UI/Common/Common_Atlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: @@ -40,6 +41,7 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 packables: @@ -76,6 +78,37 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - c1f6e390aca09a54c9faba798b828710: 21300000 + - 333322f0b3b19ce4dba37cab009ea188: 21300000 + - 60e108116b436f445aeba3dc0d1b7ca2: 21300000 + - 8c95a731e8560464dab139412c885c0b: 21300000 + - 5a7da522361f24a45af7818e0183ec45: 21300000 + - 82c1e7228269dd94781ae06e75e69ef6: 21300000 + - 2ebfc783eafcbfe419140705251d1ad4: 21300000 + - f0efb3b3a93d2674e90438758b0fb001: 21300000 + - 45f2d2f31881fd341b6c973edb5a8e0c: 21300000 + - afd415f34f8b7b541b32ebfd776147cd: 21300000 + - 9137882494353fe4c8342c28096ac799: 21300000 + - 9a444f34ba8719a4083a94891d66b364: 21300000 + - 295e60748d910fb4980a3941367a1b47: 21300000 + - 7d33dc254b3409d4283c7ed8a02f6f0f: 21300000 + - 419b9e35148c2f34dbcb7ad8af83dc95: 21300000 + - 474278f55ddc15c4d860bf136a1adf81: 21300000 + - 30fe8037cc4cc34489eb63e1d3edff3c: 21300000 + - 474379b765f84f444be10d6432efe093: 21300000 + - 41ee5478b51c9274b960c151ad9c4a40: 21300000 + - b4b9eac9ba8f7c54cb12ef5f2f8b9fc8: 21300000 + - ed1eeb6b26b0dc844a59d846c203bd74: 21300000 + - 84f2297c16eb9fd4ea1e2e99c58cdf19: 21300000 + - 4af7cdac9822d2d4c8db0efffb09b6e8: 21300000 + - ce09774d062e3a742bacc3eaa5018adc: 21300000 + - 35577cadf86d61e4fb606355b72c5aea: 21300000 + - 4380b40e982f7ab44a07bac775c75385: 21300000 + - 48bea66ecaf28704c97b08dd342307c3: 21300000 + - 1eee0b0f2754dc8488ba3428d357a60a: 21300000 + - ebdeff1fc4e9ecb498671cfd5fae65e4: 21300000 + - f2e1332f2cadfa9449dfdb2aa4c656b4: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: c1f6e390aca09a54c9faba798b828710, type: 3} diff --git a/Assets/Scripts/Exporters/ModelExporter.cs b/Assets/Scripts/Exporters/ModelExporter.cs index ada30a3..6e2b049 100644 --- a/Assets/Scripts/Exporters/ModelExporter.cs +++ b/Assets/Scripts/Exporters/ModelExporter.cs @@ -38,6 +38,7 @@ public class ModelExporter writer.Close(); fileStream.Close(); + ClearBlendShape(container); UmaViewerUI.Instance.ShowMessage($"PMX Save at {path}", UIMessageType.Success); } @@ -153,6 +154,19 @@ public class ModelExporter facial.ChangeMorph(); } + private static void ClearBlendShape(UmaContainerCharacter container) + { + if (!container.FaceDrivenKeyTarget) return; + //assuming base meshes do not have any blend shapes + foreach (SkinnedMeshRenderer s in container.GetComponentsInChildren()) + { + if (s.name.Contains("M_Face") || s.name.Contains("M_Mayu") || s.name.Contains("M_Hair")) + { + s.sharedMesh.ClearBlendShapes(); + } + } + } + private static Morph[] ReadMorph(List renderers) { List morphs = new List(); diff --git a/Assets/Scripts/UmaSceneController.cs b/Assets/Scripts/UmaSceneController.cs index f91ee9a..abb3aa2 100644 --- a/Assets/Scripts/UmaSceneController.cs +++ b/Assets/Scripts/UmaSceneController.cs @@ -76,7 +76,7 @@ public class UmaSceneController:MonoBehaviour { LoadingProgressPanel.SetActive(false); } - else + else if (target > 0) { LoadingProgressPanel.SetActive(true); LoadingProgressSlider.value = (float)curren / target; diff --git a/Assets/Scripts/UmaViewerDownload.cs b/Assets/Scripts/UmaViewerDownload.cs index 8a419b6..be90e0a 100644 --- a/Assets/Scripts/UmaViewerDownload.cs +++ b/Assets/Scripts/UmaViewerDownload.cs @@ -69,7 +69,7 @@ public class UmaViewerDownload : MonoBehaviour entries = entries.Where(e => !File.Exists(e.Path)).ToList(); if (entries.Count == 0) yield break; callback?.Invoke(0, entries.Count, "DownLoading"); - var percent_num = entries.Count / 100; + var percent_num = (float)entries.Count / 100; for(int i = 0; i < entries.Count; i++) { var entry = entries[i]; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 00e08b0..861bd45 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 2.1.24 + bundleVersion: 2.1.25 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index f11957c..c378bfe 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 505 - y: 216 - width: 642 - height: 604 - m_ShowMode: 0 - m_Title: Build Settings - m_RootView: {fileID: 4} - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -39,67 +15,16 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 8 - y: 51 - width: 1904 - height: 1093 + y: 53 + width: 1902 + height: 1091 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 6} + m_Title: Game + m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &3 -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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 642 - height: 604 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 642 - height: 604 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 2106 - draggingID: 0 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -114,18 +39,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1369 + x: 1366 y: 0 - width: 535 - height: 1043 + width: 536 + height: 1041 m_MinSize: {x: 276, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -138,22 +63,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 9} - - {fileID: 8} + - {fileID: 4} + - {fileID: 6} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1904 - height: 1093 + width: 1902 + height: 1091 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -170,12 +95,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 + width: 1902 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -191,11 +116,89 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1073 - width: 1904 + y: 1071 + width: 1902 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} +--- !u!114 &6 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1902 + height: 1041 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 16 + draggingID: 0 +--- !u!114 &7 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1366 + height: 1041 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 17 + draggingID: 0 +--- !u!114 &8 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1366 + height: 991 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 18 + draggingID: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -205,23 +208,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 5} + m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 30 - width: 1904 - height: 1043 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 90 - draggingID: 0 + y: 0 + width: 169 + height: 991 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -231,50 +234,26 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView m_EditorClassIdentifier: - m_Children: - - {fileID: 11} - - {fileID: 14} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 169 y: 0 - width: 1369 - height: 1043 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 136 - draggingID: 0 + width: 1197 + height: 991 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 15} + - {fileID: 12} + - {fileID: 18} + m_Selected: 2 + m_LastSelected: 0 --- !u!114 &11 -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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 12} - - {fileID: 13} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1369 - height: 742 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 46 - draggingID: 0 ---- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -284,134 +263,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 446 - height: 742 - m_MinSize: {x: 201, y: 221} + y: 991 + width: 1366 + height: 50 + m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 446 - y: 0 - width: 923 - height: 742 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - {fileID: 16} - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &14 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 742 - width: 1369 - height: 301 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &15 -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: 12043, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Settings - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 505 - y: 216 - width: 642 - height: 583 - 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 - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &16 + - {fileID: 17} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -487,7 +356,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -508,10 +377,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1377 - y: 81 - width: 534 - height: 1022 + x: 1374 + y: 83 + width: 535 + height: 1020 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -535,7 +404,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -557,9 +426,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 81 - width: 445 - height: 721 + y: 83 + width: 168 + height: 970 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -575,7 +444,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: fefaffff4a820000 + m_ExpandedIDs: fefaffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -591,7 +460,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -599,7 +468,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -620,10 +489,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 454 + x: 456 y: 81 - width: 921 - height: 721 + width: 918 + height: 719 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -995,9 +864,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: -1.1173961, y: 0.78319824, z: -4.181621} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: -1.1173961, y: 0.78319824, z: -4.181621} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1043,13 +912,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0.008837877, y: -0.98918545, z: 0.06717923, w: 0.13011949} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0.008837832, y: -0.9891805, z: 0.0671789, w: 0.13011883} m_Size: - m_Target: 10 + m_Target: 2.3812582 speed: 2 - m_Value: 10 + m_Value: 2.3812582 m_Ortho: m_Target: 0 speed: 2 @@ -1074,7 +943,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1095,9 +964,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 823 - width: 1368 + x: 10 + y: 821 + width: 1365 height: 280 m_SerializedDataModeController: m_DataMode: 0 @@ -1135,9 +1004,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 48} - m_SelectedIDs: a6cc0000 - m_LastClickedID: 52390 - m_ExpandedIDs: 00000000bc8b000000ca9a3b + m_SelectedIDs: d28b0000 + m_LastClickedID: 35794 + m_ExpandedIDs: 00000000be8b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1165,7 +1034,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000bc8b0000 + m_ExpandedIDs: 00000000be8b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1209,7 +1078,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1217,11 +1086,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 91.5} + m_ScrollPosition: {x: 0, y: 263} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1243,9 +1112,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 823 - width: 1368 - height: 280 + y: 1074 + width: 1365 + height: 29 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1256,7 +1125,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1277,10 +1146,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 454 - y: 81 - width: 921 - height: 721 + x: 177 + y: 83 + width: 1195 + height: 970 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1299,7 +1168,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 921, y: 518} + m_TargetSize: {x: 1195, y: 672} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1314,10 +1183,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -460.5 - m_HBaseRangeMax: 460.5 - m_VBaseRangeMin: -259 - m_VBaseRangeMax: 259 + m_HBaseRangeMin: -597.5 + m_HBaseRangeMax: 597.5 + m_VBaseRangeMin: -336 + m_VBaseRangeMax: 336 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1326,7 +1195,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1335,23 +1204,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 921 - height: 700 + width: 1195 + height: 949 m_Scale: {x: 1, y: 1} - m_Translation: {x: 460.5, y: 350} + m_Translation: {x: 597.5, y: 474.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -460.5 - y: -350 - width: 921 - height: 700 + x: -597.5 + y: -474.5 + width: 1195 + height: 949 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 921, y: 721} + m_LastWindowPixelSize: {x: 1195, y: 970} m_ClearInEditMode: 1 m_NoCameraWarning: 0 m_LowResolutionForAspectRatios: 01000001000000000000