(NEEDS DEBUGGING) Boing block rudimentary implementation
All it's trying to do is figure out if the vulture should mess up his pun and it only plays both functions every time no matter what
This commit is contained in:
parent
e3899a5f7a
commit
f01f8988ce
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
BIN
Assets/Resources/Sfx/games/manzai/donaiyanen.ogg
Normal file
BIN
Assets/Resources/Sfx/games/manzai/donaiyanen.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/manzai/donaiyanen.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/manzai/donaiyanen.ogg.meta
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 32cb6c4f7fbe6e2489288dd4cd26f2b1
|
||||||
|
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:
|
||||||
BIN
Assets/Resources/Sfx/games/manzai/donaiyanenAccent.ogg
Normal file
BIN
Assets/Resources/Sfx/games/manzai/donaiyanenAccent.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/manzai/donaiyanenAccent.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/manzai/donaiyanenAccent.ogg.meta
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 65f8593b250a04a41928255e67a4277f
|
||||||
|
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:
|
||||||
|
|
@ -1,5 +1,31 @@
|
||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1102 &-9061909759151879405
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Boing
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 7400000, guid: fc3770b3333e7d74a86a5dec2de32d45, type: 2}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
--- !u!1102 &-3411817078048662773
|
--- !u!1102 &-3411817078048662773
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
@ -66,6 +92,9 @@ AnimatorStateMachine:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -3411817078048662773}
|
m_State: {fileID: -3411817078048662773}
|
||||||
m_Position: {x: 400, y: 100, z: 0}
|
m_Position: {x: 400, y: 100, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -9061909759151879405}
|
||||||
|
m_Position: {x: 400, y: 300, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!74 &7400000
|
||||||
|
AnimationClip:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: VultureBoing
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Legacy: 0
|
||||||
|
m_Compressed: 0
|
||||||
|
m_UseHighQualityCurve: 1
|
||||||
|
m_RotationCurves: []
|
||||||
|
m_CompressedRotationCurves: []
|
||||||
|
m_EulerCurves: []
|
||||||
|
m_PositionCurves: []
|
||||||
|
m_ScaleCurves: []
|
||||||
|
m_FloatCurves: []
|
||||||
|
m_PPtrCurves:
|
||||||
|
- curve:
|
||||||
|
- time: 0
|
||||||
|
value: {fileID: 1492920022, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3}
|
||||||
|
- time: 0.083333336
|
||||||
|
value: {fileID: 1855868972, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3}
|
||||||
|
attribute: m_Sprite
|
||||||
|
path: FULL HEAD/Beak
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_SampleRate: 60
|
||||||
|
m_WrapMode: 0
|
||||||
|
m_Bounds:
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
|
m_ClipBindingConstant:
|
||||||
|
genericBindings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 848800724
|
||||||
|
attribute: 0
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 23
|
||||||
|
isPPtrCurve: 1
|
||||||
|
pptrCurveMapping:
|
||||||
|
- {fileID: 1492920022, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3}
|
||||||
|
- {fileID: 1855868972, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3}
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 0.1
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
m_LoopBlend: 0
|
||||||
|
m_LoopBlendOrientation: 0
|
||||||
|
m_LoopBlendPositionY: 0
|
||||||
|
m_LoopBlendPositionXZ: 0
|
||||||
|
m_KeepOriginalOrientation: 0
|
||||||
|
m_KeepOriginalPositionY: 1
|
||||||
|
m_KeepOriginalPositionXZ: 0
|
||||||
|
m_HeightFromFeet: 0
|
||||||
|
m_Mirror: 0
|
||||||
|
m_EditorCurves: []
|
||||||
|
m_EulerEditorCurves: []
|
||||||
|
m_HasGenericRootTransform: 0
|
||||||
|
m_HasMotionFloatCurves: 0
|
||||||
|
m_Events: []
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fc3770b3333e7d74a86a5dec2de32d45
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -31,7 +31,9 @@ namespace HeavenStudio.Games.Loaders
|
||||||
},
|
},
|
||||||
new GameAction("pun", "Pun")
|
new GameAction("pun", "Pun")
|
||||||
{
|
{
|
||||||
function = delegate { Manzai.instance.DoPun(eventCaller.currentEntity.beat); },
|
function = delegate {
|
||||||
|
var e = eventCaller.currentEntity;
|
||||||
|
Manzai.instance.DoPun(e.beat, e["boing"]); },
|
||||||
defaultLength = 4,
|
defaultLength = 4,
|
||||||
parameters = new List<Param>()
|
parameters = new List<Param>()
|
||||||
{
|
{
|
||||||
|
|
@ -74,6 +76,7 @@ namespace HeavenStudio.Games
|
||||||
static readonly List<SfxDef> sfxDefs = new()
|
static readonly List<SfxDef> sfxDefs = new()
|
||||||
{
|
{
|
||||||
new("futongaFuttonda", new double[] {}),
|
new("futongaFuttonda", new double[] {}),
|
||||||
|
new("futongaFuttondaBoing", new double[] {}),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -173,7 +176,21 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoPun(double beat)
|
public void DoPun(double beat, int isBoing)
|
||||||
|
{
|
||||||
|
Debug.Log(isBoing);
|
||||||
|
if(isBoing == (int)Manzai.BoingType.Normal);
|
||||||
|
{
|
||||||
|
DoPunHai(beat);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isBoing == (int)Manzai.BoingType.Boing);
|
||||||
|
{
|
||||||
|
DoPunBoing(beat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DoPunHai(double beat)
|
||||||
{
|
{
|
||||||
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
|
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
|
||||||
|
|
||||||
|
|
@ -222,6 +239,37 @@ namespace HeavenStudio.Games
|
||||||
//VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
|
//VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void DoPunBoing(double beat)
|
||||||
|
{
|
||||||
|
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
|
||||||
|
|
||||||
|
SoundByte.PlayOneShotGame("manzai/"+sfxDefs[1].sfx, pitch: Conductor.instance.songBpm/98);
|
||||||
|
ScheduleInput(beat, 2.5f, InputAction_BasicPress, BoingJust, BoingMiss, Nothing);
|
||||||
|
BeatAction.New(instance, new List<BeatAction.Action>()
|
||||||
|
{
|
||||||
|
new BeatAction.Action(beat + 0.00f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
|
||||||
|
|
||||||
|
new BeatAction.Action(beat + 0.50f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
|
||||||
|
|
||||||
|
new BeatAction.Action(beat + 1.00f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
|
||||||
|
|
||||||
|
new BeatAction.Action(beat + 1.25f, delegate { VultureAnim.DoScaledAnimationAsync("Boing", 0.5f); }),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void BoingJust(PlayerActionEvent caller, float state)
|
||||||
|
{
|
||||||
|
SoundByte.PlayOneShotGame("manzai/donaiyanen", pitch: Conductor.instance.songBpm/98);
|
||||||
|
SoundByte.PlayOneShotGame("manzai/donaiyanenAccent");
|
||||||
|
//RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
|
||||||
|
//VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void BoingMiss(PlayerActionEvent caller)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public void Nothing(PlayerActionEvent caller)
|
public void Nothing(PlayerActionEvent caller)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue