diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 88b74c77a..d473f76b0 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -20432,8 +20432,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 1 - m_Size: 0.99799865 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25001,7 +25001,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: 120.08144} + m_AnchoredPosition: {x: 0, y: 121.30615} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -28447,6 +28447,11 @@ RectTransform: m_AnchoredPosition: {x: -1, y: 0} m_SizeDelta: {x: -26, y: -28} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1331943928 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 177638, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + m_PrefabInstance: {fileID: 2106389009} + m_PrefabAsset: {fileID: 0} --- !u!1 &1332021415 GameObject: m_ObjectHideFlags: 0 @@ -29872,6 +29877,7 @@ MonoBehaviour: SearchBar: {fileID: 320483642} EditorThemeBTN: {fileID: 0} EditorSettingsBTN: {fileID: 619618400} + DebugHolder: {fileID: 1331943928} Dialogs: - {fileID: 1962376965} - {fileID: 683816223} @@ -33938,8 +33944,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1220118245} m_HandleRect: {fileID: 1220118244} m_Direction: 2 - m_Value: 0.0000003242795 - m_Size: 0 + m_Value: 0.00000022176499 + m_Size: 0.60682213 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -37408,7 +37414,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: 0, y: 141.16324} + m_AnchoredPosition: {x: -0.000030517578, y: 137.61221} m_SizeDelta: {x: 100, y: 350} m_Pivot: {x: 0, y: 1} --- !u!114 &1852819574 @@ -41948,6 +41954,135 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098678239} m_CullTransparentMesh: 1 +--- !u!1001 &2106389009 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 177638, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_Name + value: '[Graphy]' + objectReference: {fileID: 0} + - target: {fileID: 177638, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6658570366365034085, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6760672456574371718, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} --- !u!1 &2107887118 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs index 6bf045267..6a258c057 100644 --- a/Assets/Scripts/AppInfo.cs +++ b/Assets/Scripts/AppInfo.cs @@ -1,8 +1,8 @@ using System; public static class AppInfo { - public const string Version = "0.0.989"; - public static readonly DateTime Date = new DateTime(2023, 09, 25, 06, 36, 21, 213, DateTimeKind.Utc); + public const string Version = "0.0.991"; + public static readonly DateTime Date = new DateTime(2023, 09, 25, 15, 04, 38, 319, DateTimeKind.Utc); } diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index a9f62e3d5..d9d7012cb 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -66,6 +66,8 @@ namespace HeavenStudio.Editor [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button EditorSettingsBTN; + [SerializeField] private GameObject DebugHolder; + [Header("Dialogs")] [SerializeField] private Dialog[] Dialogs; @@ -208,6 +210,11 @@ namespace HeavenStudio.Editor SaveRemix(false); } } + + if (Input.GetKeyDown(KeyCode.F12)) + { + DebugHolder.gameObject.SetActive(!DebugHolder.activeInHierarchy); + } } #endregion diff --git a/Packages/manifest.json b/Packages/manifest.json index fe20cc3c2..b7a706181 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,8 @@ { "dependencies": { + "com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git", "com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox", + "com.tayx.graphy": "https://github.com/Tayx94/graphy.git", "com.unity.2d.sprite": "1.0.0", "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", "com.unity.collab-proxy": "2.0.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a93a751bf..32d9fc562 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.nobi.roundedcorners": { + "version": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "88623988179d35ce2da93b7740d6e7be59fcc971" + }, "com.rheavenstudio.jukebox": { "version": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox", "depth": 0, @@ -10,6 +17,13 @@ }, "hash": "4f75a6f71362da8c873da1e85728757213ad9017" }, + "com.tayx.graphy": { + "version": "https://github.com/Tayx94/graphy.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "7b634c383ae631e7f4efaf08235c2d829a7d3ecc" + }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bc28a5fce..6c6cb391d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.0.989 + bundleVersion: 0.0.991 preloadedAssets: - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3} metroInputSource: 0 @@ -158,11 +158,11 @@ PlayerSettings: applicationIdentifier: Standalone: com.RHeavenStudio.Heaven-Studio buildNumber: - Standalone: 989 + Standalone: 991 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 989 + AndroidBundleVersionCode: 991 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1