From f229a9fff51c8e775c08fe60d90abe0b65e1d985 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 7 Oct 2021 15:06:19 +0900 Subject: [PATCH] =?UTF-8?q?SE=E8=BF=BD=E5=8A=A0=E3=80=81=E3=81=8A=E5=AE=A2?= =?UTF-8?q?animation=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/SpeechBalloon.anim | 9 ++- .../Resource/Animation/Tap_reaction.anim | 9 ++- .../MyGame/Resource/Animation/corn_icon.anim | 9 ++- .../Animation/customer_nomal_walk_side.anim | 4 +- .../Avatars/customer_beside_curl.prefab | 63 +++++++++++++++++- .../Avatars/customer_cap_Blue.prefab | 32 +++++++++ .../Avatars/customer_cap_Brown.prefab | 32 +++++++++ .../Resources/Avatars/customer_normal.prefab | 46 +++++++++++++ .../Resources/Sounds/SE/se_corn_get.wav | Bin 0 -> 10700 bytes .../Resources/Sounds/SE/se_corn_get.wav.meta | 22 ++++++ .../MyGame/Scenes/CornField/CornField.unity | 32 +++++++++ .../Main/Prefabs/BulkOrder/Canvas.prefab | 17 +++++ .../Main/Prefabs/BulkOrder/smartphone.prefab | 44 ++++++++++++ .../MyGame/Scenes/recipe/RecipeChoice.unity | 34 ++++++++++ 14 files changed, 347 insertions(+), 6 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav create mode 100644 popcorn/Assets/MyGame/Resources/Sounds/SE/se_corn_get.wav.meta 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 0000000000000000000000000000000000000000..2f00c68452a05693db0438d12d39cebe5b2fd737 GIT binary patch literal 10700 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 Tmq+;3gIqo#2j}e1+2?-%Tc=CP literal 0 HcmV?d00001 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