diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim index 4669d3c7..034571fe 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim @@ -384,4 +384,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_conversation_question + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim index 86927b9b..721502dd 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim @@ -265,4 +265,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.016666668 + functionName: OnPlaySE + data: se_conversation_Sweat + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim index d40b402e..6cccecd9 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim @@ -581,4 +581,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.25 + functionName: OnPlaySE + data: se_conversation_astonishment + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav new file mode 100644 index 00000000..9504f481 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta new file mode 100644 index 00000000..86b4e8da --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e95a20686fc2e0642a987d29063db9ff +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_conversation_astonishment.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav new file mode 100644 index 00000000..43189e1f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta new file mode 100644 index 00000000..c13aa90e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a15ca8d7478efdf45a51213888e42c5c +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_conversation_question.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav new file mode 100644 index 00000000..14da81b1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta new file mode 100644 index 00000000..f511f005 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4151d54049e7079438ced323ce8b6c28 +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/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index c9a43dd8..8b00dc95 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -623,6 +623,7 @@ GameObject: - component: {fileID: 8326132140883042585} - component: {fileID: 8326132140883042586} - component: {fileID: 8326132140883042587} + - component: {fileID: 3094961694111828232} m_Layer: 5 m_Name: Question m_TagString: Untagged @@ -713,6 +714,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3094961694111828232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132140883042584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132140921411081 GameObject: m_ObjectHideFlags: 0 @@ -1430,6 +1457,7 @@ GameObject: - component: {fileID: 8326132141302094844} - component: {fileID: 8326132141302094845} - component: {fileID: 8326132141302094846} + - component: {fileID: 5851726405219579597} m_Layer: 5 m_Name: astonishment m_TagString: Untagged @@ -1520,6 +1548,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5851726405219579597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141302094835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141332391092 GameObject: m_ObjectHideFlags: 0 @@ -2381,6 +2435,7 @@ GameObject: - component: {fileID: 8326132141608364540} - component: {fileID: 8326132141608364541} - component: {fileID: 8326132141608364542} + - component: {fileID: 8111289022594492393} m_Layer: 5 m_Name: Sweat m_TagString: Untagged @@ -2471,6 +2526,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8111289022594492393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141608364531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141641515376 GameObject: m_ObjectHideFlags: 0 @@ -3340,6 +3421,7 @@ GameObject: - component: {fileID: 8326132141892762133} - component: {fileID: 8326132141892762134} - component: {fileID: 8326132141892762135} + - component: {fileID: 4105248273629038113} m_Layer: 5 m_Name: Sweat m_TagString: Untagged @@ -3430,6 +3512,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4105248273629038113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141892762132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141911565868 GameObject: m_ObjectHideFlags: 0 @@ -4031,6 +4139,7 @@ GameObject: - component: {fileID: 8326132142047786581} - component: {fileID: 8326132142047786582} - component: {fileID: 8326132142047786583} + - component: {fileID: 1243163698786121904} m_Layer: 5 m_Name: astonishment m_TagString: Untagged @@ -4121,6 +4230,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1243163698786121904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132142047786580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132142065893231 GameObject: m_ObjectHideFlags: 0 @@ -5033,6 +5168,7 @@ GameObject: - component: {fileID: 8326132142376114442} - component: {fileID: 8326132142376114443} - component: {fileID: 8326132142376114484} + - component: {fileID: 4987520635343006334} m_Layer: 5 m_Name: Question m_TagString: Untagged @@ -5123,6 +5259,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4987520635343006334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132142376114441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132142418878642 GameObject: m_ObjectHideFlags: 0