diff --git a/Assets/ResWork/AppRes/AppIcon.png b/Assets/ResWork/AppRes/AppIcon.png index 8423057..1311647 100644 Binary files a/Assets/ResWork/AppRes/AppIcon.png and b/Assets/ResWork/AppRes/AppIcon.png differ diff --git a/Assets/ResWork/Sound_MinigameVoice.meta b/Assets/ResWork/Sound_MinigameVoice.meta new file mode 100644 index 0000000..03207f0 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6e84227fa49c164a8d7b1e16cd4d521 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav b/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav new file mode 100644 index 0000000..3019792 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav.meta new file mode 100644 index 0000000..cac5146 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Impact_1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5ac02a4e620ea8843942f75c5a50b8c5 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav b/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav new file mode 100644 index 0000000..64a6809 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav.meta new file mode 100644 index 0000000..b9762df --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Impact_2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c4c60064da718804d8dd85e85cb7311c +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav b/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav new file mode 100644 index 0000000..dcb3c86 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav.meta new file mode 100644 index 0000000..e73d165 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Impact_3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3251d6e9a4d85194aa396bcd60790740 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav b/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav new file mode 100644 index 0000000..6a9a7cf Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav.meta new file mode 100644 index 0000000..0fcd493 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Impact_4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ff7999f0ab648b547ad63ad6e0c8c07e +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav b/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav new file mode 100644 index 0000000..7722414 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav.meta new file mode 100644 index 0000000..2b4f9ce --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Impact_5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c6c1687e4c828f24bb309586111f5ea8 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav b/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav new file mode 100644 index 0000000..853aef3 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav.meta new file mode 100644 index 0000000..c130f6e --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Normal_1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0f01b3b78312f714688896652c7e342e +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav b/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav new file mode 100644 index 0000000..63013ea Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav.meta new file mode 100644 index 0000000..036ba7e --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Normal_2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2436de663272fbc469158b1212a59b08 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav b/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav new file mode 100644 index 0000000..05b9f89 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav.meta new file mode 100644 index 0000000..e21b647 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Normal_3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 37f2f1229e982ea4fa1f802c4b594b4e +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav b/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav new file mode 100644 index 0000000..50121f0 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav.meta new file mode 100644 index 0000000..0b59d4a --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Normal_4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d927e8b485e2c25459d0ccc8d6b40796 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav b/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav new file mode 100644 index 0000000..2ed9075 Binary files /dev/null and b/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav differ diff --git a/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav.meta b/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav.meta new file mode 100644 index 0000000..c79b6d9 --- /dev/null +++ b/Assets/ResWork/Sound_MinigameVoice/Normal_5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d3a547b4e11c97e4aacfc6c869c245a2 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 4ab9fb0..d954aff 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -115,8 +115,8 @@ public class HorseRushPanel : AddrHandleBase float _nextTimeUpdate = 0.1f; - List _normalTouchSound = new List { eSound.s020_Noraml_Hit, eSound.s021_Noraml_Hit, eSound.s022_Noraml_Hit, eSound.s023_Noraml_Hit, eSound.s024_Noraml_Hit, eSound.s025_Noraml_Hit }; - List _impactTouchSound = new List { eSound.s026_Impact_Hit, eSound.s027_Impact_Hit, eSound.s028_Impact_Hit, eSound.s029_Impact_Hit }; + List _normalTouchSound = new List { eSound.s020_Noraml_Hit, eSound.s021_Noraml_Hit, eSound.s022_Noraml_Hit, eSound.s023_Noraml_Hit, eSound.s024_Noraml_Hit }; + List _impactTouchSound = new List { eSound.s025_Impact_Hit, eSound.s026_Impact_Hit, eSound.s027_Impact_Hit, eSound.s028_Impact_Hit, eSound.s029_Impact_Hit }; // 클래스 멤버 변수에 추가 private float _lastTouchTime = 0f; diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 713fbf2..d71a746 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -21887,18 +21887,18 @@ MonoBehaviour: - {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} - {fileID: 8300000, guid: e0eb2da7439fc034ca5c8191f20d6dba, type: 3} - {fileID: 8300000, guid: 259a0b95d0f01dc429937c074f67213b, type: 3} + - {fileID: 8300000, guid: 0f01b3b78312f714688896652c7e342e, type: 3} + - {fileID: 8300000, guid: 2436de663272fbc469158b1212a59b08, type: 3} + - {fileID: 8300000, guid: 37f2f1229e982ea4fa1f802c4b594b4e, type: 3} + - {fileID: 8300000, guid: d927e8b485e2c25459d0ccc8d6b40796, type: 3} + - {fileID: 8300000, guid: d3a547b4e11c97e4aacfc6c869c245a2, type: 3} + - {fileID: 8300000, guid: 5ac02a4e620ea8843942f75c5a50b8c5, type: 3} + - {fileID: 8300000, guid: c4c60064da718804d8dd85e85cb7311c, type: 3} + - {fileID: 8300000, guid: 3251d6e9a4d85194aa396bcd60790740, type: 3} + - {fileID: 8300000, guid: ff7999f0ab648b547ad63ad6e0c8c07e, type: 3} + - {fileID: 8300000, guid: c6c1687e4c828f24bb309586111f5ea8, type: 3} arr_bgm: - {fileID: 8300000, guid: 1401bffe8915f674ea9c54be5dc84841, type: 3} - {fileID: 8300000, guid: 204b5c2111c37664197c0e12db7ddea3, type: 3} diff --git a/Assets/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index 45e814b..a29da32 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -6,9 +6,9 @@ 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, s030_Ready, s031_Go, + s020_Noraml_Hit, s021_Noraml_Hit, s022_Noraml_Hit, s023_Noraml_Hit, s024_Noraml_Hit, + s025_Impact_Hit, s026_Impact_Hit, s027_Impact_Hit, s028_Impact_Hit, s029_Impact_Hit, Max } public enum eBGM @@ -65,7 +65,7 @@ public class SoundInfo : MonoBehaviourSingletonTemplate case eSound.s022_Noraml_Hit: case eSound.s023_Noraml_Hit: case eSound.s024_Noraml_Hit: - case eSound.s025_Noraml_Hit: + case eSound.s025_Impact_Hit: case eSound.s026_Impact_Hit: case eSound.s027_Impact_Hit: case eSound.s028_Impact_Hit: