diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav
new file mode 100644
index 000000000..1508acd3e
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta
rename to Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav.meta
index 8ed86abeb..849d581fb 100644
--- a/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda1.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8be9143a5c0e3c44f8d685b65c3bb298
+guid: 3aae338c7ca76c0459199d6363610cfa
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav
new file mode 100644
index 000000000..8421c8b8d
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta
rename to Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav.meta
index eadc8ce16..1609329a1 100644
--- a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda2.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: cd8ed62daf8b41b47a28ed245f659a6c
+guid: 61a6fb2085cbd67418a0cd249a5f82e7
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav
new file mode 100644
index 000000000..d31463179
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav.meta
new file mode 100644
index 000000000..f89409636
--- /dev/null
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda4.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 104901654e13e9b44917039b3ef18027
+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/manzai/FutongaFuttonda5.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda5.wav
new file mode 100644
index 000000000..04301e403
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda5.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda5.wav.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda5.wav.meta
new file mode 100644
index 000000000..053e4b1da
--- /dev/null
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda5.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: da5889a262f48304695077e1f53be3fc
+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/manzai/FutongaFuttonda7.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda7.wav
new file mode 100644
index 000000000..4d4080326
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda7.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda7.wav.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda7.wav.meta
new file mode 100644
index 000000000..6eb8ea102
--- /dev/null
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda7.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 76bd6e57ec167eb4891aa8027292b30e
+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/manzai/FutongaFuttonda9.wav b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda9.wav
new file mode 100644
index 000000000..ddd6fc9b3
Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda9.wav differ
diff --git a/Assets/Resources/Sfx/games/manzai/FutongaFuttonda9.wav.meta b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda9.wav.meta
new file mode 100644
index 000000000..ef3090f88
--- /dev/null
+++ b/Assets/Resources/Sfx/games/manzai/FutongaFuttonda9.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 7822c7f5eb42b7c4a9cd4486b76bcfcd
+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/manzai/futongaFuttonda.ogg b/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg
deleted file mode 100644
index 3eedd6610..000000000
Binary files a/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg b/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg
deleted file mode 100644
index 17eb57e1d..000000000
Binary files a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg and /dev/null differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/manzai.png b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png
new file mode 100644
index 000000000..3d99f5d07
Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta
new file mode 100644
index 000000000..a3052ceb6
--- /dev/null
+++ b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: f55b71f8b595d354c9274d3cb5073565
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/Tunnel/Materials/TunnelLightEffect.mat b/Assets/Resources/Sprites/Games/Tunnel/Materials/TunnelLightEffect.mat
index fbb81abe3..11dbb0413 100644
--- a/Assets/Resources/Sprites/Games/Tunnel/Materials/TunnelLightEffect.mat
+++ b/Assets/Resources/Sprites/Games/Tunnel/Materials/TunnelLightEffect.mat
@@ -82,7 +82,7 @@ Material:
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- - _AddColor: {r: 0, g: 0, b: 0, a: 0}
+ - _AddColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 1f034c56e..887e47d70 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -26851,7 +26851,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
- m_Size: 0.9751009
+ m_Size: 0.9849506
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -32707,7 +32707,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 91.71366}
+ m_AnchoredPosition: {x: 0, y: 91.314285}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
diff --git a/Assets/Scripts/Games/Manzai/Manzai.cs b/Assets/Scripts/Games/Manzai/Manzai.cs
index e15304216..b5c2d443c 100644
--- a/Assets/Scripts/Games/Manzai/Manzai.cs
+++ b/Assets/Scripts/Games/Manzai/Manzai.cs
@@ -31,10 +31,15 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("pun", "Pun")
{
+ preFunction = delegate {
+ var e = eventCaller.currentEntity;
+ Manzai.PunSFX(e.beat, e["pun"], e["pitch"]); },
+
function = delegate {
var e = eventCaller.currentEntity;
Manzai.instance.DoPun(e.beat, e["boing"]); },
defaultLength = 4,
+
parameters = new List()
{
new Param("boing", Manzai.BoingType.Normal, "Pun Type", "Will Kosuke mess up his pun?"),
@@ -112,45 +117,45 @@ namespace HeavenStudio.Games
{
Normal,
Boing,
- Random,
+ //Random,
}
public enum Puns
{
- AichiniAichinna,
- AmmeteAmena,
- ChainaniNichaina,
- DenwariDenwa, //short animation
+ // AichiniAichinna,
+ // AmmeteAmena,
+ // ChainaniNichaina,
+ // DenwariDenwa, //short animation
FutongaFuttonda,
- HiromegaHirameida,
- IkagariKatta,
- IkugawaIkura, //short animation (boing unused)
- KaeruBurikaeru,
- KarewaKare,
- KouchagaKouchou,
- KusagaKusai, //short animation (boing unused)
- MegaminiwaMegane,
+ // HiromegaHirameida,
+ // IkagariKatta,
+ // IkugawaIkura, //short animation (boing unused)
+ // KaeruBurikaeru,
+ // KarewaKare,
+ // KouchagaKouchou,
+ // KusagaKusai, //short animation (boing unused)
+ // MegaminiwaMegane,
MikangaMikannai,
- NekogaNekoronda,
+ // NekogaNekoronda,
OkanewaOkkane,
- OkurezeKitteOkure,
- OmochinoKimochi,
- OmoinoHokaOmoi,
- PuringaTappurin,
- RakudawaRakugana,
- RoukadaKatarouka,
- SaiyoMinasai,
- SakanaKanaMasakana,
- SarugaSaru, //short animation (boing unused)
- ShaiinniNanariNashain_Unused, //fully unused
- SuikawaYasuika,
- TaigaTabetaina,
- TaininiKittai,
- TaiyoGamiTaiyou,
- ToiletNiIttoire,
- TonakaiyoOtonokoi,
- TorinikugaTorininkui,
- UmetteUmena,
+ // OkurezeKitteOkure,
+ // OmochinoKimochi,
+ // OmoinoHokaOmoi,
+ // PuringaTappurin,
+ // RakudawaRakugana,
+ // RoukadaKatarouka,
+ // SaiyoMinasai,
+ // SakanaKanaMasakana,
+ // SarugaSaru, //short animation (boing unused)
+ // ShaiinniNanariNashain_Unused, //fully unused
+ // SuikawaYasuika,
+ // TaigaTabetaina,
+ // TaininiKittai,
+ // TaiyoGamiTaiyou,
+ // ToiletNiIttoire,
+ // TonakaiyoOtonokoi,
+ // TorinikugaTorininkui,
+ // UmetteUmena,
}
@@ -192,10 +197,10 @@ namespace HeavenStudio.Games
{
int punOrBoing = isBoing;
- if(isBoing == (int)Manzai.BoingType.Random)
- {
- punOrBoing = UnityEngine.Random.Range(0, 5) % 2;
- }
+ //if(isBoing == (int)Manzai.BoingType.Random)
+ //{
+ // punOrBoing = UnityEngine.Random.Range(0, 5) % 2;
+ //}
if(punOrBoing == (int)Manzai.BoingType.Normal)
{
@@ -206,15 +211,32 @@ namespace HeavenStudio.Games
{
DoPunBoing(beat);
}
- Debug.Log(punOrBoing);
+ //Debug.Log(punOrBoing);
+ }
+
+ public static void PunSFX(double beat, int whichPun, bool isPitched)
+ {
+
+ var punName= Enum.GetName(typeof(Puns), whichPun);
+ float pitch = isPitched ? Conductor.instance.songBpm/98 : 1;
+
+ MultiSound.Play(new MultiSound.Sound[] {
+ new MultiSound.Sound($"manzai/{punName}1", beat + 0.00f, pitch, offset: 0.05),
+ new MultiSound.Sound($"manzai/{punName}2", beat + 0.25f, pitch),
+ new MultiSound.Sound($"manzai/{punName}3", beat + 0.50f, pitch),
+ new MultiSound.Sound($"manzai/{punName}4", beat + 0.75f, pitch),
+ new MultiSound.Sound($"manzai/{punName}5", beat + 1.00f, pitch),
+ new MultiSound.Sound($"manzai/{punName}6", beat + 1.25f, pitch),
+ new MultiSound.Sound($"manzai/{punName}7", beat + 1.50f, pitch),
+ new MultiSound.Sound($"manzai/{punName}8", beat + 1.75f, pitch),
+ new MultiSound.Sound($"manzai/{punName}9", beat + 2.00f, pitch),
+ }, forcePlay: true);
}
public void DoPunHai(double beat)
{
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
- SoundByte.PlayOneShotGame("manzai/"+sfxDefs[0].sfx, pitch: Conductor.instance.songBpm/98);
-
ScheduleInput(beat, 2.5f, InputAction_BasicPress, bubbleAnimation == 0 ? HaiJustL : HaiJustR, HaiMiss, Nothing);
ScheduleInput(beat, 3.0f, InputAction_BasicPress, bubbleAnimation == 0 ? HaiJustR : HaiJustL, HaiMiss, Nothing);
BeatAction.New(instance, new List()
@@ -263,7 +285,7 @@ namespace HeavenStudio.Games
{
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
- SoundByte.PlayOneShotGame("manzai/"+sfxDefs[1].sfx, pitch: Conductor.instance.songBpm/98);
+ //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()