From 7e81842644a85855d68f02d90a3646c3e89e9a74 Mon Sep 17 00:00:00 2001 From: wookywok <62037083+wookywok@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:37:10 -0500 Subject: [PATCH] Updated Screen Jump default --- Assets/Scenes/Editor.unity | 40 ++++---- Assets/Scripts/Minigames.cs | 96 ++++++++++--------- Assets/_TerrainAutoUpgrade.meta | 8 -- ...ss01ground01Nb2e386cdaf7e7ee2.terrainlayer | 22 ----- ...round01Nb2e386cdaf7e7ee2.terrainlayer.meta | 8 -- ...ss01ground01Nb3407d0e55802f81.terrainlayer | 22 ----- ...round01Nb3407d0e55802f81.terrainlayer.meta | 8 -- ...Generator.Editor.ProjectSettingsData.asset | 2 + 8 files changed, 71 insertions(+), 135 deletions(-) delete mode 100644 Assets/_TerrainAutoUpgrade.meta delete mode 100644 Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer delete mode 100644 Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer.meta delete mode 100644 Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer delete mode 100644 Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer.meta diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 278091734..d053c82f1 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -551,9 +551,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &9435782 @@ -4172,9 +4172,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 32, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &121871281 @@ -4396,9 +4396,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 72, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &129013734 @@ -4532,9 +4532,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &151246938 @@ -26847,7 +26847,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -32704,7 +32704,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: 199.06122} + m_AnchoredPosition: {x: 0, y: 199.06119} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -37247,9 +37247,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1345846031 @@ -46873,9 +46873,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -21} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1783491359 diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 7b6c98458..bda685143 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -1097,6 +1097,54 @@ namespace HeavenStudio } }, + new GameAction("colorGrading", "Color Grading") + { + resizable = true, + parameters = new() + { + new("tempStart", new EntityTypes.Float(-100f, 100f), "Start Temperature", "Set the temperature at the start of the event."), + new("tempEnd", new EntityTypes.Float(-100f, 100f), "End Temperature", "Set the temperature at the end of the event."), + + new("tintStart", new EntityTypes.Float(-100f, 100f), "Start Tint", "Set the tint at the start of the event."), + new("tintEnd", new EntityTypes.Float(-100f, 100f), "End Tint", "Set the tint at the end of the event."), + + new("colorStart", Color.white, "Start Color Filter", "Set the color filter at the start of the event."), + new("colorEnd", Color.white, "End Color Filter", "Set the color filter at the end of the event."), + + new("hueShiftStart", new EntityTypes.Float(-180f, 180f), "Start Hue Shift", "Set the hue shift at the start of the event."), + new("hueShiftEnd", new EntityTypes.Float(-180f, 180f), "End Hue Shift", "Set the hue shift at the end of the event."), + + new("satStart", new EntityTypes.Float(-100f, 100f), "Start Saturation", "Set the saturation at the start of the event."), + new("satEnd", new EntityTypes.Float(-100f, 100f), "End Saturation", "Set the saturation at the end of the event."), + + new("brightStart", new EntityTypes.Float(-100f, 100f), "Start Brightness", "Set the brightness at the start of the event."), + new("brightEnd", new EntityTypes.Float(-100f, 100f), "End Brightness", "Set the brightness at the end of the event."), + + new("conStart", new EntityTypes.Float(-100f, 100f), "Start Contrast", "Set the contrast at the start of the event."), + new("conEnd", new EntityTypes.Float(-100f, 100f), "End Contrast", "Set the contrast at the end of the event."), + + new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() + { + new((x, y) => (Util.EasingFunction.Ease)x != Util.EasingFunction.Ease.Instant, new string[] { "tempStart", "tintStart", "colorStart", "hueShiftStart", "satStart", "brightStart", "conStart" }) + }), + } + }, + + new GameAction("gaussBlur", "Gaussian Blur") + { + resizable = true, + parameters = new() + { + new("intenStart", new EntityTypes.Float(0f, 5f, 0f), "Start Intensity", "Set the intensity at the start of the event."), + new("intenEnd", new EntityTypes.Float(0f, 5f, 1f), "End Intensity", "Set the intensity at the end of the event."), + + new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() + { + new((x, y) => (Util.EasingFunction.Ease)x != Util.EasingFunction.Ease.Linear, new string[] { "intenStart" }) + }), + } + }, + new GameAction("retroTv", "Retro TV") { resizable = true, @@ -1163,7 +1211,7 @@ namespace HeavenStudio parameters = new() { new("intenStart", new EntityTypes.Float(0f, 1f, 0f), "Start Intensity", "Set the intensity at the start of the event."), - new("intenEnd", new EntityTypes.Float(0f, 1f, 0.05f), "End Intensity", "Set the intensity at the end of the event."), + new("intenEnd", new EntityTypes.Float(0f, 1f, 0.01f), "End Intensity", "Set the intensity at the end of the event."), new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() { @@ -1198,39 +1246,6 @@ namespace HeavenStudio } }, - - new GameAction("colorGrading", "Color Grading") - { - resizable = true, - parameters = new() - { - new("tempStart", new EntityTypes.Float(-100f, 100f), "Start Temperature", "Set the temperature at the start of the event."), - new("tempEnd", new EntityTypes.Float(-100f, 100f), "End Temperature", "Set the temperature at the end of the event."), - - new("tintStart", new EntityTypes.Float(-100f, 100f), "Start Tint", "Set the tint at the start of the event."), - new("tintEnd", new EntityTypes.Float(-100f, 100f), "End Tint", "Set the tint at the end of the event."), - - new("colorStart", Color.white, "Start Color Filter", "Set the color filter at the start of the event."), - new("colorEnd", Color.white, "End Color Filter", "Set the color filter at the end of the event."), - - new("hueShiftStart", new EntityTypes.Float(-180f, 180f), "Start Hue Shift", "Set the hue shift at the start of the event."), - new("hueShiftEnd", new EntityTypes.Float(-180f, 180f), "End Hue Shift", "Set the hue shift at the end of the event."), - - new("satStart", new EntityTypes.Float(-100f, 100f), "Start Saturation", "Set the saturation at the start of the event."), - new("satEnd", new EntityTypes.Float(-100f, 100f), "End Saturation", "Set the saturation at the end of the event."), - - new("brightStart", new EntityTypes.Float(-100f, 100f), "Start Brightness", "Set the brightness at the start of the event."), - new("brightEnd", new EntityTypes.Float(-100f, 100f), "End Brightness", "Set the brightness at the end of the event."), - - new("conStart", new EntityTypes.Float(-100f, 100f), "Start Contrast", "Set the contrast at the start of the event."), - new("conEnd", new EntityTypes.Float(-100f, 100f), "End Contrast", "Set the contrast at the end of the event."), - - new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() - { - new((x, y) => (Util.EasingFunction.Ease)x != Util.EasingFunction.Ease.Instant, new string[] { "tempStart", "tintStart", "colorStart", "hueShiftStart", "satStart", "brightStart", "conStart" }) - }), - } - }, new GameAction("screenTiling", "Tile Screen") { @@ -1265,20 +1280,7 @@ namespace HeavenStudio } }, - new GameAction("gaussBlur", "Gaussian Blur") - { - resizable = true, - parameters = new() - { - new("intenStart", new EntityTypes.Float(0f, 5f, 0f), "Start Intensity", "Set the intensity at the start of the event."), - new("intenEnd", new EntityTypes.Float(0f, 5f, 1f), "End Intensity", "Set the intensity at the end of the event."), - new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.", new() - { - new((x, y) => (Util.EasingFunction.Ease)x != Util.EasingFunction.Ease.Linear, new string[] { "intenStart" }) - }), - } - }, }), new Minigame("advanced", "Advanced", "", false, true, new List() diff --git a/Assets/_TerrainAutoUpgrade.meta b/Assets/_TerrainAutoUpgrade.meta deleted file mode 100644 index d3ace7ae3..000000000 --- a/Assets/_TerrainAutoUpgrade.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67f18e6746967c846a199cc58e329016 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer deleted file mode 100644 index 04e7e4910..000000000 --- a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: layer_groundgrass01ground01Nb2e386cdaf7e7ee2 - m_DiffuseTexture: {fileID: 2800000, guid: cc7345aa189037b4eadd014712552d5e, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: 45dc0631d6a6bc14bb016b26372021e3, type: 3} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 3, y: 3} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0.67 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer.meta deleted file mode 100644 index 2a20aabb5..000000000 --- a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb2e386cdaf7e7ee2.terrainlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1509fe35fed39fb4f86ff3a6a65fe9dd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8574412962073106934 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer deleted file mode 100644 index fec61c2de..000000000 --- a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: layer_groundgrass01ground01Nb3407d0e55802f81 - m_DiffuseTexture: {fileID: 2800000, guid: cc7345aa189037b4eadd014712552d5e, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: 45dc0631d6a6bc14bb016b26372021e3, type: 3} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 2, y: 2} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer.meta deleted file mode 100644 index 3432f69ef..000000000 --- a/Assets/_TerrainAutoUpgrade/layer_groundgrass01ground01Nb3407d0e55802f81.terrainlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a503b21b4c6f4df4ca83f542ae47e7db -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8574412962073106934 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 1264bf817..263776bd9 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -19,5 +19,7 @@ MonoBehaviour: ImportedScriptPaths: - Assets/Scripts/PostProcessingVFX.cs - Assets/Scripts/Minigames.cs + - Assets/Scripts/Games/PowerCalligraphy/Writing.cs + - Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []