diff --git a/Assets/Scenes/MNML_CircleBar.unity b/Assets/Scenes/MNML_CircleBar.unity index 6376527..6bbea8e 100644 --- a/Assets/Scenes/MNML_CircleBar.unity +++ b/Assets/Scenes/MNML_CircleBar.unity @@ -282,7 +282,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135872332} - m_LocalRotation: {x: 0.12422062, y: -0.000000011957323, z: 0.0000000014969403, w: 0.9922547} + m_LocalRotation: {x: 0.12422062, y: 0.000000011957323, z: -0.0000000014969403, w: 0.9922547} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -808,7 +808,7 @@ RectTransform: - {fileID: 204077337} - {fileID: 674604166} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1167,360 +1167,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 594617800} m_CullTransparentMesh: 1 ---- !u!1001 &657072714 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 101783718333680142, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101783718333680142, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 101783718333680142, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1336357564912058984, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1336357564912058984, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.y - value: 0.81333333 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.b - value: 0.009433985 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.g - value: 0.009433985 - objectReference: {fileID: 0} - - target: {fileID: 1754673864255675372, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.r - value: 0.009433985 - objectReference: {fileID: 0} - - target: {fileID: 2731344749564446346, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2731344749564446346, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2731344749564446346, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3013196897029551629, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4365975985793281027, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_SizeDelta.x - value: -35 - objectReference: {fileID: 0} - - target: {fileID: 4365975985793281027, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchoredPosition.x - value: -7.5 - objectReference: {fileID: 0} - - target: {fileID: 5235976366750037133, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5235976366750037133, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5235976366750037133, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5305278010342315831, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Name - value: Menu - objectReference: {fileID: 0} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 2eec6d9eb205aff4ab971dea4ede1c30, type: 3} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_MinSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5935992921077596680, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_FontSize - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 6212834909065181664, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: vfx - value: - objectReference: {fileID: 2125593504} - - target: {fileID: 6799349554450070180, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Maskable - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_NormalColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_PressedColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_DisabledColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.b - value: 0.3207547 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.g - value: 0.3207547 - objectReference: {fileID: 0} - - target: {fileID: 6810272086726213020, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Colors.m_HighlightedColor.r - value: 0.3207547 - objectReference: {fileID: 0} - - target: {fileID: 6822126994811884559, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6822126994811884559, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6822126994811884559, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_SizeDelta.x - value: -17 - objectReference: {fileID: 0} - - target: {fileID: 7479755003839443640, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Text - value: Select Theme - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 2eec6d9eb205aff4ab971dea4ede1c30, type: 3} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_MinSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8571172288365902113, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - propertyPath: m_FontData.m_FontSize - value: 16 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 6212834909065181664, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} --- !u!1 &667181310 GameObject: m_ObjectHideFlags: 0 @@ -2065,6 +1711,17 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &916906094 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3228088716711179522, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + m_PrefabInstance: {fileID: 1258533306} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a4ecabf05fe7f144948e9229d01468b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &936348874 GameObject: m_ObjectHideFlags: 0 @@ -2267,7 +1924,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936348874} - m_LocalRotation: {x: 0.14220117, y: 0.000000017570697, z: -0.0000000023692373, w: 0.98983777} + m_LocalRotation: {x: 0.14220117, y: 0.000000017570704, z: -0.000000002369296, w: 0.98983777} m_LocalPosition: {x: 0, y: 50, z: -150} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2469,17 +2126,154 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1032143034} m_CullTransparentMesh: 1 ---- !u!114 &1102090043 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3228088716711179522, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} - m_PrefabInstance: {fileID: 657072714} +--- !u!1001 &1258533306 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5305278010342315831, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_Name + value: Menu + objectReference: {fileID: 0} + - target: {fileID: 8681115429733332136, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: data.themeIndex + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} +--- !u!28 &1296665471 +Texture2D: + m_ObjectHideFlags: 0 + 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: 11500000, guid: 5a4ecabf05fe7f144948e9229d01468b, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: AudioSpectrumData128 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 2 + m_Width: 128 + m_Height: 1 + m_CompleteImageSize: 512 + m_MipsStripped: 0 + m_TextureFormat: 18 + m_MipCount: 1 + m_IsReadable: 1 + m_IsPreProcessed: 0 + m_IgnoreMasterTextureLimit: 0 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_VTOnly: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + m_PlatformBlob: + image data: 512 + _typelessdata: 4c8bbd3e65a3a93ea62d943e67f5653eda412f3ee8fb023e506ddb3d45edd13dd5a2d53d5067cd3d9dccab3d9af48b3df7318d3d7b7d8d3df7fc893da0f88a3d1f73893d47d48a3db3738f3de6b08d3dde338c3dc7f8883ddd4c833d306e663d1c775a3de522573d5970503dce3c6d3d08da6c3ddd186f3d9f74753db13e763d8e5c6d3dc14e643d6498553d05294a3d8cb9403d73d32f3d82d4243d74f32c3da3e9303df96a343d68bc353deb652e3d506e283d8e611f3d68541c3d217d1f3d6aa9293d250f303da6b32a3dce3e353d15f5343d320c353d1de7263d8a8d233d6a461f3dd8251e3dd6c9213d1b4e2b3d041e2b3d682b333dd48b2e3d9e5b2b3d8e6d1b3d0eed273d23a32e3d2080323da24c2d3d8190333d77c63f3d72c23f3d6916363db407273d4b67243de85a243d62b32e3d89b8333db13e333d163c223d62e5293d5576293d7a4e1b3d0471143d980f133d575b1c3d1443233df0fa273dea57263dcb5a233de860283dcda72b3d1ee82a3d4ac2333dd169393da4372c3dfbcb313d6027263dceb91d3d2a15243de75a1f3de9731e3d99d91d3dc9742a3d9477363d833e363daf113e3d49fc443d6ff33d3d783a333d31682c3d83522c3d35d22a3d8634243d08b6243db9a01d3d1611263dba07283da8352c3d14e6283dcf99213dfd2d243d33641a3d9169053dc0b0e53cea88ad3c79f4923ca019813c + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1391277498 GameObject: m_ObjectHideFlags: 3 @@ -2734,53 +2528,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!28 &1951334687 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AudioSpectrumData128 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 - serializedVersion: 2 - m_Width: 128 - m_Height: 1 - m_CompleteImageSize: 512 - m_MipsStripped: 0 - m_TextureFormat: 18 - m_MipCount: 1 - m_IsReadable: 1 - m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_VTOnly: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 0 - m_PlatformBlob: - image data: 512 - _typelessdata: a07ab23dfde19f3d0957883df1e1813d77ace83d8f9ba03d17af673d23c0543df7223d3dc6845f3d7bd86f3d14dc723d5c22503d1e55413d698b243da323fc3c94a5d33cdc2eb43c9812a13cc93e963c20738b3ce34f833c74c2823ccdcf7b3cc7b5743cc3a56e3cd920683c6434643c9dd05f3c11755c3cc69e593caaf5563c9dd9533c65f1513c59734f3cef5e4d3c60874b3c8d69493c3aa3473c0b01463c126b443cd7ff423cd392413c3817403c682d3f3c5c7f3d3c21403c3c83ee3a3c9eae393c701d393cd84e383c0a08373caf0f363c0705353c42ec333c8205333cab12323cdb80313cea79313cc86d303cc85b2f3c922b2e3c379b2d3cc2722c3cbe762b3c944f2b3c9efc2a3cdbb3293cc3ef283cdc9e283cdbf7273cbcfd263c732f263ce74d253cf9cc243ca843243c0c9d233c06ba223c564f223c6b54213cff93203c7f21203cfcd01f3c61cd1f3caeb81e3c18441e3ceb6a1d3c05f21c3c72711c3c2cf91b3c46701b3cd6821a3c2a3c1a3c00bf193c692c183c2b47173ce45f163ce23b153cea9c143c3446143cc58e133c8184123c5bfc113c532d113c0e60103ceddf0f3c6b150f3cf1e60e3cf6b90d3c2ece0c3ccce10b3cc9d50a3c44820a3c0032093ca066083c6c39073c1900063c63a6053cf398043c56c20c3c99d4063cae91033c5eda003c7f43fd3bf5e4f93b14acf53b61b3f03be348eb3b - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &2125593500 GameObject: m_ObjectHideFlags: 0 @@ -2952,7 +2699,7 @@ VisualEffect: m_Overridden: 1 m_NamedObject: m_Array: - - m_Value: {fileID: 1951334687} + - m_Value: {fileID: 1296665471} m_Name: SpectrumDataTexture m_Overridden: 1 - m_Value: {fileID: 0} @@ -2981,134 +2728,134 @@ MonoBehaviour: - rid: 1586242992680206341 Preview: Values: - - 0.08714795 - - 0.07806776 - - 0.06657226 - - 0.06341923 - - 0.1136102 - - 0.078421704 - - 0.056563463 - - 0.05194105 - - 0.046175923 - - 0.054569982 - - 0.05855606 - - 0.059291914 - - 0.050814018 - - 0.047200315 - - 0.040172014 - - 0.030778712 - - 0.02583579 - - 0.021995 - - 0.019662187 - - 0.018340485 - - 0.01702267 - - 0.016029304 - - 0.015961863 - - 0.015369368 - - 0.014935917 - - 0.014565888 - - 0.014167988 - - 0.0139285065 - - 0.013660577 - - 0.013455645 - - 0.013282483 - - 0.013120094 - - 0.012930301 - - 0.012813901 - - 0.012661778 - - 0.012534841 - - 0.012422413 - - 0.012293232 - - 0.012184912 - - 0.01208521 - - 0.011988418 - - 0.011901817 - - 0.011814791 - - 0.011724286 - - 0.011668541 - - 0.011566009 - - 0.011489899 - - 0.011409405 - - 0.011333136 - - 0.011298522 - - 0.011249267 - - 0.01117135 - - 0.011112138 - - 0.011048562 - - 0.010981621 - - 0.010926606 - - 0.010868709 - - 0.010833944 - - 0.010832289 - - 0.010768361 - - 0.010703035 - - 0.010630505 - - 0.010596088 - - 0.010525407 - - 0.010465322 - - 0.010455985 - - 0.010436205 - - 0.010357822 - - 0.01031107 - - 0.010291781 - - 0.010251964 - - 0.010192331 - - 0.010143149 - - 0.010089374 - - 0.010058635 - - 0.010025896 - - 0.009986173 - - 0.009932047 - - 0.0099066105 - - 0.009846787 - - 0.00980091 - - 0.009773611 - - 0.009754416 - - 0.009753556 - - 0.009687586 - - 0.0096597895 - - 0.009608011 - - 0.009579186 - - 0.009548532 - - 0.009519856 - - 0.009487217 - - 0.009430608 - - 0.009413758 - - 0.009383917 - - 0.009287932 - - 0.009233276 - - 0.009178136 - - 0.009108515 - - 0.009070614 - - 0.009049941 - - 0.009006207 - - 0.008942724 - - 0.008910264 - - 0.008860904 - - 0.008811964 - - 0.008781415 - - 0.008733134 - - 0.008722053 - - 0.008650294 - - 0.008594079 - - 0.008537721 - - 0.008473822 - - 0.008453909 - - 0.008373737 - - 0.008325249 - - 0.008253437 - - 0.008178734 - - 0.0081573455 - - 0.008093107 - - 0.008591255 - - 0.008229398 - - 0.008030338 - - 0.007864563 - - 0.0077289934 - - 0.0076261708 - - 0.00749732 - - 0.0073456024 - - 0.0071803196 + - 0.37020338 + - 0.33132473 + - 0.28941077 + - 0.22456895 + - 0.17114964 + - 0.12791407 + - 0.10714209 + - 0.10250334 + - 0.10431448 + - 0.10029471 + - 0.08388636 + - 0.068337634 + - 0.06894296 + - 0.06908699 + - 0.06737702 + - 0.06785703 + - 0.06711411 + - 0.0677877 + - 0.0700449 + - 0.06918506 + - 0.068458304 + - 0.066880755 + - 0.06411145 + - 0.056257427 + - 0.053336248 + - 0.052523512 + - 0.050888393 + - 0.057919316 + - 0.05782512 + - 0.05837332 + - 0.05992567 + - 0.06011838 + - 0.057949595 + - 0.055739168 + - 0.052147284 + - 0.049355526 + - 0.04705195 + - 0.042926263 + - 0.040241726 + - 0.042224362 + - 0.043191563 + - 0.04404733 + - 0.04436913 + - 0.042577665 + - 0.041120827 + - 0.038911395 + - 0.038166434 + - 0.03893769 + - 0.04142133 + - 0.042983193 + - 0.041675232 + - 0.04424935 + - 0.04417904 + - 0.044201083 + - 0.04074775 + - 0.039929904 + - 0.03888551 + - 0.03861031 + - 0.039499126 + - 0.041822534 + - 0.041776672 + - 0.043742567 + - 0.04261382 + - 0.04183542 + - 0.037946276 + - 0.040997557 + - 0.042636048 + - 0.04357922 + - 0.04230941 + - 0.04383898 + - 0.04682013 + - 0.046816297 + - 0.044454966 + - 0.04077883 + - 0.04013757 + - 0.040125757 + - 0.04265154 + - 0.04387716 + - 0.04376096 + - 0.039608084 + - 0.041478522 + - 0.041372616 + - 0.037916638 + - 0.036240593 + - 0.035903543 + - 0.038173046 + - 0.039858893 + - 0.041010797 + - 0.040611185 + - 0.03988151 + - 0.041108042 + - 0.041908074 + - 0.04172527 + - 0.04388646 + - 0.04526693 + - 0.04204525 + - 0.04340742 + - 0.040564895 + - 0.038507275 + - 0.040059246 + - 0.03890505 + - 0.03868476 + - 0.038537595 + - 0.04161528 + - 0.044547632 + - 0.04449321 + - 0.046403583 + - 0.04809216 + - 0.046374734 + - 0.043756932 + - 0.042091552 + - 0.042070877 + - 0.041704375 + - 0.040089153 + - 0.04021266 + - 0.038483355 + - 0.04054364 + - 0.041022994 + - 0.042043358 + - 0.041235045 + - 0.039453324 + - 0.04008292 + - 0.037693214 + - 0.03257138 + - 0.028038383 + - 0.02118345 + - 0.01793884 + - 0.01575929 SpectrumSizeParameter: m_Name: SpectrumSize SpectrumDataTextureParameter: @@ -3163,7 +2910,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3182,6 +2929,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 269234fd88fbc1d4abae3d63a0e04233, type: 3} m_Name: m_EditorClassIdentifier: - themeSelector: {fileID: 1102090043} + themeSelector: {fileID: 916906094} ThemeParameter: m_Name: Theme diff --git a/Assets/ThemeVfxBinder.cs b/Assets/ThemeVfxBinder.cs index 7669eaa..01bc1d3 100644 --- a/Assets/ThemeVfxBinder.cs +++ b/Assets/ThemeVfxBinder.cs @@ -26,4 +26,14 @@ public class ThemeVfxBinder : VFXBinderBase { public override void UpdateBinding(VisualEffect component) { component.SetGradient(ThemeParameter, themeSelector.CurrentTheme()); } + + + // have to override these to prevent NRE + protected override void OnEnable() { + // Debug.Log("OnEnable"); + } + + protected override void OnDisable() { + // Debug.Log("OnDisable"); + } }