diff --git a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim index c50c3d2a..eec23782 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim @@ -1021,9 +1021,9 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: - - time: 0 - functionName: - data: + - time: 0.25 + functionName: OnPlaySE + data: se_cooking_corn_Collide objectReferenceParameter: {fileID: 0} floatParameter: 0 intParameter: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index b9cc7596..55d192ab 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -825,4 +825,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.05 + functionName: OnPlaySE + data: se_cooking_corn_Pop + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/EffectCoin.anim b/popcorn/Assets/MyGame/Resource/Animation/EffectCoin.anim index 235e660b..698d4c45 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/EffectCoin.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/EffectCoin.anim @@ -707,4 +707,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_coin_get + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim index 886e1194..393a1ef1 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim @@ -238,4 +238,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.016666668 + functionName: OnPlaySE + data: se_CornField_machine + 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 af8d490f..1358cade 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/customer_nomal_walk_side.anim @@ -291,6 +291,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: NormalBody_side/AnimationPivot/normal/decoration/hat + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.113, y: -0.069, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside m_ScaleCurves: - curve: serializedVersion: 2 @@ -634,6 +650,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1371562689 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -1956,6 +1979,63 @@ AnimationClip: path: NormalBody_side/AnimationPivot/normal/decoration/Blue_behind_boy classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.113 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.069 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: NormalBody_side/AnimationPivot/normal/decoration/Blue_beside + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab index b0a05811..1c46f0e4 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 5078088515886692164} - component: {fileID: 5078088515886692165} - component: {fileID: 5078088515886692166} + - component: {fileID: 8569377843704253759} m_Layer: 0 m_Name: pt_Corn m_TagString: Untagged @@ -4813,6 +4814,24 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!114 &8569377843704253759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5078088515886692167} + 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_cooking_corn_FlyAway + maxCount: 0 --- !u!1 &5078088516399480977 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab index 806e07cc..15e1b79f 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab @@ -4823,6 +4823,7 @@ GameObject: - component: {fileID: 4783546067326661872} - component: {fileID: 4783546067326661839} - component: {fileID: 4783546067326661838} + - component: {fileID: 8545251597796919711} m_Layer: 0 m_Name: pt_Popcorn m_TagString: Untagged @@ -9625,3 +9626,21 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!114 &8545251597796919711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4783546067326661837} + 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_cooking_corn_FlyAway + maxCount: 0 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab index 15c4883d..e04fdc0c 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab @@ -9681,6 +9681,7 @@ GameObject: - component: {fileID: 7516975307168929494} - component: {fileID: 7516975307168929493} - component: {fileID: 721213865261247925} + - component: {fileID: 7983731304899893992} m_Layer: 0 m_Name: pt_Popcorn_strike m_TagString: Untagged @@ -14501,6 +14502,24 @@ MonoBehaviour: burntMaterialA: {fileID: 2100000, guid: bec51957e6eb5467abd3d46dc72f642a, type: 2} burntMaterialB: {fileID: 2100000, guid: cea7e196dbc8d4a4a8b8540ce7a2410f, type: 2} burntMaterialC: {fileID: 2100000, guid: 036c01b6cfb3f425e9b48f183b100571, type: 2} +--- !u!114 &7983731304899893992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7516975307168929492} + 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_cooking_corn_FlyAway + maxCount: 0 --- !u!1 &7516975307813098669 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab index f6648bf7..d78dabc6 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 6559742460595484781} - component: {fileID: 1595263809649592030} - component: {fileID: 378229802842188442} + - component: {fileID: 6392374182646515778} m_Layer: 0 m_Name: pt_Sand m_TagString: Untagged @@ -4769,6 +4770,24 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 35 +--- !u!114 &6392374182646515778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3900911687800301846} + 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_CornField_harvest_a + maxCount: 0 --- !u!1 &4087301220832393016 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Machines/machine_a.prefab b/popcorn/Assets/MyGame/Resources/Machines/machine_a.prefab index b51700e5..df884903 100644 --- a/popcorn/Assets/MyGame/Resources/Machines/machine_a.prefab +++ b/popcorn/Assets/MyGame/Resources/Machines/machine_a.prefab @@ -208,6 +208,7 @@ GameObject: - component: {fileID: 47850826084813397} - component: {fileID: 47850826084813398} - component: {fileID: 47850826084813396} + - component: {fileID: 2451034716134318137} m_Layer: 0 m_Name: machine_a m_TagString: Untagged @@ -275,6 +276,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2451034716134318137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47850826084813402} + 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 &47850826329687644 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Machines/machine_b.prefab b/popcorn/Assets/MyGame/Resources/Machines/machine_b.prefab index d260867f..cac7901b 100644 --- a/popcorn/Assets/MyGame/Resources/Machines/machine_b.prefab +++ b/popcorn/Assets/MyGame/Resources/Machines/machine_b.prefab @@ -451,6 +451,7 @@ GameObject: - component: {fileID: 124765514107862531} - component: {fileID: 124765514107862529} - component: {fileID: 124765514107862530} + - component: {fileID: 3636032791086425528} m_Layer: 0 m_Name: machine_b m_TagString: Untagged @@ -518,3 +519,29 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3636032791086425528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 124765514107862532} + 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: [] diff --git a/popcorn/Assets/MyGame/Resources/Machines/machine_c.prefab b/popcorn/Assets/MyGame/Resources/Machines/machine_c.prefab index 041ebbf8..cbcdcf5d 100644 --- a/popcorn/Assets/MyGame/Resources/Machines/machine_c.prefab +++ b/popcorn/Assets/MyGame/Resources/Machines/machine_c.prefab @@ -370,6 +370,7 @@ GameObject: - component: {fileID: 5133338031533004172} - component: {fileID: 5133338031533004162} - component: {fileID: 5133338031533004163} + - component: {fileID: 4766346115099295596} m_Layer: 0 m_Name: machine_c m_TagString: Untagged @@ -437,6 +438,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4766346115099295596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5133338031533004173} + 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 &5133338031540108383 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Machines/machine_d.prefab b/popcorn/Assets/MyGame/Resources/Machines/machine_d.prefab index 9608f32c..18968ce6 100644 --- a/popcorn/Assets/MyGame/Resources/Machines/machine_d.prefab +++ b/popcorn/Assets/MyGame/Resources/Machines/machine_d.prefab @@ -127,6 +127,7 @@ GameObject: - component: {fileID: 3212654287129546592} - component: {fileID: 3212654287129546598} - component: {fileID: 3212654287129546599} + - component: {fileID: 5747906951369458436} m_Layer: 0 m_Name: machine_d m_TagString: Untagged @@ -194,6 +195,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5747906951369458436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3212654287129546593} + 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 &3212654287251339992 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Machines/machine_e.prefab b/popcorn/Assets/MyGame/Resources/Machines/machine_e.prefab index a5848415..5fe8cd15 100644 --- a/popcorn/Assets/MyGame/Resources/Machines/machine_e.prefab +++ b/popcorn/Assets/MyGame/Resources/Machines/machine_e.prefab @@ -452,6 +452,7 @@ GameObject: - component: {fileID: 2000129564726371483} - component: {fileID: 2000129564726371481} - component: {fileID: 2000129564726371482} + - component: {fileID: 7697469540825494552} m_Layer: 0 m_Name: machine_e m_TagString: Untagged @@ -519,6 +520,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7697469540825494552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000129564726371484} + 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 &2000129564853321125 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3 b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3 new file mode 100644 index 00000000..fef58ea1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3 differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3.meta similarity index 91% rename from popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav.meta rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3.meta index ea356921..0f51294c 100644 --- a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav.meta +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a13e7efde9e029043921440744773c60 +guid: 3f34ce358d4f074468c38dcd9548950a AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav deleted file mode 100644 index c7600ae2..00000000 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav deleted file mode 100644 index 498ba76c..00000000 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav index ec032038..498ba76c 100644 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav.meta index 2f9b3d1c..84b39e8e 100644 --- a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav.meta +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_a.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e120ca76924b6d242ba5668f74d08311 +guid: 749af704a43854442823049f6a24d273 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav deleted file mode 100644 index 9bfceb83..00000000 Binary files a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_harvest_b.wav and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav new file mode 100644 index 00000000..fb6e6084 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav.meta similarity index 91% rename from popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav.meta rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav.meta index c51b7f74..a81ebc7e 100644 --- a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav.meta +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_release.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8bfb7aef7ca98d7488f24c53ae4eae5f +guid: 153cf52c76f8c2e4e831431b48f8d4e4 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav new file mode 100644 index 00000000..fa8e35dd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav.meta similarity index 91% rename from popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav.meta rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav.meta index 84b39e8e..68620d06 100644 --- a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_CornField_SeedlingGrowth.wav.meta +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cancel.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 749af704a43854442823049f6a24d273 +guid: af6334a5ae8c8ef48b7fc728e6d76a87 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav new file mode 100644 index 00000000..ed435601 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav.meta new file mode 100644 index 00000000..599bfa02 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_coin_get.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 908dc3e4cef1f3e41a180cd2dbdcb52c +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_cooking_corn_FlyAway.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cooking_corn_FlyAway.wav new file mode 100644 index 00000000..f24edba5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cooking_corn_FlyAway.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cooking_corn_FlyAway.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cooking_corn_FlyAway.wav.meta new file mode 100644 index 00000000..2f57d811 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_cooking_corn_FlyAway.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e3ecaabd3c13c03438bc2c6e9ab56296 +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/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 49965200..b4f23dbb 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -4169,6 +4169,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2137549891} m_PrefabAsset: {fileID: 0} +--- !u!114 &2137549894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137549893} + 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_cooking_corn_bake + maxCount: 0 --- !u!1 &2603874726320550220 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab index 5c7f57dc..55677220 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab @@ -60,6 +60,7 @@ GameObject: m_Component: - component: {fileID: 2449901118525682480} - component: {fileID: 2449901118525682481} + - component: {fileID: 4833659214657225623} m_Layer: 0 m_Name: Directing_com m_TagString: Untagged @@ -102,6 +103,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4833659214657225623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118525682483} + 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 &2449901118546329407 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index c886bea3..80101b72 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 5972257590091015193} - component: {fileID: 7195010600253370228} - component: {fileID: 8932234855615206969} + - component: {fileID: 5612557438344858771} m_Layer: 0 m_Name: corn m_TagString: Untagged @@ -115,6 +116,32 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.15 +--- !u!114 &5612557438344858771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324329073609281157} + 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 &3431194784518736845 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 93f08058..79475480 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -520,6 +520,7 @@ MonoBehaviour: harvestedSpawnTransform: {fileID: 1355152264} harvestedPrefab: {fileID: 2111766585493962378, guid: d52f3514ed7fd461b8ab77a202c122c6, type: 3} + harvestedSpawnTarget: {fileID: 0} thrust: 40 machineTarget: {fileID: 1491597820} --- !u!1 &313196410 @@ -534,6 +535,7 @@ GameObject: - component: {fileID: 313196414} - component: {fileID: 313196413} - component: {fileID: 313196412} + - component: {fileID: 313196415} m_Layer: 5 m_Name: Button_fertilizer_on m_TagString: Untagged @@ -642,6 +644,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313196410} m_CullTransparentMesh: 0 +--- !u!114 &313196415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313196410} + 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 &355725951 GameObject: m_ObjectHideFlags: 0 @@ -1080,6 +1098,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4852160585447148657, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: onClickPlaySEFilename + value: se_ButtonTap + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab index 4b00c2b9..90b74c86 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab @@ -5002,12 +5002,12 @@ PrefabInstance: - target: {fileID: -585356677611995407, guid: 93e1ec5e271c64b43b62aa6b6e4c1e70, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.021009952 + value: -0.021009982 objectReference: {fileID: 0} - target: {fileID: -585356677611995407, guid: 93e1ec5e271c64b43b62aa6b6e4c1e70, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.25373748 + value: 0.25373736 objectReference: {fileID: 0} - target: {fileID: -585356677611995407, guid: 93e1ec5e271c64b43b62aa6b6e4c1e70, type: 3} @@ -5017,7 +5017,7 @@ PrefabInstance: - target: {fileID: -585356677611995407, guid: 93e1ec5e271c64b43b62aa6b6e4c1e70, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.29000005 + value: 0.29000002 objectReference: {fileID: 0} - target: {fileID: 446891784795313783, guid: 93e1ec5e271c64b43b62aa6b6e4c1e70, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab index 9b2c5ad9..b29c21da 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab @@ -4992,13 +4992,18 @@ PrefabInstance: - target: {fileID: 479607024626019354, guid: 3b3b85fbfc98c41ef89c803c4034379a, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.9780416 + value: 0.97804135 objectReference: {fileID: 0} - target: {fileID: 479607024626019354, guid: 3b3b85fbfc98c41ef89c803c4034379a, type: 3} propertyPath: m_Bounds.m_Extent.x value: 0.53666484 objectReference: {fileID: 0} + - target: {fileID: 479607024626019354, guid: 3b3b85fbfc98c41ef89c803c4034379a, + type: 3} + propertyPath: m_Bounds.m_Extent.y + value: 1.0025198 + objectReference: {fileID: 0} - target: {fileID: 909144893010573319, guid: 3b3b85fbfc98c41ef89c803c4034379a, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab index a17c262a..585afe63 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab @@ -5032,12 +5032,12 @@ PrefabInstance: - target: {fileID: 1874588906064736778, guid: e937b33cf25c14d929b870a288aa5625, type: 3} propertyPath: m_Bounds.m_Center.y - value: 1.0673614 + value: 1.0673612 objectReference: {fileID: 0} - target: {fileID: 1874588906064736778, guid: e937b33cf25c14d929b870a288aa5625, type: 3} propertyPath: m_Bounds.m_Extent.x - value: 0.7449399 + value: 0.74494 objectReference: {fileID: 0} - target: {fileID: 1874588906064736778, guid: e937b33cf25c14d929b870a288aa5625, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 7a471e2a..c21bf4ad 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -1824,7 +1824,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} m_Name: m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap + onClickPlaySEFilename: se_CornField_release randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index c46b415e..4fa0dbb9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -381,6 +381,7 @@ GameObject: m_Component: - component: {fileID: 137127163028694528} - component: {fileID: 4683425562393467656} + - component: {fileID: 6105273470475597304} m_Layer: 5 m_Name: Icon_Coin m_TagString: Untagged @@ -434,6 +435,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &6105273470475597304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127163028694531} + 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 &137127163230790451 GameObject: m_ObjectHideFlags: 0