diff --git a/popcorn/Assets/MyGame/Resource/Animation/SpeechBalloon.anim b/popcorn/Assets/MyGame/Resource/Animation/SpeechBalloon.anim index 6d3c3215..02c0d525 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/SpeechBalloon.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/SpeechBalloon.anim @@ -238,4 +238,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_Main_phone_sound + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim index e85a4be4..7919a689 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim @@ -743,4 +743,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_marketing_CustomerTap + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/corn_icon.anim b/popcorn/Assets/MyGame/Resource/Animation/corn_icon.anim index bea455e4..dd534416 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/corn_icon.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/corn_icon.anim @@ -238,4 +238,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_corn_get + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim index 1358cade..5e2d6263 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim @@ -296,7 +296,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.113, y: -0.069, z: 0} + value: {x: 0.113, y: 1.013, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -2003,7 +2003,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.069 + value: 1.013 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_beside_curl.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_beside_curl.prefab index da8175da..cfabe440 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_beside_curl.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_beside_curl.prefab @@ -1,5 +1,49 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &3067135439811116850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7339072713069749340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} + m_Name: + m_EditorClassIdentifier: + seInfoArray: + - delay: 0 + time: 0 + interval: 0 + filename: se_sale _HeartMeter + maxCount: 0 +--- !u!114 &8894917039424606479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4216845566696962765} + 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!1001 &6978467593088534287 PrefabInstance: m_ObjectHideFlags: 0 @@ -65,7 +109,24 @@ PrefabInstance: - target: {fileID: 4886416728471897999, guid: db654393793a67d45a7d0b70a68b73a6, type: 3} propertyPath: m_Name - value: customer_normal + value: customer_beside_curl + objectReference: {fileID: 0} + - target: {fileID: 7358655632798716600, guid: db654393793a67d45a7d0b70a68b73a6, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db654393793a67d45a7d0b70a68b73a6, type: 3} +--- !u!1 &7339072713069749340 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 360816779210449747, guid: db654393793a67d45a7d0b70a68b73a6, + type: 3} + m_PrefabInstance: {fileID: 6978467593088534287} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4216845566696962765 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6511433195714067906, guid: db654393793a67d45a7d0b70a68b73a6, + type: 3} + m_PrefabInstance: {fileID: 6978467593088534287} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Blue.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Blue.prefab index e0b6bf51..65f12891 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Blue.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Blue.prefab @@ -357,6 +357,32 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &556997194131121793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651040942839398860} + 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 &6375669516749364255 GameObject: m_ObjectHideFlags: 0 @@ -633,3 +659,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6004907678350228494} m_PrefabAsset: {fileID: 0} +--- !u!1 &651040942839398860 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6511433195714067906, guid: db654393793a67d45a7d0b70a68b73a6, + type: 3} + m_PrefabInstance: {fileID: 6004907678350228494} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Brown.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Brown.prefab index f5948ec5..5a4477ac 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Brown.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_cap_Brown.prefab @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &6176638148766936305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4875308242045529638} + 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 &2217022381167848926 GameObject: m_ObjectHideFlags: 0 @@ -633,3 +659,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1870633191703925732} m_PrefabAsset: {fileID: 0} +--- !u!1 &4875308242045529638 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6511433195714067906, guid: db654393793a67d45a7d0b70a68b73a6, + type: 3} + m_PrefabInstance: {fileID: 1870633191703925732} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index ac079481..2b207ed2 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -92,6 +92,7 @@ GameObject: - component: {fileID: 3958804368776631697} - component: {fileID: 4809398092723176810} - component: {fileID: 3534603063824972783} + - component: {fileID: 6568944925665769151} m_Layer: 5 m_Name: SmallHeart m_TagString: Untagged @@ -4853,6 +4854,24 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!114 &6568944925665769151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360816779210449747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} + m_Name: + m_EditorClassIdentifier: + seInfoArray: + - delay: 0 + time: 0 + interval: 0 + filename: se_sale _HeartMeter + maxCount: 0 --- !u!1 &471339744374256983 GameObject: m_ObjectHideFlags: 0 @@ -7635,6 +7654,7 @@ GameObject: - component: {fileID: 9057806665180912866} - component: {fileID: 4766182679767614286} - component: {fileID: 5357947501416858343} + - component: {fileID: 5908913919659511385} m_Layer: 0 m_Name: Tap_reaction m_TagString: Untagged @@ -7725,6 +7745,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5908913919659511385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6511433195714067906} + 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 &6952551938940088656 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav new file mode 100644 index 00000000..2f00c684 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav.meta new file mode 100644 index 00000000..58448157 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2dacea37636116d4380de26202c2330e +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/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 79475480..6af12eb1 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -1225,6 +1225,38 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443195450} m_CullTransparentMesh: 0 +--- !u!1 &492106929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1507187602806663288, guid: 21599f8e6d1104a07b0b14b49f8c1429, + type: 3} + m_PrefabInstance: {fileID: 1507187603938887410} + m_PrefabAsset: {fileID: 0} +--- !u!114 &492106930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492106929} + 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 &497302670 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 0328f77b..51229c5d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -1310,6 +1310,7 @@ GameObject: - component: {fileID: 4082915278942985869} - component: {fileID: 4082915278942985870} - component: {fileID: 4082915278942985871} + - component: {fileID: 4124234847921123430} m_Layer: 5 m_Name: Button_cancel m_TagString: Untagged @@ -1417,6 +1418,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4124234847921123430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082915278942985865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_cancel + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &4082915278992014895 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab index ca87feb6..9e6d45d6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/smartphone.prefab @@ -84,6 +84,7 @@ GameObject: m_Component: - component: {fileID: 3651850967930418324} - component: {fileID: 8309988580877545720} + - component: {fileID: 4379314340399256126} m_Layer: 5 m_Name: SpeechBalloon m_TagString: Untagged @@ -131,6 +132,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4379314340399256126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417867770995537213} + 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 &1521238715367636891 GameObject: m_ObjectHideFlags: 0 @@ -144,6 +171,7 @@ GameObject: - component: {fileID: 7556100823702958014} - component: {fileID: 9152305840986396987} - component: {fileID: 976747258084973401} + - component: {fileID: 2489519731325220227} m_Layer: 5 m_Name: Main_phone m_TagString: Untagged @@ -269,6 +297,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &2489519731325220227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1521238715367636891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_Main_phone + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &3597909497214952350 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 427b2791..faae8ee7 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -1441,6 +1441,7 @@ GameObject: - component: {fileID: 843133642} - component: {fileID: 843133641} - component: {fileID: 843133640} + - component: {fileID: 843133643} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1548,6 +1549,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 843133638} m_CullTransparentMesh: 0 +--- !u!114 &843133643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 843133638} + 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 &858120089 GameObject: m_ObjectHideFlags: 0 @@ -3440,6 +3457,7 @@ GameObject: - component: {fileID: 1853630206} - component: {fileID: 1853630205} - component: {fileID: 1853630204} + - component: {fileID: 1853630207} m_Layer: 5 m_Name: Button_make m_TagString: Untagged @@ -3547,6 +3565,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853630202} m_CullTransparentMesh: 0 +--- !u!114 &1853630207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853630202} + 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 &1972550997 GameObject: m_ObjectHideFlags: 0