diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png index a4a9f81b7..ad1a9a633 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png and b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta index fb46fbe70..0d16ff4e3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png new file mode 100644 index 000000000..fe151f755 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png.meta new file mode 100644 index 000000000..850897edb --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb_mask.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: c2ac181301ed06d46be9ab5487671425 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 8 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline.png.meta index f5acf090e..357926da0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline_mask.png.meta index 9ef7875b8..0faa7af0a 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tramAndPauline_mask.png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Sprites/Games/Tunnel/tunnelChar.png.meta b/Assets/Resources/Sprites/Games/Tunnel/tunnelChar.png.meta index 2a128d8e2..82b03bfd9 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/tunnelChar.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/tunnelChar.png.meta @@ -356,6 +356,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs index ebd60b190..b5e70f4db 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs @@ -4,6 +4,7 @@ using UnityEngine; using HeavenStudio.Util; using Jukebox; using System; +using HeavenStudio.InputSystem; namespace HeavenStudio.Games.Loaders { @@ -167,6 +168,52 @@ namespace HeavenStudio.Games [NonSerialized] public int requiredJumps; [NonSerialized] public int requiredJumpsP; + const int IAAltDownCat = IAMAXCAT; + const int IAAltUpCat = IAMAXCAT + 1; + + protected static bool IA_PadAltDown(out double dt) + { + return PlayerInput.GetPadDown(InputController.ActionsPad.South, out dt); + } + protected static bool IA_BatonAltDown(out double dt) + { + return PlayerInput.GetSqueezeDown(out dt); + } + protected static bool IA_TouchAltDown(out double dt) + { + return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt) + && instance.IsExpectingInputNow(InputAction_AltDown); + } + + protected static bool IA_PadAltUp(out double dt) + { + return PlayerInput.GetPadUp(InputController.ActionsPad.South, out dt); + } + protected static bool IA_BatonAltUp(out double dt) + { + return PlayerInput.GetSqueezeUp(out dt); + } + protected static bool IA_TouchAltUp(out double dt) + { + return PlayerInput.GetFlick(out dt) + && instance.IsExpectingInputNow(InputAction_AltUp); + } + + protected static bool IA_EmptyTouchUp(out double dt) + { + return PlayerInput.GetTouchUp(InputController.ActionsTouch.Tap, out dt) && !PlayerInput.GetFlick(out _); + } + + public static PlayerInput.InputAction InputAction_AltDown = + new("KarateAltDown", new int[] { IAAltDownCat, IAAltDownCat, IAAltDownCat }, + IA_PadAltDown, IA_TouchAltDown, IA_BatonAltDown); + public static PlayerInput.InputAction InputAction_AltUp = + new("KarateAltUp", new int[] { IAAltUpCat, IAAltUpCat, IAAltUpCat }, + IA_PadAltUp, IA_TouchAltUp, IA_BatonAltUp); + public static PlayerInput.InputAction InputAction_TouchUp = + new("KarateAltUp", new int[] { IAEmptyCat, IAReleaseCat, IAEmptyCat }, + IA_PadAltUp, IA_EmptyTouchUp, IA_BatonAltUp); + new void OnDrawGizmos() { base.OnDrawGizmos(); @@ -251,7 +298,7 @@ namespace HeavenStudio.Games starHandler.Evolve(starAmount); })); } - BeatAction.New(instance.gameObject, actions); + BeatAction.New(this, actions); } public bool FishOnBeat(double beat) @@ -596,7 +643,7 @@ namespace HeavenStudio.Games { if (countInLength == 8) { - BeatAction.New(instance.gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(countInBeat, delegate { playYan.PopBalloon(0, beat > countInBeat); }), new BeatAction.Action(countInBeat + 2, delegate { playYan.PopBalloon(1, beat > countInBeat + 2); }), @@ -611,7 +658,7 @@ namespace HeavenStudio.Games { playYan.PopBalloon(0, true); playYan.PopBalloon(1, true); - BeatAction.New(instance.gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(countInBeat, delegate { playYan.PopBalloon(2, beat > countInBeat); }), new BeatAction.Action(countInBeat + 1, delegate { playYan.PopBalloon(3, beat > countInBeat + 1); }), diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs index c00447c5d..0603bca38 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs @@ -96,10 +96,10 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { if (game.ShouldNotJumpOnBeat(endBeat) || isFish) { - inputEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat, InputType.STANDARD_ALT_DOWN, JustRollHold, RollMissHold, Empty); + inputEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat, AgbNightWalk.InputAction_AltDown, JustRollHold, RollMissHold, Empty); if (nextPlatformIsSameHeight && !isFinalBlock && !isEndEvent) { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat, delegate { @@ -129,7 +129,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk } else { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat + 0.5, delegate { @@ -148,10 +148,10 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk } else { - inputEvent = game.ScheduleInput(startBeat, endBeat - startBeat, InputType.STANDARD_ALT_DOWN, JustRollHold, RollMissHold, Empty); + inputEvent = game.ScheduleInput(startBeat, endBeat - startBeat, AgbNightWalk.InputAction_AltDown, JustRollHold, RollMissHold, Empty); } canKick = true; - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat, delegate { @@ -168,7 +168,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk if (nextPlatformIsSameHeight && !isEndEvent) { canKickRelease = true; - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat + 0.5, delegate { @@ -211,10 +211,10 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { if (game.ShouldNotJumpOnBeat(endBeat) || isFish) { - inputEvent = AgbNightWalk.instance.ScheduleUserInput(startBeat, endBeat - startBeat, InputType.STANDARD_DOWN, isEndEvent ? JustEnd : Just, Miss, Empty); + inputEvent = AgbNightWalk.instance.ScheduleUserInput(startBeat, endBeat - startBeat, Minigame.InputAction_BasicPress, isEndEvent ? JustEnd : Just, Miss, Empty); if (nextPlatformIsSameHeight && !isFinalBlock) { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat, delegate { @@ -235,7 +235,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk } else { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat, delegate { @@ -254,12 +254,12 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk } else if (!isFish) { - inputEvent = AgbNightWalk.instance.ScheduleInput(startBeat, endBeat - startBeat, InputType.STANDARD_DOWN, isEndEvent ? JustEnd : Just, Miss, Empty); + inputEvent = AgbNightWalk.instance.ScheduleInput(startBeat, endBeat - startBeat, Minigame.InputAction_BasicPress, isEndEvent ? JustEnd : Just, Miss, Empty); } if (nextPlatformIsSameHeight && !isEndEvent) { canKick = true; - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(endBeat, delegate { @@ -356,11 +356,11 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk if (caller.noAutoplay) { - releaseEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat + 0.5, InputType.STANDARD_ALT_UP, JustRollRelease, RollMissRelease, Empty); + releaseEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat + 0.5, AgbNightWalk.InputAction_AltUp, JustRollRelease, RollMissRelease, Empty); } else { - releaseEvent = game.ScheduleInput(startBeat, endBeat - startBeat + 0.5, InputType.STANDARD_ALT_UP, JustRollRelease, RollMissRelease, Empty); + releaseEvent = game.ScheduleInput(startBeat, endBeat - startBeat + 0.5, AgbNightWalk.InputAction_AltUp, JustRollRelease, RollMissRelease, Empty); } if (state >= 1f || state <= -1f) @@ -388,7 +388,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk handler.DevolveAll(); if (isFish) { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(beat + 1, delegate { @@ -414,7 +414,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk fish.DoScaledAnimationAsync("Shock", 0.5f); handler.StopAll(); handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat + 6); - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate { @@ -427,8 +427,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { game.playYan.HighJump(beat, true, state >= 1f || state <= -1f); handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat); - double missTime = 1.5 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat)); - BeatAction.New(gameObject, new List() + double missTime = 1.5 - Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat)); + BeatAction.New(this, new List() { new BeatAction.Action(beat + missTime, delegate { @@ -452,7 +452,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk fish.DoScaledAnimationAsync("Shock", 0.5f); handler.StopAll(); handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat + 6); - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate { @@ -464,8 +464,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk else if (isFinalBlock) { handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat); - double missTime2 = 1.5 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat)); - BeatAction.New(gameObject, new List() + double missTime2 = 1.5 - Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat)); + BeatAction.New(this, new List() { new BeatAction.Action(beat + missTime2, delegate { @@ -492,16 +492,16 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { if (caller.noAutoplay) { - releaseEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat + 0.5, InputType.STANDARD_ALT_UP, JustRollRelease, RollMissRelease, Empty); + releaseEvent = game.ScheduleUserInput(startBeat, endBeat - startBeat + 0.5, AgbNightWalk.InputAction_AltUp, JustRollRelease, RollMissRelease, Empty); } else { - releaseEvent = game.ScheduleInput(startBeat, endBeat - startBeat + 0.5, InputType.STANDARD_ALT_UP, JustRollRelease, RollMissRelease, Empty); + releaseEvent = game.ScheduleInput(startBeat, endBeat - startBeat + 0.5, AgbNightWalk.InputAction_AltUp, JustRollRelease, RollMissRelease, Empty); } releaseEvent.canHit = false; game.playYan.Walk(); SoundByte.PlayOneShotGame("nightWalkAgb/open" + (int)type, caller.timer + caller.startBeat + 0.5); - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(caller.timer + caller.startBeat + 0.5, delegate { anim.DoScaledAnimationAsync("Note", 0.5f); }) }); @@ -513,7 +513,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { game.playYan.Walk(); SoundByte.PlayOneShotGame("nightWalkAgb/open" + (int)type, caller.timer + caller.startBeat + 0.5); - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(caller.timer + caller.startBeat + 0.5, delegate { rollPlatform.DoScaledAnimationAsync("Note", 0.5f); }) }); @@ -537,7 +537,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk game.playYan.Jump(beat, isFinalBlock); if (isFish) { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(beat + 0.5, delegate { @@ -557,8 +557,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk else if (isFinalBlock) { handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat); - double missTime = 1 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat)); - BeatAction.New(gameObject, new List() + double missTime = 1 - Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat)); + BeatAction.New(this, new List() { new BeatAction.Action(beat + missTime, delegate { @@ -616,7 +616,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk handler.DevolveAll(); if (isFish) { - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(beat + 0.5, delegate { @@ -645,7 +645,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk { game.playYan.Walk(); SoundByte.PlayOneShotGame("nightWalkAgb/open" + (int)type, caller.timer + caller.startBeat + 0.5); - BeatAction.New(gameObject, new List() + BeatAction.New(this, new List() { new BeatAction.Action(caller.timer + caller.startBeat + 0.5, delegate { anim.DoScaledAnimationAsync("Note", 0.5f); }) }); diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs index 035acca87..a3d548b93 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs @@ -122,7 +122,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk currentPlatformToDdestroy.Disappear(fallBeat); })); } - BeatAction.New(gameObject, actions); + BeatAction.New(this, actions); } public void RaiseHeight(double beat, int lastUnits, int currentUnits) diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs index 74c4beeed..5fbe4aced 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs @@ -82,7 +82,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk case JumpingState.Walking: transform.localPosition = Vector3.zero; anim.DoScaledAnimation("Walk", walkBeat, 0.5f, 0.35f); - if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN)) + if (PlayerInput.GetIsAction(Minigame.InputAction_BasicPress) && !game.IsExpectingInputNow(Minigame.InputAction_BasicPress)) { Whiff(cond.songPositionInBeatsAsDouble); } @@ -183,7 +183,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk jumpBeat = beat; anim.Play("Jump", 0, 0); spriteTrans.localEulerAngles = Vector3.zero; - jumpPath.positions[0].duration = 1 - (float)Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(jumpBeat)); + jumpPath.positions[0].duration = 1 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(jumpBeat)); Update(); } @@ -193,7 +193,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk jumpBeat = beat; anim.DoScaledAnimationAsync("HighJump", 0.5f); spriteTrans.localEulerAngles = Vector3.zero; - highJumpPath.positions[0].duration = 1.5f - (float)Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(jumpBeat)); + highJumpPath.positions[0].duration = 1.5f - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(jumpBeat)); highJumpPath.positions[0].height = barely ? 3.5f : 4.5f; Update(); } diff --git a/Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs b/Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs index b95ea9781..8b3c3af82 100644 --- a/Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs +++ b/Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs @@ -3,21 +3,21 @@ using System.Collections.Generic; using UnityEngine; using HeavenStudio.Util; -namespace HeavenStudio.Games.Loaders -{ - using static Minigames; +// namespace HeavenStudio.Games.Loaders +// { +// using static Minigames; - public static class RvlNightWalkLoader - { - public static Minigame AddGame(EventCaller eventCaller) - { - return new Minigame("nightWalkRvl", "Night Walk (Wii)", "FFFFFF", false, false, new List() - { +// public static class RvlNightWalkLoader +// { +// public static Minigame AddGame(EventCaller eventCaller) +// { +// return new Minigame("nightWalkRvl", "Night Walk (Wii)", "FFFFFF", false, false, new List() +// { - }); - } - } -} +// }); +// } +// } +// } namespace HeavenStudio.Games { diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 9023dcd21..34ccb468f 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -310,6 +310,17 @@ namespace HeavenStudio Debug.LogWarning("Game loader ntrMunchyMonkLoader failed!"); } + Debug.Log("Running game loader AgbNightWalkLoader"); + game = AgbNightWalkLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader AgbNightWalkLoader failed!"); + } + Debug.Log("Running game loader NtrOctopusMachineLoader"); game = NtrOctopusMachineLoader.AddGame(eventCaller); if (game != null) @@ -530,6 +541,17 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbTossBoysLoader failed!"); } + Debug.Log("Running game loader TotemClimbLoader"); + game = TotemClimbLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader TotemClimbLoader failed!"); + } + Debug.Log("Running game loader AgbTramLoader"); game = AgbTramLoader.AddGame(eventCaller); if (game != null) diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 9bd4b8b72..cd74f76fe 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -58,5 +58,228 @@ MonoBehaviour: - Assets/Scripts/Games/PlayerActionEvent.cs - Assets/Scripts/Games/KarateMan/KarateManPot.cs - Assets/Scripts/Games/DJSchool/DJSchool.cs + - Assets/Scripts/LevelEditor/Commands/TestCommand.cs + - Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs + - Assets/Scripts/Games/GleeClub/GleeClub.cs + - Assets/Scripts/Games/DoubleDate/Basketball.cs + - Assets/Scripts/Games/TotemClimb/TCBackgroundManager.cs + - Assets/Scripts/Games/Spaceball/SpaceballBall.cs + - Assets/Scripts/Games/QuizShow/QuizShow.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs + - Assets/Scripts/Games/TotemClimb/TCEndTotem.cs + - Assets/Editor/BuildScript.cs + - Assets/Scripts/LevelEditor/Selections.cs + - Assets/Scripts/Games/NightWalkRvl/RvlNightWalk.cs + - Assets/Plugins/Starpelly/Math.cs + - Assets/Scripts/Games/GleeClub/ChorusKid.cs + - Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs + - Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs + - Assets/Scripts/Games/CheerReaders/RvlCharacter.cs + - Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs + - Assets/Scripts/Games/CatchyTune/CatchyTune.cs + - Assets/GUIWindows/Scripts/GUIWindow.cs + - Assets/Scripts/Games/AirRally/CloudsManager.cs + - Assets/Scripts/Games/DogNinja/ThrowObject.cs + - Assets/Scripts/Games/RhythmTweezers/Hair.cs + - Assets/Scripts/Games/Rockers/RockersInput.cs + - Assets/Scripts/UI/Overlays/GoForAPerfect.cs + - Assets/Scripts/Games/SpaceSoccer/Ball.cs + - Assets/Scripts/Games/TossBoys/TossKid.cs + - Assets/Scripts/Games/CropStomp/Farmer.cs + - Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs + - Assets/Scripts/UI/LeftClickTMP_Dropdown.cs + - Assets/Scripts/Games/RhythmTweezers/NoPeekingSign.cs + - Assets/Scripts/Games/Fireworks/FireworksBomb.cs + - Assets/Scripts/Transform/ScaleByVelocity.cs + - Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs + - Assets/Scripts/Games/Global/Textbox.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/ImageChartResourcePrefab.cs + - Assets/Scripts/Games/CropStomp/Veggie.cs + - Assets/Scripts/OpeningManager.cs + - Assets/Scripts/Games/BlueBear/BlueBear.cs + - Assets/Scripts/Games/DoubleDate/Football.cs + - Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs + - Assets/Scripts/StretchCameraVFX.cs + - Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs + - Assets/Scripts/Games/TapTrial/TapTrial.cs + - Assets/Scripts/Games/AirRally/RvlIsland.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs + - Assets/Scripts/Games/DoubleDate/DoubleDateWeasels.cs + - Assets/Scripts/Games/Rockers/RockersRocker.cs + - Assets/Scripts/Games/TapTroupe/TapTroupe.cs + - Assets/Scripts/Games/TotemClimb/TCTotem.cs + - Assets/Scripts/LevelEditor/Timeline/BlockDeleteFX.cs + - Assets/Scripts/UI/Overlays/SectionMedalsManager.cs + - Assets/Scripts/Games/AirRally/IslandsManager.cs + - Assets/Scripts/Games/CallAndResponseHandler.cs + - Assets/Scripts/Games/RhythmTweezers/LongHair.cs + - Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs + - Assets/Scripts/Games/ForkLifter/Pea.cs + - Assets/Scripts/LevelEditor/WaveformVisual.cs + - Assets/Scripts/Games/CatchyTune/Fruit.cs + - Assets/Scripts/Games/FanClub/NtrIdolFan.cs + - Assets/Scripts/Games/PajamaParty/PajamaParty.cs + - Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs + - Assets/Scripts/LevelEditor/Commands/Block.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs + - Assets/Scripts/Games/LaunchParty/LaunchParty.cs + - Assets/Scripts/Games/Rockers/Rockers.cs + - Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs + - Assets/Scripts/Games/ForkLifter/ForkLifterHand.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/EnumChartPropertyPrefab.cs + - Assets/Scripts/Games/Global/Filter.cs + - Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs + - Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs + - Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs + - Assets/Scripts/LevelEditor/SnapDialog/SnapChangeButton.cs + - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs + - Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs + - Assets/Scripts/ScreenTiling.cs + - Assets/Scripts/Games/AirRally/Shuttlecock.cs + - Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs + - Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs + - Assets/Scripts/Games/CoinToss/CoinToss.cs + - Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/EnumPropertyPrefab.cs + - Assets/Scripts/Games/TapTrial/TapTrialPlayer.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/NumberChartPropertyPrefab.cs + - Assets/Plugins/Starpelly/Colors.cs + - Assets/Scripts/Games/AirRally/RvlBirds.cs + - Assets/Scripts/Games/GleeClub/GleeClubSingInput.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs + - Assets/Scripts/Games/Splashdown/NtrSplash.cs + - Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs + - Assets/Scripts/Games/FlipperFlop/FlipperFlopFlipper.cs + - Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs + - Assets/Scripts/Games/TramAndPauline/AgbAnimalKid.cs + - Assets/Scripts/AppInfo.cs + - Assets/Scripts/Games/SeeSaw/SeeSaw.cs + - Assets/Scripts/Util/AnimationHelpers.cs + - Assets/Scripts/Games/TossBoys/TossBoysBall.cs + - Assets/Scripts/LevelEditor/BPMText.cs + - Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs + - Assets/Scripts/Games/CheerReaders/CheerReaders.cs + - Assets/Scripts/Games/SpaceSoccer/Kicker.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs + - Assets/Scripts/Games/DogNinja/DogNinja.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs + - Assets/Scripts/Games/TotemClimb/TCDragon.cs + - Assets/Scripts/LevelEditor/BoxSelection.cs + - Assets/Scripts/Games/ForkLifter/ForkLifter.cs + - Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs + - Assets/Scripts/LevelEditor/DisableSelectOnHover.cs + - Assets/Scripts/LevelEditor/Theme.cs + - Assets/Scripts/Games/BoardMeeting/BMExecutive.cs + - Assets/Scripts/Common/CanvasScroll.cs + - Assets/Scripts/GameCamera.cs + - Assets/Scripts/Games/TotemClimb/TCJumper.cs + - Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs + - Assets/Scripts/UI/RightClickDropdownObject.cs + - Assets/Scripts/StaticCamera.cs + - Assets/Scripts/Games/Spaceball/SpaceballPlayer.cs + - Assets/Scripts/Util/SoundByte.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs + - Assets/Scripts/Games/Splashdown/NtrSynchrette.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/VolumeTimelineObj.cs + - Assets/Scripts/LevelEditor/DialogHelpers/Dialog.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs + - Assets/Scripts/StudioDance/ChoreographyInfo.cs + - Assets/Scripts/Games/CropStomp/CropStomp.cs + - Assets/Scripts/Games/Global/Flash.cs + - Assets/Scripts/LevelEditor/Commands/ICommand.cs + - Assets/Scripts/StudioDance/StudioDanceManager.cs + - Assets/Scripts/Games/SeeSaw/SeeSawGuy.cs + - Assets/Scripts/Games/DrummingPractice/Drummer.cs + - Assets/Scripts/Games/RhythmRally/Paddlers.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/DispAudioSettings.cs + - Assets/Scripts/Util/SavWav.cs + - Assets/Scripts/Util/EntityTypes.cs + - Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs + - Assets/Scripts/Games/Ringside/Ringside.cs + - Assets/Scripts/Games/LaunchParty/LaunchPartyRocket.cs + - Assets/Scripts/Games/Spaceball/Spaceball.cs + - Assets/Scripts/Games/TotemClimb/TCGroundManager.cs + - Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs + - Assets/Scripts/Games/BlueBear/Treat.cs + - Assets/Scripts/PostProcessingVFX.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs + - Assets/Scripts/SourceGenerators/MinigameLoaderGenerator.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs + - Assets/Scripts/LevelEditor/EditorTheme.cs + - Assets/Scripts/Games/TrickClass/MobTrickObj.cs + - Assets/Scripts/Games/OctopusMachine/Octopus.cs + - Assets/Scripts/Games/WizardsWaltz/Plant.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/CreditsLegalSettings.cs + - Assets/Scripts/Games/TapTroupe/TapTroupeZoomOut.cs + - Assets/Scripts/Games/MeatGrinder/Meat.cs + - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowser.cs + - Assets/Scripts/Games/TheDazzles/TheDazzlesGirl.cs + - Assets/Scripts/LevelEditor/Commands/SpecialMarker.cs + - Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs + - Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/ColorChartPropertyPrefab.cs + - Assets/GUIWindows/Scripts/GUIWindowHandle.cs + - Assets/Scripts/Games/Kitties/Kitties.cs + - Assets/Scripts/Games/QuizShow/QSTimer.cs + - Assets/Scripts/CircleCursor.cs + - Assets/Scripts/Games/TotemClimb/TCBirdManager.cs + - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SpecialTimelineObj.cs + - Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs + - Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs + - Assets/Scripts/LevelEditor/Timeline/TimelineBlockManager.cs + - Assets/Scripts/Games/Rockers/RockerBendInput.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/Tabs/ChartInfoProperties.cs + - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs + - Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/TempoTimelineObj.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs + - Assets/Scripts/Games/Splashdown/Splashdown.cs + - Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs + - Assets/Scripts/Games/AirRally/Cloud.cs + - Assets/Scripts/InputSystem/InputController.cs + - Assets/Scripts/UI/Overlays/SkillStarManager.cs + - Assets/Scripts/LevelEditor/BeatGrid.cs + - Assets/Scripts/Games/RhythmRally/RhythmRally.cs + - Assets/Scripts/Games/SamuraiSliceNtr/NtrSamurai.cs + - Assets/Scripts/Games/TapTroupe/TapTroupeCorner.cs + - Assets/Scripts/Games/FanClub/NtrIdolAmie.cs + - Assets/GUIWindows/Scripts/GUIWindowUtils.cs + - Assets/Scripts/Games/Tambourine/Tambourine.cs + - Assets/Scripts/Util/MultiSound.cs + - Assets/Scripts/Games/Fireworks/Rocket.cs + - Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs + - Assets/Scripts/Games/Tunnel/Tunnel.cs + - Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs + - Assets/Scripts/Games/TotemClimb/TotemClimb.cs + - Assets/Plugins/StandaloneFileBrowser/IStandaloneFileBrowser.cs + - Assets/Scripts/LevelEditor/Commands/CommandManager.cs + - Assets/Scripts/Games/FirstContact/Translator.cs + - Assets/Scripts/LevelEditor/TooltipGiver.cs + - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs + - Assets/Scripts/Games/DrummingPractice/DrummerHit.cs + - Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs + - Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs + - Assets/Scripts/StudioDance/Dancer.cs + - Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs + - Assets/Scripts/Games/Lockstep/Lockstep.cs + - Assets/Scripts/Games/TotemClimb/TCTotemManager.cs + - Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs + - Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs + - Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs + - Assets/Scripts/Games/DoubleDate/SoccerBall.cs + - Assets/Scripts/Games/RhythmTweezers/Tweezers.cs + - Assets/Scripts/Games/WorkingDough/WorkingDough.cs + - Assets/Scripts/Games/TotemClimb/TCFrog.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs + - Assets/Scripts/Games/SpaceDance/SpaceDance.cs + - Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs + - Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs + - Assets/Scripts/Games/TotemClimb/TCPillarManager.cs + - Assets/Scripts/Games/Fireworks/Fireworks.cs + - Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs + - Assets/Scripts/Games/WizardsWaltz/Wizard.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []