From fbee49e7389f68a8e99385e287c560679c15e4a2 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 9 Oct 2023 12:02:58 -0400 Subject: [PATCH 1/4] remove unneeded using directives --- Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs | 1 - Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs | 1 - Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs | 1 - 3 files changed, 3 deletions(-) diff --git a/Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs b/Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs index fa48b85f..348b603f 100644 --- a/Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs +++ b/Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs @@ -1,7 +1,6 @@ using HeavenStudio.Util; using UnityEngine; using UnityEngine.UI; -using static UnityEditor.Experimental.GraphView.GraphView; namespace HeavenStudio.Editor.Track { diff --git a/Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs b/Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs index 023c9918..8566ebc6 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs @@ -5,7 +5,6 @@ using UnityEngine.Pool; using Jukebox; using System.Linq; -using static Jukebox.Legacy.Beatmap; namespace HeavenStudio.Editor.Track { diff --git a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs index 028327f0..e39e3664 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs @@ -6,7 +6,6 @@ using Jukebox; using TMPro; using System.Linq; using System.Collections.Generic; -using UnityEngine.Timeline; namespace HeavenStudio.Editor.Track { From 943e1299047186a9df61b9ff1b20964b0a82946a Mon Sep 17 00:00:00 2001 From: minenice55 Date: Tue, 10 Oct 2023 22:27:28 -0400 Subject: [PATCH 2/4] update Jukebox --- Packages/packages-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 82214068..b33517e8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,7 +15,7 @@ "com.unity.nuget.newtonsoft-json": "3.2.1", "jillejr.newtonsoft.json-for-unity.converters": "1.5.1" }, - "hash": "81dd6eb3c04980d603402a18de641b55bb875e15" + "hash": "33fa051b5a6954a365df23038085caca9a844cab" }, "com.tayx.graphy": { "version": "https://github.com/Tayx94/graphy.git", From cbb912772f281f41e31dd31f801b4801b9073125 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Sat, 14 Oct 2023 03:43:44 +0200 Subject: [PATCH 3/4] Reset Event Property Value + Right Click Dropdown API + Confirm Quit (#563) * * in name when changing value * Popup UI and quit basics * Quit button finalized, i think * fix * fixed * right click dropdown prefab * tryna getit to work * woohoo it works * value reset support for text areas * Color reset support * Enums and numbers supported * catchy tune fix --- .../Prefabs/Common/RightClickDropdown.prefab | 440 ++++++ .../Common/RightClickDropdown.prefab.meta | 7 + Assets/Scenes/Editor.unity | 1357 ++++++++++++++++- Assets/Scripts/Games/CatchyTune/CatchyTune.cs | 4 +- Assets/Scripts/GlobalGameManager.cs | 9 + Assets/Scripts/LevelEditor/Editor.cs | 18 + .../EventSelector/EventParameterManager.cs | 3 - .../EventSelector/EventPropertyPrefab.cs | 8 +- .../PropertyPrefabs/BoolPropertyPrefab.cs | 26 +- .../PropertyPrefabs/ColorPropertyPrefab.cs | 21 +- .../PropertyPrefabs/EnumPropertyPrefab.cs | 25 +- .../PropertyPrefabs/NumberPropertyPrefab.cs | 42 + .../PropertyPrefabs/StringPropertyPrefab.cs | 21 +- Assets/Scripts/UI/LeftClickTMP_Dropdown.cs | 17 + .../Scripts/UI/LeftClickTMP_Dropdown.cs.meta | 11 + Assets/Scripts/UI/RightClickDropdownObject.cs | 86 ++ .../UI/RightClickDropdownObject.cs.meta | 11 + 17 files changed, 2019 insertions(+), 87 deletions(-) create mode 100644 Assets/Resources/Prefabs/Common/RightClickDropdown.prefab create mode 100644 Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta create mode 100644 Assets/Scripts/UI/LeftClickTMP_Dropdown.cs create mode 100644 Assets/Scripts/UI/LeftClickTMP_Dropdown.cs.meta create mode 100644 Assets/Scripts/UI/RightClickDropdownObject.cs create mode 100644 Assets/Scripts/UI/RightClickDropdownObject.cs.meta diff --git a/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab new file mode 100644 index 00000000..372af683 --- /dev/null +++ b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab @@ -0,0 +1,440 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1069446853043438909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8384641343036272350} + - component: {fileID: 5892063193686803625} + m_Layer: 5 + m_Name: RightClickDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8384641343036272350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069446853043438909} + 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: 957154786397146521} + m_Father: {fileID: 0} + 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: 160, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5892063193686803625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069446853043438909} + m_CullTransparentMesh: 1 +--- !u!1 &2304285986814012682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187626560509100645} + - component: {fileID: 5548373997629452713} + - component: {fileID: 6009602095063593120} + 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 &1187626560509100645 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2304285986814012682} + 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: 6907741928570761706} + 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 &5548373997629452713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2304285986814012682} + m_CullTransparentMesh: 1 +--- !u!114 &6009602095063593120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2304285986814012682} + 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: Option + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2} + m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, 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: 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 &6068898642408905715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 957154786397146521} + - component: {fileID: 7068493347926292236} + - component: {fileID: 1343412359289404708} + - component: {fileID: 7980774898327048575} + - component: {fileID: 6566328886501881416} + m_Layer: 5 + m_Name: RightClickDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &957154786397146521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068898642408905715} + 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: 6907741928570761706} + m_Father: {fileID: 8384641343036272350} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -60} + m_SizeDelta: {x: 160, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7068493347926292236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068898642408905715} + m_CullTransparentMesh: 1 +--- !u!114 &1343412359289404708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068898642408905715} + 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: 0, g: 0, b: 0, 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: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + 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 &7980774898327048575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068898642408905715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 70 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &6566328886501881416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6068898642408905715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &8337216749316256214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6907741928570761706} + - component: {fileID: 154936598456533904} + - component: {fileID: 5155450919514646833} + - component: {fileID: 6604080304440396267} + - component: {fileID: 8296619418044947051} + m_Layer: 5 + m_Name: Option + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6907741928570761706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337216749316256214} + 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: 1187626560509100645} + m_Father: {fileID: 957154786397146521} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -17.5} + m_SizeDelta: {x: 160, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &154936598456533904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337216749316256214} + m_CullTransparentMesh: 1 +--- !u!114 &5155450919514646833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337216749316256214} + 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 &6604080304440396267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337216749316256214} + 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.4811321, g: 0.4811321, b: 0.4811321, a: 1} + m_PressedColor: {r: 0.2264151, g: 0.2264151, b: 0.2264151, 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: 5155450919514646833} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8296619418044947051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337216749316256214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] diff --git a/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta new file mode 100644 index 00000000..3cbc2d90 --- /dev/null +++ b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 56a45ac5cd0da2a4ab398d1a63e18d9f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 11eaddf0..346cd084 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -458,6 +458,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9435780} m_CullTransparentMesh: 1 +--- !u!1 &13368643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13368644} + - component: {fileID: 13368646} + - component: {fileID: 13368645} + m_Layer: 5 + m_Name: Inner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &13368644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13368643} + 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: 921541686} + 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: 0, y: 0} + m_SizeDelta: {x: 840, y: 480} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &13368645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13368643} + 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: 0.09019608, g: 0.09019608, b: 0.09019608, 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: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + 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 &13368646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13368643} + m_CullTransparentMesh: 1 --- !u!1 &19519744 GameObject: m_ObjectHideFlags: 0 @@ -2835,6 +2911,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101168579} m_CullTransparentMesh: 1 +--- !u!1 &107377386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 107377387} + - component: {fileID: 107377390} + - component: {fileID: 107377389} + - component: {fileID: 107377388} + m_Layer: 5 + m_Name: No + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &107377387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107377386} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 810916347} + m_Father: {fileID: 921541686} + m_RootOrder: 4 + 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: 170, y: -40} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &107377388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107377386} + 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.7921569, g: 0.7921569, b: 0.7921569, a: 1} + m_PressedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, 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: 107377389} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1423699437} + m_TargetAssemblyTypeName: HeavenStudio.Editor.Editor, Assembly-CSharp + m_MethodName: ShowQuitPopUp + m_Mode: 6 + 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 &107377389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107377386} + 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: 77703dfffd29ca6439338d6adfc62c9b, type: 3} + 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 &107377390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 107377386} + m_CullTransparentMesh: 1 --- !u!1 &110654309 GameObject: m_ObjectHideFlags: 0 @@ -4661,7 +4871,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 459.58514, y: -145} + m_AnchoredPosition: {x: 459.58514, y: -25} m_SizeDelta: {x: 879.1703, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &184838089 @@ -4679,7 +4889,7 @@ MonoBehaviour: caption: {fileID: 44496736} parameterManager: {fileID: 0} propertyName: - dropdown: {fileID: 9172948791891367920} + dropdown: {fileID: 9172948791891367936} --- !u!1 &191459085 GameObject: m_ObjectHideFlags: 0 @@ -4795,7 +5005,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -400, y: 0} + m_AnchoredPosition: {x: -399.99994, y: 0} m_SizeDelta: {x: -800.0001, y: 194} m_Pivot: {x: 0.5, y: 1} --- !u!114 &195260752 @@ -6405,6 +6615,7 @@ GameObject: m_Component: - component: {fileID: 279538358} - component: {fileID: 279538359} + - component: {fileID: 279538360} m_Layer: 5 m_Name: Toggle m_TagString: Untagged @@ -6481,6 +6692,37 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!114 &279538360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 279538357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 755586979} + m_TargetAssemblyTypeName: HeavenStudio.Editor.BoolPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &282924607 GameObject: m_ObjectHideFlags: 0 @@ -10135,7 +10377,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 177.66988, y: -60.01} + m_AnchoredPosition: {x: 177.66986, y: -60.01} m_SizeDelta: {x: 42, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &449176922 @@ -17565,6 +17807,7 @@ GameObject: - component: {fileID: 735918248} - component: {fileID: 735918247} - component: {fileID: 735918245} + - component: {fileID: 735918249} m_Layer: 5 m_Name: InputField (TMP) m_TagString: Untagged @@ -17734,6 +17977,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 735918244} m_CullTransparentMesh: 1 +--- !u!114 &735918249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735918244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 345301790} + m_TargetAssemblyTypeName: HeavenStudio.Editor.NumberPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &738028139 GameObject: m_ObjectHideFlags: 0 @@ -18106,6 +18380,7 @@ GameObject: m_Component: - component: {fileID: 749529047} - component: {fileID: 749529046} + - component: {fileID: 749529048} m_Layer: 5 m_Name: Slider m_TagString: Untagged @@ -18187,6 +18462,37 @@ RectTransform: m_AnchoredPosition: {x: 134.5, y: 0.0000097752} m_SizeDelta: {x: -269, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &749529048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749529045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 345301790} + m_TargetAssemblyTypeName: HeavenStudio.Editor.NumberPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &755586977 GameObject: m_ObjectHideFlags: 0 @@ -19422,6 +19728,143 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -32, y: -32} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &810916346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 810916347} + - component: {fileID: 810916349} + - component: {fileID: 810916348} + 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 &810916347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810916346} + 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: 107377387} + 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!114 &810916348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810916346} + 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: No + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2} + m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, 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: 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!222 &810916349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810916346} + m_CullTransparentMesh: 1 --- !u!1 &811580414 GameObject: m_ObjectHideFlags: 0 @@ -20896,8 +21339,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 1 - m_Size: 0.9999938 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -21214,6 +21657,57 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921242772} m_CullTransparentMesh: 1 +--- !u!1 &921541685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 921541686} + - component: {fileID: 921541688} + m_Layer: 5 + m_Name: ConfirmQuit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &921541686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921541685} + 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: 1520666589} + - {fileID: 1023579054} + - {fileID: 13368644} + - {fileID: 2013645875} + - {fileID: 107377387} + - {fileID: 1643615741} + m_Father: {fileID: 1791483803} + m_RootOrder: 12 + 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: 700, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &921541688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921541685} + m_CullTransparentMesh: 1 --- !u!1 &932211466 GameObject: m_ObjectHideFlags: 0 @@ -22973,6 +23467,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1022970659} m_CullTransparentMesh: 1 +--- !u!1 &1023579053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023579054} + - component: {fileID: 1023579056} + - component: {fileID: 1023579055} + m_Layer: 5 + m_Name: Outer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1023579054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023579053} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.04, y: 1.07, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 921541686} + 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: 0, y: 0} + m_SizeDelta: {x: 840, y: 480} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1023579055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023579053} + 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: 0.20392157, g: 0.20392157, b: 0.20392157, 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: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3} + 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 &1023579056 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023579053} + m_CullTransparentMesh: 1 --- !u!1 &1024706792 GameObject: m_ObjectHideFlags: 0 @@ -25541,7 +26111,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: 162.32596} + m_AnchoredPosition: {x: 0, y: 199.06122} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -26031,6 +26601,7 @@ GameObject: - component: {fileID: 1182082597} - component: {fileID: 1182082596} - component: {fileID: 1182082595} + - component: {fileID: 1182082598} m_Layer: 5 m_Name: InputField (TMP) m_TagString: Untagged @@ -26200,6 +26771,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1182082593} m_CullTransparentMesh: 1 +--- !u!114 &1182082598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182082593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 396879234} + m_TargetAssemblyTypeName: HeavenStudio.Editor.NumberPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &1183003085 GameObject: m_ObjectHideFlags: 0 @@ -30572,6 +31174,9 @@ MonoBehaviour: SortFavoritesBTN: {fileID: 1436105795} SortChronologicBTN: {fileID: 345154594} SearchBar: {fileID: 320483642} + _confirmQuitMain: {fileID: 921541685} + _quitYes: {fileID: 1643615742} + _quitNo: {fileID: 107377388} EditorThemeBTN: {fileID: 0} EditorSettingsBTN: {fileID: 619618400} DebugHolder: {fileID: 1331943928} @@ -30590,6 +31195,7 @@ MonoBehaviour: inAuthorativeMenu: 0 isCursorEnabled: 1 isDiscordEnabled: 1 + ShouldQuit: 0 --- !u!114 &1423699438 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30707,7 +31313,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -400, y: 0} + m_AnchoredPosition: {x: -399.99994, y: 0} m_SizeDelta: {x: -800.0001, y: 194} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1426168094 @@ -30995,7 +31601,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 459.58514, y: -185} + m_AnchoredPosition: {x: 459.58514, y: -25} m_SizeDelta: {x: 879.1703, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1443721748 @@ -32677,6 +33283,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516873909} m_CullTransparentMesh: 1 +--- !u!1 &1520666588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1520666589} + - component: {fileID: 1520666591} + - component: {fileID: 1520666590} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1520666589 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 921541686} + 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: 700, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1520666590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + 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: 0, g: 0, b: 0, a: 0.6156863} + 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: 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 &1520666591 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520666588} + m_CullTransparentMesh: 1 --- !u!1 &1522319055 GameObject: m_ObjectHideFlags: 0 @@ -32785,7 +33467,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -33462,6 +34144,7 @@ GameObject: - component: {fileID: 1535224919} - component: {fileID: 1535224918} - component: {fileID: 1535224921} + - component: {fileID: 1535224922} m_Layer: 5 m_Name: ColorBTN m_TagString: Untagged @@ -33586,6 +34269,37 @@ MonoBehaviour: previewGraphic: {fileID: 1535224919} colorPicker: {fileID: 1489888672} hex: {fileID: 426555699} +--- !u!114 &1535224922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535224916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1443721748} + m_TargetAssemblyTypeName: HeavenStudio.Editor.ColorPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &1536668598 GameObject: m_ObjectHideFlags: 0 @@ -33808,7 +34522,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 @@ -34587,8 +35301,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1220118245} m_HandleRect: {fileID: 1220118244} m_Direction: 2 - m_Value: 1.0000017 - m_Size: 0.9467054 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -34974,6 +35688,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 23} m_SizeDelta: {x: 0, y: -46} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1643615740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1643615741} + - component: {fileID: 1643615744} + - component: {fileID: 1643615743} + - component: {fileID: 1643615742} + m_Layer: 5 + m_Name: Yes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1643615741 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643615740} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1993461017} + m_Father: {fileID: 921541686} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -170, y: -40} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1643615742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643615740} + 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.7921569, g: 0.7921569, b: 0.7921569, a: 1} + m_PressedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, 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: 1643615743} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1423699437} + m_TargetAssemblyTypeName: HeavenStudio.Editor.Editor, Assembly-CSharp + m_MethodName: QuitGame + 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 &1643615743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643615740} + 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: 77703dfffd29ca6439338d6adfc62c9b, type: 3} + 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 &1643615744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643615740} + m_CullTransparentMesh: 1 --- !u!1 &1647324172 GameObject: m_ObjectHideFlags: 0 @@ -36921,6 +37769,7 @@ GameObject: - component: {fileID: 1776034730} - component: {fileID: 1776034729} - component: {fileID: 1776034728} + - component: {fileID: 1776034731} m_Layer: 5 m_Name: InputField (TMP) m_TagString: Untagged @@ -37088,6 +37937,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1776034726} m_CullTransparentMesh: 1 +--- !u!114 &1776034731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776034726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1671827688} + m_TargetAssemblyTypeName: HeavenStudio.Editor.StringPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &1776319212 GameObject: m_ObjectHideFlags: 0 @@ -37523,6 +38403,7 @@ RectTransform: - {fileID: 1336470762} - {fileID: 1063174879} - {fileID: 1946344931} + - {fileID: 921541686} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -41164,6 +42045,143 @@ RectTransform: m_AnchoredPosition: {x: -37.75, y: -13.5} m_SizeDelta: {x: -84.5, y: -37} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1993461016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1993461017} + - component: {fileID: 1993461019} + - component: {fileID: 1993461018} + 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 &1993461017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993461016} + 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: 1643615741} + 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!114 &1993461018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993461016} + 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: Yes + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2} + m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, 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: 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!222 &1993461019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993461016} + m_CullTransparentMesh: 1 --- !u!1 &2003035385 GameObject: m_ObjectHideFlags: 0 @@ -41322,6 +42340,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2003035385} m_CullTransparentMesh: 1 +--- !u!1 &2013645874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013645875} + - component: {fileID: 2013645877} + - component: {fileID: 2013645876} + m_Layer: 5 + m_Name: YouSure? + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2013645875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013645874} + 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: 921541686} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -72.5} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &2013645876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013645874} + 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: Are you sure that you want to quit? + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2} + m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: -232.17368, y: 0, z: -232.17355, 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 &2013645877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013645874} + m_CullTransparentMesh: 1 --- !u!1 &2027507890 GameObject: m_ObjectHideFlags: 0 @@ -42223,6 +43378,7 @@ GameObject: m_Component: - component: {fileID: 2067224778} - component: {fileID: 2067224779} + - component: {fileID: 2067224780} m_Layer: 5 m_Name: Slider m_TagString: Untagged @@ -42304,6 +43460,37 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &2067224780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2067224777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 396879234} + m_TargetAssemblyTypeName: HeavenStudio.Editor.NumberPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} --- !u!1 &2067805742 GameObject: m_ObjectHideFlags: 0 @@ -45023,61 +46210,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &9172948791891367920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9172948791891367934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, 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.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: 9172948791891367923} - m_Template: {fileID: 9172948790492497235} - m_CaptionText: {fileID: 9172948791664681353} - m_CaptionImage: {fileID: 0} - m_Placeholder: {fileID: 0} - m_ItemText: {fileID: 9172948790358451334} - m_ItemImage: {fileID: 0} - m_Value: 0 - m_MultiSelect: 0 - m_Options: - m_Options: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_AlphaFadeSpeed: 0 --- !u!224 &9172948791891367921 RectTransform: m_ObjectHideFlags: 0 @@ -45150,7 +46282,8 @@ GameObject: - component: {fileID: 9172948791891367921} - component: {fileID: 9172948791891367922} - component: {fileID: 9172948791891367923} - - component: {fileID: 9172948791891367920} + - component: {fileID: 9172948791891367936} + - component: {fileID: 9172948791891367935} m_Layer: 5 m_Name: Dropdown m_TagString: Untagged @@ -45158,6 +46291,92 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &9172948791891367935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9172948791891367934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4972b7ea15fb7943ad12ed39e229140, type: 3} + m_Name: + m_EditorClassIdentifier: + _events: + - name: Reset + action: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 184838089} + m_TargetAssemblyTypeName: HeavenStudio.Editor.EnumPropertyPrefab, Assembly-CSharp + m_MethodName: ResetValue + 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 + _masterTrans: {fileID: 1791483803} + _dropDown: {fileID: 8384641343036272350, guid: 56a45ac5cd0da2a4ab398d1a63e18d9f, type: 3} +--- !u!114 &9172948791891367936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9172948791891367934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1c3bece73b33f2f4b9c68a0c2413e42b, 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.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: 9172948791891367923} + m_Template: {fileID: 9172948790492497235} + m_CaptionText: {fileID: 9172948791664681353} + m_CaptionImage: {fileID: 0} + m_Placeholder: {fileID: 0} + m_ItemText: {fileID: 9172948790358451334} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_MultiSelect: 0 + m_Options: + m_Options: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_AlphaFadeSpeed: 0 --- !u!1 &9172948792157168128 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs index 35060ba5..ba491726 100644 --- a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs +++ b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs @@ -24,7 +24,7 @@ namespace HeavenStudio.Games.Loaders { new Param.CollapseParam(x => (bool)x, new string[] { "endSmile" }) }), - new Param("endSmile", new EntityTypes.Float(2, 100), "End Smile Beat", "How many beats after the catch should the smile end?") + new Param("endSmile", new EntityTypes.Float(2, 100, 2), "End Smile Beat", "How many beats after the catch should the smile end?") }, preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], false, e["endSmile"]); }, }, @@ -39,7 +39,7 @@ namespace HeavenStudio.Games.Loaders { new Param.CollapseParam(x => (bool)x, new string[] { "endSmile" }) }), - new Param("endSmile", new EntityTypes.Float(2, 100), "End Smile Beat", "How many beats after the catch should the smile end?") + new Param("endSmile", new EntityTypes.Float(2, 100, 2), "End Smile Beat", "How many beats after the catch should the smile end?") }, preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], true, e["endSmile"]); }, }, diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index 8df0874c..8c255500 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -76,6 +76,8 @@ namespace HeavenStudio [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] public static void Init() { + Application.wantsToQuit += WantsToQuit; + BasicCheck(); Minigames.InitPreprocessor(); @@ -384,5 +386,12 @@ namespace HeavenStudio Debug.Log("Clearing RIQ Cache..."); Jukebox.RiqFileHandler.ClearCache(); } + + private static bool WantsToQuit() + { + if (SceneManager.GetActiveScene().name != "Editor") return true; + Editor.Editor.instance.ShowQuitPopUp(true); + return Editor.Editor.instance.ShouldQuit; + } } } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index c98bb892..e6988761 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -55,6 +55,11 @@ namespace HeavenStudio.Editor [SerializeField] private Button SortChronologicBTN; [SerializeField] private TMP_InputField SearchBar; + [Header("Confirm Quit")] + [SerializeField] private GameObject _confirmQuitMain; + [SerializeField] private Button _quitYes; + [SerializeField] private Button _quitNo; + [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button EditorSettingsBTN; @@ -144,6 +149,19 @@ namespace HeavenStudio.Editor (minigame.fxOnly ? ggs.fxActive : ggs.mgsActive).Add(GameIcon_.GetComponent()); } + public void ShowQuitPopUp(bool show) + { + _confirmQuitMain.SetActive(show); + } + + public bool ShouldQuit = false; + + public void QuitGame() + { + ShouldQuit = true; + Application.Quit(); + } + public void LateUpdate() { if (lastScreenSize != new Vector2(UnityEngine.Screen.width, UnityEngine.Screen.height)) diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs index ab154923..f6460126 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs @@ -105,11 +105,8 @@ namespace HeavenStudio.Editor ePrefabs.Add(propertyName, AddParam(propertyName, param, caption, tooltip)); } - Debug.Log(action.parameters); - foreach (var p in action.parameters) { - Debug.Log(p.collapseParams); if (p.collapseParams == null || p.collapseParams.Count == 0) continue; EventPropertyPrefab input = ePrefabs[p.propertyName].GetComponent(); foreach (var c in p.collapseParams) diff --git a/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs index 606baf30..551db89c 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs @@ -14,6 +14,7 @@ namespace HeavenStudio.Editor public class EventPropertyPrefab : MonoBehaviour { public TMP_Text caption; + protected string _captionText; public EventParameterManager parameterManager; public string propertyName; public List propertyCollapses = new List(); @@ -25,7 +26,10 @@ namespace HeavenStudio.Editor { this.parameterManager = EventParameterManager.instance; this.propertyName = propertyName; - this.caption.text = caption; + + _captionText = caption; + + this.caption.text = _captionText; } public void UpdateCollapse(object type) @@ -34,7 +38,7 @@ namespace HeavenStudio.Editor { foreach (var c in p.collapseables) { - c.SetActive(p.collapseOn(type) && gameObject.activeSelf); + if (c != null) c.SetActive(p.collapseOn(type) && gameObject.activeSelf); } } } diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs index fa2d0e5e..7789748f 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs @@ -18,18 +18,36 @@ namespace HeavenStudio.Editor [Space(10)] public Toggle toggle; + private bool _defaultValue; + new public void SetProperties(string propertyName, object type, string caption) { InitProperties(propertyName, caption); - // ' (bool)type ' always results in false + _defaultValue = (bool)type; toggle.isOn = Convert.ToBoolean(parameterManager.entity[propertyName]); toggle.onValueChanged.AddListener( - _ => parameterManager.entity[propertyName] = toggle.isOn + _ => + { + parameterManager.entity[propertyName] = toggle.isOn; + if (toggle.isOn != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } + } ); } + public void ResetValue() + { + toggle.isOn = _defaultValue; + } + public override void SetCollapses(object type) { toggle.onValueChanged.AddListener( @@ -37,9 +55,5 @@ namespace HeavenStudio.Editor ); UpdateCollapse(toggle.isOn); } - - private void Update() - { - } } } \ No newline at end of file diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs index 1e36a1ee..4e69b914 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs @@ -21,12 +21,26 @@ namespace HeavenStudio.Editor public bool colorTableActive; public ColorPreview colorPreview; + private Color _defaultColor; + new public void SetProperties(string propertyName, object type, string caption) { InitProperties(propertyName, caption); - colorPreview.colorPicker.onColorChanged += _ => + colorPreview.colorPicker.onColorChanged += _ => + { parameterManager.entity[propertyName] = colorPreview.colorPicker.color; + if (colorPreview.colorPicker.color != _defaultColor) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } + }; + + _defaultColor = (Color)type; Color paramCol = parameterManager.entity[propertyName]; @@ -43,6 +57,11 @@ namespace HeavenStudio.Editor ColorTable.gameObject.SetActive(false); } + public void ResetValue() + { + colorPreview.ChangeColor(_defaultColor); + } + public override void SetCollapses(object type) { colorPreview.colorPicker.onColorChanged += _ => UpdateCollapse(colorPreview.colorPicker.color); diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs index f97ee098..2a604c6a 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs @@ -9,6 +9,7 @@ using Starpelly; using HeavenStudio.Util; using HeavenStudio.Editor; +using HeavenStudio.Common; namespace HeavenStudio.Editor { @@ -16,9 +17,11 @@ namespace HeavenStudio.Editor { [Header("Dropdown")] [Space(10)] - public TMP_Dropdown dropdown; + public LeftClickTMP_Dropdown dropdown; private Array enumVals; + private int _defaultValue; + private bool openedDropdown = false; new public void SetProperties(string propertyName, object type, string caption) @@ -28,6 +31,7 @@ namespace HeavenStudio.Editor var enumType = type.GetType(); enumVals = Enum.GetValues(enumType); var enumNames = Enum.GetNames(enumType).ToList(); + _defaultValue = (int)type; // Can we assume non-holey enum? // If we can we can simplify to dropdown.value = (int) parameterManager.entity[propertyName] @@ -40,11 +44,26 @@ namespace HeavenStudio.Editor dropdown.AddOptions(enumNames); dropdown.value = selected; - dropdown.onValueChanged.AddListener(_ => - parameterManager.entity[propertyName] = (int) enumVals.GetValue(dropdown.value) + dropdown.onValueChanged.AddListener(_ => + { + parameterManager.entity[propertyName] = (int)enumVals.GetValue(dropdown.value); + if ((int)enumVals.GetValue(dropdown.value) != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } + } ); } + public void ResetValue() + { + dropdown.value = _defaultValue; + } + public override void SetCollapses(object type) { dropdown.onValueChanged.AddListener(_ => UpdateCollapse((int)enumVals.GetValue(dropdown.value))); diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs index 15cdb6f2..10e9b636 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs @@ -9,6 +9,7 @@ using Starpelly; using HeavenStudio.Util; using HeavenStudio.Editor; +using static HeavenStudio.EntityTypes; namespace HeavenStudio.Editor { @@ -19,6 +20,8 @@ namespace HeavenStudio.Editor public Slider slider; public TMP_InputField inputField; + private float _defaultValue; + new public void SetProperties(string propertyName, object type, string caption) { InitProperties(propertyName, caption); @@ -28,6 +31,7 @@ namespace HeavenStudio.Editor case EntityTypes.Integer integer: slider.minValue = integer.min; slider.maxValue = integer.max; + _defaultValue = integer.val; slider.wholeNumbers = true; slider.value = Convert.ToSingle(parameterManager.entity[propertyName]); @@ -38,6 +42,14 @@ namespace HeavenStudio.Editor { inputField.text = slider.value.ToString(); parameterManager.entity[propertyName] = (int) slider.value; + if (slider.value != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } } ); @@ -52,6 +64,14 @@ namespace HeavenStudio.Editor slider.value = Convert.ToSingle(inputField.text); parameterManager.entity[propertyName] = (int) slider.value; Editor.instance.editingInputField = false; + if (slider.value != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } } ); break; @@ -59,6 +79,7 @@ namespace HeavenStudio.Editor case EntityTypes.Float fl: slider.minValue = fl.min; slider.maxValue = fl.max; + _defaultValue = fl.val; slider.value = Convert.ToSingle(parameterManager.entity[propertyName]); inputField.text = slider.value.ToString("G"); @@ -69,6 +90,14 @@ namespace HeavenStudio.Editor var newValue = (float) Math.Round(slider.value, 4); inputField.text = newValue.ToString("G"); parameterManager.entity[propertyName] = newValue; + if (newValue != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } } ); @@ -83,6 +112,14 @@ namespace HeavenStudio.Editor slider.value = (float) Math.Round(Convert.ToSingle(inputField.text), 4); parameterManager.entity[propertyName] = slider.value; Editor.instance.editingInputField = false; + if (slider.value != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } } ); break; @@ -94,6 +131,11 @@ namespace HeavenStudio.Editor } } + public void ResetValue() + { + slider.value = _defaultValue; + } + public override void SetCollapses(object type) { switch (type) diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs index ecae26ce..de5283ca 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs @@ -9,6 +9,7 @@ using Starpelly; using HeavenStudio.Util; using HeavenStudio.Editor; +using UnityEngine.UIElements; namespace HeavenStudio.Editor { @@ -18,10 +19,14 @@ namespace HeavenStudio.Editor [Space(10)] public TMP_InputField inputFieldString; + private string _defaultValue; + new public void SetProperties(string propertyName, object type, string caption) { InitProperties(propertyName, caption); + _defaultValue = (string)type; + inputFieldString.text = (string) parameterManager.entity[propertyName]; inputFieldString.onSelect.AddListener( @@ -30,10 +35,19 @@ namespace HeavenStudio.Editor ); inputFieldString.onValueChanged.AddListener( _ => - {; + { parameterManager.entity[propertyName] = inputFieldString.text; + if (inputFieldString.text != _defaultValue) + { + this.caption.text = _captionText + "*"; + } + else + { + this.caption.text = _captionText; + } } ); + inputFieldString.onEndEdit.AddListener( _ => {; @@ -42,6 +56,11 @@ namespace HeavenStudio.Editor ); } + public void ResetValue() + { + inputFieldString.text = _defaultValue; + } + public override void SetCollapses(object type) { inputFieldString.onValueChanged.AddListener( diff --git a/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs b/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs new file mode 100644 index 00000000..551cd542 --- /dev/null +++ b/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine.EventSystems; + +namespace HeavenStudio.Common +{ + public class LeftClickTMP_Dropdown : TMP_Dropdown + { + public override void OnPointerClick(PointerEventData eventData) + { + if (eventData.button == PointerEventData.InputButton.Right) return; + base.OnPointerClick(eventData); + } + } +} + diff --git a/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs.meta b/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs.meta new file mode 100644 index 00000000..59b56947 --- /dev/null +++ b/Assets/Scripts/UI/LeftClickTMP_Dropdown.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1c3bece73b33f2f4b9c68a0c2413e42b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/RightClickDropdownObject.cs b/Assets/Scripts/UI/RightClickDropdownObject.cs new file mode 100644 index 00000000..de95cf42 --- /dev/null +++ b/Assets/Scripts/UI/RightClickDropdownObject.cs @@ -0,0 +1,86 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace HeavenStudio.Common +{ + public class RightClickDropdownObject : MonoBehaviour, IPointerClickHandler + { + [SerializeField] private Event[] _events; + [Header("Components")] + [SerializeField] private Transform _masterTrans; + [SerializeField] private RectTransform _dropDown; + + private Button _dropDownButton; + + private RectTransform _currentDropDown; + + private bool _beingHovered; + + private void Awake() + { + _dropDownButton = _dropDown.GetChild(0).GetChild(0).GetComponent