From 4afa1f646cc4274c7e98e16078264022310de6b9 Mon Sep 17 00:00:00 2001 From: Braedon Lewis Date: Fri, 27 Oct 2023 16:19:16 -0400 Subject: [PATCH] more editor fixes (#574) --- .../Editor/SettingsMenu/EditorSettings.prefab | 1376 ++++++++++++++++- .../Editor/SettingsMenu/GameSettings.prefab | 135 +- Assets/Resources/Sprites/Editor/UI/icons.meta | 8 + .../Editor/UI/{ => icons}/GameEventArrow.png | Bin .../UI/{ => icons}/GameEventArrow.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/a-z.png | Bin .../Editor/UI/{ => icons}/a-z.png.meta | 0 .../Editor/UI/{ => icons}/add-file.png | Bin .../Editor/UI/{ => icons}/add-file.png.meta | 0 .../Editor/UI/{ => icons}/add-music.png | Bin .../Editor/UI/{ => icons}/add-music.png.meta | 0 .../Editor/UI/{ => icons}/bookmark.png | Bin .../Editor/UI/{ => icons}/bookmark.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/clock.png | Bin .../Editor/UI/{ => icons}/clock.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/cog.png | Bin .../Editor/UI/{ => icons}/cog.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/copy.png | Bin .../Editor/UI/{ => icons}/copy.png.meta | 0 .../Editor/UI/{ => icons}/document-signed.png | Bin .../UI/{ => icons}/document-signed.png.meta | 0 .../Editor/UI/{ => icons}/editor-theme.png | Bin .../UI/{ => icons}/editor-theme.png.meta | 0 .../Editor/UI/{ => icons}/fullscreen.png | Bin .../Editor/UI/{ => icons}/fullscreen.png.meta | 0 .../Editor/UI/{ => icons}/grid-snap.png | Bin .../Editor/UI/{ => icons}/grid-snap.png.meta | 0 .../Editor/UI/{ => icons}/open-folder.png | Bin .../UI/{ => icons}/open-folder.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/paste.png | Bin .../Editor/UI/{ => icons}/paste.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/pause.png | Bin .../Editor/UI/{ => icons}/pause.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/play.png | Bin .../Editor/UI/{ => icons}/play.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/redo.png | Bin .../Editor/UI/{ => icons}/redo.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/save.png | Bin .../Editor/UI/{ => icons}/save.png.meta | 0 .../Editor/UI/{ => icons}/selection.png | Bin .../Editor/UI/{ => icons}/selection.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/sort.png | Bin .../Editor/UI/{ => icons}/sort.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/stop.png | Bin .../Editor/UI/{ => icons}/stop.png.meta | 0 .../Editor/UI/{ => icons}/tempo-change.png | Bin .../UI/{ => icons}/tempo-change.png.meta | 0 .../Editor/UI/{ => icons}/tempo-finder.png | Bin .../UI/{ => icons}/tempo-finder.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/undo.png | Bin .../Editor/UI/{ => icons}/undo.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/volume.png | Bin .../Editor/UI/{ => icons}/volume.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/wrench.png | Bin .../Editor/UI/{ => icons}/wrench.png.meta | 0 .../Sprites/Editor/UI/{ => icons}/zoom-in.png | Bin .../Editor/UI/{ => icons}/zoom-in.png.meta | 0 .../Editor/UI/{ => icons}/zoom-out.png | Bin .../Editor/UI/{ => icons}/zoom-out.png.meta | 0 .../Editor/UI/{ => icons}/zoom-reset.png | Bin .../Editor/UI/{ => icons}/zoom-reset.png.meta | 0 .../Sprites/Editor/UI/icons_atlas.spriteatlas | 114 ++ .../Editor/UI/icons_atlas.spriteatlas.meta | 8 + Assets/Scripts/LevelEditor/Editor.cs | 8 + .../Scripts/LevelEditor/Timeline/Timeline.cs | 25 +- .../LevelEditor/Timeline/TimelineZoom.cs | 85 +- Assets/Scripts/PersistentDataManager.cs | 8 +- .../UI/SettingsDialog/Tabs/EditorSettings.cs | 49 +- 68 files changed, 1754 insertions(+), 62 deletions(-) create mode 100644 Assets/Resources/Sprites/Editor/UI/icons.meta rename Assets/Resources/Sprites/Editor/UI/{ => icons}/GameEventArrow.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/GameEventArrow.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/a-z.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/a-z.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/add-file.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/add-file.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/add-music.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/add-music.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/bookmark.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/bookmark.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/clock.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/clock.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/cog.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/cog.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/copy.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/copy.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/document-signed.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/document-signed.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/editor-theme.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/editor-theme.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/fullscreen.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/fullscreen.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/grid-snap.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/grid-snap.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/open-folder.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/open-folder.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/paste.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/paste.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/pause.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/pause.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/play.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/play.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/redo.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/redo.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/save.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/save.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/selection.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/selection.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/sort.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/sort.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/stop.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/stop.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/tempo-change.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/tempo-change.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/tempo-finder.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/tempo-finder.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/undo.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/undo.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/volume.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/volume.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/wrench.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/wrench.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-in.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-in.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-out.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-out.png.meta (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-reset.png (100%) rename Assets/Resources/Sprites/Editor/UI/{ => icons}/zoom-reset.png.meta (100%) create mode 100644 Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas create mode 100644 Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas.meta diff --git a/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab b/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab index f591d56df..de83fdbfd 100644 --- a/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab +++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab @@ -1,5 +1,828 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &101159054597722170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6861573717526687243} + - component: {fileID: 1987294861373899821} + - component: {fileID: 2499129337308477260} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6861573717526687243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101159054597722170} + 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: 7824470515256624502} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1987294861373899821 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101159054597722170} + m_CullTransparentMesh: 1 +--- !u!114 &2499129337308477260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101159054597722170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: = + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &240086508178130264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2807923255578696521} + - component: {fileID: 5262680735014795458} + - component: {fileID: 8921356690607522631} + - component: {fileID: 383095155661938755} + m_Layer: 5 + m_Name: Incre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2807923255578696521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240086508178130264} + 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: 1326256688912109657} + m_Father: {fileID: 6652101627242449918} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -39.6, y: -0.0000030994} + m_SizeDelta: {x: 99.464, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5262680735014795458 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240086508178130264} + m_CullTransparentMesh: 1 +--- !u!114 &8921356690607522631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240086508178130264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &383095155661938755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240086508178130264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8921356690607522631} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 9208581106079180837} + m_TargetAssemblyTypeName: HeavenStudio.Editor.EditorSettings, Assembly-CSharp + m_MethodName: OnEditorScaleIncre + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &741884007213335733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7774736397554609743} + - component: {fileID: 8757829121654880135} + - component: {fileID: 2857186382041299405} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7774736397554609743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741884007213335733} + 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: 2413368467991160268} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8757829121654880135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741884007213335733} + m_CullTransparentMesh: 1 +--- !u!114 &2857186382041299405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741884007213335733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '-' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1684521149580031745 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6652101627242449918} + - component: {fileID: 1629991509693806793} + - component: {fileID: 1058206118348333195} + m_Layer: 5 + m_Name: EditorScale + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6652101627242449918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1684521149580031745} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2413368467991160268} + - {fileID: 2807923255578696521} + - {fileID: 7824470515256624502} + m_Father: {fileID: 9208581106298752703} + 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_SizeDelta: {x: 1165, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1629991509693806793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1684521149580031745} + m_CullTransparentMesh: 1 +--- !u!114 &1058206118348333195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1684521149580031745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Editor Scale + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2671879292283605456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3382107506031419457} + - component: {fileID: 1143089118221371013} + - component: {fileID: 8487556764501708920} + m_Layer: 5 + m_Name: ScaleWSS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3382107506031419457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671879292283605456} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7292326169755866509} + m_Father: {fileID: 9208581106298752703} + 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_SizeDelta: {x: 1165, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1143089118221371013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671879292283605456} + m_CullTransparentMesh: 1 +--- !u!114 &8487556764501708920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671879292283605456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Scale With Screen Size + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3395407686526024338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1326256688912109657} + - component: {fileID: 6853165160418157372} + - component: {fileID: 8214015227030685802} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1326256688912109657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3395407686526024338} + 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: 2807923255578696521} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6853165160418157372 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3395407686526024338} + m_CullTransparentMesh: 1 +--- !u!114 &8214015227030685802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3395407686526024338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4020318567940760538 GameObject: m_ObjectHideFlags: 0 @@ -28,6 +851,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7785783802733199037} m_Father: {fileID: 9208581106298752703} @@ -109,15 +933,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -135,6 +961,216 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4483555756327182171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2413368467991160268} + - component: {fileID: 4480235305736490524} + - component: {fileID: 2681763775808117533} + - component: {fileID: 6127870905162584076} + m_Layer: 5 + m_Name: Decre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2413368467991160268 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4483555756327182171} + 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: 7774736397554609743} + m_Father: {fileID: 6652101627242449918} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -146.76791, y: -0.0000030994} + m_SizeDelta: {x: 99.464, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4480235305736490524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4483555756327182171} + m_CullTransparentMesh: 1 +--- !u!114 &2681763775808117533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4483555756327182171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6127870905162584076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4483555756327182171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2681763775808117533} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 9208581106079180837} + m_TargetAssemblyTypeName: HeavenStudio.Editor.EditorSettings, Assembly-CSharp + m_MethodName: OnEditorScaleDecre + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &5433741745970652310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7815667255158939506} + - component: {fileID: 1530090611450384744} + - component: {fileID: 3718459074068155101} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7815667255158939506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433741745970652310} + 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: 3595855392946436849} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1530090611450384744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433741745970652310} + m_CullTransparentMesh: 1 +--- !u!114 &3718459074068155101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5433741745970652310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6125627487853319211 GameObject: m_ObjectHideFlags: 0 @@ -163,6 +1199,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: [] m_Father: {fileID: 4915438607901596292} m_RootOrder: 0 @@ -210,6 +1247,315 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6367179987033381837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3595855392946436849} + - component: {fileID: 2197657614678147653} + - component: {fileID: 9072224171221309358} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3595855392946436849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6367179987033381837} + 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: 7815667255158939506} + m_Father: {fileID: 7292326169755866509} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2197657614678147653 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6367179987033381837} + m_CullTransparentMesh: 1 +--- !u!114 &9072224171221309358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6367179987033381837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6519585144011932023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7824470515256624502} + - component: {fileID: 6544614745947759419} + - component: {fileID: 2262624455503317595} + - component: {fileID: 1247686370311955214} + m_Layer: 5 + m_Name: Reset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7824470515256624502 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519585144011932023} + 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: 6861573717526687243} + m_Father: {fileID: 6652101627242449918} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 67, y: -0.0000030994} + m_SizeDelta: {x: 99.464, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6544614745947759419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519585144011932023} + m_CullTransparentMesh: 1 +--- !u!114 &2262624455503317595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519585144011932023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1247686370311955214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519585144011932023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2262624455503317595} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 9208581106079180837} + m_TargetAssemblyTypeName: HeavenStudio.Editor.EditorSettings, Assembly-CSharp + m_MethodName: OnEditorScaleReset + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &6964604673250433715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7292326169755866509} + - component: {fileID: 1122327647812458447} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7292326169755866509 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964604673250433715} + 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: 3595855392946436849} + m_Father: {fileID: 3382107506031419457} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -181.5, y: -0.0000030994} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1122327647812458447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964604673250433715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9072224171221309358} + toggleTransition: 1 + graphic: {fileID: 3718459074068155101} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 9208581106079180837} + m_TargetAssemblyTypeName: HeavenStudio.Editor.EditorSettings, Assembly-CSharp + m_MethodName: OnSWSSChanged + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 --- !u!1 &7720499959914799361 GameObject: m_ObjectHideFlags: 0 @@ -238,6 +1584,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: 3358182036527372524} m_Father: {fileID: 7785783802733199037} @@ -313,6 +1660,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: 4915438607901596292} m_Father: {fileID: 14539832792667216} @@ -411,6 +1759,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: [] m_Father: {fileID: 9208581106009979527} m_RootOrder: 0 @@ -491,15 +1840,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -545,6 +1896,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: 9208581105990529507} m_Father: {fileID: 9208581106079180834} @@ -622,6 +1974,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: 9208581107103424964} - {fileID: 9208581106009979527} @@ -685,6 +2038,9 @@ MonoBehaviour: m_EditorClassIdentifier: cursorCheckbox: {fileID: 9208581106828673704} discordRPCCheckbox: {fileID: 7046810222813886660} + editorScaleDecre: {fileID: 6127870905162584076} + editorScaleIncre: {fileID: 383095155661938755} + scaleWSS: {fileID: 1122327647812458447} --- !u!1 &9208581106298752702 GameObject: m_ObjectHideFlags: 0 @@ -713,9 +2069,12 @@ 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: 9208581106704273180} - {fileID: 14539832792667216} + - {fileID: 6652101627242449918} + - {fileID: 3382107506031419457} m_Father: {fileID: 9208581106987031240} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -790,6 +2149,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: 9208581106831335129} m_Father: {fileID: 9208581106700575103} @@ -829,6 +2189,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: 9208581106336568507} m_Father: {fileID: 9208581107103424964} @@ -954,6 +2315,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9208581106828673703} m_Father: {fileID: 9208581106298752703} @@ -1035,15 +2397,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1088,6 +2452,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: 9208581107110813884} m_Father: {fileID: 9208581106704273180} @@ -1186,6 +2551,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: [] m_Father: {fileID: 9208581106336568507} m_RootOrder: 0 @@ -1262,6 +2628,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: 9208581106298752703} m_Father: {fileID: 9208581107103424964} @@ -1352,6 +2719,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: 9208581106987031240} - {fileID: 9208581106700575103} @@ -1459,6 +2827,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: 9208581107756448695} m_Father: {fileID: 9208581106828673703} @@ -1535,6 +2904,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: [] m_Father: {fileID: 9208581107110813884} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab b/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab index 967562451..fb8c50e44 100644 --- a/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab +++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab @@ -349,15 +349,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -550,15 +552,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -685,15 +689,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -822,15 +828,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1986,15 +1994,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3061,15 +3071,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3560,15 +3572,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3922,10 +3936,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &2413243360073305582 GameObject: m_ObjectHideFlags: 0 @@ -4345,10 +4362,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &2663069741382970651 GameObject: m_ObjectHideFlags: 0 @@ -4533,10 +4553,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &2663113318115009593 GameObject: m_ObjectHideFlags: 0 @@ -5274,15 +5297,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5690,15 +5715,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5900,10 +5927,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &3551385317041670879 GameObject: m_ObjectHideFlags: 0 @@ -6093,15 +6123,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6228,15 +6260,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6517,15 +6551,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6692,15 +6728,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7895,15 +7933,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -8509,15 +8549,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -8645,15 +8687,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -9068,15 +9112,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -9203,15 +9249,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -9672,12 +9720,15 @@ MonoBehaviour: m_ItemText: {fileID: 8402981209467784936} m_ItemImage: {fileID: 0} m_Value: 0 + m_MultiSelect: 0 m_Options: m_Options: - m_Text: Dual m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Text: Single m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -9803,15 +9854,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10100,15 +10153,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10457,15 +10512,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10592,15 +10649,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10803,15 +10862,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10938,15 +10999,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11260,15 +11323,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12106,15 +12171,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12588,10 +12655,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &7818140731132867041 GameObject: m_ObjectHideFlags: 0 @@ -13063,6 +13133,7 @@ MonoBehaviour: m_ItemText: {fileID: 607737781079879371} m_ItemImage: {fileID: 0} m_Value: 0 + m_MultiSelect: 0 m_Options: m_Options: [] m_OnValueChanged: @@ -13181,15 +13252,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -13728,15 +13801,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -13863,15 +13938,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Resources/Sprites/Editor/UI/icons.meta b/Assets/Resources/Sprites/Editor/UI/icons.meta new file mode 100644 index 000000000..b436ca3bb --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b230d12951a959f40840eccb3dc8fc35 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/UI/GameEventArrow.png b/Assets/Resources/Sprites/Editor/UI/icons/GameEventArrow.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/GameEventArrow.png rename to Assets/Resources/Sprites/Editor/UI/icons/GameEventArrow.png diff --git a/Assets/Resources/Sprites/Editor/UI/GameEventArrow.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/GameEventArrow.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/GameEventArrow.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/GameEventArrow.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/a-z.png b/Assets/Resources/Sprites/Editor/UI/icons/a-z.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/a-z.png rename to Assets/Resources/Sprites/Editor/UI/icons/a-z.png diff --git a/Assets/Resources/Sprites/Editor/UI/a-z.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/a-z.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/a-z.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/a-z.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/add-file.png b/Assets/Resources/Sprites/Editor/UI/icons/add-file.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/add-file.png rename to Assets/Resources/Sprites/Editor/UI/icons/add-file.png diff --git a/Assets/Resources/Sprites/Editor/UI/add-file.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/add-file.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/add-file.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/add-file.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/add-music.png b/Assets/Resources/Sprites/Editor/UI/icons/add-music.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/add-music.png rename to Assets/Resources/Sprites/Editor/UI/icons/add-music.png diff --git a/Assets/Resources/Sprites/Editor/UI/add-music.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/add-music.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/add-music.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/add-music.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/bookmark.png b/Assets/Resources/Sprites/Editor/UI/icons/bookmark.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/bookmark.png rename to Assets/Resources/Sprites/Editor/UI/icons/bookmark.png diff --git a/Assets/Resources/Sprites/Editor/UI/bookmark.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/bookmark.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/bookmark.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/bookmark.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/clock.png b/Assets/Resources/Sprites/Editor/UI/icons/clock.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/clock.png rename to Assets/Resources/Sprites/Editor/UI/icons/clock.png diff --git a/Assets/Resources/Sprites/Editor/UI/clock.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/clock.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/clock.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/clock.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/cog.png b/Assets/Resources/Sprites/Editor/UI/icons/cog.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/cog.png rename to Assets/Resources/Sprites/Editor/UI/icons/cog.png diff --git a/Assets/Resources/Sprites/Editor/UI/cog.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/cog.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/cog.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/cog.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/copy.png b/Assets/Resources/Sprites/Editor/UI/icons/copy.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/copy.png rename to Assets/Resources/Sprites/Editor/UI/icons/copy.png diff --git a/Assets/Resources/Sprites/Editor/UI/copy.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/copy.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/copy.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/copy.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/document-signed.png b/Assets/Resources/Sprites/Editor/UI/icons/document-signed.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/document-signed.png rename to Assets/Resources/Sprites/Editor/UI/icons/document-signed.png diff --git a/Assets/Resources/Sprites/Editor/UI/document-signed.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/document-signed.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/document-signed.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/document-signed.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/editor-theme.png b/Assets/Resources/Sprites/Editor/UI/icons/editor-theme.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/editor-theme.png rename to Assets/Resources/Sprites/Editor/UI/icons/editor-theme.png diff --git a/Assets/Resources/Sprites/Editor/UI/editor-theme.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/editor-theme.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/editor-theme.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/editor-theme.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/fullscreen.png b/Assets/Resources/Sprites/Editor/UI/icons/fullscreen.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/fullscreen.png rename to Assets/Resources/Sprites/Editor/UI/icons/fullscreen.png diff --git a/Assets/Resources/Sprites/Editor/UI/fullscreen.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/fullscreen.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/fullscreen.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/fullscreen.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/grid-snap.png b/Assets/Resources/Sprites/Editor/UI/icons/grid-snap.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/grid-snap.png rename to Assets/Resources/Sprites/Editor/UI/icons/grid-snap.png diff --git a/Assets/Resources/Sprites/Editor/UI/grid-snap.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/grid-snap.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/grid-snap.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/grid-snap.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/open-folder.png b/Assets/Resources/Sprites/Editor/UI/icons/open-folder.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/open-folder.png rename to Assets/Resources/Sprites/Editor/UI/icons/open-folder.png diff --git a/Assets/Resources/Sprites/Editor/UI/open-folder.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/open-folder.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/open-folder.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/open-folder.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/paste.png b/Assets/Resources/Sprites/Editor/UI/icons/paste.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/paste.png rename to Assets/Resources/Sprites/Editor/UI/icons/paste.png diff --git a/Assets/Resources/Sprites/Editor/UI/paste.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/paste.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/paste.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/paste.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/pause.png b/Assets/Resources/Sprites/Editor/UI/icons/pause.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/pause.png rename to Assets/Resources/Sprites/Editor/UI/icons/pause.png diff --git a/Assets/Resources/Sprites/Editor/UI/pause.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/pause.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/pause.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/pause.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/play.png b/Assets/Resources/Sprites/Editor/UI/icons/play.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/play.png rename to Assets/Resources/Sprites/Editor/UI/icons/play.png diff --git a/Assets/Resources/Sprites/Editor/UI/play.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/play.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/play.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/play.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/redo.png b/Assets/Resources/Sprites/Editor/UI/icons/redo.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/redo.png rename to Assets/Resources/Sprites/Editor/UI/icons/redo.png diff --git a/Assets/Resources/Sprites/Editor/UI/redo.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/redo.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/redo.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/redo.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/save.png b/Assets/Resources/Sprites/Editor/UI/icons/save.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/save.png rename to Assets/Resources/Sprites/Editor/UI/icons/save.png diff --git a/Assets/Resources/Sprites/Editor/UI/save.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/save.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/save.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/save.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/selection.png b/Assets/Resources/Sprites/Editor/UI/icons/selection.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/selection.png rename to Assets/Resources/Sprites/Editor/UI/icons/selection.png diff --git a/Assets/Resources/Sprites/Editor/UI/selection.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/selection.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/selection.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/selection.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/sort.png b/Assets/Resources/Sprites/Editor/UI/icons/sort.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/sort.png rename to Assets/Resources/Sprites/Editor/UI/icons/sort.png diff --git a/Assets/Resources/Sprites/Editor/UI/sort.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/sort.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/sort.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/sort.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/stop.png b/Assets/Resources/Sprites/Editor/UI/icons/stop.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/stop.png rename to Assets/Resources/Sprites/Editor/UI/icons/stop.png diff --git a/Assets/Resources/Sprites/Editor/UI/stop.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/stop.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/stop.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/stop.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/tempo-change.png b/Assets/Resources/Sprites/Editor/UI/icons/tempo-change.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/tempo-change.png rename to Assets/Resources/Sprites/Editor/UI/icons/tempo-change.png diff --git a/Assets/Resources/Sprites/Editor/UI/tempo-change.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/tempo-change.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/tempo-change.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/tempo-change.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/tempo-finder.png b/Assets/Resources/Sprites/Editor/UI/icons/tempo-finder.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/tempo-finder.png rename to Assets/Resources/Sprites/Editor/UI/icons/tempo-finder.png diff --git a/Assets/Resources/Sprites/Editor/UI/tempo-finder.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/tempo-finder.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/tempo-finder.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/tempo-finder.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/undo.png b/Assets/Resources/Sprites/Editor/UI/icons/undo.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/undo.png rename to Assets/Resources/Sprites/Editor/UI/icons/undo.png diff --git a/Assets/Resources/Sprites/Editor/UI/undo.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/undo.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/undo.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/undo.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/volume.png b/Assets/Resources/Sprites/Editor/UI/icons/volume.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/volume.png rename to Assets/Resources/Sprites/Editor/UI/icons/volume.png diff --git a/Assets/Resources/Sprites/Editor/UI/volume.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/volume.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/volume.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/volume.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/wrench.png b/Assets/Resources/Sprites/Editor/UI/icons/wrench.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/wrench.png rename to Assets/Resources/Sprites/Editor/UI/icons/wrench.png diff --git a/Assets/Resources/Sprites/Editor/UI/wrench.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/wrench.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/wrench.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/wrench.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-in.png b/Assets/Resources/Sprites/Editor/UI/icons/zoom-in.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-in.png rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-in.png diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-in.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/zoom-in.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-in.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-in.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-out.png b/Assets/Resources/Sprites/Editor/UI/icons/zoom-out.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-out.png rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-out.png diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-out.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/zoom-out.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-out.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-out.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-reset.png b/Assets/Resources/Sprites/Editor/UI/icons/zoom-reset.png similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-reset.png rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-reset.png diff --git a/Assets/Resources/Sprites/Editor/UI/zoom-reset.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/zoom-reset.png.meta similarity index 100% rename from Assets/Resources/Sprites/Editor/UI/zoom-reset.png.meta rename to Assets/Resources/Sprites/Editor/UI/icons/zoom-reset.png.meta diff --git a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas new file mode 100644 index 000000000..b53036ea8 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!687078895 &4343727234628468602 +SpriteAtlas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: icons_atlas + m_EditorData: + serializedVersion: 2 + textureSettings: + serializedVersion: 2 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: + - serializedVersion: 3 + m_BuildTarget: DefaultTexturePlatform + m_MaxTextureSize: 512 + m_ResizeAlgorithm: 0 + m_TextureFormat: -1 + m_TextureCompression: 0 + m_CompressionQuality: 50 + m_CrunchedCompression: 0 + m_AllowsAlphaSplitting: 0 + m_Overridden: 0 + m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 0 + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 1 + allowAlphaSplitting: 0 + enableRotation: 0 + enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} + variantMultiplier: 1 + packables: + - {fileID: 102900000, guid: b230d12951a959f40840eccb3dc8fc35, type: 3} + bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + m_MasterAtlas: {fileID: 0} + m_PackedSprites: + - {fileID: 21300000, guid: 49e59e302f4a24a4da56bd63185fcb01, type: 3} + - {fileID: 21300000, guid: 6f76ee0157ff5854295d8d0b12b5f165, type: 3} + - {fileID: 21300000, guid: 9ae7ecf2cc001d14595ec03e1d4d86a6, type: 3} + - {fileID: 21300000, guid: 6dd981c3e3319f243b56549e3f26fb72, type: 3} + - {fileID: 21300000, guid: 99dd78d3f365c0b498bc65b192951aa7, type: 3} + - {fileID: 21300000, guid: c158bbf3be7618c468e696e8c2c54e95, type: 3} + - {fileID: 21300000, guid: 348825b5c77b9d143961119fc008e631, type: 3} + - {fileID: 21300000, guid: 44c391c5df20f2844b9437c0f3138355, type: 3} + - {fileID: 21300000, guid: 4ea196d68cba90a4d8b08ad6fe012f49, type: 3} + - {fileID: 21300000, guid: 55bb46a7614176b4c941a5caf846f7e8, type: 3} + - {fileID: 21300000, guid: 57971d0838f02124080be29466f8f638, type: 3} + - {fileID: 21300000, guid: e85d5d286a8191b499c570d33dd0899c, type: 3} + - {fileID: 21300000, guid: 39656548c069d5541a9d9d1a808a76e4, type: 3} + - {fileID: 21300000, guid: 21da6678ec5624a439f87f3487819ac0, type: 3} + - {fileID: 21300000, guid: b7a1fac8b59b4d14289fa198206ef47e, type: 3} + - {fileID: 21300000, guid: 6e7b88d9d62ed1b429c63b83745e3672, type: 3} + - {fileID: 21300000, guid: dd516f1a3380ca642939d4fa86603249, type: 3} + - {fileID: 21300000, guid: e63dfe3b432d7404bab9ef307426a0bf, type: 3} + - {fileID: 21300000, guid: 1256a95b617ffc0458b3aec7fba83afe, type: 3} + - {fileID: 21300000, guid: ba34210de39bafc4d9bc0bb9163d83c7, type: 3} + - {fileID: 21300000, guid: 5562630d3cb1e1b439e6f0d06c45b14a, type: 3} + - {fileID: 21300000, guid: 05e0181d5d7f7144f9263d1ccca41112, type: 3} + - {fileID: 21300000, guid: 8dce25bd7de8cb7409d9043e6735bda5, type: 3} + - {fileID: 21300000, guid: 0c2c8bed0306b7d408a268884c6af79b, type: 3} + - {fileID: 21300000, guid: 9d635a6edbcd76549a58fd1b4640cc99, type: 3} + - {fileID: 21300000, guid: 42ffabfe4c37e104d8e9d884fe7db980, type: 3} + - {fileID: 21300000, guid: 8ae7d31f585b0cf4483963e20305e4f8, type: 3} + - {fileID: 21300000, guid: a851bc8ff871b2e4a8101d0ffab93164, type: 3} + - {fileID: 21300000, guid: b29210cf5b7b8234984ec842a3110005, type: 3} + m_PackedSpriteNamesToIndex: + - cog + - zoom-out + - save + - add-music + - clock + - zoom-reset + - undo + - tempo-change + - copy + - fullscreen + - grid-snap + - bookmark + - add-file + - tempo-finder + - GameEventArrow + - selection + - document-signed + - stop + - pause + - play + - zoom-in + - editor-theme + - sort + - redo + - wrench + - paste + - open-folder + - a-z + - volume + m_RenderDataMap: {} + m_Tag: icons_atlas + m_IsVariant: 0 diff --git a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas.meta b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas.meta new file mode 100644 index 000000000..feb73f932 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6735c7c994c42514b9183635285bb184 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index e69887611..467f16c33 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -162,6 +162,14 @@ namespace HeavenStudio.Editor Application.Quit(); } + public void Update() + { + if (!PersistentDataManager.gameSettings.scaleWScreenSize) + MainCanvas.scaleFactor = 1.0f + (0.25f * PersistentDataManager.gameSettings.editorScale); + + MainCanvas.GetComponent().uiScaleMode = (PersistentDataManager.gameSettings.scaleWScreenSize) ? CanvasScaler.ScaleMode.ScaleWithScreenSize : CanvasScaler.ScaleMode.ConstantPixelSize; + } + public void LateUpdate() { if (lastScreenSize != new Vector2(UnityEngine.Screen.width, UnityEngine.Screen.height)) diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index 5986c3dbb..ff753e358 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -38,6 +38,7 @@ namespace HeavenStudio.Editor.Track public float WidthPerBeat { get; private set; } = 100.0f; public float PixelsPerBeat => WidthPerBeat * Zoom; public float Zoom { get; private set; } = 1.0f; + public float VerticalZoom { get; private set; } = 1.0f; public float MousePos2Beat { get; private set; } public float MousePos2Layer { get; private set; } public float MousePos2BeatSnap => Mathp.Round2Nearest(MousePos2Beat + (SnapInterval() * 0.5f), SnapInterval()); @@ -294,11 +295,11 @@ namespace HeavenStudio.Editor.Track ZoomInBTN.onClick.AddListener(delegate { - zoomComponent.Zoom(0.25f * zoomComponent.Scale.x, Vector2.zero); + zoomComponent.Zoom(0.25f * zoomComponent.Scale.x, Vector2.zero, true); }); ZoomOutBTN.onClick.AddListener(delegate { - zoomComponent.Zoom(-0.2f * zoomComponent.Scale.x, Vector2.zero); + zoomComponent.Zoom(-0.2f * zoomComponent.Scale.x, Vector2.zero, true); }); ZoomResetBTN.onClick.AddListener(delegate { @@ -355,7 +356,7 @@ namespace HeavenStudio.Editor.Track if (songBeats == 0) songBeats = 320; else songBeats += 10; - TimelineContent.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y); + TimelineContent.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y * RealTimelineContent.localScale.y); // TimelineEventGrid.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y); RealTimelineContent.sizeDelta = new Vector2(TimelineContent.sizeDelta.x / Zoom, RealTimelineContent.sizeDelta.y); } @@ -417,7 +418,9 @@ namespace HeavenStudio.Editor.Track RectTransformUtility.ScreenPointToLocalPointInRectangle(EventContent, Input.mousePosition, Editor.instance.EditorCamera, out relativeMousePos); MouseInTimeline = this.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(EventContent, Input.mousePosition, Editor.instance.EditorCamera); - + if (MouseInTimeline) + MouseInTimeline = RectTransformUtility.RectangleContainsScreenPoint(TimelineScroll.viewport, + Input.mousePosition, Editor.instance.EditorCamera); /* if (MouseInTimeline) @@ -607,7 +610,7 @@ namespace HeavenStudio.Editor.Track layerRect.sizeDelta = new Vector2(layerRect.sizeDelta.x, LayerHeight()); } - RealTimelineContent.sizeDelta = new Vector2(RealTimelineContent.sizeDelta.x, LayerHeight() * LayerCount); + RealTimelineContent.sizeDelta = new Vector2(RealTimelineContent.sizeDelta.x, (LayerHeight() * LayerCount) / VerticalZoom); } public void LateUpdate() @@ -1109,8 +1112,8 @@ namespace HeavenStudio.Editor.Track public float LayerHeight() { - var defaultHeight = 32; - return Mathf.Max(defaultHeight, (LayersRect.rect.height / LayerCount)); + var defaultHeight = 32 * VerticalZoom; + return Mathf.Max(defaultHeight, (LayersRect.rect.height / LayerCount) * VerticalZoom); // return LayersRect.rect.height / LayerCount; } @@ -1148,6 +1151,14 @@ namespace HeavenStudio.Editor.Track TimelineBlockManager.Instance.OnZoom(); } + public void OnZoomVertical(float zoom) + { + VerticalZoom = zoom; + + FitToSong(); + TimelineBlockManager.Instance.OnZoom(); + } + public void UpdateOffsetText() { // show up to 4 decimal places diff --git a/Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs b/Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs index 3851b9c84..e4127b014 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs @@ -3,7 +3,7 @@ using UnityEngine.EventSystems; namespace HeavenStudio.Editor.Track { - public class TimelineZoom : MonoBehaviour, IScrollHandler + public class TimelineZoom : MonoBehaviour { public Vector3 Scale => _scale; @@ -25,7 +25,17 @@ namespace HeavenStudio.Editor.Track rectTransform.localScale = _scale; } - public void OnScroll(PointerEventData eventData) + private void Update() + { + var scrollDeltaY = Input.mouseScrollDelta.y; + if (scrollDeltaY != 0) + { + if (Timeline.instance.MouseInTimeline) + OnScroll(scrollDeltaY); + } + } + + public void OnScroll(float scrollDeltaY) { if (Conductor.instance.NotStopped()) return; @@ -37,37 +47,70 @@ namespace HeavenStudio.Editor.Track if (cam == null) Debug.LogError("Camera not set!"); RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, cam, out relativeMousePosition); - float delta = eventData.scrollDelta.y; - - if (delta > 0) + if (scrollDeltaY > 0) { - Zoom(0.25f * _scale.x, relativeMousePosition); + if (Input.GetKey(KeyCode.LeftControl)) + { + Zoom(0.25f * _scale.y, relativeMousePosition, false); + } + else + { + Zoom(0.25f * _scale.x, relativeMousePosition, true); + } } - else if (delta < 0) + else if (scrollDeltaY < 0) { - var incre = -0.2f * _scale.x; - if (_scale.x + incre > minScale - 0.1f) - Zoom(-0.2f * _scale.x, relativeMousePosition); + if (Input.GetKey(KeyCode.LeftControl)) + { + var incre = -0.2f * _scale.y; + if (_scale.y + incre > minScale - 0.1f) + Zoom(-0.2f * _scale.y, relativeMousePosition, false); + } + else + { + var incre = -0.2f * _scale.x; + if (_scale.x + incre > minScale - 0.1f) + Zoom(-0.2f * _scale.x, relativeMousePosition, true); + } } } - public void Zoom(float incre, Vector2 relativeMousePosition) + public void Zoom(float incre, Vector2 relativeMousePosition, bool horiz) { if (!(_scale.x < maxScale)) return; - var newScale = Mathf.Clamp(_scale.x + incre, minScale, maxScale); - _scale.Set(newScale, 1, 1); - relativeMousePosition = new Vector2(relativeMousePosition.x, 0); - relMousePos -= (relativeMousePosition * incre); + if (horiz) + { + var newScale = Mathf.Clamp(_scale.x + incre, minScale, maxScale); + _scale.Set(newScale, _scale.y, 1); + relativeMousePosition = new Vector2(relativeMousePosition.x, 0); + relMousePos -= (relativeMousePosition * incre); - rectTransform.localScale = _scale; - rectTransform.anchoredPosition = relMousePos; + rectTransform.localScale = _scale; + rectTransform.anchoredPosition = relMousePos; - rectTransform.localScale = - new Vector3(Mathf.Clamp(rectTransform.localScale.x, minScale, Mathf.Infinity), - rectTransform.localScale.y); + rectTransform.localScale = + new Vector3(Mathf.Clamp(rectTransform.localScale.x, minScale, Mathf.Infinity), + rectTransform.localScale.y); - Timeline.instance.OnZoom(newScale); + Timeline.instance.OnZoom(newScale); + } + else + { + var newScale = Mathf.Clamp(_scale.y + incre, 1.0f, maxScale); + _scale.Set(_scale.x, newScale, 1); + relativeMousePosition = new Vector2(0, relativeMousePosition.y); + relMousePos -= (relativeMousePosition * incre); + + rectTransform.localScale = _scale; + rectTransform.anchoredPosition = relMousePos; + + rectTransform.localScale = + new Vector3(rectTransform.localScale.x, + Mathf.Clamp(rectTransform.localScale.y, 1.0f, Mathf.Infinity)); + + Timeline.instance.OnZoomVertical(newScale); + } } public void SetNewPos(float newX) diff --git a/Assets/Scripts/PersistentDataManager.cs b/Assets/Scripts/PersistentDataManager.cs index fcbe18db0..0c967eff9 100644 --- a/Assets/Scripts/PersistentDataManager.cs +++ b/Assets/Scripts/PersistentDataManager.cs @@ -113,7 +113,9 @@ namespace HeavenStudio.Common bool timingDisplayMinMode = false, bool overlaysInEditor = true, bool letterboxBgEnable = true, - bool letterboxFxEnable = true + bool letterboxFxEnable = true, + int editorScale = 0, + bool scaleWScreenSize = false ) { this.showSplash = showSplash; @@ -132,6 +134,8 @@ namespace HeavenStudio.Common this.discordRPCEnable = false; else this.discordRPCEnable = true; + this.editorScale = editorScale; + this.scaleWScreenSize = scaleWScreenSize; this.perfectChallengeType = perfectChallengeType; this.isMedalOn = isMedalOn; @@ -169,6 +173,8 @@ namespace HeavenStudio.Common // Editor Settings public bool editorCursorEnable; public bool discordRPCEnable; + public int editorScale; + public bool scaleWScreenSize; // Gameplay Settings public PerfectChallengeType perfectChallengeType; diff --git a/Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs b/Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs index 30b1ecab2..ff1ac7b98 100644 --- a/Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs +++ b/Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs @@ -10,10 +10,17 @@ namespace HeavenStudio.Editor { public Toggle cursorCheckbox; public Toggle discordRPCCheckbox; + public Button editorScaleDecre, editorScaleIncre; + public Toggle scaleWSS; - private void Start() { + private void Start() + { cursorCheckbox.isOn = PersistentDataManager.gameSettings.editorCursorEnable; discordRPCCheckbox.isOn = PersistentDataManager.gameSettings.discordRPCEnable; + scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize; + + + SetDecreIncreInteractable(); } public void OnCursorCheckboxChanged() @@ -36,10 +43,50 @@ namespace HeavenStudio.Editor { cursorCheckbox.isOn = PersistentDataManager.gameSettings.editorCursorEnable; discordRPCCheckbox.isOn = PersistentDataManager.gameSettings.discordRPCEnable; + scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize; + + + SetDecreIncreInteractable(); } public override void OnCloseTab() { } + + public void OnSWSSChanged() + { + PersistentDataManager.gameSettings.scaleWScreenSize = scaleWSS.isOn; + scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize; + } + + public void OnEditorScaleDecre() + { + PersistentDataManager.gameSettings.editorScale--; + if (PersistentDataManager.gameSettings.editorScale < -3) + PersistentDataManager.gameSettings.editorScale = -3; + + SetDecreIncreInteractable(); + } + + public void OnEditorScaleIncre() + { + PersistentDataManager.gameSettings.editorScale++; + if (PersistentDataManager.gameSettings.editorScale > 5) + PersistentDataManager.gameSettings.editorScale = 5; + + SetDecreIncreInteractable(); + } + + public void OnEditorScaleReset() + { + PersistentDataManager.gameSettings.editorScale = 0; + SetDecreIncreInteractable(); + } + + private void SetDecreIncreInteractable() + { + editorScaleDecre.interactable = PersistentDataManager.gameSettings.editorScale > -3; // hardcoded? We might not change. + editorScaleIncre.interactable = PersistentDataManager.gameSettings.editorScale < 5; + } } } \ No newline at end of file