diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index e3db87ea6..2827a2537 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -1089,7 +1089,7 @@ RectTransform: m_GameObject: {fileID: 57310822} 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_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 316841412} m_RootOrder: 0 @@ -1302,9 +1302,11 @@ RectTransform: m_Children: - {fileID: 270434624} - {fileID: 1121370304} + - {fileID: 365690206} - {fileID: 344865318} - {fileID: 1550880755} - {fileID: 316841412} + - {fileID: 2099454902} m_Father: {fileID: 683816222} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4211,6 +4213,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 270434623} m_CullTransparentMesh: 1 +--- !u!1 &279065747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 279065748} + - component: {fileID: 279065750} + - component: {fileID: 279065749} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &279065748 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279065747} + 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_Children: [] + m_Father: {fileID: 2099454902} + 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: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &279065749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279065747} + 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: 0.5803922, b: 0.5882353, 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: 21300000, guid: 6809f7224eccf2142985b642abf0e0e1, type: 3} + 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!222 &279065750 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279065747} + m_CullTransparentMesh: 1 --- !u!1 &279538357 GameObject: m_ObjectHideFlags: 0 @@ -4752,13 +4829,14 @@ GameObject: - component: {fileID: 316841412} - component: {fileID: 316841415} - component: {fileID: 316841414} + - component: {fileID: 316841413} m_Layer: 5 m_Name: Decrement m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &316841412 RectTransform: m_ObjectHideFlags: 0 @@ -4772,13 +4850,59 @@ RectTransform: m_Children: - {fileID: 57310823} m_Father: {fileID: 58525996} - m_RootOrder: 4 + m_RootOrder: 5 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: 184, y: -47.8} m_SizeDelta: {x: 58.76, y: 58.76} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &316841413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316841411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e0cac45de7228a4c8f7bc6adb0751a2, 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: 316841414} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + SnapDialog: {fileID: 683816223} + isDown: 1 --- !u!114 &316841414 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4979,7 +5103,7 @@ GameObject: - component: {fileID: 344865320} - component: {fileID: 344865319} m_Layer: 5 - m_Name: tempLabel + m_Name: snapLabel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4997,12 +5121,12 @@ RectTransform: m_LocalScale: {x: 0.9995906, y: 0.9995906, z: 0.9995906} m_Children: [] m_Father: {fileID: 58525996} - m_RootOrder: 2 + m_RootOrder: 3 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: 0, y: 11.82} - m_SizeDelta: {x: 309.85, y: 50} + m_AnchoredPosition: {x: 16.588013, y: -20.04} + m_SizeDelta: {x: 217.54, y: 145.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &344865319 MonoBehaviour: @@ -5024,7 +5148,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: (Nothing Here!) + m_text: 1/4 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 6d4610587e293f74ca2b71ec1cf59da3, type: 2} @@ -5033,8 +5157,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190208 - m_fontColor: {r: 0.5019608, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5051,12 +5175,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 100 + m_fontSizeBase: 100 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 80 + m_fontSizeMax: 100 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -5307,6 +5431,140 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: 0, y: 0, z: 0, w: 0} m_Softness: {x: 0, y: 0} +--- !u!1 &365690205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 365690206} + - component: {fileID: 365690208} + - component: {fileID: 365690207} + m_Layer: 5 + m_Name: label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &365690206 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365690205} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9995906, y: 0.9995906, z: 0.9995906} + m_Children: [] + m_Father: {fileID: 58525996} + 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: -156.16, y: -20.04} + m_SizeDelta: {x: 127.95, y: 145.54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &365690207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365690205} + 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: 'Current Snap:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} + m_sharedMaterial: {fileID: 8580487687356851718, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292664540 + m_fontColor: {r: 0.8627451, g: 0.8627451, b: 0.8627451, 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: 25 + m_fontSizeBase: 25 + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!222 &365690208 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365690205} + m_CullTransparentMesh: 1 --- !u!1 &380411593 GameObject: m_ObjectHideFlags: 0 @@ -5888,7 +6146,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.5803922, b: 0.5882353, a: 1} + m_Color: {r: 0.5986803, g: 1, b: 0.5803922, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9378,6 +9636,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: snapSetter: {fileID: 683816221} + snapText: {fileID: 344865319} --- !u!1 &689207019 GameObject: m_ObjectHideFlags: 0 @@ -12217,8 +12476,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: -0.00000013204993 - m_Size: 0.5293149 + m_Value: -0.0000011884493 + m_Size: 0.5289384 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -13762,8 +14021,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 31.184998} - m_SizeDelta: {x: 0, y: 31.187} + m_AnchoredPosition: {x: -0, y: 28.925} + m_SizeDelta: {x: 0, y: 28.927} m_Pivot: {x: 0, y: 1} --- !u!114 &1037563075 MonoBehaviour: @@ -15336,7 +15595,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 361.05325} + m_AnchoredPosition: {x: 0, y: 361.05347} m_SizeDelta: {x: 0, y: 491} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -19493,8 +19752,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -26.46289} - m_SizeDelta: {x: 1440.022, y: -115.3} + m_AnchoredPosition: {x: 0, y: -27.594} + m_SizeDelta: {x: 1440.022, y: -113.04} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1527251881 MonoBehaviour: @@ -20024,13 +20283,14 @@ GameObject: - component: {fileID: 1550880755} - component: {fileID: 1550880758} - component: {fileID: 1550880757} + - component: {fileID: 1550880756} m_Layer: 5 m_Name: Increment m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1550880755 RectTransform: m_ObjectHideFlags: 0 @@ -20044,13 +20304,59 @@ RectTransform: m_Children: - {fileID: 413228133} m_Father: {fileID: 58525996} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 184, y: 16.199982} m_SizeDelta: {x: 58.76, y: 58.76} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1550880756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1550880754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e0cac45de7228a4c8f7bc6adb0751a2, 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: 1550880757} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + SnapDialog: {fileID: 683816223} + isDown: 0 --- !u!114 &1550880757 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23116,8 +23422,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -84.09494} - m_SizeDelta: {x: 320, y: -115.28} + m_AnchoredPosition: {x: -0, y: -84.09494} + m_SizeDelta: {x: 320, y: -113.02} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 GameObject: @@ -26187,6 +26493,129 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2067805742} m_CullTransparentMesh: 1 +--- !u!1 &2099454901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2099454902} + - component: {fileID: 2099454905} + - component: {fileID: 2099454904} + - component: {fileID: 2099454903} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2099454902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2099454901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032} + m_Children: + - {fileID: 279065748} + m_Father: {fileID: 58525996} + m_RootOrder: 6 + 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: 154.74002, y: -711.80005} + m_SizeDelta: {x: 58.76, y: 58.76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2099454903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2099454901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e0cac45de7228a4c8f7bc6adb0751a2, 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: 2099454904} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + SnapDialog: {fileID: 0} + isDown: 0 +--- !u!114 &2099454904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2099454901} + 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!222 &2099454905 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2099454901} + m_CullTransparentMesh: 1 --- !u!1 &2127582756 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/LevelEditor/SnapDialog.cs b/Assets/Scripts/LevelEditor/SnapDialog.cs deleted file mode 100644 index d6a1949ed..000000000 --- a/Assets/Scripts/LevelEditor/SnapDialog.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio.Editor -{ - public class SnapDialog : MonoBehaviour - { - [SerializeField] private GameObject snapSetter; - private void Awake() - { - } - - public void SwitchSnapDialog() - { - if(snapSetter.activeSelf) { - snapSetter.SetActive(false); - } else { - snapSetter.SetActive(true); - } - } - - private void Update() - { - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/LevelEditor/SnapDialog.meta b/Assets/Scripts/LevelEditor/SnapDialog.meta new file mode 100644 index 000000000..ed186b8f3 --- /dev/null +++ b/Assets/Scripts/LevelEditor/SnapDialog.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 537580972fcefa548bd9ee5e8254cbfc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs b/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs new file mode 100644 index 000000000..b6651ca6c --- /dev/null +++ b/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.EventSystems; + +namespace HeavenStudio.Editor +{ + public class SnapChangeButton : Button, IPointerDownHandler + { + public SnapDialog SnapDialog; + public bool isDown; + + public override void OnPointerDown(PointerEventData eventData) + { + if (eventData.button == PointerEventData.InputButton.Left) + { + SnapDialog.ChangeCommon(isDown); + } + } + } +} diff --git a/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs.meta b/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs.meta new file mode 100644 index 000000000..5ec35f5f9 --- /dev/null +++ b/Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e0cac45de7228a4c8f7bc6adb0751a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelEditor/SnapDialog/SnapDialog.cs b/Assets/Scripts/LevelEditor/SnapDialog/SnapDialog.cs new file mode 100644 index 000000000..a51b852ab --- /dev/null +++ b/Assets/Scripts/LevelEditor/SnapDialog/SnapDialog.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using HeavenStudio.Editor.Track; + +using TMPro; + +namespace HeavenStudio.Editor +{ + public class SnapDialog : MonoBehaviour + { + [SerializeField] private GameObject snapSetter; + [SerializeField] private TMP_Text snapText; + private Timeline timeline; + + private static float[] CommonDenominators = { 1, 2, 3, 4, 6, 8, 12, 16}; + private int currentCommon = 3; + private void Start() + { + timeline = Timeline.instance; + } + + public void SwitchSnapDialog() + { + if(snapSetter.activeSelf) { + snapSetter.SetActive(false); + } else { + snapSetter.SetActive(true); + } + } + + public void ChangeCommon(bool down = false) + { + if(down) { + currentCommon--; + } else { + currentCommon++; + } + if(currentCommon < 0) { + currentCommon = 0; + } else if(currentCommon >= CommonDenominators.Length) { + currentCommon = CommonDenominators.Length - 1; + } + timeline.SetSnap(1f / CommonDenominators[currentCommon]); + } + + private void Update() + { + snapText.text = $"1/{CommonDenominators[currentCommon]}"; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/LevelEditor/SnapDialog.cs.meta b/Assets/Scripts/LevelEditor/SnapDialog/SnapDialog.cs.meta similarity index 100% rename from Assets/Scripts/LevelEditor/SnapDialog.cs.meta rename to Assets/Scripts/LevelEditor/SnapDialog/SnapDialog.cs.meta diff --git a/Assets/Scripts/LevelEditor/TempoFinder.meta b/Assets/Scripts/LevelEditor/TempoFinder.meta new file mode 100644 index 000000000..841abb22d --- /dev/null +++ b/Assets/Scripts/LevelEditor/TempoFinder.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36b14c8563ea37442aa7a2f0342549b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelEditor/TempoFinder.cs b/Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs similarity index 100% rename from Assets/Scripts/LevelEditor/TempoFinder.cs rename to Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs diff --git a/Assets/Scripts/LevelEditor/TempoFinder.cs.meta b/Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs.meta similarity index 100% rename from Assets/Scripts/LevelEditor/TempoFinder.cs.meta rename to Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs.meta diff --git a/Assets/Scripts/LevelEditor/TempoFinderButton.cs b/Assets/Scripts/LevelEditor/TempoFinder/TempoFinderButton.cs similarity index 100% rename from Assets/Scripts/LevelEditor/TempoFinderButton.cs rename to Assets/Scripts/LevelEditor/TempoFinder/TempoFinderButton.cs diff --git a/Assets/Scripts/LevelEditor/TempoFinderButton.cs.meta b/Assets/Scripts/LevelEditor/TempoFinder/TempoFinderButton.cs.meta similarity index 100% rename from Assets/Scripts/LevelEditor/TempoFinderButton.cs.meta rename to Assets/Scripts/LevelEditor/TempoFinder/TempoFinderButton.cs.meta diff --git a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs index dc71fd26d..e1dc268e6 100644 --- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs @@ -30,6 +30,8 @@ namespace HeavenStudio.Editor.Track public static float SnapInterval() { return instance.snapInterval; } + public void SetSnap(float snap) { snapInterval = snap; } + public class CurrentTimelineState { public bool selected;