diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 6880f9043..233355b3f 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -13793,6 +13793,10 @@ PrefabInstance: propertyPath: m_RaycastTarget value: 0 objectReference: {fileID: 0} + - target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3} + propertyPath: parentView + value: + objectReference: {fileID: 631525714} - target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3} propertyPath: letterboxMask value: @@ -13887,6 +13891,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6052331674369862802, guid: 720073bc7682b1441bece7116681f72c, type: 3} m_PrefabInstance: {fileID: 631525709} m_PrefabAsset: {fileID: 0} +--- !u!224 &631525714 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2077856143944097172, guid: 720073bc7682b1441bece7116681f72c, type: 3} + m_PrefabInstance: {fileID: 631525709} + m_PrefabAsset: {fileID: 0} --- !u!1 &632795495 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index e3d5c0b3e..bd666c8d4 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -715,29 +715,28 @@ namespace HeavenStudio ), new GameAction("scale letterbox", "Scale Letterbox", 1f, true, new List() { - new Param("valA", new EntityTypes.Float(0, 50, 1), "Scale Letterbox X"), - new Param("valB", new EntityTypes.Float(0, 50, 1), "Scale Letterbox Y"), + new Param("valA", new EntityTypes.Integer(0, 200, 100), "Scale Letterbox X"), + new Param("valB", new EntityTypes.Integer(0, 200, 100), "Scale Letterbox Y"), new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"), new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the letterbox in") } ), - new GameAction("complex pan", "Pan Viewport(Complex)", 1f, true, new List() + new GameAction("tile screen", "Tile Screen", 1f, true, new List() { - new Param("valA", new EntityTypes.Float(-50, 50, 1), "Pan Viewport X"), - new Param("valB", new EntityTypes.Float(-50, 50, 1), "Pan Viewport Y"), + new Param("valA", new EntityTypes.Float(1, 50, 1), "Tile Screen X"), + new Param("valB", new EntityTypes.Float(1, 50, 1), "Tile Screen Y"), new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"), - new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to pan the viewport in") + new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to tile the screen in") } ), - new GameAction("complex scale", "Scale Viewport(Complex)", 1f, true, new List() + new GameAction("pan tiles", "Pan Tiles", 1f, true, new List() { - new Param("valA", new EntityTypes.Float(0, 200, 100), "Scale Viewport X"), - new Param("valB", new EntityTypes.Float(0, 200, 100), "Scale Viewport Y"), + new Param("valA", new EntityTypes.Float(-50, 50, 1), "Pan Tiles X"), + new Param("valB", new EntityTypes.Float(-50, 50, 1), "Pan Tiles Y"), new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"), - new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the viewport in") + new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to pan the tiles in") } ), - new GameAction("pan window", "Move Window", 1f, true, new List() { new Param("valA", new EntityTypes.Float(-100, 200, 0), "Window X", "The Window's destination X coordinate. Can go off screen. Measured in percent."),