diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index e1234198..890c2ca8 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -56,11 +56,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564650125393930190} m_LocalRotation: {x: -0, y: -0, z: -0.0016571856, w: 0.9999986} - m_LocalPosition: {x: -3.03, y: 1.8, z: 0} - m_LocalScale: {x: 0.58812755, y: 0.58812755, z: 0.58812755} + m_LocalPosition: {x: 0.098745, y: 1.1128998, z: 0} + m_LocalScale: {x: 0.96952605, y: 0.96952605, z: 0.96952605} m_Children: [] - m_Father: {fileID: 7248900333300803150} - m_RootOrder: 11 + m_Father: {fileID: 7248900332283351267} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.19} --- !u!212 &868007046405604311 SpriteRenderer: @@ -5795,7 +5795,7 @@ Transform: m_Children: - {fileID: 8285689916985503547} m_Father: {fileID: 7248900333300803150} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6693302166145137461 GameObject: @@ -6258,6 +6258,8 @@ MonoBehaviour: - {fileID: 8497358629359107968, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} missEffect: {fileID: 564650125393930190} hitBarrel: 0 + inCombo: 0 + hitCombo: 0 currentComboPots: [] comboNormalizedBeat: 0 --- !u!95 &7248900332013002442 @@ -6799,7 +6801,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.0899, y: 1.1249, z: 0} m_LocalScale: {x: 0.6066134, y: 0.6066134, z: 0.6066134} - m_Children: [] + m_Children: + - {fileID: 7677199528729525918} m_Father: {fileID: 7248900332013002293} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17734,7 +17737,6 @@ Transform: - {fileID: 2035530467837460450} - {fileID: 634606877704519381} - {fileID: 6013960276080899241} - - {fileID: 7677199528729525918} - {fileID: 7581330309301576633} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Resources/Music/practice.json b/Assets/Resources/Music/practice.json new file mode 100644 index 00000000..b000574c --- /dev/null +++ b/Assets/Resources/Music/practice.json @@ -0,0 +1 @@ +{"bpm":125.0,"entities":[{"beat":0.0,"track":0,"length":33.0,"datamodel":"karateman/bop"},{"beat":1.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":3.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":3.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":5.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":6.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":7.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":9.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":11.0,"track":1,"length":2.0,"datamodel":"karateman/bulb"},{"beat":13.0,"track":1,"length":4.5,"datamodel":"karateman/kick"},{"beat":17.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":19.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":19.5,"track":2,"length":1.0,"datamodel":"karateman/hit4"},{"beat":21.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":22.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":23.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":24.0,"track":3,"length":2.0,"datamodel":"karateman/ball"},{"beat":25.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":27.0,"track":1,"length":2.0,"datamodel":"karateman/bulb"},{"beat":29.0,"track":1,"length":4.0,"datamodel":"karateman/combo"}]} \ No newline at end of file diff --git a/Assets/Resources/Music/practice.json.meta b/Assets/Resources/Music/practice.json.meta new file mode 100644 index 00000000..371beb4d --- /dev/null +++ b/Assets/Resources/Music/practice.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ad2467f171a3aee4b9be8c26e2e1a42c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/practice.ogg b/Assets/Resources/Music/practice.ogg new file mode 100644 index 00000000..612f9d12 Binary files /dev/null and b/Assets/Resources/Music/practice.ogg differ diff --git a/Assets/Resources/Music/practice.ogg.meta b/Assets/Resources/Music/practice.ogg.meta new file mode 100644 index 00000000..150f383a --- /dev/null +++ b/Assets/Resources/Music/practice.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7d1a104c87e593f40a262ebbcb2a371b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 9f3be34c..530bb431 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -7970,8 +7970,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3} m_Name: m_EditorClassIdentifier: - level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3} - music: {fileID: 8300000, guid: f3b9f9179bad8394a98f617bda265a62, type: 3} + level: {fileID: 4900000, guid: ad2467f171a3aee4b9be8c26e2e1a42c, type: 3} + music: {fileID: 8300000, guid: 7d1a104c87e593f40a262ebbcb2a371b, type: 3} debugUI: 0 playOnStart: 0 editor: 1 diff --git a/Assets/Scripts/Games/KarateMan/KarateJoe.cs b/Assets/Scripts/Games/KarateMan/KarateJoe.cs index e41af417..d315acc9 100644 --- a/Assets/Scripts/Games/KarateMan/KarateJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateJoe.cs @@ -24,8 +24,8 @@ namespace RhythmHeavenMania.Games.KarateMan public Coroutine kickC; public Coroutine missC; private float barrelBeat; - private bool inCombo; - private bool hitCombo; + public bool inCombo; + public bool hitCombo; private float comboBeat; public List currentComboPots = new List(); private int comboPotIndex; diff --git a/Assets/Scripts/Games/KarateMan/Pot.cs b/Assets/Scripts/Games/KarateMan/Pot.cs index 9d34236c..e820eb63 100644 --- a/Assets/Scripts/Games/KarateMan/Pot.cs +++ b/Assets/Scripts/Games/KarateMan/Pot.cs @@ -141,12 +141,17 @@ namespace RhythmHeavenMania.Games.KarateMan lastShadowX = Shadow.transform.localPosition.x; lastRot = Holder.transform.GetChild(0).eulerAngles.z; - if (combo && comboIndex == 0 || combo && comboIndex == 5 || !combo) - if (normalizedBeat >= 2 && missTimes == 0) + if (combo && comboIndex == 0 || !combo) { - if (KarateJoe.instance.missC != null) StopCoroutine(KarateJoe.instance.missC); - KarateJoe.instance.missC = KarateJoe.instance.StartCoroutine(KarateJoe.instance.Miss()); - missTimes = 1; + if (!KarateJoe.instance.hitCombo) + { + if (normalizedBeat >= 2 && missTimes == 0) + { + if (KarateJoe.instance.missC != null) StopCoroutine(KarateJoe.instance.missC); + KarateJoe.instance.missC = KarateJoe.instance.StartCoroutine(KarateJoe.instance.Miss()); + missTimes = 1; + } + } } StateCheck(normalizedBeat);