diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs
index 52c6d761a..f6f590321 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.1026";
- public static readonly DateTime Date = new DateTime(2023, 08, 08, 22, 57, 11, 954, DateTimeKind.Utc);
+ public const string Version = "0.0.1030";
+ public static readonly DateTime Date = new DateTime(2023, 08, 08, 23, 27, 34, 219, DateTimeKind.Utc);
}
diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 9501ab369..46574643e 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -717,8 +717,8 @@ namespace HeavenStudio
new GameAction("pan window", "Move Window", 1f, true, new List()
{
- new Param("valA", new EntityTypes.Integer(-100, 200, 0), "Window X", "The Window's destination X coordinate. Can go off screen. Measured in percent."),
- new Param("valB", new EntityTypes.Integer(-100, 200, 0), "Window Y", "The Window's destination Y coordinate. Can go off screen. Measured in percent."),
+ new Param("valA", new EntityTypes.Float(-100, 200, 0), "Window X", "The Window's destination X coordinate. Can go off screen. Measured in percent."),
+ new Param("valB", new EntityTypes.Float(-100, 200, 0), "Window Y", "The Window's destination Y coordinate. Can go off screen. Measured in percent."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", WindowController.ViewAxis.All, "Axis", "Idk why i would need this")
}
@@ -726,8 +726,8 @@ namespace HeavenStudio
new GameAction("scale window", "Scale Window", 1f, true, new List()
{
- new Param("valA", new EntityTypes.Integer(0, 200, 100), "Scale X", "How much the window is scaled on the X axis, measured in percent."),
- new Param("valB", new EntityTypes.Integer(0, 200, 100), "Scale Y", "How much the window is scaled on the Y axis, measured in percent."),
+ new Param("valA", new EntityTypes.Float(0, 200, 100), "Scale X", "How much the window is scaled on the X axis, measured in percent."),
+ new Param("valB", new EntityTypes.Float(0, 200, 100), "Scale Y", "How much the window is scaled on the Y axis, measured in percent."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", WindowController.ViewAxis.All, "Axis", "AAAAAAA")
}
diff --git a/Assets/Scripts/WindowController.cs b/Assets/Scripts/WindowController.cs
index e1665f859..346ba8955 100644
--- a/Assets/Scripts/WindowController.cs
+++ b/Assets/Scripts/WindowController.cs
@@ -154,14 +154,14 @@ namespace HeavenStudio
switch (e["axis"])
{
case (int) ViewAxis.X:
- pan.x = func(panLast.x/Screen.width, e["valA"], Mathf.Min(prog, 1f)) * Screen.width;
+ pan.x = func(panLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
break;
case (int) ViewAxis.Y:
- pan.y = func(panLast.y/Screen.height, e["valB"], Mathf.Min(prog, 1f)) * Screen.height;
+ pan.y = func(panLast.y, e["valB"]* .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f));
break;
default:
- float dx = func(panLast.x/Screen.width, e["valA"], Mathf.Min(prog, 1f)) * Screen.width;
- float dy = func(panLast.y/Screen.height, e["valB"], Mathf.Min(prog, 1f)) * Screen.height;
+ float dx = func(panLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
+ float dy = func(panLast.y, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f));
pan = new Vector3(dx, dy, 0);
break;
}
@@ -171,13 +171,13 @@ namespace HeavenStudio
switch (e["axis"])
{
case (int) ViewAxis.X:
- panLast.x = e["valA"];
+ panLast.x = e["valA"] * .01f * Screen.mainWindowDisplayInfo.width;
break;
case (int) ViewAxis.Y:
- panLast.y = e["valB"];
+ panLast.y = e["valB"] * .01f * Screen.mainWindowDisplayInfo.height;
break;
default:
- panLast = new Vector3(e["valA"], e["valB"], 0);
+ panLast = new Vector3(e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, 0);
break;
}
}
@@ -211,13 +211,13 @@ namespace HeavenStudio
switch (e["axis"])
{
case (int) ViewAxis.X:
- scaleLast.x = e["valA"];
+ scaleLast.x = e["valA"] * .01f * Screen.mainWindowDisplayInfo.width;
break;
case (int) ViewAxis.Y:
- scaleLast.y = e["valB"];
+ scaleLast.y = e["valB"] * .01f * Screen.mainWindowDisplayInfo.height;
break;
default:
- scaleLast = new Vector3(e["valA"], e["valB"], 1);
+ scaleLast = new Vector3(e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, 1);
break;
}
}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 481fac73e..a55b27786 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.1026
+ bundleVersion: 0.0.1030
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
- Standalone: 1026
+ Standalone: 1030
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
- AndroidBundleVersionCode: 1026
+ AndroidBundleVersionCode: 1030
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1