From 27c056320a564cdce3a8e2a1d7afe19ab8f85cb3 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Sat, 9 Mar 2024 01:39:35 -0500 Subject: [PATCH] actual last fixes + ass buns --- Assets/Resources/Games/dogNinja.prefab | 8 ++--- .../Animation/Bird/BirdAnim.controller.meta | 2 +- .../DogNinja/Animation/Bird/FlyIn.anim.meta | 2 +- .../DogNinja/Animation/Bird/FlyOut.anim.meta | 2 +- .../Animation/Dog/BarelyGlobal.anim.meta | 2 +- .../Animation/Dog/BarelyLeft.anim.meta | 2 +- .../Animation/Dog/BarelyRight.anim.meta | 2 +- .../DogNinja/Animation/Dog/Bop.anim.meta | 2 +- .../Animation/Dog/DogAnim.controller.meta | 2 +- .../DogNinja/Animation/Dog/Idle.anim.meta | 2 +- .../DogNinja/Animation/Dog/Prepare.anim.meta | 2 +- .../Animation/Dog/SliceBoth.anim.meta | 2 +- .../Animation/Dog/SliceLeft.anim.meta | 2 +- .../Animation/Dog/SliceRight.anim.meta | 2 +- .../Animation/Dog/UnPrepare.anim.meta | 2 +- .../Animation/Dog/WhiffGlobal.anim.meta | 2 +- .../Animation/Dog/WhiffLeft.anim.meta | 2 +- .../Animation/Dog/WhiffRight.anim.meta | 2 +- .../DogNinja/Animation/Halves/Idle.anim.meta | 2 +- .../Halves/LeftHalfAnim.controller.meta | 2 +- .../Halves/LeftHalfFallLeft.anim.meta | 2 +- .../Halves/LeftHalfFallRight.anim.meta | 2 +- .../Halves/RightHalfAnim.controller.meta | 2 +- .../Halves/RightHalfFallLeft.anim.meta | 2 +- .../Halves/RightHalfFallRight.anim.meta | 2 +- .../DogNinja/DogNinja_OtherObjects.png.meta | 29 ++++++++++++++-- Assets/Scripts/Games/DogNinja/DogNinja.cs | 34 +++++++++++-------- Assets/Scripts/Games/DogNinja/ThrowObject.cs | 1 - 28 files changed, 74 insertions(+), 46 deletions(-) diff --git a/Assets/Resources/Games/dogNinja.prefab b/Assets/Resources/Games/dogNinja.prefab index cb32b6388..8a38c146a 100644 --- a/Assets/Resources/Games/dogNinja.prefab +++ b/Assets/Resources/Games/dogNinja.prefab @@ -1699,26 +1699,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: - - name: hereWeGo + - name: here_we_go sequence: game: 1 force: 1 clips: - - clip: here + - clip: dogNinja/here beat: 0 pitch: 0 volume: 0 looping: 0 offset: 0 parameters: [] - - clip: we + - clip: dogNinja/we beat: 0.5 pitch: 0 volume: 0 looping: 0 offset: 0 parameters: [] - - clip: go + - clip: dogNinja/go beat: 1 pitch: 0 volume: 0 diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/BirdAnim.controller.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/BirdAnim.controller.meta index abbdbe0a6..009b0a09c 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/BirdAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/BirdAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyIn.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyIn.anim.meta index 997497ca1..a28831a6f 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyIn.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyIn.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyOut.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyOut.anim.meta index 3820a2a1b..230973ff5 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyOut.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Bird/FlyOut.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyGlobal.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyGlobal.anim.meta index a28d740de..aa8ae57e1 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyGlobal.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyGlobal.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyLeft.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyLeft.anim.meta index 2b07dad96..f313d1f88 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyRight.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyRight.anim.meta index 73740ae94..a7acf716c 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyRight.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/BarelyRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Bop.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Bop.anim.meta index 32ab7457f..1d0eec4af 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Bop.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Bop.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/DogAnim.controller.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/DogAnim.controller.meta index 73651b4c1..0fbe4ea84 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/DogAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/DogAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Idle.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Idle.anim.meta index 1f2b56426..9c82a3f1b 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Idle.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Prepare.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Prepare.anim.meta index 1a194f7a9..48323703c 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Prepare.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/Prepare.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceBoth.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceBoth.anim.meta index fc9bfc336..68558e80b 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceBoth.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceBoth.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceLeft.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceLeft.anim.meta index 31b5faf05..504eeca22 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceRight.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceRight.anim.meta index 080a72f19..f94d5c5ea 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceRight.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/SliceRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/UnPrepare.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/UnPrepare.anim.meta index 995c96199..e8afa9c3d 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/UnPrepare.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/UnPrepare.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffGlobal.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffGlobal.anim.meta index de358332e..4977fbd55 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffGlobal.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffGlobal.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffLeft.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffLeft.anim.meta index 3254ca4ca..ff841b0f5 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffRight.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffRight.anim.meta index 1eba1e4e3..69e71753d 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffRight.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Dog/WhiffRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/Idle.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/Idle.anim.meta index c3a0a3a1e..7d6a96208 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/Idle.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfAnim.controller.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfAnim.controller.meta index 4167596fd..2bef73156 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallLeft.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallLeft.anim.meta index abe410c1d..dd82eac4e 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallRight.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallRight.anim.meta index 892db1a80..931c8ca06 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallRight.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/LeftHalfFallRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfAnim.controller.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfAnim.controller.meta index ac48afa42..8495dae3d 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallLeft.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallLeft.anim.meta index eb4e20e9e..967bae6eb 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallLeft.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallLeft.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallRight.anim.meta b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallRight.anim.meta index 20624a75e..cf3d070ac 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallRight.anim.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/Animation/Halves/RightHalfFallRight.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrninja/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta index 4b6f86db9..06caa9aec 100644 --- a/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta +++ b/Assets/Resources/Sprites/Games/DogNinja/DogNinja_OtherObjects.png.meta @@ -689,7 +689,7 @@ TextureImporter: width: 110 height: 201 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -710,7 +710,7 @@ TextureImporter: width: 103 height: 198 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -731,7 +731,7 @@ TextureImporter: width: 78 height: 199 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -743,6 +743,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: oh it's the little guy. you found him + rect: + serializedVersion: 2 + x: 1143 + y: 1591 + width: 16 + height: 49 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4cd68dea3c30b1f48bcd6dd5ad0fffa5 + internalID: 1314131981 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -763,6 +784,7 @@ TextureImporter: Ball_Full: 8158683621920566786 Ball_Left: -5925680740112638021 Ball_Right: -5567381644477528568 + DogNinja_OtherObjects_0: -1593653543 Idol_Full: 2196219148037962045 Idol_Left: -130797512336752496 Idol_Right: 8490305602720712907 @@ -783,6 +805,7 @@ TextureImporter: WildBreath_Full: 2053246660185171032 WildBreath_Left: -7594402133338608887 WildBreath_Right: 3508372842914876614 + oh it's the little guy. you found him: 1314131981 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scripts/Games/DogNinja/DogNinja.cs b/Assets/Scripts/Games/DogNinja/DogNinja.cs index 9267acbd5..dc115d9d0 100644 --- a/Assets/Scripts/Games/DogNinja/DogNinja.cs +++ b/Assets/Scripts/Games/DogNinja/DogNinja.cs @@ -65,7 +65,7 @@ namespace HeavenStudio.Games.Loaders { function = delegate { if (eventCaller.gameManager.minigameObj.TryGetComponent(out DogNinja instance)) { - instance.DoPrepare(eventCaller.currentEntity.beat); + instance.DoPrepare(); } }, defaultLength = 0.5f, @@ -109,16 +109,14 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("HereWeGo", "Here We Go!") { - function = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); }, - inactiveFunction = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); }, + preFunction = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); }, defaultLength = 2, preFunctionLength = 1, }, - } - // , - // new List() { "ntr", "normal" }, - // "ntrninja", "en", - // new List() { } + }, + new List() { "ntr", "normal" }, + "ntrninja", "en", + new List() { } ); } } @@ -130,7 +128,7 @@ namespace HeavenStudio.Games using Scripts_DogNinja; public class DogNinja : Minigame { - struct QueuedThrow + private struct QueuedThrow { public int[] types; public string sfxNumL, sfxNumR; @@ -223,11 +221,13 @@ namespace HeavenStudio.Games foreach (var e in gameManager.Beatmap.Entities.FindAll(e => e.datamodel is "dogNinja/ThrowObject" && beat >= e.beat - 2 && beat < e.beat + 1)) { QueuedThrow t = e["throwData"]; + bool shouldPrepare = e["shouldPrepare"]; if (beat > e.beat) { + shouldPrepare = false; DogAnim.Play("Prepare", 0, 1); preparing = true; } - ThrowObject(e.beat, e["direction"], ((beat <= e.beat) && e["shouldPrepare"]), t.types, t.sfxNumL, t.sfxNumR); + ThrowObject(e.beat, e["direction"], shouldPrepare, t.types, t.sfxNumL, t.sfxNumR); } } @@ -349,16 +349,22 @@ namespace HeavenStudio.Games queuePrepare = false; } - public void DoPrepare(double beat) + public void DoPrepare() { if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch && PlayerInput.PlayerHasControl()) return; - if (!queuePrepare) DogAnim.DoScaledAnimationAsync("Prepare", 0.5f); - queuePrepare = true; + DogAnim.DoScaledAnimationAsync("Prepare", 0.5f); + preparing = true; } public static void HereWeGo(double beat) { - PlaySoundSequence("dogNinja", "here_we_go", beat); + // // sound sequence isn't working? + // PlaySoundSequence("dogNinja", "here_we_go", beat); + MultiSound.Play(new List() { + new("dogNinja/here", beat + 0), + new("dogNinja/we", beat + 0.5), + new("dogNinja/go", beat + 1), + }, forcePlay: true); } } } diff --git a/Assets/Scripts/Games/DogNinja/ThrowObject.cs b/Assets/Scripts/Games/DogNinja/ThrowObject.cs index 81856af4d..69ef9ffb0 100644 --- a/Assets/Scripts/Games/DogNinja/ThrowObject.cs +++ b/Assets/Scripts/Games/DogNinja/ThrowObject.cs @@ -88,7 +88,6 @@ namespace HeavenStudio.Games.Scripts_DogNinja DogAnim.DoScaledAnimationAsync("Slice" + dir, 0.5f); if (shouldSfx) SoundByte.PlayOneShotGame(sfxNum + "2"); - Debug.Log("type - 1 : " + (type - 1)); HalvesLeftBase.sr.sprite = objectLeftHalves[type - 1]; HalvesRightBase.sr.sprite = objectRightHalves[type - 1]; for (int i = 0; i < 2; i++) {