diff --git a/Assets/Resources/Sfx/games/holeInOne.meta b/Assets/Resources/Sfx/games/holeInOne.meta new file mode 100644 index 000000000..fae62985b --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a96f87fb28b80a94e8145f468ac40ce7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/holeInOne/hole1.ogg b/Assets/Resources/Sfx/games/holeInOne/hole1.ogg new file mode 100644 index 000000000..1059b67e2 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/hole1.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/hole1.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/hole1.ogg.meta new file mode 100644 index 000000000..c52b429c7 --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/hole1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6f37f97d5a693854f935a4ae840bb0a9 +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/holeInOne/hole2.ogg b/Assets/Resources/Sfx/games/holeInOne/hole2.ogg new file mode 100644 index 000000000..b17742a82 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/hole2.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/hole2.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/hole2.ogg.meta new file mode 100644 index 000000000..d8bdca0af --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/hole2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0229791fee06a9f438c8dcff97838818 +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/holeInOne/hole3.ogg b/Assets/Resources/Sfx/games/holeInOne/hole3.ogg new file mode 100644 index 000000000..f68046c11 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/hole3.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/hole3.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/hole3.ogg.meta new file mode 100644 index 000000000..bf33c49bd --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/hole3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 826f05891e5c9f64880177651fc62742 +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/holeInOne/hole4.ogg b/Assets/Resources/Sfx/games/holeInOne/hole4.ogg new file mode 100644 index 000000000..58ad9d511 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/hole4.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/hole4.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/hole4.ogg.meta new file mode 100644 index 000000000..1b2b9b3ba --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/hole4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2baec7fdc378fbb4f8f30b152efb54a1 +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/holeInOne/mandrill1.ogg b/Assets/Resources/Sfx/games/holeInOne/mandrill1.ogg new file mode 100644 index 000000000..b4315507c Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/mandrill1.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/mandrill1.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/mandrill1.ogg.meta new file mode 100644 index 000000000..8b21092ae --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/mandrill1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f93648b2381503346a79d0f3300b7b43 +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/holeInOne/mandrill2.ogg b/Assets/Resources/Sfx/games/holeInOne/mandrill2.ogg new file mode 100644 index 000000000..0dec90bef Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/mandrill2.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/mandrill2.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/mandrill2.ogg.meta new file mode 100644 index 000000000..3a073b6e4 --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/mandrill2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 344af51407329a14c978639a46d3b36e +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/holeInOne/mandrill3.ogg b/Assets/Resources/Sfx/games/holeInOne/mandrill3.ogg new file mode 100644 index 000000000..6dd0cecf8 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/mandrill3.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/mandrill3.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/mandrill3.ogg.meta new file mode 100644 index 000000000..0b7b97f6f --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/mandrill3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6b85b5635c0cb2346943cf15e64e805c +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/holeInOne/mandrill4.ogg b/Assets/Resources/Sfx/games/holeInOne/mandrill4.ogg new file mode 100644 index 000000000..a5d7a3575 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/mandrill4.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/mandrill4.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/mandrill4.ogg.meta new file mode 100644 index 000000000..687da315d --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/mandrill4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b0cb3064169f272489f5ee7b25391703 +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/holeInOne/monkey1.ogg b/Assets/Resources/Sfx/games/holeInOne/monkey1.ogg new file mode 100644 index 000000000..f01115b8d Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/monkey1.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/monkey1.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/monkey1.ogg.meta new file mode 100644 index 000000000..3714708f7 --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/monkey1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3663a6aaffe973b40afd59032c629131 +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/holeInOne/monkey2.ogg b/Assets/Resources/Sfx/games/holeInOne/monkey2.ogg new file mode 100644 index 000000000..d925d99a7 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/monkey2.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/monkey2.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/monkey2.ogg.meta new file mode 100644 index 000000000..592df34fc --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/monkey2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e81a6ca27a86a9445aa186513bf43997 +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/holeInOne/monkey3.ogg b/Assets/Resources/Sfx/games/holeInOne/monkey3.ogg new file mode 100644 index 000000000..1b455a1f9 Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/monkey3.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/monkey3.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/monkey3.ogg.meta new file mode 100644 index 000000000..a5f4ee384 --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/monkey3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d7c40be9653964341af1360806bf53c3 +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/holeInOne/whale.ogg b/Assets/Resources/Sfx/games/holeInOne/whale.ogg new file mode 100644 index 000000000..242249e2f Binary files /dev/null and b/Assets/Resources/Sfx/games/holeInOne/whale.ogg differ diff --git a/Assets/Resources/Sfx/games/holeInOne/whale.ogg.meta b/Assets/Resources/Sfx/games/holeInOne/whale.ogg.meta new file mode 100644 index 000000000..aacdc8a90 --- /dev/null +++ b/Assets/Resources/Sfx/games/holeInOne/whale.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8e4f28551c57f0a4cbe07781c15e3418 +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/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 007c27bb1..3dd779e7f 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -18,14 +18,14 @@ namespace HeavenStudio.Games.Loaders { return new Minigame("holeInOne", "Hole in One", "6ab99e", false, false, new List() { - // new GameAction("testanims", "Test Animation") - // { - // function = delegate { HoleInOne.instance.DoTestAnim(eventCaller.currentEntity.beat); }, - // } - }, - new List() { "rvl", "normal" }, - "rvlgolf", "en", - new List() { } + new GameAction("testanims", "Test Animation") + { + function = delegate { HoleInOne.instance.DoTestAnim(eventCaller.currentEntity.beat); }, + } + }//, + // new List() { "rvl", "normal" }, + // "rvlgolf", "en", + // new List() { } ); } } @@ -37,20 +37,30 @@ namespace HeavenStudio.Games /// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override. public class HoleInOne : Minigame { - // public Animator Monkey; + public Animator Monkey; - // public static HoleInOne instance; + public static HoleInOne instance; - // public void DoTestAnim(double beat) - // { - // //Bell Sound lol - // SoundByte.PlayOneShotGame("rhythmSomen/somen_bell"); + // Awake is called before the first frame update + void Awake() + { + instance = this; + } - // BeatAction.New(this, new List() - // { - // new BeatAction.Action(beat, delegate { Monkey.DoScaledAnimationAsync("MonkeySpin", 0.5f);}), - // }); + void Update() + { - // } + } + + public void DoTestAnim(double beat) + { + SoundByte.PlayOneShotGame("holeInOne/whale"); + + // BeatAction.New(instance, new List() + // { + // new BeatAction.Action(beat, delegate { Monkey.DoScaledAnimationAsync("MonkeySpin", 0.5f);}), + // }); + + } } } \ No newline at end of file