make all dialogs inherit one base class
- opening a new dialog closes the previous one
This commit is contained in:
parent
6c80073b12
commit
2b4b7f0a73
|
@ -289,7 +289,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1090919178}
|
- {fileID: 1090919178}
|
||||||
m_Father: {fileID: 202724642}
|
m_Father: {fileID: 202724642}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 11
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
|
@ -4058,7 +4058,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: -289.15002, y: 2}
|
m_AnchoredPosition: {x: -289.15, y: 2}
|
||||||
m_SizeDelta: {x: -578.29, y: 49.92}
|
m_SizeDelta: {x: -578.29, y: 49.92}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0}
|
||||||
--- !u!114 &156962255
|
--- !u!114 &156962255
|
||||||
|
@ -5372,6 +5372,7 @@ RectTransform:
|
||||||
- {fileID: 1271528577}
|
- {fileID: 1271528577}
|
||||||
- {fileID: 1478799965}
|
- {fileID: 1478799965}
|
||||||
- {fileID: 1201441976}
|
- {fileID: 1201441976}
|
||||||
|
- {fileID: 285739499}
|
||||||
- {fileID: 1055877578}
|
- {fileID: 1055877578}
|
||||||
- {fileID: 3236231}
|
- {fileID: 3236231}
|
||||||
- {fileID: 528192060}
|
- {fileID: 528192060}
|
||||||
|
@ -7078,6 +7079,139 @@ MonoBehaviour:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 1
|
m_IsOn: 1
|
||||||
|
--- !u!1 &285739498
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 285739499}
|
||||||
|
- component: {fileID: 285739502}
|
||||||
|
- component: {fileID: 285739501}
|
||||||
|
- component: {fileID: 285739500}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: ChartParameters
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &285739499
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 285739498}
|
||||||
|
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_Children:
|
||||||
|
- {fileID: 646945866}
|
||||||
|
m_Father: {fileID: 202724642}
|
||||||
|
m_RootOrder: 9
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 295.7, y: 0}
|
||||||
|
m_SizeDelta: {x: 35, y: 35}
|
||||||
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
|
--- !u!114 &285739500
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 285739498}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 0
|
||||||
|
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.7490196, g: 1, b: 1, 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
|
||||||
|
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: 285739501}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1336470763}
|
||||||
|
m_TargetAssemblyTypeName: HeavenStudio.Editor.RemixPropertiesDialog, Assembly-CSharp
|
||||||
|
m_MethodName: SwitchPropertiesDialog
|
||||||
|
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!114 &285739501
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 285739498}
|
||||||
|
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: 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: 10
|
||||||
|
--- !u!222 &285739502
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 285739498}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &285804966
|
--- !u!1 &285804966
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -11700,7 +11834,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 551314712}
|
- {fileID: 551314712}
|
||||||
m_Father: {fileID: 202724642}
|
m_Father: {fileID: 202724642}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 12
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
|
@ -15587,6 +15721,81 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 643814082}
|
m_GameObject: {fileID: 643814082}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &646945865
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 646945866}
|
||||||
|
- component: {fileID: 646945868}
|
||||||
|
- component: {fileID: 646945867}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Graphic
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &646945866
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 646945865}
|
||||||
|
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: 285739499}
|
||||||
|
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: 30, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &646945867
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 646945865}
|
||||||
|
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: 21300000, guid: 05e0181d5d7f7144f9263d1ccca41112, 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 &646945868
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 646945865}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &657727711
|
--- !u!1 &657727711
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -16645,7 +16854,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: f32d53b1d58c64e41b71bd7520435169, type: 3}
|
m_Script: {fileID: 11500000, guid: f32d53b1d58c64e41b71bd7520435169, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
snapSetter: {fileID: 683816221}
|
dialog: {fileID: 683816221}
|
||||||
snapText: {fileID: 344865319}
|
snapText: {fileID: 344865319}
|
||||||
--- !u!1 &683953387
|
--- !u!1 &683953387
|
||||||
GameObject:
|
GameObject:
|
||||||
|
@ -20908,8 +21117,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1589389272}
|
m_TargetGraphic: {fileID: 1589389272}
|
||||||
m_HandleRect: {fileID: 1589389271}
|
m_HandleRect: {fileID: 1589389271}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1
|
m_Value: 0
|
||||||
m_Size: 0.99982846
|
m_Size: 1
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -22543,7 +22752,19 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 971914992}
|
m_TargetGraphic: {fileID: 971914992}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1336470763}
|
||||||
|
m_TargetAssemblyTypeName: HeavenStudio.Editor.RemixPropertiesDialog, Assembly-CSharp
|
||||||
|
m_MethodName: SwitchPropertiesDialog
|
||||||
|
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!114 &971914992
|
--- !u!114 &971914992
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -24491,11 +24712,11 @@ RectTransform:
|
||||||
- {fileID: 837036037}
|
- {fileID: 837036037}
|
||||||
- {fileID: 215482486}
|
- {fileID: 215482486}
|
||||||
m_Father: {fileID: 202724642}
|
m_Father: {fileID: 202724642}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 10
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 0, y: 0.5}
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 295.7, y: 0}
|
m_AnchoredPosition: {x: 335.7, y: 0}
|
||||||
m_SizeDelta: {x: 35, y: 35}
|
m_SizeDelta: {x: 35, y: 35}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &1055877579
|
--- !u!114 &1055877579
|
||||||
|
@ -24872,6 +25093,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1063174879}
|
- component: {fileID: 1063174879}
|
||||||
|
- component: {fileID: 1063174880}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: DialogTemplate
|
m_Name: DialogTemplate
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -24901,6 +25123,19 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1063174880
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1063174878}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e317d304732b562489c993ae93ce2265, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
dialog: {fileID: 1063174878}
|
||||||
--- !u!1 &1063895373
|
--- !u!1 &1063895373
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -25697,7 +25932,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: -408.98004, y: -17}
|
m_AnchoredPosition: {x: -408.97998, y: -17}
|
||||||
m_SizeDelta: {x: -817.96, y: -46.29}
|
m_SizeDelta: {x: -817.96, y: -46.29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1118147045
|
--- !u!1 &1118147045
|
||||||
|
@ -26866,7 +27101,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 129.91096}
|
m_AnchoredPosition: {x: 0, y: 129.89534}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &1154875944
|
--- !u!114 &1154875944
|
||||||
|
@ -29343,7 +29578,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 1b489f3aef16a65499f9596abda39c35, type: 3}
|
m_Script: {fileID: 11500000, guid: 1b489f3aef16a65499f9596abda39c35, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
tempoFinder: {fileID: 1265865540}
|
dialog: {fileID: 1265865540}
|
||||||
bpmText: {fileID: 565525426}
|
bpmText: {fileID: 565525426}
|
||||||
--- !u!1 &1267250656
|
--- !u!1 &1267250656
|
||||||
GameObject:
|
GameObject:
|
||||||
|
@ -32184,7 +32419,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: eedc1c2d03f4b22478ebb914e36371d8, type: 3}
|
m_Script: {fileID: 11500000, guid: eedc1c2d03f4b22478ebb914e36371d8, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
propertiesMenu: {fileID: 1336470761}
|
dialog: {fileID: 1336470761}
|
||||||
--- !u!1 &1337141464
|
--- !u!1 &1337141464
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -33164,13 +33399,21 @@ MonoBehaviour:
|
||||||
FullScreenBTN: {fileID: 151246938}
|
FullScreenBTN: {fileID: 151246938}
|
||||||
TempoFinderBTN: {fileID: 1478799966}
|
TempoFinderBTN: {fileID: 1478799966}
|
||||||
SnapDiagBTN: {fileID: 1201441977}
|
SnapDiagBTN: {fileID: 1201441977}
|
||||||
|
ChartParamBTN: {fileID: 285739500}
|
||||||
EditorThemeBTN: {fileID: 528192061}
|
EditorThemeBTN: {fileID: 528192061}
|
||||||
EditorSettingsBTN: {fileID: 3236232}
|
EditorSettingsBTN: {fileID: 3236232}
|
||||||
|
Dialogs:
|
||||||
|
- {fileID: 1962376965}
|
||||||
|
- {fileID: 683816223}
|
||||||
|
- {fileID: 1265865542}
|
||||||
|
- {fileID: 1336470763}
|
||||||
|
- {fileID: 1946344932}
|
||||||
tooltipText: {fileID: 1196204504}
|
tooltipText: {fileID: 1196204504}
|
||||||
fullscreen: 0
|
fullscreen: 0
|
||||||
discordDuringTesting: 0
|
discordDuringTesting: 0
|
||||||
canSelect: 1
|
canSelect: 1
|
||||||
editingInputField: 0
|
editingInputField: 0
|
||||||
|
inAuthorativeMenu: 0
|
||||||
isCursorEnabled: 1
|
isCursorEnabled: 1
|
||||||
--- !u!114 &1423699438
|
--- !u!114 &1423699438
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -41448,7 +41691,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: -84.99005}
|
m_AnchoredPosition: {x: 0, y: -84.99002}
|
||||||
m_SizeDelta: {x: 320, y: -113.92}
|
m_SizeDelta: {x: 320, y: -113.92}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!1 &1852819572
|
--- !u!1 &1852819572
|
||||||
|
@ -43288,7 +43531,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: d82cc04699de2e54483ca0e0468d9ed2, type: 3}
|
m_Script: {fileID: 11500000, guid: d82cc04699de2e54483ca0e0468d9ed2, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
settingsMenu: {fileID: 1946344930}
|
dialog: {fileID: 1946344930}
|
||||||
--- !u!1 &1946352456
|
--- !u!1 &1946352456
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -43853,7 +44096,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 5e1b2b36751952147bb6126f9ffd6086, type: 3}
|
m_Script: {fileID: 11500000, guid: 5e1b2b36751952147bb6126f9ffd6086, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
diag: {fileID: 1962376963}
|
dialog: {fileID: 1962376963}
|
||||||
--- !u!1 &1964271230
|
--- !u!1 &1964271230
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
28
Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs
Normal file
28
Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using HeavenStudio.Editor.Track;
|
||||||
|
|
||||||
|
using TMPro;
|
||||||
|
|
||||||
|
namespace HeavenStudio.Editor
|
||||||
|
{
|
||||||
|
public class Dialog : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] protected GameObject dialog;
|
||||||
|
public void ForceState(bool onoff = false)
|
||||||
|
{
|
||||||
|
Editor.instance.canSelect = onoff;
|
||||||
|
Editor.instance.inAuthorativeMenu = !onoff;
|
||||||
|
dialog.SetActive(onoff);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ResetAllDialogs()
|
||||||
|
{
|
||||||
|
foreach(var dialog in FindObjectsOfType<Dialog>())
|
||||||
|
{
|
||||||
|
dialog.ForceState(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
11
Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs.meta
Normal file
11
Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs.meta
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e317d304732b562489c993ae93ce2265
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -52,10 +52,14 @@ namespace HeavenStudio.Editor
|
||||||
[SerializeField] private Button FullScreenBTN;
|
[SerializeField] private Button FullScreenBTN;
|
||||||
[SerializeField] private Button TempoFinderBTN;
|
[SerializeField] private Button TempoFinderBTN;
|
||||||
[SerializeField] private Button SnapDiagBTN;
|
[SerializeField] private Button SnapDiagBTN;
|
||||||
|
[SerializeField] private Button ChartParamBTN;
|
||||||
|
|
||||||
[SerializeField] private Button EditorThemeBTN;
|
[SerializeField] private Button EditorThemeBTN;
|
||||||
[SerializeField] private Button EditorSettingsBTN;
|
[SerializeField] private Button EditorSettingsBTN;
|
||||||
|
|
||||||
|
[Header("Dialogs")]
|
||||||
|
[SerializeField] private Dialog[] Dialogs;
|
||||||
|
|
||||||
[Header("Tooltip")]
|
[Header("Tooltip")]
|
||||||
public TMP_Text tooltipText;
|
public TMP_Text tooltipText;
|
||||||
|
|
||||||
|
@ -68,8 +72,11 @@ namespace HeavenStudio.Editor
|
||||||
public bool discordDuringTesting = false;
|
public bool discordDuringTesting = false;
|
||||||
public bool canSelect = true;
|
public bool canSelect = true;
|
||||||
public bool editingInputField = false;
|
public bool editingInputField = false;
|
||||||
|
public bool inAuthorativeMenu = false;
|
||||||
public bool isCursorEnabled = true;
|
public bool isCursorEnabled = true;
|
||||||
|
|
||||||
|
public bool isShortcutsEnabled { get { return (!inAuthorativeMenu) && (!editingInputField); } }
|
||||||
|
|
||||||
private byte[] MusicBytes;
|
private byte[] MusicBytes;
|
||||||
|
|
||||||
public static Editor instance { get; private set; }
|
public static Editor instance { get; private set; }
|
||||||
|
@ -111,6 +118,7 @@ namespace HeavenStudio.Editor
|
||||||
Tooltip.AddTooltip(FullScreenBTN.gameObject, "Preview <color=#adadad>[Tab]</color>");
|
Tooltip.AddTooltip(FullScreenBTN.gameObject, "Preview <color=#adadad>[Tab]</color>");
|
||||||
Tooltip.AddTooltip(TempoFinderBTN.gameObject, "Tempo Finder");
|
Tooltip.AddTooltip(TempoFinderBTN.gameObject, "Tempo Finder");
|
||||||
Tooltip.AddTooltip(SnapDiagBTN.gameObject, "Snap Settings");
|
Tooltip.AddTooltip(SnapDiagBTN.gameObject, "Snap Settings");
|
||||||
|
Tooltip.AddTooltip(ChartParamBTN.gameObject, "Remix Properties");
|
||||||
|
|
||||||
Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings <color=#adadad>[Ctrl+Shift+O]</color>");
|
Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings <color=#adadad>[Ctrl+Shift+O]</color>");
|
||||||
UpdateEditorStatus(true);
|
UpdateEditorStatus(true);
|
||||||
|
@ -119,7 +127,7 @@ namespace HeavenStudio.Editor
|
||||||
public void LateUpdate()
|
public void LateUpdate()
|
||||||
{
|
{
|
||||||
#region Keyboard Shortcuts
|
#region Keyboard Shortcuts
|
||||||
if (!editingInputField)
|
if (isShortcutsEnabled)
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.Tab))
|
if (Input.GetKeyDown(KeyCode.Tab))
|
||||||
{
|
{
|
||||||
|
@ -160,7 +168,7 @@ namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.N))
|
if (Input.GetKeyDown(KeyCode.N))
|
||||||
{
|
{
|
||||||
NewRemix();
|
NewBTN.onClick.Invoke();
|
||||||
}
|
}
|
||||||
else if (Input.GetKeyDown(KeyCode.O))
|
else if (Input.GetKeyDown(KeyCode.O))
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,24 +4,23 @@ using UnityEngine;
|
||||||
|
|
||||||
using HeavenStudio.Editor;
|
using HeavenStudio.Editor;
|
||||||
|
|
||||||
public class NewRemixDialog : MonoBehaviour
|
public class NewRemixDialog : Dialog
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject diag;
|
|
||||||
|
|
||||||
public void SwitchNewDialog()
|
public void SwitchNewDialog()
|
||||||
{
|
{
|
||||||
if(diag.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
diag.SetActive(false);
|
dialog.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
diag.SetActive(true);
|
ResetAllDialogs();
|
||||||
|
dialog.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Confirm()
|
public void Confirm()
|
||||||
{
|
{
|
||||||
Editor.instance.NewRemix();
|
Editor.instance.NewRemix();
|
||||||
if(diag.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
diag.SetActive(false);
|
dialog.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,18 +7,21 @@ using TMPro;
|
||||||
|
|
||||||
namespace HeavenStudio.Editor
|
namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
public class RemixPropertiesDialog : MonoBehaviour
|
public class RemixPropertiesDialog : Dialog
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject propertiesMenu;
|
|
||||||
|
|
||||||
private void Start() {}
|
private void Start() {}
|
||||||
|
|
||||||
public void SwitchSettingsDialog()
|
public void SwitchPropertiesDialog()
|
||||||
{
|
{
|
||||||
if(propertiesMenu.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
propertiesMenu.SetActive(false);
|
Editor.instance.canSelect = true;
|
||||||
|
Editor.instance.inAuthorativeMenu = false;
|
||||||
|
dialog.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
propertiesMenu.SetActive(true);
|
ResetAllDialogs();
|
||||||
|
Editor.instance.canSelect = false;
|
||||||
|
Editor.instance.inAuthorativeMenu = true;
|
||||||
|
dialog.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,19 +7,21 @@ using TMPro;
|
||||||
|
|
||||||
namespace HeavenStudio.Editor
|
namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
public class SettingsDialog : MonoBehaviour
|
public class SettingsDialog : Dialog
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject settingsMenu;
|
|
||||||
//this may all be moved to a different script in the future
|
|
||||||
|
|
||||||
private void Start() {}
|
private void Start() {}
|
||||||
|
|
||||||
public void SwitchSettingsDialog()
|
public void SwitchSettingsDialog()
|
||||||
{
|
{
|
||||||
if(settingsMenu.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
settingsMenu.SetActive(false);
|
Editor.instance.canSelect = true;
|
||||||
|
Editor.instance.inAuthorativeMenu = false;
|
||||||
|
dialog.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
settingsMenu.SetActive(true);
|
ResetAllDialogs();
|
||||||
|
Editor.instance.canSelect = false;
|
||||||
|
Editor.instance.inAuthorativeMenu = true;
|
||||||
|
dialog.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,8 @@ using TMPro;
|
||||||
|
|
||||||
namespace HeavenStudio.Editor
|
namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
public class SnapDialog : MonoBehaviour
|
public class SnapDialog : Dialog
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject snapSetter;
|
|
||||||
[SerializeField] private TMP_Text snapText;
|
[SerializeField] private TMP_Text snapText;
|
||||||
private Timeline timeline;
|
private Timeline timeline;
|
||||||
|
|
||||||
|
@ -22,10 +21,11 @@ namespace HeavenStudio.Editor
|
||||||
|
|
||||||
public void SwitchSnapDialog()
|
public void SwitchSnapDialog()
|
||||||
{
|
{
|
||||||
if(snapSetter.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
snapSetter.SetActive(false);
|
dialog.SetActive(false);
|
||||||
} else {
|
} else {
|
||||||
snapSetter.SetActive(true);
|
ResetAllDialogs();
|
||||||
|
dialog.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,8 @@ using UnityEngine;
|
||||||
|
|
||||||
namespace HeavenStudio.Editor
|
namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
public class TempoFinder : MonoBehaviour
|
public class TempoFinder : Dialog
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject tempoFinder;
|
|
||||||
private bool pressed;
|
private bool pressed;
|
||||||
private float timePressed;
|
private float timePressed;
|
||||||
[SerializeField] private BPMText bpmText;
|
[SerializeField] private BPMText bpmText;
|
||||||
|
@ -17,12 +16,13 @@ namespace HeavenStudio.Editor
|
||||||
}
|
}
|
||||||
public void SwitchTempoDialog()
|
public void SwitchTempoDialog()
|
||||||
{
|
{
|
||||||
if(tempoFinder.activeSelf) {
|
if(dialog.activeSelf) {
|
||||||
tempoFinder.SetActive(false);
|
dialog.SetActive(false);
|
||||||
timePressed = 0;
|
timePressed = 0;
|
||||||
bpmText.ResetText();
|
bpmText.ResetText();
|
||||||
} else {
|
} else {
|
||||||
tempoFinder.SetActive(true);
|
ResetAllDialogs();
|
||||||
|
dialog.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void TapBPM()
|
public void TapBPM()
|
||||||
|
|
|
@ -273,7 +273,7 @@ namespace HeavenStudio.Editor.Track
|
||||||
SliderControl();
|
SliderControl();
|
||||||
|
|
||||||
#region Keyboard Shortcuts
|
#region Keyboard Shortcuts
|
||||||
if (!userIsEditingInputField)
|
if ((!userIsEditingInputField) && Editor.instance.isShortcutsEnabled)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (Input.GetKeyDown(KeyCode.Space))
|
if (Input.GetKeyDown(KeyCode.Space))
|
||||||
|
|
Loading…
Reference in a new issue