diff --git a/Assets/ResWork/Sound/s020_Noraml_Hit.wav b/Assets/ResWork/Sound/s020_Noraml_Hit.wav new file mode 100644 index 0000000..853aef3 Binary files /dev/null and b/Assets/ResWork/Sound/s020_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s020_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s020_Noraml_Hit.wav.meta new file mode 100644 index 0000000..47bdd36 --- /dev/null +++ b/Assets/ResWork/Sound/s020_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 623dea15264ddbd47949266d2239d8df +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s021_Noraml_Hit.wav b/Assets/ResWork/Sound/s021_Noraml_Hit.wav new file mode 100644 index 0000000..63013ea Binary files /dev/null and b/Assets/ResWork/Sound/s021_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s021_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s021_Noraml_Hit.wav.meta new file mode 100644 index 0000000..a992108 --- /dev/null +++ b/Assets/ResWork/Sound/s021_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1862b942b06ab7548a909e88800784b6 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s022_Noraml_Hit.wav b/Assets/ResWork/Sound/s022_Noraml_Hit.wav new file mode 100644 index 0000000..05b9f89 Binary files /dev/null and b/Assets/ResWork/Sound/s022_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s022_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s022_Noraml_Hit.wav.meta new file mode 100644 index 0000000..c63dbd1 --- /dev/null +++ b/Assets/ResWork/Sound/s022_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b07680a331d403a40bd75aa8b25b71a0 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s023_Noraml_Hit.wav b/Assets/ResWork/Sound/s023_Noraml_Hit.wav new file mode 100644 index 0000000..50121f0 Binary files /dev/null and b/Assets/ResWork/Sound/s023_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s023_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s023_Noraml_Hit.wav.meta new file mode 100644 index 0000000..b614d83 --- /dev/null +++ b/Assets/ResWork/Sound/s023_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4fdcda63e3b76a74493431223236abbf +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s024_Noraml_Hit.wav b/Assets/ResWork/Sound/s024_Noraml_Hit.wav new file mode 100644 index 0000000..2ed9075 Binary files /dev/null and b/Assets/ResWork/Sound/s024_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s024_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s024_Noraml_Hit.wav.meta new file mode 100644 index 0000000..35c5d81 --- /dev/null +++ b/Assets/ResWork/Sound/s024_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 98ef7d96f2ffd2c44b33c08da55be487 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s025_Noraml_Hit.wav b/Assets/ResWork/Sound/s025_Noraml_Hit.wav new file mode 100644 index 0000000..64a6809 Binary files /dev/null and b/Assets/ResWork/Sound/s025_Noraml_Hit.wav differ diff --git a/Assets/ResWork/Sound/s025_Noraml_Hit.wav.meta b/Assets/ResWork/Sound/s025_Noraml_Hit.wav.meta new file mode 100644 index 0000000..0e05c06 --- /dev/null +++ b/Assets/ResWork/Sound/s025_Noraml_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 146cb9c1776be7e499e5da5d0f76cd49 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s026_Impact_Hit.wav b/Assets/ResWork/Sound/s026_Impact_Hit.wav new file mode 100644 index 0000000..3019792 Binary files /dev/null and b/Assets/ResWork/Sound/s026_Impact_Hit.wav differ diff --git a/Assets/ResWork/Sound/s026_Impact_Hit.wav.meta b/Assets/ResWork/Sound/s026_Impact_Hit.wav.meta new file mode 100644 index 0000000..fefe594 --- /dev/null +++ b/Assets/ResWork/Sound/s026_Impact_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b838120ed34a67641b056d770c9ba465 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s027_Impact_Hit.wav b/Assets/ResWork/Sound/s027_Impact_Hit.wav new file mode 100644 index 0000000..dcb3c86 Binary files /dev/null and b/Assets/ResWork/Sound/s027_Impact_Hit.wav differ diff --git a/Assets/ResWork/Sound/s027_Impact_Hit.wav.meta b/Assets/ResWork/Sound/s027_Impact_Hit.wav.meta new file mode 100644 index 0000000..40d9334 --- /dev/null +++ b/Assets/ResWork/Sound/s027_Impact_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8466b09bf42e936478ab0fd8711eea01 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s028_Impact_Hit.wav b/Assets/ResWork/Sound/s028_Impact_Hit.wav new file mode 100644 index 0000000..6a9a7cf Binary files /dev/null and b/Assets/ResWork/Sound/s028_Impact_Hit.wav differ diff --git a/Assets/ResWork/Sound/s028_Impact_Hit.wav.meta b/Assets/ResWork/Sound/s028_Impact_Hit.wav.meta new file mode 100644 index 0000000..ef6e392 --- /dev/null +++ b/Assets/ResWork/Sound/s028_Impact_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 68c6fa9e461ecb443b256560ce0500a8 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s029_Impact_Hit.wav b/Assets/ResWork/Sound/s029_Impact_Hit.wav new file mode 100644 index 0000000..7722414 Binary files /dev/null and b/Assets/ResWork/Sound/s029_Impact_Hit.wav differ diff --git a/Assets/ResWork/Sound/s029_Impact_Hit.wav.meta b/Assets/ResWork/Sound/s029_Impact_Hit.wav.meta new file mode 100644 index 0000000..785cac1 --- /dev/null +++ b/Assets/ResWork/Sound/s029_Impact_Hit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e5d3771565247fb488eee9fc417aadc3 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index cf8a806..8bb0249 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -12795,6 +12795,21 @@ MonoBehaviour: - {fileID: 8300000, guid: d8886705e44c1cc40b2f6ee13d3ab806, type: 3} - {fileID: 8300000, guid: 2630ab513f86d24429e50c7b24a88cb2, type: 3} - {fileID: 8300000, guid: 4aa31db6a4437114bb2b5f801cad743c, type: 3} + - {fileID: 8300000, guid: 7bf1fe9a095546149aa06daff6e469f2, type: 3} + - {fileID: 8300000, guid: 65cc2a048a917f340949eb64950cb31b, type: 3} + - {fileID: 8300000, guid: 32340c42066b68f459c52633fedfd5e8, type: 3} + - {fileID: 8300000, guid: 2409b50e7cbcbb84182692ff9264311c, type: 3} + - {fileID: 8300000, guid: 38ca2ccc81cb7054fbd0bf58895252e7, type: 3} + - {fileID: 8300000, guid: 623dea15264ddbd47949266d2239d8df, type: 3} + - {fileID: 8300000, guid: 1862b942b06ab7548a909e88800784b6, type: 3} + - {fileID: 8300000, guid: b07680a331d403a40bd75aa8b25b71a0, type: 3} + - {fileID: 8300000, guid: 4fdcda63e3b76a74493431223236abbf, type: 3} + - {fileID: 8300000, guid: 98ef7d96f2ffd2c44b33c08da55be487, type: 3} + - {fileID: 8300000, guid: 146cb9c1776be7e499e5da5d0f76cd49, type: 3} + - {fileID: 8300000, guid: b838120ed34a67641b056d770c9ba465, type: 3} + - {fileID: 8300000, guid: 8466b09bf42e936478ab0fd8711eea01, type: 3} + - {fileID: 8300000, guid: 68c6fa9e461ecb443b256560ce0500a8, type: 3} + - {fileID: 8300000, guid: e5d3771565247fb488eee9fc417aadc3, type: 3} arr_bgm: - {fileID: 8300000, guid: f6114cbd9684c734a86622e924246b10, type: 3} - {fileID: 8300000, guid: 91f78e0e508d80b4bbc02cf71c03b081, type: 3} diff --git a/Assets/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index c5cc1fb..c1ca0c7 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -6,6 +6,8 @@ public enum eSound { s005_MiniGameResult, s006_MiniGameGetHeart, s007_MiniGameGetChatCoint, s008_MiniGameGetGachaCoin, s009_MiniGameUseBomb, s010_MiniGameUseUmbrella, s011_MiniGameUseDildo, s012_Title, s013_GachaOpen, s014_GachaOpen, s015_LuckyCup, s016_LuckyCup, s017_LuckyGetItem, s018_LuckyGetItem, s019_LuckyGetItem, + s020_Noraml_Hit, s021_Noraml_Hit, s022_Noraml_Hit, s023_Noraml_Hit, s024_Noraml_Hit, s025_Noraml_Hit, + s026_Impact_Hit, s027_Impact_Hit, s028_Impact_Hit, s029_Impact_Hit, Max } public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max } diff --git a/Assets/Scripts/Game/Game_Mini.cs b/Assets/Scripts/Game/Game_Mini.cs index 296a236..d98be55 100644 --- a/Assets/Scripts/Game/Game_Mini.cs +++ b/Assets/Scripts/Game/Game_Mini.cs @@ -242,6 +242,9 @@ public class Game_Mini : MonoBehaviour slider_hp.value = m_HP / table_GlobalValue.Ins.Get_Float("MiniGameHP"); if (m_HP <= 0) GameOver(); i_girl.sprite = m_Handle2.Result; + + if (slider_hp.value > 0.3f) SoundInfo.Ins.Play_OneShot((eSound)Random.Range(19, 25)); + else SoundInfo.Ins.Play_OneShot((eSound)Random.Range(25, 29)); break; case eMiniGameObtacleType.HpHeal: m_HP += val;