From f2c33e041e84ce99681eb27e7cc3cc4b89d89fb7 Mon Sep 17 00:00:00 2001 From: Braedon Date: Thu, 20 Jan 2022 02:26:53 -0500 Subject: [PATCH] Fixed Karate Man combo pot scale bug --- Assets/Resources/Games/karateman.prefab | 4 +- .../Games/KarateMan/Animations/PotCombo1.anim | 40 +-- .../Games/KarateMan/Animations/PotCombo2.anim | 40 +-- .../Games/KarateMan/Animations/PotCombo3.anim | 278 ++++++++++-------- .../Games/KarateMan/Animations/PotCombo4.anim | 70 ++--- .../Games/KarateMan/Animations/PotCombo5.anim | 30 +- Assets/Scenes/Editor.unity | 4 +- Assets/Scenes/Game.unity | 4 +- .../Games/KarateMan/BarrelDestroyEffect.cs | 3 + Assets/Scripts/Games/KarateMan/KarateJoe.cs | 20 +- Assets/cointoss.json | 2 +- Assets/karatekacombos.json | 2 +- 12 files changed, 272 insertions(+), 225 deletions(-) diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index ebc8e668..1bbb78af 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -604,7 +604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2035530467837460450 Transform: m_ObjectHideFlags: 0 @@ -650,7 +650,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &634606877704519381 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo1.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo1.anim index d3243069..6a3394b6 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo1.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo1.anim @@ -27,7 +27,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2479757} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: 0, y: 0, z: -11.06} inSlope: {x: 0, y: 0, z: 272.54776} outSlope: {x: 0, y: 0, z: 272.54776} @@ -62,7 +62,7 @@ AnimationClip: inWeight: {x: 0.1784299, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.3413071, y: 0.26758954, z: 0.33333334} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: -1.036, y: -2.478, z: 0} inSlope: {x: -0.752979, y: -5.6134834, z: 0} outSlope: {x: -0.752979, y: -5.6134834, z: 0} @@ -86,24 +86,24 @@ AnimationClip: tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.037211556, y: 0.037211556, z: 0.33333334} + outWeight: {x: 0.040162172, y: 0.040162172, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.9890089, y: 0.9890089, z: 1} - inSlope: {x: -3.7101257, y: -3.7101257, z: 0} - outSlope: {x: -3.7101257, y: -3.7101257, z: 0} + value: {x: 0.88272935, y: 0.88272935, z: 1} + inSlope: {x: -3.4151554, y: -3.4151554, z: 0} + outSlope: {x: -3.4151554, y: -3.4151554, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.5408862, y: 0.5408862, z: 0.33333334} - outWeight: {x: 0.31883663, y: 0.31883663, z: 0.33333334} + inWeight: {x: 0.55122477, y: 0.55122477, z: 0.33333334} + outWeight: {x: 0.30302405, y: 0.30302405, z: 0.33333334} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: 0.34, y: 0.34, z: 1} inSlope: {x: -0.9695547, y: -0.9695547, z: 0} outSlope: {x: -0.9695547, y: -0.9695547, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.28599936, y: 0.28599936, z: 0.33333334} + inWeight: {x: 0.2878659, y: 0.2878659, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -145,7 +145,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6166667 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -183,7 +183,7 @@ AnimationClip: inWeight: 0.1784299 outWeight: 0.3413071 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: -1.036 inSlope: -0.752979 outSlope: -0.752979 @@ -220,7 +220,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.26758954 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: -2.478 inSlope: -5.6134834 outSlope: -5.6134834 @@ -257,7 +257,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -285,7 +285,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.02730252 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0.34 inSlope: -0.9695547 outSlope: -0.9695547 @@ -313,7 +313,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.02730252 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0.34 inSlope: -0.9695547 outSlope: -0.9695547 @@ -350,7 +350,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 1 inSlope: 0 outSlope: 0 @@ -378,7 +378,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -406,7 +406,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -434,7 +434,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.2479757 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: -11.06 inSlope: 272.54776 outSlope: 272.54776 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo2.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo2.anim index 5ac6bba2..bce59105 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo2.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo2.anim @@ -36,7 +36,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: 0, y: 0, z: 160.728} inSlope: {x: 0, y: 0, z: 266.39154} outSlope: {x: 0, y: 0, z: 266.39154} @@ -71,7 +71,7 @@ AnimationClip: inWeight: {x: 0.1784299, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.3413071, y: 0.26758954, z: 0.33333334} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: -1.036, y: -2.478, z: 0} inSlope: {x: -0.752979, y: -5.6134834, z: 0} outSlope: {x: -0.752979, y: -5.6134834, z: 0} @@ -95,24 +95,24 @@ AnimationClip: tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.037211556, y: 0.037211556, z: 0.33333334} + outWeight: {x: 0.040162172, y: 0.040162172, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.9890089, y: 0.9890089, z: 1} - inSlope: {x: -3.7101257, y: -3.7101257, z: 0} - outSlope: {x: -3.7101257, y: -3.7101257, z: 0} + value: {x: 0.88272935, y: 0.88272935, z: 1} + inSlope: {x: -3.4151554, y: -3.4151554, z: 0} + outSlope: {x: -3.4151554, y: -3.4151554, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.5408862, y: 0.5408862, z: 0.33333334} - outWeight: {x: 0.31883663, y: 0.31883663, z: 0.33333334} + inWeight: {x: 0.55122477, y: 0.55122477, z: 0.33333334} + outWeight: {x: 0.30302405, y: 0.30302405, z: 0.33333334} - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: {x: 0.34, y: 0.34, z: 1} inSlope: {x: -0.9695547, y: -0.9695547, z: 0} outSlope: {x: -0.9695547, y: -0.9695547, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.28599936, y: 0.28599936, z: 0.33333334} + inWeight: {x: 0.2878659, y: 0.2878659, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -154,7 +154,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6166667 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -192,7 +192,7 @@ AnimationClip: inWeight: 0.1784299 outWeight: 0.3413071 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: -1.036 inSlope: -0.752979 outSlope: -0.752979 @@ -229,7 +229,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.26758954 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: -2.478 inSlope: -5.6134834 outSlope: -5.6134834 @@ -266,7 +266,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -294,7 +294,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.02730252 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0.34 inSlope: -0.9695547 outSlope: -0.9695547 @@ -322,7 +322,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.02730252 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0.34 inSlope: -0.9695547 outSlope: -0.9695547 @@ -359,7 +359,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 1 inSlope: 0 outSlope: 0 @@ -396,7 +396,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -433,7 +433,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -470,7 +470,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6166667 + time: 0.75 value: 160.728 inSlope: 266.39154 outSlope: 266.39154 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo3.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo3.anim index 1f9eb375..b689eeec 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo3.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo3.anim @@ -20,29 +20,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: -79.217} - inSlope: {x: 0, y: 0, z: 275.68842} - outSlope: {x: 0, y: 0, z: 275.68842} + inSlope: {x: 0, y: 0, z: 166.69946} + outSlope: {x: 0, y: 0, z: 166.69946} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2479757} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.07624634} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0, y: 0, z: -29.5} - inSlope: {x: 0, y: 0, z: 302.02054} - outSlope: {x: 0, y: 0, z: 302.02054} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: {x: 0, y: 0, z: 31.361} - inSlope: {x: 0, y: 0, z: 266.39154} - outSlope: {x: 0, y: 0, z: 266.39154} + inSlope: {x: 0, y: 0, z: 147.11118} + outSlope: {x: 0, y: 0, z: 147.11118} tangentMode: 0 weightedMode: 1 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.35048735} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.3665688} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -55,29 +46,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 5.42, y: 1.82, z: 0} - inSlope: {x: -153.32253, y: 0.7282096, z: 0} - outSlope: {x: -153.32253, y: 0.7282096, z: 0} + inSlope: {x: -72.87218, y: 0.072588295, z: 0} + outSlope: {x: -72.87218, y: 0.072588295, z: 0} tangentMode: 0 weightedMode: 2 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.08151799, y: 0.10968421, z: 0.33333334} + outWeight: {x: 0.10997069, y: 0.091430426, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.3180399, y: -0.1524534, z: 0} - inSlope: {x: -8.3998, y: -10.387912, z: 0} - outSlope: {x: -8.3998, y: -10.387912, z: 0} - tangentMode: 0 - weightedMode: 3 - inWeight: {x: 0.47489047, y: 0.46183217, z: 0.33333334} - outWeight: {x: 0.4161321, y: 0.39179474, z: 0.33333334} - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: {x: -0.8, y: -2.7, z: 0} - inSlope: {x: -0.752979, y: -5.6134834, z: 0} - outSlope: {x: -0.752979, y: -5.6134834, z: 0} + inSlope: {x: -0.752979, y: 3.0504506, z: 0} + outSlope: {x: -0.752979, y: 3.0504506, z: 0} tangentMode: 0 weightedMode: 1 - inWeight: {x: 0.13815694, y: 0.18687104, z: 0.33333334} + inWeight: {x: 0.1469018, y: 0.20422499, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -90,36 +72,92 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 3.68, y: 3.68, z: 1} - inSlope: {x: -183.15404, y: -183.15404, z: 0} - outSlope: {x: -183.15404, y: -183.15404, z: 0} + inSlope: {x: -117.08657, y: -117.08657, z: 0} + outSlope: {x: -117.08657, y: -117.08657, z: 0} tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.038239025, y: 0.038239025, z: 0.33333334} + outWeight: {x: 0.03812317, y: 0.03812317, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.8366754, y: 0.8366754, z: 1} - inSlope: {x: -3.5711012, y: -3.5711012, z: 0} - outSlope: {x: -3.5711012, y: -3.5711012, z: 0} - tangentMode: 0 - weightedMode: 3 - inWeight: {x: 0.58458066, y: 0.58458066, z: 0.33333334} - outWeight: {x: 0.2815436, y: 0.2815436, z: 0.33333334} - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: {x: 0.43, y: 0.43, z: 1} inSlope: {x: -0.1832941, y: -0.1832941, z: 0} outSlope: {x: -0.1832941, y: -0.1832941, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.37770292, y: 0.37770292, z: 0.33333334} + inWeight: {x: 0.5599424, y: 0.5599424, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: ObjectHolder m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: cec3657ea52672144b24a0185d7ab30b, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: a818f16f09a2a8b4ca8a133ac7d5daa0, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 8e800e09f436b0447830f90b68f20d6a, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: d77cff0784ef4374cbc63677ebd947c6, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 135bd961c23901a49b0defd7cab0cd03, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: aeeced232e9fbf64fb57d46b3731eee1, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 938cd03d9dd77bd4cb9677ec6532272e, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: fd830bbae4abadb49be51a08ecc716ae, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: c84205d07af041c43947bc90abd18034, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 15dc9eea62bd9ad4da2a695e6f7cdff9, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: f1524b0a3623b994d90e12207e19456f, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: e2cabe9f865bf15419d47fa492fe2a57, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 5d8caa6d7883a894088538fec5bd51ed, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: eb5227c6e4f83a642bd8ca9c0042271f, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: bc9f53c039a29ef428679540f9aba7de, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 96edbd98f04e13743bca8fc26a5f447f, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 5e95594c974e6214385353ebf85c8eab, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 37dfd166de43b0542aec52a5c7cd31b6, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 8dbeebc8794bfcf428bf333bd2ea73f3, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: f94d699b9d3d19e4282775193e9739a8, type: 3} + - time: 0.51666665 + value: {fileID: 21300000, guid: baa728021f4c0054aac03b7aba107f3c, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 040d44bfb0deaa5419aeebfcfcd58f66, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: e7c7681c6d369e049ab2b5086fe18366, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 50c1f811d01b3574186bcf9eed27d0c8, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: aa4f38442edf7a746b0f6bdd8fc9a6ba, type: 3} + - time: 0.65 + value: {fileID: 21300000, guid: b5873711dfee2414a9f1d4f153246e79, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: b3589de3a025a9c469549e587506282f, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: 676925a5a6a0dc84288451c632690f25, type: 3} + - time: 0.71666664 + value: {fileID: 21300000, guid: 23d12a20ce4f2c44f95c425d8a6eca57, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 23d12a20ce4f2c44f95c425d8a6eca57, type: 3} + attribute: m_Sprite + path: GameObject + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -148,13 +186,50 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: [] + - serializedVersion: 2 + path: 1482111001 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: cec3657ea52672144b24a0185d7ab30b, type: 3} + - {fileID: 21300000, guid: a818f16f09a2a8b4ca8a133ac7d5daa0, type: 3} + - {fileID: 21300000, guid: 8e800e09f436b0447830f90b68f20d6a, type: 3} + - {fileID: 21300000, guid: d77cff0784ef4374cbc63677ebd947c6, type: 3} + - {fileID: 21300000, guid: 135bd961c23901a49b0defd7cab0cd03, type: 3} + - {fileID: 21300000, guid: aeeced232e9fbf64fb57d46b3731eee1, type: 3} + - {fileID: 21300000, guid: 938cd03d9dd77bd4cb9677ec6532272e, type: 3} + - {fileID: 21300000, guid: fd830bbae4abadb49be51a08ecc716ae, type: 3} + - {fileID: 21300000, guid: c84205d07af041c43947bc90abd18034, type: 3} + - {fileID: 21300000, guid: 15dc9eea62bd9ad4da2a695e6f7cdff9, type: 3} + - {fileID: 21300000, guid: f1524b0a3623b994d90e12207e19456f, type: 3} + - {fileID: 21300000, guid: e2cabe9f865bf15419d47fa492fe2a57, type: 3} + - {fileID: 21300000, guid: 5d8caa6d7883a894088538fec5bd51ed, type: 3} + - {fileID: 21300000, guid: eb5227c6e4f83a642bd8ca9c0042271f, type: 3} + - {fileID: 21300000, guid: bc9f53c039a29ef428679540f9aba7de, type: 3} + - {fileID: 21300000, guid: 96edbd98f04e13743bca8fc26a5f447f, type: 3} + - {fileID: 21300000, guid: 5e95594c974e6214385353ebf85c8eab, type: 3} + - {fileID: 21300000, guid: 37dfd166de43b0542aec52a5c7cd31b6, type: 3} + - {fileID: 21300000, guid: 8dbeebc8794bfcf428bf333bd2ea73f3, type: 3} + - {fileID: 21300000, guid: f94d699b9d3d19e4282775193e9739a8, type: 3} + - {fileID: 21300000, guid: baa728021f4c0054aac03b7aba107f3c, type: 3} + - {fileID: 21300000, guid: 040d44bfb0deaa5419aeebfcfcd58f66, type: 3} + - {fileID: 21300000, guid: e7c7681c6d369e049ab2b5086fe18366, type: 3} + - {fileID: 21300000, guid: 50c1f811d01b3574186bcf9eed27d0c8, type: 3} + - {fileID: 21300000, guid: aa4f38442edf7a746b0f6bdd8fc9a6ba, type: 3} + - {fileID: 21300000, guid: b5873711dfee2414a9f1d4f153246e79, type: 3} + - {fileID: 21300000, guid: b3589de3a025a9c469549e587506282f, type: 3} + - {fileID: 21300000, guid: 676925a5a6a0dc84288451c632690f25, type: 3} + - {fileID: 21300000, guid: 23d12a20ce4f2c44f95c425d8a6eca57, type: 3} + - {fileID: 21300000, guid: 23d12a20ce4f2c44f95c425d8a6eca57, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.48333332 + m_StopTime: 0.76666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -176,14 +251,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 5.42 - inSlope: -153.32253 - outSlope: -153.32253 + inSlope: -72.87218 + outSlope: -72.87218 tangentMode: 0 weightedMode: 2 inWeight: 0.33333334 - outWeight: 0.075953215 + outWeight: 0.10997069 - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: -0.8 inSlope: -0.752979 outSlope: -0.752979 @@ -204,20 +279,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1.82 - inSlope: 0.7282096 - outSlope: 0.7282096 + inSlope: 0.072588295 + outSlope: 0.072588295 tangentMode: 0 weightedMode: 2 inWeight: 0.33333334 - outWeight: 0.100506976 + outWeight: 0.091430426 - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: -2.7 - inSlope: -5.6134834 - outSlope: -5.6134834 + inSlope: 3.0504506 + outSlope: 3.0504506 tangentMode: 0 weightedMode: 1 - inWeight: 0.20184574 + inWeight: 0.20422499 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -239,16 +314,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -269,14 +335,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -117.08657 + outSlope: -117.08657 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.03812317 - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 0.43 inSlope: -0.1832941 outSlope: -0.1832941 @@ -297,14 +363,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -117.08657 + outSlope: -117.08657 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.03812317 - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 0.43 inSlope: -0.1832941 outSlope: -0.1832941 @@ -332,16 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 1 inSlope: 0 outSlope: 0 @@ -369,16 +426,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -406,16 +454,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -436,29 +475,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -79.217 - inSlope: 275.68842 - outSlope: 275.68842 + inSlope: 166.69946 + outSlope: 166.69946 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.2479757 + outWeight: 0.07624634 - serializedVersion: 3 - time: 0.21666667 - value: -29.5 - inSlope: 302.02054 - outSlope: 302.02054 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.48333332 + time: 0.75 value: 31.361 - inSlope: 266.39154 - outSlope: 266.39154 + inSlope: 147.11118 + outSlope: 147.11118 tangentMode: 0 weightedMode: 1 - inWeight: 0.35048735 + inWeight: 0.3665688 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo4.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo4.anim index 4e770713..b3b173d3 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo4.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo4.anim @@ -36,7 +36,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: {x: 0, y: 0, z: -49.451} inSlope: {x: 0, y: 0, z: 266.39154} outSlope: {x: 0, y: 0, z: 266.39154} @@ -69,24 +69,24 @@ AnimationClip: tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.2964741, y: 0.36941233, z: 0.33333334} + outWeight: {x: 0.29839396, y: 0.36941233, z: 0.33333334} - serializedVersion: 3 time: 0.31666666 - value: {x: 1.8246424, y: -3.04, z: 0} - inSlope: {x: -2.9400666, y: 2.963286, z: 0} - outSlope: {x: -2.9400666, y: 2.963286, z: 0} + value: {x: 1.8311211, y: -3.04, z: 0} + inSlope: {x: -2.806747, y: 2.963286, z: 0} + outSlope: {x: -2.806747, y: 2.963286, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.35174656, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.42171556, y: 0.37232676, z: 0.33333334} + inWeight: {x: 0.35341308, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.41548514, y: 0.37232676, z: 0.33333334} - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: {x: 1.51, y: -2.78, z: 0} inSlope: {x: -0.752979, y: -5.6134834, z: 0} outSlope: {x: -0.752979, y: -5.6134834, z: 0} tangentMode: 0 weightedMode: 1 - inWeight: {x: 0.15664825, y: 0.20184574, z: 0.33333334} + inWeight: {x: 0.15460075, y: 0.20184574, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -99,29 +99,29 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 3.68, y: 3.68, z: 1} - inSlope: {x: -183.15404, y: -183.15404, z: 0} - outSlope: {x: -183.15404, y: -183.15404, z: 0} + inSlope: {x: -463.80225, y: -463.80225, z: 0} + outSlope: {x: -463.80225, y: -463.80225, z: 0} tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.038239025, y: 0.038239025, z: 0.33333334} + outWeight: {x: 0.019122591, y: 0.019122591, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.8366754, y: 0.8366754, z: 1} - inSlope: {x: -3.5711012, y: -3.5711012, z: 0} - outSlope: {x: -3.5711012, y: -3.5711012, z: 0} + value: {x: 0.67391634, y: 0.67391634, z: 1} + inSlope: {x: -2.4542947, y: -2.4542947, z: 0} + outSlope: {x: -2.4542947, y: -2.4542947, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.58458066, y: 0.58458066, z: 0.33333334} - outWeight: {x: 0.2815436, y: 0.2815436, z: 0.33333334} + inWeight: {x: 0.5974984, y: 0.5974984, z: 0.33333334} + outWeight: {x: 0.27860132, y: 0.27860132, z: 0.33333334} - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: {x: 0.43, y: 0.43, z: 1} inSlope: {x: -0.1832941, y: -0.1832941, z: 0} outSlope: {x: -0.1832941, y: -0.1832941, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.37770292, y: 0.37770292, z: 0.33333334} + inWeight: {x: 0.37833822, y: 0.37833822, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -163,7 +163,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.48333332 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -201,7 +201,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.2075992 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 1.51 inSlope: -0.752979 outSlope: -0.752979 @@ -247,7 +247,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.37232676 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: -2.78 inSlope: -5.6134834 outSlope: -5.6134834 @@ -293,7 +293,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 0 inSlope: 0 outSlope: 0 @@ -314,14 +314,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -463.80225 + outSlope: -463.80225 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.013196481 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 0.43 inSlope: -0.1832941 outSlope: -0.1832941 @@ -342,14 +342,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -463.80225 + outSlope: -463.80225 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.013196481 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 0.43 inSlope: -0.1832941 outSlope: -0.1832941 @@ -386,7 +386,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 1 inSlope: 0 outSlope: 0 @@ -423,7 +423,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 0 inSlope: 0 outSlope: 0 @@ -460,7 +460,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: 0 inSlope: 0 outSlope: 0 @@ -497,7 +497,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.48333332 + time: 0.51666665 value: -49.451 inSlope: 266.39154 outSlope: 266.39154 diff --git a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo5.anim b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo5.anim index a0198694..b0b3decd 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo5.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/Animations/PotCombo5.anim @@ -90,21 +90,21 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 3.68, y: 3.68, z: 1} - inSlope: {x: -183.15404, y: -183.15404, z: 0} - outSlope: {x: -183.15404, y: -183.15404, z: 0} + inSlope: {x: -603.6004, y: -603.6004, z: 0} + outSlope: {x: -603.6004, y: -603.6004, z: 0} tangentMode: 0 weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.03880059, y: 0.03880059, z: 0.33333334} + outWeight: {x: 0.014674168, y: 0.014674168, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.8411305, y: 0.8411305, z: 1} - inSlope: {x: -3.4926617, y: -3.4926617, z: 0} - outSlope: {x: -3.4926617, y: -3.4926617, z: 0} + value: {x: 0.67246646, y: 0.67246646, z: 1} + inSlope: {x: -2.4616354, y: -2.4616354, z: 0} + outSlope: {x: -2.4616354, y: -2.4616354, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.58506167, y: 0.58506167, z: 0.33333334} - outWeight: {x: 0.27910393, y: 0.27910393, z: 0.33333334} + inWeight: {x: 0.5990613, y: 0.5990613, z: 0.33333334} + outWeight: {x: 0.28133544, y: 0.28133544, z: 0.33333334} - serializedVersion: 3 time: 0.5 value: {x: 0.43, y: 0.43, z: 1} @@ -112,7 +112,7 @@ AnimationClip: outSlope: {x: -0.1832941, y: -0.1832941, z: 0} tangentMode: 0 weightedMode: 3 - inWeight: {x: 0.37961566, y: 0.37961566, z: 0.33333334} + inWeight: {x: 0.37595588, y: 0.37595588, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -269,12 +269,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -603.6004 + outSlope: -603.6004 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.01026393 - serializedVersion: 3 time: 0.5 value: 0.43 @@ -297,12 +297,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.68 - inSlope: -183.15404 - outSlope: -183.15404 + inSlope: -603.6004 + outSlope: -603.6004 tangentMode: 0 weightedMode: 3 inWeight: 0.33333334 - outWeight: 0.02730252 + outWeight: 0.01026393 - serializedVersion: 3 time: 0.5 value: 0.43 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 68027d00..6052ef26 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -7244,8 +7244,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3} m_Name: m_EditorClassIdentifier: - level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3} - music: {fileID: 0} + level: {fileID: 4900000, guid: 244c565c8088cfa4597e0ebda9c7de98, type: 3} + music: {fileID: 8300000, guid: e5cf71158cc9bff4a8fbfbca1e73e500, type: 3} debugUI: 0 playOnStart: 0 editor: 1 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 3628ae41..9f982170 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -166,8 +166,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: 906894b5477fc3645a0c5c3e6e8f77a3, type: 3} + level: {fileID: 4900000, guid: 244c565c8088cfa4597e0ebda9c7de98, type: 3} + music: {fileID: 8300000, guid: e5cf71158cc9bff4a8fbfbca1e73e500, type: 3} debugUI: 1 playOnStart: 1 editor: 0 diff --git a/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs b/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs index 2582cfc6..14d015ca 100644 --- a/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs +++ b/Assets/Scripts/Games/KarateMan/BarrelDestroyEffect.cs @@ -15,6 +15,8 @@ namespace RhythmHeavenMania.Games.KarateMan public int spriteIndex; public int index; + public bool combo; + public GameObject shadow; @@ -57,6 +59,7 @@ namespace RhythmHeavenMania.Games.KarateMan yRange = Random.Range(500, 1600); break; } + if (combo) yRange = Random.Range(800, 1600); rb2d.AddForce(Vector3.up * yRange); rb2d.AddForce(Vector3.right * Random.Range(500, 800)); diff --git a/Assets/Scripts/Games/KarateMan/KarateJoe.cs b/Assets/Scripts/Games/KarateMan/KarateJoe.cs index 3ec58cd3..e1f1c05a 100644 --- a/Assets/Scripts/Games/KarateMan/KarateJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateJoe.cs @@ -61,6 +61,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (hitCombo) { currentComboPots[comboPotIndex].Hit(); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); comboPotIndex++; Jukebox.PlayOneShotGame("karateman/comboHit1"); } @@ -72,6 +73,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (hitCombo) { currentComboPots[comboPotIndex].Hit(); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); comboPotIndex++; Jukebox.PlayOneShotGame("karateman/comboHit1"); } @@ -83,6 +85,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (hitCombo) { currentComboPots[comboPotIndex].Hit(); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); comboPotIndex++; Jukebox.PlayOneShotGame("karateman/comboHit2"); } @@ -94,6 +97,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (hitCombo) { currentComboPots[comboPotIndex].Hit(); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); comboPotIndex++; Jukebox.PlayOneShotGame("karateman/comboHit3"); } @@ -105,6 +109,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (hitCombo) { currentComboPots[comboPotIndex].Hit(); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); comboPotIndex++; Jukebox.PlayOneShotGame("karateman/comboHit3"); } @@ -124,6 +129,7 @@ namespace RhythmHeavenMania.Games.KarateMan { // fail anim anim.Play("Idle"); + ResetCombo(); } } } @@ -172,6 +178,7 @@ namespace RhythmHeavenMania.Games.KarateMan { comboBeat = EligibleHits[currentComboHitInList].createBeat; hitCombo = true; + // Debug.Break(); } else { @@ -196,7 +203,8 @@ namespace RhythmHeavenMania.Games.KarateMan if (currentComboPots[comboPotIndex].state.perfect) { - BarrelDestroy(currentComboPots[comboPotIndex]); + BarrelDestroy(currentComboPots[comboPotIndex], true); + HitEffectF(currentComboPots[comboPotIndex].Holder.transform.localPosition); Destroy(currentComboPots[comboPotIndex].gameObject); Jukebox.PlayOneShotGame("karateman/comboHit4"); } @@ -206,6 +214,11 @@ namespace RhythmHeavenMania.Games.KarateMan currentComboPots[comboPotIndex].Miss(); } + ResetCombo(); + } + + private void ResetCombo() + { hitCombo = false; inCombo = false; comboPotIndex = 0; @@ -270,7 +283,7 @@ namespace RhythmHeavenMania.Games.KarateMan case 4: if (kickC != null) StopCoroutine(kickC); kickC = StartCoroutine(PrepareKick()); - BarrelDestroy(p); + BarrelDestroy(p, false); break; } } @@ -302,7 +315,7 @@ namespace RhythmHeavenMania.Games.KarateMan Destroy(hit, 0.06f); } - private void BarrelDestroy(Pot p) + private void BarrelDestroy(Pot p, bool combo) { for (int i = 0; i < 8; i++) { @@ -318,6 +331,7 @@ namespace RhythmHeavenMania.Games.KarateMan bde.shadow.transform.position = p.Shadow.transform.position; bde.shadow.transform.localScale = p.Shadow.transform.lossyScale; bde.index = i; + bde.combo = combo; switch (i) { diff --git a/Assets/cointoss.json b/Assets/cointoss.json index ceb6eb74..d250a74b 100644 --- a/Assets/cointoss.json +++ b/Assets/cointoss.json @@ -1 +1 @@ -{"bpm":120.0,"entities":[{"beat":0.0,"track":3,"datamodel":"clappyTrio/bop"},{"beat":1.0,"track":1,"datamodel":"clappyTrio/bop"},{"beat":2.0,"track":3,"datamodel":"clappyTrio/bop"},{"beat":3.0,"track":2,"datamodel":"clappyTrio/prepare"},{"beat":4.0,"track":0,"length":1.0,"datamodel":"clappyTrio/clap"},{"beat":7.75,"track":3,"datamodel":"gameManager/switchGame/karateman"},{"beat":8.0,"track":1,"datamodel":"karateman/bop"},{"beat":9.0,"track":0,"datamodel":"karateman/bop"},{"beat":10.0,"track":3,"datamodel":"karateman/pot"},{"beat":10.0,"track":2,"datamodel":"karateman/bop"},{"beat":12.0,"track":1,"datamodel":"karateman/bop"},{"beat":13.0,"track":1,"datamodel":"karateman/rock"},{"beat":15.75,"track":2,"datamodel":"gameManager/switchGame/clappyTrio"},{"beat":16.0,"track":0,"datamodel":"clappyTrio/bop"},{"beat":17.0,"track":1,"datamodel":"clappyTrio/bop"},{"beat":18.0,"track":0,"datamodel":"clappyTrio/bop"},{"beat":19.0,"track":3,"datamodel":"clappyTrio/bop"},{"beat":20.0,"track":1,"datamodel":"clappyTrio/prepare_alt"},{"beat":21.0,"track":0,"length":0.5,"datamodel":"clappyTrio/clap"},{"beat":23.0,"track":3,"datamodel":"clappyTrio/bop"},{"beat":23.75,"track":1,"datamodel":"gameManager/switchGame/spaceball"},{"beat":24.0,"track":0,"datamodel":"spaceball/shoot"},{"beat":24.0,"track":0,"length":4.0,"valA":20.0,"datamodel":"spaceball/cameraZoom"},{"beat":26.0,"track":1,"datamodel":"spaceball/shoot"},{"beat":28.0,"track":0,"length":2.0,"valA":120.0,"datamodel":"spaceball/cameraZoom"},{"beat":28.0,"track":2,"datamodel":"spaceball/shootHigh"},{"beat":31.75,"track":2,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":32.0,"track":3,"datamodel":"forkLifter/pea"},{"beat":36.0,"track":2,"datamodel":"forkLifter/pea"},{"beat":39.0,"track":3,"datamodel":"forkLifter/gulp"},{"beat":40.0,"track":1,"datamodel":"karateman/bop"},{"beat":40.0,"track":0,"datamodel":"karateman/bgfxon"},{"beat":40.0,"track":1,"datamodel":"gameManager/switchGame/karateman"},{"beat":41.0,"track":3,"datamodel":"karateman/bop"},{"beat":42.0,"track":0,"datamodel":"karateman/pot"},{"beat":42.0,"track":3,"datamodel":"karateman/bop"},{"beat":44.0,"track":3,"datamodel":"karateman/bop"},{"beat":44.0,"track":1,"datamodel":"karateman/bulb"},{"beat":46.0,"track":0,"datamodel":"karateman/ball"},{"beat":46.0,"track":0,"datamodel":"karateman/bop"},{"beat":48.0,"track":0,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":49.0,"track":1,"datamodel":"forkLifter/pea"},{"beat":52.0,"track":2,"datamodel":"forkLifter/pea"},{"beat":56.0,"track":0,"datamodel":"karateman/bgfxon"},{"beat":56.0,"track":3,"datamodel":"karateman/kick"},{"beat":56.0,"track":3,"datamodel":"gameManager/switchGame/karateman"},{"beat":58.0,"track":2,"datamodel":"karateman/pot"},{"beat":60.0,"track":1,"datamodel":"karateman/pot"},{"beat":62.0,"track":3,"datamodel":"karateman/rock"},{"beat":64.0,"track":3,"datamodel":"gameManager/switchGame/spaceball"},{"beat":64.0,"track":1,"datamodel":"spaceball/shootHigh"},{"beat":68.0,"track":2,"datamodel":"spaceball/shootHigh"},{"beat":71.75,"track":3,"datamodel":"gameManager/switchGame/karateman"},{"beat":71.75,"track":1,"datamodel":"karateman/bgfxon"},{"beat":73.5,"track":1,"datamodel":"karateman/pot"},{"beat":74.0,"track":0,"datamodel":"karateman/pot"},{"beat":77.0,"track":3,"datamodel":"karateman/pot"},{"beat":79.0,"track":0,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":80.0,"track":1,"datamodel":"gameManager/switchGame/spaceball"},{"beat":80.0,"track":0,"datamodel":"spaceball/shoot"},{"beat":84.0,"track":3,"datamodel":"forkLifter/pea"},{"beat":84.0,"track":0,"datamodel":"spaceball/shootHigh"},{"beat":85.75,"track":1,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":87.0,"track":3,"datamodel":"karateman/bgfxon"},{"beat":87.0,"track":1,"datamodel":"gameManager/switchGame/karateman"},{"beat":88.0,"track":0,"datamodel":"karateman/pot"},{"beat":88.5,"track":2,"datamodel":"karateman/pot"},{"beat":90.0,"track":3,"datamodel":"karateman/pot"},{"beat":92.0,"track":0,"datamodel":"karateman/bulb"},{"beat":94.0,"track":2,"datamodel":"karateman/kick"},{"beat":95.75,"track":3,"datamodel":"karateman/bgfxoff"}]} \ No newline at end of file +{"bpm":120.0,"entities":[{"beat":0.0,"track":1,"datamodel":"clappyTrio/bop"},{"beat":1.0,"track":0,"datamodel":"clappyTrio/bop"},{"beat":2.0,"track":1,"datamodel":"clappyTrio/bop"},{"beat":3.0,"track":1,"datamodel":"clappyTrio/prepare"},{"beat":4.0,"track":1,"length":1.0,"datamodel":"clappyTrio/clap"},{"beat":7.75,"track":1,"datamodel":"gameManager/switchGame/karateman"},{"beat":8.0,"track":3,"datamodel":"karateman/bop"},{"beat":9.0,"track":2,"datamodel":"karateman/bop"},{"beat":10.0,"track":0,"datamodel":"karateman/bop"},{"beat":10.0,"track":0,"datamodel":"karateman/pot"},{"beat":12.0,"track":0,"datamodel":"karateman/bop"},{"beat":13.0,"track":0,"datamodel":"karateman/rock"},{"beat":15.75,"track":3,"datamodel":"gameManager/switchGame/clappyTrio"},{"beat":16.0,"track":0,"datamodel":"clappyTrio/bop"},{"beat":17.0,"track":2,"datamodel":"clappyTrio/bop"},{"beat":18.0,"track":3,"datamodel":"clappyTrio/bop"},{"beat":19.0,"track":2,"datamodel":"clappyTrio/bop"},{"beat":20.0,"track":0,"datamodel":"clappyTrio/prepare_alt"},{"beat":21.0,"track":1,"length":0.5,"datamodel":"clappyTrio/clap"},{"beat":23.0,"track":1,"datamodel":"clappyTrio/bop"},{"beat":23.75,"track":3,"datamodel":"gameManager/switchGame/spaceball"},{"beat":24.0,"track":2,"datamodel":"spaceball/shoot"},{"beat":24.0,"track":2,"length":4.0,"valA":20.0,"datamodel":"spaceball/cameraZoom"},{"beat":26.0,"track":0,"datamodel":"spaceball/shoot"},{"beat":28.0,"track":3,"datamodel":"spaceball/shootHigh"},{"beat":28.0,"track":2,"length":2.0,"valA":120.0,"datamodel":"spaceball/cameraZoom"},{"beat":31.75,"track":2,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":32.0,"track":1,"datamodel":"forkLifter/pea"},{"beat":36.0,"track":1,"datamodel":"forkLifter/pea"},{"beat":39.0,"track":2,"datamodel":"forkLifter/gulp"},{"beat":40.0,"track":2,"datamodel":"gameManager/switchGame/karateman"},{"beat":40.0,"track":0,"datamodel":"karateman/bop"},{"beat":40.0,"track":3,"datamodel":"karateman/bgfxon"},{"beat":41.0,"track":1,"datamodel":"karateman/bop"},{"beat":42.0,"track":1,"datamodel":"karateman/pot"},{"beat":42.0,"track":0,"datamodel":"karateman/bop"},{"beat":44.0,"track":0,"datamodel":"karateman/bop"},{"beat":44.0,"track":1,"datamodel":"karateman/bulb"},{"beat":46.0,"track":2,"datamodel":"karateman/ball"},{"beat":46.0,"track":0,"datamodel":"karateman/bop"},{"beat":48.0,"track":2,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":49.0,"track":0,"datamodel":"forkLifter/pea"},{"beat":52.0,"track":3,"datamodel":"forkLifter/pea"},{"beat":56.0,"track":2,"datamodel":"karateman/bgfxon"},{"beat":56.0,"track":2,"datamodel":"gameManager/switchGame/karateman"},{"beat":56.0,"track":1,"length":4.0,"datamodel":"karateman/combo"},{"beat":60.0,"track":0,"datamodel":"karateman/pot"},{"beat":62.0,"track":1,"datamodel":"karateman/rock"},{"beat":64.0,"track":0,"datamodel":"gameManager/switchGame/spaceball"},{"beat":64.0,"track":0,"datamodel":"spaceball/shootHigh"},{"beat":68.0,"track":1,"datamodel":"spaceball/shootHigh"},{"beat":71.75,"track":2,"datamodel":"karateman/bgfxon"},{"beat":71.75,"track":0,"datamodel":"gameManager/switchGame/karateman"},{"beat":73.5,"track":0,"datamodel":"karateman/pot"},{"beat":74.0,"track":3,"datamodel":"karateman/pot"},{"beat":77.0,"track":2,"datamodel":"karateman/pot"},{"beat":79.0,"track":0,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":80.0,"track":0,"datamodel":"gameManager/switchGame/spaceball"},{"beat":80.0,"track":0,"datamodel":"spaceball/shoot"},{"beat":84.0,"track":2,"datamodel":"forkLifter/pea"},{"beat":84.0,"track":2,"datamodel":"spaceball/shootHigh"},{"beat":85.75,"track":2,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":87.0,"track":1,"datamodel":"karateman/bgfxon"},{"beat":87.0,"track":3,"datamodel":"gameManager/switchGame/karateman"},{"beat":88.0,"track":0,"datamodel":"karateman/pot"},{"beat":88.5,"track":3,"datamodel":"karateman/pot"},{"beat":90.0,"track":2,"datamodel":"karateman/pot"},{"beat":92.0,"track":1,"datamodel":"karateman/bulb"},{"beat":94.0,"track":2,"datamodel":"karateman/kick"},{"beat":95.75,"track":1,"datamodel":"karateman/bgfxoff"}]} \ No newline at end of file diff --git a/Assets/karatekacombos.json b/Assets/karatekacombos.json index 78669e53..16cc58bf 100644 --- a/Assets/karatekacombos.json +++ b/Assets/karatekacombos.json @@ -1 +1 @@ -{"bpm":180.0,"entities":[{"beat":1.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":8.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":16.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":24.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":30.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":31.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":32.0,"track":1,"length":2.0,"datamodel":"karateman/rock"},{"beat":34.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":36.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":38.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":40.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":42.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":46.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":47.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":48.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":50.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":52.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":54.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":56.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":58.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":60.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":62.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":64.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":66.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":68.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":70.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":72.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":74.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":76.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":78.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":80.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":82.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":84.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":86.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":88.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":90.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":92.0,"track":2,"length":2.0,"datamodel":"karateman/bulb"},{"beat":94.0,"track":1,"length":4.0,"datamodel":"karateman/combo"}]} \ No newline at end of file +{"bpm":180.0,"entities":[{"beat":1.0,"track":0,"length":4.0,"datamodel":"karateman/combo"},{"beat":8.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":16.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":24.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":28.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":30.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":31.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":32.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":34.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":34.0,"track":0,"length":64.0,"datamodel":"karateman/bop"},{"beat":36.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":38.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":40.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":42.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":44.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":46.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":47.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":48.0,"track":2,"length":2.0,"datamodel":"karateman/rock"},{"beat":50.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":52.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":54.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":56.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":58.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":60.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":62.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":64.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":66.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":68.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":70.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":72.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":74.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":76.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":78.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":80.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":82.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":84.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":86.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":88.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":90.0,"track":3,"length":2.0,"datamodel":"karateman/pot"},{"beat":92.0,"track":0,"length":2.0,"datamodel":"karateman/bulb"},{"beat":94.0,"track":1,"length":4.0,"datamodel":"karateman/combo"}]} \ No newline at end of file