From 3ae21abfe2778bc40b030fcbc71bd648ca0cb083 Mon Sep 17 00:00:00 2001 From: colorplease <74271202+colorplease@users.noreply.github.com> Date: Tue, 13 Feb 2024 21:12:32 -0800 Subject: [PATCH] i think i updated the builds --- Assets/Scenes/Editor.unity | 160 +++++++++--------- ...Generator.Editor.ProjectSettingsData.asset | 1 + 2 files changed, 81 insertions(+), 80 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 3ae1ae346..aea7da900 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -551,9 +551,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &9435782 @@ -2387,9 +2387,9 @@ RectTransform: m_Father: {fileID: 271044166} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 21.63, y: -13.38} m_SizeDelta: {x: 43.26, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &63418758 @@ -4522,9 +4522,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 32, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &121871281 @@ -4746,9 +4746,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 72, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &129013734 @@ -4879,9 +4879,9 @@ RectTransform: m_Father: {fileID: 1302507050} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 316.615, y: -18.33} m_SizeDelta: {x: 49.03, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &144076687 @@ -5019,9 +5019,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &151246938 @@ -8288,9 +8288,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.995, y: -146.19} m_SizeDelta: {x: 141.99, y: 18.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &271044167 @@ -15215,9 +15215,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.995, y: -115.43} m_SizeDelta: {x: 141.99, y: 18.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &505838361 @@ -18948,9 +18948,9 @@ RectTransform: m_Father: {fileID: 1082186307} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -24} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &609910584 @@ -22866,9 +22866,9 @@ RectTransform: m_Father: {fileID: 505838360} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 54.645, y: -13.38} m_SizeDelta: {x: 109.29, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &724527434 @@ -23502,9 +23502,9 @@ RectTransform: m_Father: {fileID: 505838360} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.91501, y: -13.38} m_SizeDelta: {x: 93.65, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &745600109 @@ -27651,9 +27651,9 @@ RectTransform: m_Father: {fileID: 505838360} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 370.36502, y: -13.38} m_SizeDelta: {x: 93.65, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &846110831 @@ -28636,7 +28636,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.4949495, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -29118,7 +29118,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -29332,9 +29332,9 @@ RectTransform: m_Father: {fileID: 271044166} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 656.39, y: -13.38} m_SizeDelta: {x: 1087.98, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &920692077 @@ -30198,9 +30198,9 @@ RectTransform: m_Father: {fileID: 1302507050} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50.1, y: -18.33} m_SizeDelta: {x: 100.2, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &952876786 @@ -32420,9 +32420,9 @@ RectTransform: m_Father: {fileID: 505838360} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 266.64, y: -13.38} m_SizeDelta: {x: 100.2, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1014182973 @@ -34167,9 +34167,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.995, y: -14.33} m_SizeDelta: {x: 141.99, y: 28.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1082186308 @@ -34609,9 +34609,9 @@ RectTransform: m_Father: {fileID: 505838360} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 967.98, y: -13.38} m_SizeDelta: {x: 1087.98, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1104537441 @@ -39780,8 +39780,8 @@ RectTransform: m_Father: {fileID: 366916623} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.4949495, y: 0} + m_AnchorMax: {x: 0.4949495, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -40063,9 +40063,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.995, y: -54.989998} m_SizeDelta: {x: 141.99, y: 28.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1302507051 @@ -41038,9 +41038,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1345846031 @@ -45722,9 +45722,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 163.635, y: -87.685} m_SizeDelta: {x: 311.27, y: 12.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1539029286 @@ -51091,9 +51091,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1783491359 @@ -52475,9 +52475,9 @@ RectTransform: m_Father: {fileID: 1082186307} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 836.46, y: -24} m_SizeDelta: {x: 1592.92, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1854607095 @@ -53976,9 +53976,9 @@ RectTransform: m_Father: {fileID: 271044166} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 77.83, y: -13.38} m_SizeDelta: {x: 55.54, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1889589451 @@ -54337,9 +54337,9 @@ RectTransform: m_Father: {fileID: 256208522} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74.4, y: -182.2965} m_SizeDelta: {x: 132.8, y: 29.453} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1897965700 @@ -58454,9 +58454,9 @@ RectTransform: m_Father: {fileID: 1302507050} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 196.15, y: -18.33} m_SizeDelta: {x: 191.9, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2041131682 @@ -61086,7 +61086,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &4461741942136237036 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index e9a3d92e3..3c355a4c3 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -109,5 +109,6 @@ MonoBehaviour: - Assets/FFmpegOut/Runtime/FFmpegPreset.cs - Assets/Scripts/Games/TotemClimb/TotemClimb.cs - Assets/Scripts/Games/TotemClimb/TCBirdManager.cs + - Assets/StreamingAssets/FFmpegOut/Windows/NewBehaviourScript.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []