mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

inspcetor

Browse source
This commit is contained in:
Rapandrasmus 2023-08-09 01:33:07 +02:00
parent 63a364fe48
commit 1925b6e0ac
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assets/Resources/Games/monkeyWatch.prefab
View file

@ -21654,6 +21654,10 @@ MonoBehaviour:
balloonHandler: {fileID: 4712471487160862613} balloonHandler: {fileID: 4712471487160862613}
middleMonkey: {fileID: 5520703815918216618} middleMonkey: {fileID: 5520703815918216618}
fullZoomOut: 80 fullZoomOut: 80
zoomOutEase: 3
zoomOutBeatLength: 2
zoomInBeatLength: 2
zoomInEase: 9
--- !u!1 &6181011653585253546 --- !u!1 &6181011653585253546
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -24299,6 +24303,7 @@ MonoBehaviour:
pinkClap: {fileID: 5162462144302245337} pinkClap: {fileID: 5162462144302245337}
shadowTrans: {fileID: 4357628429498402732} shadowTrans: {fileID: 4357628429498402732}
shadowXRange: -0.5 shadowXRange: -0.5
shadowYRange: 1
--- !u!1 &7446072329631304920 --- !u!1 &7446072329631304920
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

20
Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
View file

@ -96,7 +96,7 @@ namespace HeavenStudio.Games.Loaders
MonkeyWatch.instance.ZoomOut(e.beat, e.length, e["timeMode"], e["hour"], e["minute"]); MonkeyWatch.instance.ZoomOut(e.beat, e.length, e["timeMode"], e["hour"], e["minute"]);
}, },
resizable = true, resizable = true,
defaultLength = 4f, defaultLength = 8f,
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("timeMode", MonkeyWatch.TimeMode.RealTime, "Time Mode", "Will the clock set the time to the current time or a certain time?"), new Param("timeMode", MonkeyWatch.TimeMode.RealTime, "Time Mode", "Will the clock set the time to the current time or a certain time?"),
@ -151,6 +151,10 @@ namespace HeavenStudio.Games
[Header("Properties")] [Header("Properties")]
[SerializeField] private float fullZoomOut = 40f; [SerializeField] private float fullZoomOut = 40f;
[SerializeField] private Util.EasingFunction.Ease zoomOutEase;
[SerializeField] private float zoomOutBeatLength = 2f;
[SerializeField] private float zoomInBeatLength = 2f;
[SerializeField] private Util.EasingFunction.Ease zoomInEase;
private float lastAngle = 0f; private float lastAngle = 0f;
private int cameraIndex = 0; private int cameraIndex = 0;
private struct MonkeyCamera private struct MonkeyCamera
@ -164,8 +168,8 @@ namespace HeavenStudio.Games
private void Awake() private void Awake()
{ {
instance = this; instance = this;
funcOut = Util.EasingFunction.GetEasingFunction(Util.EasingFunction.Ease.EaseOutQuad); funcOut = Util.EasingFunction.GetEasingFunction(zoomOutEase);
funcIn = Util.EasingFunction.GetEasingFunction(Util.EasingFunction.Ease.EaseOutQuart); funcIn = Util.EasingFunction.GetEasingFunction(zoomInEase);
pinkMonkeys = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "off", "offStretch" }); pinkMonkeys = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "off", "offStretch" });
pinkMonkeysCustom = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "offInterval" }); pinkMonkeysCustom = EventCaller.GetAllInGameManagerList("monkeyWatch", new string[] { "offInterval" });
CameraUpdate(); CameraUpdate();
@ -189,15 +193,15 @@ namespace HeavenStudio.Games
public void ZoomOut(double beat, float length, int timeMode, int hours, int minutes) public void ZoomOut(double beat, float length, int timeMode, int hours, int minutes)
{ {
length = Mathf.Max(4, length); length = Mathf.Max(zoomOutBeatLength + zoomInBeatLength, length);
zoomOutStartBeat = beat; zoomOutStartBeat = beat;
zoomOutLength = length; zoomOutLength = length;
backgroundHandler.SetFade(beat, 0.25f, true, (TimeMode)timeMode, hours, minutes); backgroundHandler.SetFade(beat, 0.25f, true, (TimeMode)timeMode, hours, minutes);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat + length - 2, delegate new BeatAction.Action(beat + length - zoomInBeatLength, delegate
{ {
backgroundHandler.SetFade(beat + length - 1, 0.25f, false, (TimeMode)timeMode, hours, minutes); backgroundHandler.SetFade(beat + length - zoomInBeatLength, 0.25f, false, (TimeMode)timeMode, hours, minutes);
}) })
}); });
CameraUpdate(); CameraUpdate();
@ -619,8 +623,8 @@ namespace HeavenStudio.Games
float newY = 0f; float newY = 0f;
float newZ = 0f; float newZ = 0f;
float normalizedZoomFirst = cond.GetPositionFromBeat(zoomOutStartBeat, 2); float normalizedZoomFirst = cond.GetPositionFromBeat(zoomOutStartBeat, zoomOutBeatLength);
float normalizedZoomLast = cond.GetPositionFromBeat(zoomOutStartBeat + zoomOutLength - 2, 2); float normalizedZoomLast = cond.GetPositionFromBeat(zoomOutStartBeat + zoomOutLength - zoomInBeatLength, zoomInBeatLength);
if (normalizedZoomFirst > 1) if (normalizedZoomFirst > 1)
{ {