diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim index b64d84de..31d09e72 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim @@ -2648,6 +2648,13 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: + - time: 0.083333336 + functionName: OnPlaySE + data: se_minigame_Collide + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 - time: 0.5833333 functionName: OnPlaySE data: se_minigame_FallDown diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_jump.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_jump.anim index dbd3c463..8df6b73d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_jump.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_jump.anim @@ -2409,4 +2409,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.13333334 + functionName: OnPlaySE + data: se_minigame_jump + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav new file mode 100644 index 00000000..cbe7ce56 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav.meta new file mode 100644 index 00000000..9bd4eb45 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_minigame.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2a6770a9cd1a2de429c1c91f700e3f4c +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav new file mode 100644 index 00000000..0603508d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav.meta new file mode 100644 index 00000000..c5b01461 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_miingame_RemainingTimeLeft.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ea468a3a98b5d644c994743a56abe07c +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav new file mode 100644 index 00000000..f2cf330e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav.meta new file mode 100644 index 00000000..30c85300 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_Collide.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8edb23a40bcbf8040a992ba141fb60bd +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav new file mode 100644 index 00000000..ac06b54f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav.meta new file mode 100644 index 00000000..680e56dc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_ItemGet.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c0974918b53a748469d2a60c2af60d4c +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav new file mode 100644 index 00000000..3fceae72 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav.meta new file mode 100644 index 00000000..9a71d3bc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_end.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1c44b76ec9f251e42ae56957d1d6bb21 +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav new file mode 100644 index 00000000..5875b74d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav.meta new file mode 100644 index 00000000..7bfae859 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_jump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f2ff4b4e22ea3fa4391fc2fb6cc3b9c4 +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/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav new file mode 100644 index 00000000..79d47ce7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav.meta new file mode 100644 index 00000000..39124d25 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_minigame_start.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: df0429c3ae44c5f498f189f360d3fc4e +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/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index 369ae3a7..6474e514 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -355,6 +355,7 @@ GameObject: - component: {fileID: 4559813503976204840} - component: {fileID: 1185655513} - component: {fileID: 1185655514} + - component: {fileID: 4736230405466674143} m_Layer: 5 m_Name: detail_Advanced m_TagString: Untagged @@ -481,6 +482,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4736230405466674143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559813503976204838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &4559813504027829706 GameObject: m_ObjectHideFlags: 0 @@ -646,6 +663,7 @@ GameObject: - component: {fileID: 4559813504188097411} - component: {fileID: 490767119} - component: {fileID: 490767120} + - component: {fileID: 5669512378568788784} m_Layer: 5 m_Name: detail_Intermediate m_TagString: Untagged @@ -772,6 +790,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5669512378568788784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559813504188097409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &4559813504302003085 GameObject: m_ObjectHideFlags: 0 @@ -2039,6 +2073,7 @@ GameObject: - component: {fileID: 4559813505698694033} - component: {fileID: 354011731} - component: {fileID: 354011732} + - component: {fileID: 846113197605390734} m_Layer: 5 m_Name: detail_Beginner m_TagString: Untagged @@ -2165,6 +2200,22 @@ MonoBehaviour: button: {fileID: 354011731} lockObject: {fileID: 5937334820449219531} lockText: {fileID: 8182159399820554065} +--- !u!114 &846113197605390734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559813505698694031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &4559813505704525541 GameObject: m_ObjectHideFlags: 0 @@ -2590,6 +2641,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} +--- !u!1 &5937334820449219531 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 4559813504394653454} + m_PrefabAsset: {fileID: 0} --- !u!224 &8190353373877730053 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, @@ -2608,12 +2665,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5937334820449219531 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, - type: 3} - m_PrefabInstance: {fileID: 4559813504394653454} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4559813504710053683 PrefabInstance: m_ObjectHideFlags: 0 @@ -2881,6 +2932,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} +--- !u!224 &811553595295701558 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + m_PrefabInstance: {fileID: 5020804910926859837} + m_PrefabAsset: {fileID: 0} --- !u!114 &821365773376196194 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, @@ -2893,12 +2950,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &811553595295701558 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, - type: 3} - m_PrefabInstance: {fileID: 5020804910926859837} - m_PrefabAsset: {fileID: 0} --- !u!1 &2922673163823420152 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,