diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 10016c52f..81a327cff 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -97608,12 +97608,15 @@ MonoBehaviour: Nori: {fileID: 3856490809560069226} MappingMaterial: {fileID: 2100000, guid: 01a12550d4a6d8141bbbdf4ce2700eea, type: 2} Word: {fileID: 8471847813194768760} + currentBgEffect: 0 BGPlane: {fileID: 5423016352081307686} BGEffect: {fileID: 185016033042157469} BGGradient: {fileID: 2790469215453043610} BGBlood: {fileID: 5404947306895237780} BGRadial: {fileID: 8238140095837895901} Wind: {fileID: 9003203273337395302} + Effects: [] + EffectsGO: [] SnowEffect: {fileID: 6887086164110906535} SnowEffectGO: {fileID: 1216083719847348373} FireEffect: {fileID: 5127881687583584282} diff --git a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg new file mode 100644 index 000000000..5cf415cd9 Binary files /dev/null and b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg differ diff --git a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta new file mode 100644 index 000000000..defa8721f --- /dev/null +++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6ad9f1d601adf9a4889010293bb854d4 +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/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg new file mode 100644 index 000000000..257073da7 Binary files /dev/null and b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg differ diff --git a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta new file mode 100644 index 000000000..84d887ce1 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 86fe61ed86cc5bd4cb8da587c4e4cc48 +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/Resources/Sprites/Games/KarateMan/anime/word/Word.controller b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller index cab9a2b21..a2b73c402 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word01 + m_Name: Word04 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -33,7 +33,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word06 + m_Name: Word00 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -59,7 +59,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word04 + m_Name: Word03 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -85,7 +85,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word00 + m_Name: Word06 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -111,7 +111,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word03 + m_Name: Word02 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -211,7 +211,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Word02 + m_Name: Word01 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim index f31800a24..fb928d49a 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -5.8, y: 1.5, z: 0} + value: {x: -4, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - - {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -5.8 + value: -4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim index 8ca43ae39..93b71c79a 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4.72, y: 1.6, z: 0} + value: {x: -4.4, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - - {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.72 + value: -4.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.6 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim index c576beafb..284fe51bb 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim @@ -14,6 +14,22 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Sub - curve: serializedVersion: 2 m_Curve: @@ -46,12 +62,13 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main + m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.403, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -62,7 +79,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Sub - m_PositionCurves: - curve: serializedVersion: 2 m_Curve: @@ -95,25 +111,16 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -1.403, y: 1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Sub m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Sub + classID: 212 + script: {fileID: 0} - curve: - time: 0 value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} @@ -123,18 +130,11 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: 0} - attribute: m_Sprite - path: Sub - classID: 212 - script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -142,6 +142,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 1615840316 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 0 @@ -158,11 +165,11 @@ AnimationClip: isPPtrCurve: 1 - serializedVersion: 2 path: 1615840316 - attribute: 0 + attribute: 1 script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 attribute: 1 @@ -179,10 +186,10 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 - attribute: 1 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 @@ -198,17 +205,10 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1615840316 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -230,6 +230,63 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.403 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Sub + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -287,63 +344,6 @@ AnimationClip: path: Exclaim classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Exclaim - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -417,7 +417,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Main + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Main + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -455,63 +455,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1.403 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z path: Sub classID: 4 script: {fileID: 0} @@ -531,7 +474,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Sub + path: Exclaim classID: 4 script: {fileID: 0} - curve: @@ -550,7 +493,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Sub + path: Exclaim classID: 4 script: {fileID: 0} - curve: @@ -569,10 +512,97 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Sub + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Main classID: 4 script: {fileID: 0} m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sub + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -633,36 +663,6 @@ AnimationClip: path: Main classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Sub - classID: 4 - script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim index 34b2b836b..f021864db 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim @@ -14,22 +14,6 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Sub - curve: serializedVersion: 2 m_Curve: @@ -62,13 +46,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main - m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.403, y: 1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -79,6 +62,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Sub + m_PositionCurves: - curve: serializedVersion: 2 m_Curve: @@ -111,16 +95,25 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.403, y: 1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Sub m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 0} - attribute: m_Sprite - path: Sub - classID: 212 - script: {fileID: 0} - curve: - time: 0 value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} @@ -130,11 +123,18 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Sub + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -142,13 +142,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 1615840316 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 0 @@ -165,11 +158,11 @@ AnimationClip: isPPtrCurve: 1 - serializedVersion: 2 path: 1615840316 - attribute: 1 + attribute: 0 script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 1 @@ -186,10 +179,10 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 - attribute: 4 + attribute: 1 script: {fileID: 0} typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 @@ -205,10 +198,17 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1615840316 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -230,63 +230,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1.403 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Sub - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -344,6 +287,63 @@ AnimationClip: path: Exclaim classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Exclaim + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -417,7 +417,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Sub + path: Main classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Sub + path: Main classID: 4 script: {fileID: 0} - curve: @@ -455,6 +455,63 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.403 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z path: Sub classID: 4 script: {fileID: 0} @@ -474,7 +531,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Exclaim + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -493,7 +550,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Exclaim + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -512,97 +569,10 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Main + path: Sub classID: 4 script: {fileID: 0} m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Sub - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -663,6 +633,36 @@ AnimationClip: path: Main classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sub + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim index d9b819928..ce75e1a27 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4.4, y: 1, z: 0} + value: {x: -4.72, y: 1.6, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} + - {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.4 + value: -4.72 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim index fbebd7445..a493e78f9 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4, y: 1, z: 0} + value: {x: -5.8, y: 1.5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} + - {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4 + value: -5.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 2d9c67a5d..12df64a0d 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -14,45 +14,10 @@ namespace HeavenStudio.Games.Loaders { public static Minigame AddGame(EventCaller eventCaller) { - RiqEntity WarningUpdater(string datamodel, RiqEntity entity) - { - if (datamodel == "karateman/hitX") - { - int newWarning = (int)entity["type"]; - if (entity["type"] < 7) { - newWarning++; - } else { - newWarning = 0; - } - - entity.CreateProperty("whichWarning", newWarning); - entity.CreateProperty("customLength", false); - entity.CreateProperty("cutOut", true); - - entity.dynamicData.Remove("type"); - - entity.datamodel = "karateman/warnings"; - return entity; - } - return null; - } - RiqBeatmap.OnUpdateEntity += WarningUpdater; - - RiqEntity BackgroundUpdater(string datamodel, RiqEntity entity) - { - if (datamodel == "karateman/set background effects") - { - - return entity; - } - return null; - } - RiqBeatmap.OnUpdateEntity += BackgroundUpdater; - - /* + /* what the fuck RiqEntity NameUpdater(string datamodel, RiqEntity entity) { - if (entity.datamodel.Split('/')[0] == "karateman") + if (entity.datamodel.Split('/')[0] == "karateMan") { Debug.Log(datamodel); // this was the only way i could figure out how to convert from that freaky format into an actual color :( @@ -80,7 +45,7 @@ namespace HeavenStudio.Games.Loaders entity.datamodel = entity.datamodel.Remove(0, 9); entity.datamodel = "karateMan" + entity.datamodel; return entity; - } else if (entity.datamodel == "gameManager/switchGame/karateman") { + } else if (entity.datamodel == "gameManager/switchGame/karateMan") { entity.datamodel = "gameManager/switchGame/karateMan"; } return null; @@ -88,7 +53,67 @@ namespace HeavenStudio.Games.Loaders RiqBeatmap.OnUpdateEntity += NameUpdater; */ - return new Minigame("karateman", "Karate Man", "fbca3e", false, false, new List() + RiqEntity WarningUpdater(string datamodel, RiqEntity entity) + { + if (datamodel == "karateman/hitX") + { + int newWarning = (int)entity["type"]; + if (entity["type"] < 7) { + newWarning++; + } else { + newWarning = 0; + } + + entity.CreateProperty("whichWarning", newWarning); + entity.CreateProperty("customLength", false); + entity.CreateProperty("cutOut", true); + + entity.dynamicData.Remove("type"); + + entity.datamodel = "karateMan/warnings"; + return entity; + } + return null; + } + RiqBeatmap.OnUpdateEntity += WarningUpdater; + + RiqEntity BackgroundUpdater(string datamodel, RiqEntity entity) + { + if (datamodel == "karateman/set background effects") + { + + return entity; + } + return null; + } + //RiqBeatmap.OnUpdateEntity += BackgroundUpdater; + + RiqEntity GameCapitalizer(string datamodel, RiqEntity entity) + { + if (datamodel.Split('/')[0] == "karateman") + { + string name = datamodel.Split('/')[1]; + entity.datamodel = "karateMan/" + name; + var tempData = entity.dynamicData.ToDictionary(x => x.Key); + foreach ((string key, dynamic item) in tempData) + { + if (item.GetType() == typeof(Newtonsoft.Json.Linq.JObject)) { + entity.dynamicData[key] = new Color((float)item["r"], (float)item["g"], (float)item["b"]); + } + Debug.Log(key + ", " + item); + } + entity.version = 1; + + return entity; + } else if (datamodel == "gameManager/switchGame/karateman") { + entity.datamodel = "gameManager/switchGame/karateMan"; + return entity; + } + return null; + } + RiqBeatmap.OnUpdateEntity += GameCapitalizer; + + return new Minigame("karateMan", "Karate Man", "fbca3e", false, false, new List() { new GameAction("bop", "Bop") { @@ -124,12 +149,12 @@ namespace HeavenStudio.Games.Loaders function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"]); - KarateMan.CreateItemSFX(e.beat, e["type"], false, true); + KarateMan.CreateBulbSFX(e.beat, e["type"], false); }, inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.QueueBulb(e.beat, e["type"], e["colorA"], e["type2"]); - KarateMan.CreateItemSFX(e.beat, e["type"], false, true); + KarateMan.CreateBulbSFX(e.beat, e["type"], false); }, defaultLength = 2, parameters = new List() @@ -147,12 +172,12 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - KarateMan.instance.Kick(e.beat, e["toggle"], e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.instance.Kick(e.beat, e["toggle"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); KarateMan.KickSFX(); }, inactiveFunction = delegate { var e = eventCaller.currentEntity; - KarateMan.QueueKick(e.beat, e["toggle"], e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.QueueKick(e.beat, e["toggle"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); KarateMan.KickSFX(); }, defaultLength = 4f, @@ -160,6 +185,11 @@ namespace HeavenStudio.Games.Loaders { new Param("toggle", false, "Contains Ball", "Barrel contains a ball instead of a bomb?"), new Param("type", KarateMan.KarateManFaces.Smirk, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), } @@ -168,18 +198,23 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - KarateMan.instance.Combo(e.beat, e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.instance.Combo(e.beat, e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); KarateMan.ComboSFX(); }, inactiveFunction = delegate { var e = eventCaller.currentEntity; - KarateMan.QueueCombo(e.beat, e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.QueueCombo(e.beat, e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); KarateMan.ComboSFX(); }, defaultLength = 4, parameters = new List() { new Param("type", KarateMan.KarateManFaces.Happy, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), } @@ -188,19 +223,24 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - KarateMan.instance.DoWord(e.beat, e.length, e["whichWarning"], e["customLength"]); + KarateMan.instance.DoWord(e.beat, e.length, e["whichWarning"], e["pitchVoice"], e["forcePitch"], e["customLength"]); }, defaultLength = 1f, resizable = true, parameters = new List() { new Param("whichWarning", KarateMan.HitThree.HitThree, "Which Warning", "The warning text to show and the sfx to play"), + new Param("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), new Param("customLength", false, "Custom Length", "Have the warning text appear for the length of the block"), new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), }, inactiveFunction = delegate { var e = eventCaller.currentEntity; - KarateMan.DoWordSound(e.beat, e.length, e["whichWarning"], e["customLength"]); + KarateMan.QueueWord(e.beat, e.length, e["whichWarning"], e["pitchVoice"], e["forcePitch"], e["customLength"]); } }, new GameAction("special camera", "Special Camera") @@ -234,12 +274,12 @@ namespace HeavenStudio.Games.Loaders { function = delegate { var e = eventCaller.currentEntity; - KarateMan.instance.BackgroundColor(e.beat, e.length, e["presetBg"], e["shadowType"], e["fxType"], e["startColor"], e["endColor"], e["bgEase"]); - //KarateMan.instance.SetBgTexture(e["type4"], e["type5"], e["colorC"], e["colorD"]); - }, - defaultLength = 0.5f, - resizable = true, - parameters = new List() + KarateMan.instance.BackgroundColor(e.beat, e.length, e["presetBg"], e["startColor"], e["endColor"], e["bgEase"], e["shadowType"], e["shadowStart"], e["shadowEnd"]); + KarateMan.instance.SetBgFx(e.beat, e.length, e["fxType"], e["textureType"], e["autoColor"], e["startTexture"], e["endTexture"], e["textureEase"]); + }, + defaultLength = 0.5f, + resizable = true, + parameters = new List() // uncomment these collapses when overlapping collapses are implemented { new Param("presetBg", KarateMan.BackgroundType.Yellow, "Preset BG Color", "The preset background type (will by default fade from the existing background color)", new List() { @@ -249,16 +289,27 @@ namespace HeavenStudio.Games.Loaders new Param("endColor", new Color(0.985f, 0.79f, 0.243f), "End BG Color", "When using the Fade background effect, make filter colour fade to this colour"), new Param("bgEase", Util.EasingFunction.Ease.Instant, "BG Color Ease", "Ease to use when fading color", new List() { - // doesn't work with the current CollapseParam implementation //new Param.CollapseParam(x => (int)x != (int)Util.EasingFunction.Ease.Instant, new string[] { "startColor" }) }), new Param("shadowType", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"), - new Param("shadowColor", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom. When fading the background colour shadows fade to this color"), - new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed. Fade uses the entity length to determine colour fading speed"), - new Param("type4", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use"), - new Param("type5", KarateMan.ShadowType.Tinted, "Color Filter Type", "The method used to apply colour to the texture"), - new Param("colorC", new Color(), "Custom Filter Color", "The filter color to use when color filter type is set to Custom"), - new Param("colorD", new Color(), "Fading Filter Color", "When using the Fade background effect, make filter colour fade to this colour"), + new Param("shadowStart", new Color(), "Start Shadow Color", "The shadow color to use when shadow type is set to Custom. When fading the background colour shadows fade to this color"), + new Param("shadowEnd", new Color(), "End Shadow Color", "The shadow color to use when shadow type is set to Custom. When fading the background colour shadows fade to this color"), + + new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed"), + new Param("textureType", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use", new List() + { + new Param.CollapseParam(x => (int)x != (int)KarateMan.BackgroundTextureType.Plain, new string[] { "startTexture", "endTexture" }) + }), + new Param("autoColor", true, "Use BG Color For Texture", "Use a tint of the background color for the ", new List() + { + //new Param.CollapseParam(x => (int)x != (int)KarateMan.ShadowType.Tinted, new string[] { "startTexture", "endTexture" }) + }), + new Param("startTexture", new Color(), "Start Filter Color", "The filter color to use when color filter type is set to Custom"), + new Param("endTexture", new Color(), "End Filter Color", "When using the Fade background effect, make filter colour fade to this colour"), + new Param("textureEase", Util.EasingFunction.Ease.Instant, "Texture Color Ease", "Ease to use when fading color", new List() + { + //new Param.CollapseParam(x => (int)x != (int)Util.EasingFunction.Ease.Instant, new string[] { "startTexture" }) + }), }, }, // new GameAction("set background effects", "Background Appearance (OLD)") @@ -266,7 +317,7 @@ namespace HeavenStudio.Games.Loaders // function = delegate { // var e = eventCaller.currentEntity; // KarateMan.instance.SetBgAndShadowCol(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"]); - // KarateMan.instance.SetBgTexture(e["type4"], e["type5"], e["colorC"], e["colorD"]); + // KarateMan.instance.SetBgFx(e["type4"], e["type5"], e["colorC"], e["colorD"]); // }, // defaultLength = 0.5f, // resizable = true, @@ -285,7 +336,10 @@ namespace HeavenStudio.Games.Loaders // }, new GameAction("set object colors", "Object Colors") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); + }, defaultLength = 0.5f, parameters = new List() { @@ -296,7 +350,10 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("particle effects", "Particle Effects") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetParticleEffect(e.beat, e["type"], e["valA"], e["valB"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.SetParticleEffect(e.beat, e["type"], e["valA"], e["valB"]); + }, defaultLength = 0.5f, parameters = new List() { @@ -315,12 +372,6 @@ namespace HeavenStudio.Games.Loaders new Param("type", KarateMan.KarateManFaces.Normal, "Facial Expression", "The facial expression to force Joe to. Special moves may override this") } }, - - // hidden but here so that the block can update - new GameAction("hitX", "Warnings (old)") - { - hidden = true, - }, }, new List() {"agb", "ntr", "rvl", "ctr", "pco", "normal"}, "karate", "en", @@ -351,6 +402,8 @@ namespace HeavenStudio.Games { public double beat; public int expression; + public bool pitchVoice; + public float forcePitch; public bool cutOut; public bool noVoice; public bool ball; @@ -372,14 +425,14 @@ namespace HeavenStudio.Games public enum HitThree { - HitOne, - HitTwo, - HitThree, - HitThreeAlt, - HitFour, - Grr, - Warning, - Combo, + HitOne, // 0 + HitTwo, // 1 + HitThree, // 2 + HitThreeAlt, // 3 + HitFour, // 4 + Grr, // 5 + Warning, // 6 + Combo, // 7 } public enum LightBulbType @@ -496,25 +549,20 @@ namespace HeavenStudio.Games [Header("Backgrounds")] // new bg fading - private double colorStartBeat = -1; - private float colorLength = 0f; - private Color colorStart = new Color(0.985f, 0.79f, 0.243f); - private Color colorEnd = new Color(0.985f, 0.79f, 0.243f); - private Util.EasingFunction.Ease colorEase; + private double[] colorStartBeats = new double[3] { + -1, + -1, + -1 + }; + private float[] colorLengths = new float[3]; + private Color[] colorStarts = new Color[3]; + private Color[] colorEnds = new Color[3]; // 0 = bg color, 1 = shadow color, 2 = filter color + private Util.EasingFunction.Ease[] colorEases = new Util.EasingFunction.Ease[3]; - static int bgType = (int) BackgroundType.Yellow; - public static int currentBgEffect = (int) BackgroundFXType.None; + public int currentBgEffect = (int) BackgroundFXType.None; public SpriteRenderer BGPlane; public GameObject BGEffect; - - Animator bgEffectAnimator; - SpriteRenderer bgEffectSpriteRenderer; - - static int textureType = (int) BackgroundTextureType.Plain; - static int textureFilterType = (int) ShadowType.Tinted; - static Color filterColour = Color.white; - static Color filterColourNext = Color.white; public GameObject BGGradient; SpriteRenderer bgGradientRenderer; public GameObject BGBlood; @@ -522,15 +570,15 @@ namespace HeavenStudio.Games public GameObject BGRadial; SpriteRenderer bgRadialRenderer; SpriteRenderer[] bgFxRenderers; - - [Header("Shadows")] - static int currentShadowType = (int) ShadowType.Tinted; - static Color customShadowColour = Color.white; - static Color oldShadowColour; + Animator bgEffectAnimator; + SpriteRenderer bgEffectSpriteRenderer; [Header("Particles")] //wind public WindZone Wind; + + public ParticleSystem[] Effects; + public GameObject[] EffectsGO; //snow public ParticleSystem SnowEffect; public GameObject SnowEffectGO; @@ -570,33 +618,31 @@ namespace HeavenStudio.Games } if (queuedKicks.Count > 0) { - foreach (var qObj in queuedKicks) { Kick(qObj.beat, qObj.ball, qObj.expression, qObj.cutOut, qObj.noVoice); } + foreach (var qObj in queuedKicks) { Kick(qObj.beat, qObj.ball, qObj.expression, qObj.pitchVoice, qObj.forcePitch, qObj.cutOut, qObj.noVoice); } queuedKicks.Clear(); } if (queuedCombos.Count > 0) { - foreach (var qObj in queuedCombos) { Combo(qObj.beat, qObj.expression, qObj.cutOut, qObj.noVoice); } + foreach (var qObj in queuedCombos) { Combo(qObj.beat, qObj.expression, qObj.pitchVoice, qObj.forcePitch, qObj.cutOut, qObj.noVoice); } queuedCombos.Clear(); } - List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman"); + List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateMan"); + + RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel.Split(1) == "warnings"); + if (wordClearTime > beat && voice != null) { + var type = voice["whichWarning"]; + Word.Play($"Word0{(type < (int)HitThree.HitThreeAlt ? type : type - 1)}"); + } // init colors RiqEntity bg = prevEntities.FindLast(c => c.beat < beat && c.datamodel.Split(1) == "set background effects"); RiqEntity obj = prevEntities.FindLast(c => c.beat < beat && c.datamodel.Split(1) == "set object colors"); - + if (bg != null) { - - } else { - + BackgroundColor(bg.beat, bg.length, bg["presetBg"], bg["startColor"], bg["endColor"], bg["bgEase"], bg["shadowType"], bg["shadowStart"], bg["shadowEnd"]); + SetBgFx(bg.beat, bg.length, bg["fxType"], bg["textureType"], bg["autoColor"], bg["startTexture"], bg["endTexture"], bg["textureEase"]); } - // if (bg != null) { - // SetBgAndShadowCol(bg.beat, 0, bg["type"], bg["type2"], bg["colorA"], bg["colorB"], bg["type3"] == (int)BackgroundFXType.Fade ? 0 : bg["type3"]); - // SetBgTexture(bg["type4"], bg["type5"], bg["colorC"], bg["colorD"]); - // } else { - // SetBgAndShadowCol(0, 0, 0, 0, new Color(), new Color(), 0); - // SetBgTexture(0, 0, new Color(), new Color()); - // } if (obj != null) { UpdateMaterialColour(obj["colorA"], obj["colorB"], obj["colorC"]); @@ -611,13 +657,7 @@ namespace HeavenStudio.Games // get all entities to later check against eachother to cut out voices voiceEntities = prevEntities.FindAll(c => c.beat > beat && (c.datamodel.Split(1) is "kick" or "combo")); - for (int i = 0; i < voiceEntities.Count; i++) { - Debug.Log("voice entity " + (i+1) + " : " + voiceEntities[i].beat); - } hitVoiceEntities = prevEntities.FindAll(c => c.beat > beat && (c.datamodel.Split(1) is "warnings" && c["whichWarning"] <= (int)HitThree.HitFour)); - for (int i = 0; i < hitVoiceEntities.Count; i++) { - Debug.Log("hitVoice entity #" + (i+1) + ", beat : " + hitVoiceEntities[i].beat); - } } public override void OnPlay(double beat) @@ -627,8 +667,6 @@ namespace HeavenStudio.Games private void Start() { - var cond = Conductor.instance; - GameCamera.additionalPosition = cameraPosition - GameCamera.defaultPosition; bgEffectAnimator = BGEffect.GetComponent(); bgEffectSpriteRenderer = BGEffect.GetComponent(); @@ -645,10 +683,10 @@ namespace HeavenStudio.Games switch (currentBgEffect) { case (int) BackgroundFXType.Sunburst: - bgEffectAnimator.DoNormalizedAnimation("Sunburst", (cond.songPositionInBeats*0.5f) % 1f); + bgEffectAnimator.DoNormalizedAnimation("Sunburst", (cond.songPositionInBeats * 0.5f) % 1f); break; case (int) BackgroundFXType.Rings: - bgEffectAnimator.DoNormalizedAnimation("Rings", (cond.songPositionInBeats*0.5f) % 1f); + bgEffectAnimator.DoNormalizedAnimation("Rings", (cond.songPositionInBeats * 0.5f) % 1f); break; default: bgEffectAnimator.Play("NoPose", -1, 0); @@ -693,13 +731,13 @@ namespace HeavenStudio.Games cameraPosition = CameraPosition[0].position; } - BackgroundColorUpdate(); + //BackgroundColorUpdate(); GameCamera.additionalPosition = cameraPosition - GameCamera.defaultPosition; BGEffect.transform.position = new Vector3(GameCamera.instance.transform.position.x, GameCamera.instance.transform.position.y, 0); } - private void OnDestroy() + private void OnDestroy() { if (!Conductor.instance.NotStopped()) { if (queuedObjects.Count > 0) queuedObjects.Clear(); @@ -713,7 +751,7 @@ namespace HeavenStudio.Games static List allEnds = new List(); public static int CountHitsToEnd(double fromBeat) { - allHits = EventCaller.GetAllInGameManagerList("karateman", new string[] { "hit", "bulb", "kick", "combo" }); + allHits = EventCaller.GetAllInGameManagerList("karateMan", new string[] { "hit", "bulb", "kick", "combo" }); allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" }); allHits.Sort((x, y) => x.beat.CompareTo(y.beat)); @@ -738,14 +776,13 @@ namespace HeavenStudio.Games RiqEntity h = allHits[i]; if (h.beat >= fromBeat) { - if (h.beat < endBeat) - { + if (h.beat < endBeat) { //kicks and combos count for 2 hits - type = (h.datamodel.Split('/'))[1]; - count += (type is "kick" or "combo" ? 2 : 1); - } - else + type = h.datamodel.Split('/')[1]; + count += (type is "kick" or "combo") ? 2 : 1; + } else { break; + } } } return count; @@ -762,96 +799,62 @@ namespace HeavenStudio.Games cameraReturnLength = Mathf.Min(2f, length*0.5f); } - public void DoWord(double beat, double length, int type, bool customLength, bool doSound = true) + public void DoWord(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true) { - Word.Play(DoWordSound(beat, length, type, customLength, doSound)); + Word.Play(DoWordSound(beat, length, type, pitchVoice, forcePitch, customLength, doSound)); } - public static string DoWordSound(double beat, double length, int type, bool customLength, bool doSound = true) + public static void QueueWord(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true) { - string word = "NoPose"; - double clear = 0f; + DoWordSound(beat, length, type, pitchVoice, forcePitch, customLength, doSound); + } - // if (type <= (int)HitThree.HitFour) { - // string number = type.ToString().Substring(3); - // number = char.ToLower(number[0]).ToString() + number.Substring(1); - // MultiSound.Play(new MultiSound.Sound[] { - // new MultiSound.Sound($"karateman/{(type == (int)HitThree.HitThreeAlt ? "hitAlt" : "hit")}", beat + 0.5f, offset: hitVoiceOffset), - // new MultiSound.Sound($"karateman/{number}", beat + 1f), - // }, forcePlay: true); - // clear = beat + 4f; - // } - switch (type) + public static string DoWordSound(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true) + { + string word = $"Word0{(type < (int)HitThree.HitThreeAlt ? type : type - 1)}"; + double clear = type switch { + <= (int)HitThree.HitFour => beat + 4f, + <= (int)HitThree.Warning => beat + 1f, + _ => beat + 3f, + }; + + if (type <= (int)HitThree.HitFour) { - case (int) HitThree.HitOne: // lol - word = "Word06"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/one", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitTwo: - word = "Word02"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/two", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitThree: - word = "Word03"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/three", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitThreeAlt: - word = "Word03"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/hitAlt", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/threeAlt", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitFour: - word = "Word04"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/four", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.Grr: - word = "Word01"; - clear = beat + 1f; - break; - case (int) HitThree.Warning: - word = "Word05"; - clear = beat + 1f; - break; - case (int) HitThree.Combo: - word = "Word00"; - clear = beat + 3f; - break; + string number = ((HitThree)type).ToString()[3..]; + number = char.ToLower(number[0]).ToString() + number[1..]; + var sounds = new MultiSound.Sound[] { + new MultiSound.Sound($"karateMan/{(type == (int)HitThree.HitThreeAlt ? "hitAlt" : "hit")}", beat + 0.5f, offset: hitVoiceOffset), + new MultiSound.Sound($"karateMan/{number}", beat + 1f), + }; + if (pitchVoice) { + foreach (var sound in sounds) { + sound.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(sound.beat) / 125 : forcePitch; + } + } + MultiSound.Play(sounds, forcePlay: true); } - if (Conductor.instance.songPositionInBeatsAsDouble <= clear && Conductor.instance.songPositionInBeatsAsDouble >= beat) - { + + var songPos = Conductor.instance.songPositionInBeatsAsDouble; + if (songPos <= clear && songPos >= beat) { wordClearTime = customLength ? (beat + length) : clear; } return word; } - public static void CreateItemSFX(double beat, int type, bool muteSound = false, bool isBulb = false) + public static void CreateItemSFX(double beat, int type, bool muteSound = false) { - if (!muteSound) SoundByte.PlayOneShotGame($"karateman/{(beat % 1.0 == 0.5 ? "offbeatObject" : "object")}Out", forcePlay: true); + if (!muteSound) SoundByte.PlayOneShotGame($"karateMan/{(beat % 1.0 == 0.5 ? $"offbeatObject" : "object")}Out", forcePlay: true); + } + + public static void CreateBulbSFX(double beat, int type, bool muteSound = false) + { + string obj = type switch { + (int)LightBulbType.Normal => "LightbulbAgb", + (int)LightBulbType.Yellow => "LightbulbNtr", + _ => "Lightbulb", + }; + Debug.Log(obj); + if (!muteSound) SoundByte.PlayOneShotGame($"karateMan/{(beat % 1.0 == 0.5 ? $"offbeat{obj}" : obj.ToLower())}Out", forcePlay: true); } public static void QueueItem(double beat, int type, int expression) @@ -910,7 +913,12 @@ namespace HeavenStudio.Games public void CreateBulbSpecial(double beat, int type, Color c, int expression) { - var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb); + string obj = type switch { + (int)LightBulbType.Normal => "LightbulbAgb", + (int)LightBulbType.Yellow => "LightbulbNtr", + _ => "Lightbulb", + }; + var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb, hitSfxOverride: $"karateMan/{obj}Hit"); if (type == (int) LightBulbType.Custom) { mobj.GetComponent().SetBulbColor(c); @@ -921,20 +929,22 @@ namespace HeavenStudio.Games public static void ComboSFX() { - SoundByte.PlayOneShotGame("karateman/barrelOutCombos", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/barrelOutCombos", forcePlay: true); } - public static void QueueCombo(double beat, int expression, bool cutOut, bool noVoice) + public static void QueueCombo(double beat, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice) { queuedCombos.Add(new QueuedSpecial() { beat = beat, expression = expression, + pitchVoice = pitchVoice, + forcePitch = forcePitch, cutOut = cutOut, noVoice = noVoice }); } - public void Combo(double beat, int expression, bool cutOut, bool noVoice) + public void Combo(double beat, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice) { int comboId = KarateManPot.GetNewCombo(); @@ -951,15 +961,22 @@ namespace HeavenStudio.Games if (noVoice) return; List sounds = new() { - new MultiSound.Sound("karateman/punchy1", beat + 1f), - new MultiSound.Sound("karateman/punchy2", beat + 1.25f), - new MultiSound.Sound("karateman/punchy3", beat + 1.5f), - new MultiSound.Sound("karateman/punchy4", beat + 1.75f), - new MultiSound.Sound("karateman/ko", beat + 2f), - new MultiSound.Sound("karateman/pow", beat + 2.5f) + new MultiSound.Sound("karateMan/punchy1", beat + 1f), + new MultiSound.Sound("karateMan/punchy2", beat + 1.25f), + new MultiSound.Sound("karateMan/punchy3", beat + 1.5f), + new MultiSound.Sound("karateMan/punchy4", beat + 1.75f), + new MultiSound.Sound("karateMan/ko", beat + 2f), + new MultiSound.Sound("karateMan/pow", beat + 2.5f) }; - if (voiceEntities.Count > 0 && cutOut) { + if (pitchVoice) { + foreach (var sound in sounds) { + sound.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(sound.beat) / 125 : forcePitch; + } + } + + if (voiceEntities.Count > 0 && cutOut) + { RiqEntity firstVoice = voiceEntities.Find(x => x.beat >= beat + 1); RiqEntity firstHitVoice = hitVoiceEntities.Find(x => x.beat >= beat + 1); if (firstVoice != null) sounds.RemoveAll(x => x.beat > firstVoice.beat); @@ -971,34 +988,43 @@ namespace HeavenStudio.Games public static void KickSFX() { - SoundByte.PlayOneShotGame("karateman/barrelOutKicks", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/barrelOutKicks", forcePlay: true); } - public static void QueueKick(double beat, bool ball, int expression, bool cutOut, bool noVoice) + public static void QueueKick(double beat, bool ball, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice) { queuedKicks.Add(new QueuedSpecial() { beat = beat, expression = expression, + pitchVoice = pitchVoice, + forcePitch = forcePitch, cutOut = cutOut, noVoice = noVoice, ball = ball, }); } - public void Kick(double beat, bool ball, int expression, bool cutOut, bool noVoice) + public void Kick(double beat, bool ball, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice) { CreateItemInstance(beat, "Item05", expression, KarateManPot.ItemType.KickBarrel, content: ball); if (noVoice) return; List sounds = new() { - new MultiSound.Sound("karateman/punchKick1", beat + 1f), - new MultiSound.Sound("karateman/punchKick2", beat + 1.5f), - new MultiSound.Sound("karateman/punchKick3", beat + 1.75f), - new MultiSound.Sound("karateman/punchKick4", beat + 2.5f), + new MultiSound.Sound("karateMan/punchKick1", beat + 1f), + new MultiSound.Sound("karateMan/punchKick2", beat + 1.5f), + new MultiSound.Sound("karateMan/punchKick3", beat + 1.75f), + new MultiSound.Sound("karateMan/punchKick4", beat + 2.5f), }; - if (voiceEntities.Count > 0 && cutOut) { + if (pitchVoice) { + foreach (var sound in sounds) { + sound.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(sound.beat) / 125 : forcePitch; + } + } + + if (voiceEntities.Count > 0 && cutOut) + { RiqEntity firstVoice = voiceEntities.Find(x => x.beat >= beat + 1); RiqEntity firstHitVoice = hitVoiceEntities.Find(x => x.beat >= beat + 1); if (firstVoice != null) sounds.RemoveAll(x => x.beat > firstVoice.beat); @@ -1008,7 +1034,7 @@ namespace HeavenStudio.Games MultiSound.Play(sounds.ToArray(), forcePlay: true); } - public GameObject CreateItemInstance(double beat, string awakeAnim, int successExpression, KarateManPot.ItemType type = KarateManPot.ItemType.Pot, int comboId = -1, bool content = false) + public GameObject CreateItemInstance(double beat, string awakeAnim, int successExpression, KarateManPot.ItemType type = KarateManPot.ItemType.Pot, int comboId = -1, bool content = false, string hitSfxOverride = null) { GameObject mobj = GameObject.Instantiate(Item, ItemHolder); KarateManPot mobjDat = mobj.GetComponent(); @@ -1018,124 +1044,65 @@ namespace HeavenStudio.Games mobjDat.comboId = comboId; mobjDat.OnHitExpression = successExpression; mobjDat.KickBarrelContent = content; + mobjDat.hitSfxOverride = hitSfxOverride; mobj.SetActive(true); return mobj; } - public void BackgroundColor(double beat, float length, int presetBG, int shadowType, int fxType, Color colorStartSet, Color colorEndSet, int ease) + public void BackgroundColor(double beat, float length, int presetBG, Color colorStart, Color colorEnd, int colorEaseSet, int shadowType, Color shadowStart, Color shadowEnd) { - ////////////////////////////////////////// - // preset = BackgroundType // - // shadow = ShadowType // - // fxType = BackgroundFXType // - // textureType = BackgroundTextureType // - ////////////////////////////////////////// - if (presetBG != (int)BackgroundType.Custom) { - colorEndSet = BackgroundColors[presetBG]; + colorEnd = BackgroundColors[presetBG]; } - colorStartBeat = beat; - colorLength = length; - colorStart = colorStartSet; - colorEnd = colorEndSet; - colorEase = (Util.EasingFunction.Ease)ease; + colorStartBeats[0] = beat; + colorLengths[0] = length; + colorStarts[0] = colorStart; + colorEnds[0] = colorEnd; + colorEases[0] = (Util.EasingFunction.Ease)colorEaseSet; + + BackgroundColorUpdate(); } - public void SetBgTexture(int type, int filterType, Color colorStartSet, Color colorEndSet) + public void SetBgFx(double beat, float length, int fxType, int textureType, bool autoColor, Color filterStartSet, Color filterEndSet, int ease) { - textureType = type; - textureFilterType = filterType; - if (textureFilterType == (int) ShadowType.Tinted) - filterColour = Color.LerpUnclamped(colorStartSet, colorEndSet, 0.45f); - else - { - filterColour = colorStartSet; - filterColourNext = colorEndSet; - } - switch (textureType) - { - case (int) BackgroundTextureType.Blood: - BGBlood.SetActive(true); - BGGradient.SetActive(false); - BGRadial.SetActive(false); - break; - case (int) BackgroundTextureType.Gradient: - BGGradient.SetActive(true); - BGBlood.SetActive(false); - BGRadial.SetActive(false); - break; - case (int) BackgroundTextureType.Radial: - BGRadial.SetActive(true); - BGBlood.SetActive(false); - BGGradient.SetActive(false); - break; - default: - BGGradient.SetActive(false); - BGBlood.SetActive(false); - BGRadial.SetActive(false); - break; - } - BackgroundColorUpdate(); + colorStarts[2] = filterStartSet; + colorEnds[2] = filterEndSet; + + BGBlood.SetActive(fxType == (int)BackgroundTextureType.Blood); + BGGradient.SetActive(fxType == (int)BackgroundTextureType.Gradient); + BGRadial.SetActive(fxType == (int)BackgroundTextureType.Radial); } private void BackgroundColorUpdate() { - float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(colorStartBeat, colorLength)); + float[,] newRgb = new float[3, 3]; - var func = Util.EasingFunction.GetEasingFunction(colorEase); + for (int i = 0; i < newRgb.GetLength(0); i++) + { + float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(colorStartBeats[i], colorLengths[i])); + var func = Util.EasingFunction.GetEasingFunction(colorEases[i]); + + for (int j = 0; j < newRgb.GetLength(1); j++) + { + float Hue(Color[] whichColors) => j switch { + 0 => whichColors[i].r, + 1 => whichColors[i].g, + _ => whichColors[i].b, + }; + newRgb[j, i] = func(Hue(colorStarts), Hue(colorEnds), normalizedBeat); + } + } - float newR = func(colorStart.r, colorEnd.r, normalizedBeat); - float newG = func(colorStart.g, colorEnd.g, normalizedBeat); - float newB = func(colorStart.b, colorEnd.b, normalizedBeat); + BGPlane.color = new Color(newRgb[0, 0], newRgb[0, 1], newRgb[0, 2]); - BGPlane.color = new Color(newR, newG, newB); - - // bgGradientRenderer.color = filterCol; - // bgBloodRenderer.color = filterCol; - // bgRadialRenderer.color = filterCol; + bgGradientRenderer.color = + bgBloodRenderer.color = + bgRadialRenderer.color = new Color(newRgb[1, 0], newRgb[1, 1], newRgb[1, 2]); } - // public void SetBgAndShadowCol(double beat, float length, int newBgType, int shadowType, Color a, Color b, int fx) - // { - // SetBgFx(fx, beat, length); - // UpdateShadowColour(shadowType, b); - - // bgType = newBgType; - // if (bgType == (int) BackgroundType.Custom) - // bgColour = a; - // else - // bgColour = BackgroundColors[newBgType]; - // BGPlane.color = bgColour; - - // //😢 - // if (fx != (int) BackgroundFXType.Fade) - // { - // bgColourLast = bgColour; - // oldShadowColour = GetShadowColor(true); - // } - - // if (textureFilterType == (int) ShadowType.Tinted) - // filterColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - // } - - // public void SetBgFx(int fx, double beat, float length) - // { - // switch (fx) - // { - // case (int) BackgroundFXType.Fade: - // bgColourLast = bgColour; - // bgFadeTime = beat; - // bgFadeDuration = length; - // break; - // default: - // currentBgEffect = fx; - // break; - // } - // } - public void SetGameplayMods(double beat, int mode, bool combo) { NoriGO.SetActive(true); @@ -1143,39 +1110,6 @@ namespace HeavenStudio.Games IsComboEnable = combo; } - public static Color ShadowBlendColor = new Color(195 / 255f, 48 / 255f, 2 / 255f); - // public Color GetShadowColor(bool next = false) - // { - // Color lastCol, nextCol; - // lastCol = oldShadowColour; - - // if (currentShadowType == (int) ShadowType.Custom) - // nextCol = customShadowColour; - // else if (bgType < (int) BackgroundType.Custom) - // nextCol = ShadowColors[bgType]; - // else - // nextCol = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - - // float fadeProg = Conductor.instance.GetPositionFromBeat(bgFadeTime, bgFadeDuration); - // if (fadeProg <= 1f && fadeProg >= 0) - // { - // return Color.LerpUnclamped(lastCol, nextCol, fadeProg); - // } - // return next ? nextCol : lastCol; - // } - - // public void UpdateShadowColour(int type, Color colour) - // { - // if (currentShadowType == (int) ShadowType.Custom) - // oldShadowColour = customShadowColour; - // else if (bgType < (int) BackgroundType.Custom) - // oldShadowColour = ShadowColors[bgType]; - // else - // oldShadowColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - - // currentShadowType = type; - // customShadowColour = colour; - // } public static void UpdateMaterialColour(Color mainCol, Color highlightCol, Color objectCol) { @@ -1247,4 +1181,4 @@ namespace HeavenStudio.Games Joe.SetFaceExpression(face); } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index 82a8424b7..e04946ab6 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -140,7 +140,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (!KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN)) { Punch(1); - SoundByte.PlayOneShotGame("karateman/swingNoHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/swingNoHit", forcePlay: true); } } @@ -174,7 +174,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan else if (inKick && cond.GetPositionFromBeat(lastChargeTime, 2.75f) <= 0.5f && !KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_UP | InputType.DIRECTION_UP)) { Kick(cond.songPositionInBeatsAsDouble); - SoundByte.PlayOneShotGame("karateman/swingKick", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/swingKick", forcePlay: true); } } @@ -189,7 +189,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public bool Punch(int forceHand = 0) { - if (GameManager.instance.currentGame != "karateman") return false; + if (GameManager.instance.currentGame != "karateMan") return false; var cond = Conductor.instance; bool straight = false; @@ -232,7 +232,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ComboSequence(int seq) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var cond = Conductor.instance; bop.startBeat = cond.songPositionInBeatsAsDouble + 1f; unPrepareTime = double.MinValue; @@ -286,10 +286,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("karateman/swingNoHit", beat), - new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.25f), - new MultiSound.Sound("karateman/swingNoHit_Alt", beat + 0.5f), - new MultiSound.Sound("karateman/comboMiss", beat + 0.75f), + new MultiSound.Sound("karateMan/swingNoHit", beat), + new MultiSound.Sound("karateMan/swingNoHit_Alt", beat + 0.25f), + new MultiSound.Sound("karateMan/swingNoHit_Alt", beat + 0.5f), + new MultiSound.Sound("karateMan/comboMiss", beat + 0.75f), }, forcePlay: true); } diff --git a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs index 9f7dfd8fe..116743e58 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs @@ -154,7 +154,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (KarateMan.instance.NoriPerformance >= 0.6f && oldNori / MaxNori < 0.6f && !playedJust) { playedJust = true; - SoundByte.PlayOneShotGame("karateman/nori_just"); + SoundByte.PlayOneShotGame("karateMan/nori_just"); } UpdateHeartColours(); } @@ -193,7 +193,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (KarateMan.instance.NoriPerformance < 0.6f && oldNori / MaxNori >= 0.6f) { playedJust = false; - SoundByte.PlayOneShotGame("karateman/nori_ng"); + SoundByte.PlayOneShotGame("karateMan/nori_ng"); } UpdateHeartColours(); } @@ -205,7 +205,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (noriMode == (int) KarateMan.NoriMode.Tengoku) { if (Nori >= MaxNori) - SoundByte.PlayOneShotGame("karateman/nori_through"); + SoundByte.PlayOneShotGame("karateMan/nori_through"); playedJust = false; Nori = 0; foreach (Animator anim in NoriHeartAnimators) diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index 82faa2a83..25adcddc0 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -13,10 +13,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan public double startBeat; public ItemType type; public int path = 1; + public string hitSfxOverride; public GameObject Shadow; public GameObject ShadowInstance; - SpriteRenderer shadowRenderer; //hit effects public GameObject HitMark; @@ -255,7 +255,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (-360f * Time.deltaTime) + UnityEngine.Random.Range(0f, 360f)); ShadowInstance = GameObject.Instantiate(Shadow, KarateMan.instance.ItemHolder); - shadowRenderer = ShadowInstance.GetComponent(); //shadowRenderer.color = KarateMan.instance.GetShadowColor(); ShadowInstance.SetActive(true); ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); @@ -321,7 +320,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan GameObject.Destroy(ShadowInstance.gameObject); GameObject.Destroy(gameObject); - SoundByte.PlayOneShotGame("karateman/bombBreak", volume: 0.25f); + SoundByte.PlayOneShotGame("karateMan/bombBreak", volume: 0.25f); return; } else if (cond.songPositionInBeatsAsDouble >= startBeat + Mathf.Max(2f, curveTargetBeat) || CurrentCurve == null) { @@ -439,8 +438,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan { case ItemType.Bulb: CurrentCurve = ItemCurves[straight ? 1 : 0]; - curveTargetBeat = straight ? 1f : 1.5f;; - SoundByte.PlayOneShotGame("karateman/lightbulbHit", forcePlay: true); + curveTargetBeat = straight ? 1f : 1.5f; + Debug.Log(hitSfxOverride); + SoundByte.PlayOneShotGame(hitSfxOverride ?? "karateMan/lightbulbHit", forcePlay: true); p = Instantiate(HitParticles[5], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); if (effectTint.a == 0) @@ -464,101 +464,101 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.Rock: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/rockHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit", forcePlay: true); p = Instantiate(HitParticles[4], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p.Play(); if (game.IsNoriActive && game.NoriPerformance >= 1f) - SoundByte.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit_fullNori", forcePlay: true); break; case ItemType.Ball: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/soccerHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/soccerHit", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.Cooking: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/cookingPot", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/cookingPot", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); game.CreateItemInstance(startBeat + 1f, "Item09", 0, ItemType.CookingLid); GetComponent().Play("Item08", -1, 0); if (game.IsNoriActive && game.NoriPerformance >= 1f) - SoundByte.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit_fullNori", forcePlay: true); break; case ItemType.Alien: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/alienHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/alienHit", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); if (game.IsNoriActive && game.NoriPerformance >= 1f) - SoundByte.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit_fullNori", forcePlay: true); break; case ItemType.Bomb: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/bombHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/bombHit", forcePlay: true); p = Instantiate(HitParticles[2], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); game.Joe.RemoveBombGlow(startBeat + 1f, 1f); if (game.IsNoriActive && game.NoriPerformance >= 1f) - SoundByte.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit_fullNori", forcePlay: true); break; case ItemType.TacoBell: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/rockHit", forcePlay: true); - SoundByte.PlayOneShotGame("karateman/tacobell", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/tacobell", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); if (game.IsNoriActive && game.NoriPerformance >= 1f) - SoundByte.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/rockHit_fullNori", forcePlay: true); break; case ItemType.ComboPot1: CurrentCurve = ItemCurves[straight ? 1 : 0]; curveTargetBeat = 1.5f; - SoundByte.PlayOneShotGame("karateman/comboHit1", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit1", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot2: CurrentCurve = ItemCurves[0]; curveTargetBeat = 1.5f; - SoundByte.PlayOneShotGame("karateman/comboHit1", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit1", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot3: CurrentCurve = ItemCurves[2]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/comboHit2", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit2", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[2].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot4: CurrentCurve = ItemCurves[3]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/comboHit3", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit3", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[3].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot5: CurrentCurve = ItemCurves[4]; curveTargetBeat = 1f; - SoundByte.PlayOneShotGame("karateman/comboHit3", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit3", forcePlay: true); p = Instantiate(HitParticles[1], HitPosition[4].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboBarrel: - SoundByte.PlayOneShotGame("karateman/comboHit4", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboHit4", forcePlay: true); p = Instantiate(HitParticles[0], HitPosition[5].position, Quaternion.identity, game.ItemHolder); p.Play(); p = Instantiate(HitParticles[1], HitPosition[5].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); @@ -572,7 +572,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan game.Joe.ApplyBombGlow(); game.CreateItemInstance(startBeat + 1f, "Item04", OnHitExpression, ItemType.KickBomb); } - SoundByte.PlayOneShotGame("karateman/barrelBreak", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/barrelBreak", forcePlay: true); p = Instantiate(HitParticles[0], HitPosition[1].position, Quaternion.Euler(0, 0, -5f), game.ItemHolder); p.Play(); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); @@ -580,14 +580,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan break; case ItemType.KickBomb: - SoundByte.PlayOneShotGame("karateman/bombKick", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/bombKick", forcePlay: true); p = Instantiate(HitParticles[2], ItemCurves[6].GetPoint(0.5f), Quaternion.identity, game.ItemHolder); p.Play(); game.Joe.RemoveBombGlow(startBeat + 0.75f); break; case ItemType.KickBall: - SoundByte.PlayOneShotGame("karateman/bombKick", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/bombKick", forcePlay: true); p = Instantiate(HitParticles[1], ItemCurves[6].GetPoint(0.5f), Quaternion.identity, game.ItemHolder); p.Play(); break; @@ -596,11 +596,11 @@ namespace HeavenStudio.Games.Scripts_KarateMan curveTargetBeat = straight ? 1f : 1.5f; if (game.IsNoriActive && game.NoriPerformance < 0.6f) { - SoundByte.PlayOneShotGame("karateman/potHit_lowNori", forcePlay: true); - SoundByte.PlayOneShotGame("karateman/potHit", volume: 0.66f, forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/potHit_lowNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/potHit", volume: 0.66f, forcePlay: true); } else - SoundByte.PlayOneShotGame("karateman/potHit", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/potHit", forcePlay: true); p = Instantiate(HitParticles[3], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p.Play(); @@ -657,7 +657,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan void JoeComboSequence() { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; if (joe.GetShouldComboId() != comboId || !joe.inCombo) return; switch (type) @@ -665,7 +665,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.ComboPot2: joe.Punch(2); if (joe.GetComboId() != comboId) - SoundByte.PlayOneShotGame("karateman/swingNoHit_Alt", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/swingNoHit_Alt", forcePlay: true); else { ItemHitEffect(); @@ -683,7 +683,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan //if the button isn't held anymore make Joe spin if (joe.GetComboId() != comboId) { joe.ComboMiss(startBeat + 1f); - SoundByte.PlayOneShotGame("karateman/comboMiss", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/comboMiss", forcePlay: true); joe.SetShouldComboId(-2); } else @@ -730,7 +730,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ItemJustOrNg(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; if (state <= -1f || state >= 1f) { bool straight = joe.Punch(ItemPunchHand()); @@ -758,7 +758,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan CreateHitMark(false); startBeat = Conductor.instance.songPositionInBeatsAsDouble; status = FlyStatus.HitWeak; - SoundByte.PlayOneShotGame("karateman/hitNoNori", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/hitNoNori", forcePlay: true); joe.Punch(3); transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z - 30f); KarateMan.instance.Nori.DoNG(); @@ -775,7 +775,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ItemWrongAction(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (!KarateMan.IsComboEnable) return; //hitting a normal object with the alt input //WHEN SCORING THIS IS A MISS @@ -809,13 +809,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ItemThrough(PlayerActionEvent caller) { var joe = KarateMan.instance.Joe; - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (status != FlyStatus.Fly || gameObject == null) return; BeatAction.New(joe.gameObject, new List() { new BeatAction.Action(startBeat + 2f, delegate { joe.SetFaceExpression((int) KarateMan.KarateManFaces.Surprise); - SoundByte.PlayOneShotGame("karateman/karate_through", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/karate_through", forcePlay: true); }), new BeatAction.Action(startBeat + 5f, delegate { if (joe.wantFace == -1) @@ -835,7 +835,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ComboStartJustOrNg(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; joe.inCombo = true; joe.Punch(1); @@ -860,13 +860,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ComboStartThrough(PlayerActionEvent caller) { var joe = KarateMan.instance.Joe; - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (status != FlyStatus.Fly || gameObject == null) return; BeatAction.New(joe.gameObject, new List() { new BeatAction.Action(startBeat + 2f, delegate { joe.SetFaceExpression((int) KarateMan.KarateManFaces.Surprise); - SoundByte.PlayOneShotGame("karateman/karate_through", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/karate_through", forcePlay: true); }), new BeatAction.Action(startBeat + 5f, delegate { if (joe.wantFace == -1) @@ -880,7 +880,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ComboStartWrongAction(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; //hitting a combo start with the normal input //WHEN SCORING THIS IS A MISS var joe = KarateMan.instance.Joe; @@ -906,7 +906,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void ComboEndJustOrNg(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; joe.inCombo = false; joe.SetComboId(-1); @@ -939,7 +939,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan } public void ComboEndOut(PlayerActionEvent caller) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; if (status == FlyStatus.Fly && joe.inCombo && joe.GetComboId() == comboId && joe.comboWaiting) { @@ -947,14 +947,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan joe.SetComboId(-1); joe.SetShouldComboId(-1); joe.ComboSequence(3); - SoundByte.PlayOneShotGame("karateman/swingKick", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/swingKick", forcePlay: true); } OnHit.CanHit(false); } public void ComboEndThrough(PlayerActionEvent caller) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (status != FlyStatus.Fly || gameObject == null) return; var joe = KarateMan.instance.Joe; if (joe.GetComboId() != comboId || !joe.inCombo) @@ -995,7 +995,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void KickChargeJustOrNg(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; joe.Punch(ItemPunchHand()); @@ -1028,13 +1028,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void KickChargeThrough(PlayerActionEvent caller) { var joe = KarateMan.instance.Joe; - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (status != FlyStatus.Fly || gameObject == null) return; BeatAction.New(joe.gameObject, new List() { new BeatAction.Action(startBeat + 2f, delegate { joe.SetFaceExpression((int) KarateMan.KarateManFaces.Surprise); - SoundByte.PlayOneShotGame("karateman/karate_through", forcePlay: true); + SoundByte.PlayOneShotGame("karateMan/karate_through", forcePlay: true); }), new BeatAction.Action(startBeat + 5f, delegate { if (joe.wantFace == -1) @@ -1054,7 +1054,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void KickJustOrNg(PlayerActionEvent caller, float state) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; var joe = KarateMan.instance.Joe; joe.Kick(Conductor.instance.songPositionInBeatsAsDouble); @@ -1094,7 +1094,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void KickThrough(PlayerActionEvent caller) { - if (GameManager.instance.currentGame != "karateman") return; + if (GameManager.instance.currentGame != "karateMan") return; if (status != FlyStatus.Fly || gameObject == null) return; BeatAction.New(KarateMan.instance.Joe.gameObject, new List() { diff --git a/Packages/manifest.json b/Packages/manifest.json index 3fd746bde..390cdb5d7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", "com.unity.collab-proxy": "2.0.1", "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ide.visualstudio": "2.0.20", "com.unity.ide.vscode": "1.2.5", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.postprocessing": "3.2.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 318b26058..d64d7261a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -47,7 +47,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.20", "depth": 0, "source": "registry", "dependencies": {