diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav new file mode 100644 index 00000000..f047ea65 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav.meta new file mode 100644 index 00000000..acb6d02d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_buy.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4edaf6f75610340449ff99382fb552be +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/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index c5ad04c1..11437c7b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -361,6 +361,7 @@ GameObject: - component: {fileID: 312157414} - component: {fileID: 312157413} - component: {fileID: 312157412} + - component: {fileID: 312157415} m_Layer: 5 m_Name: Button_ok m_TagString: Untagged @@ -468,6 +469,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 312157410} m_CullTransparentMesh: 0 +--- !u!114 &312157415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312157410} + 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 &322139898 GameObject: m_ObjectHideFlags: 0 @@ -611,6 +628,7 @@ GameObject: m_Component: - component: {fileID: 460945447} - component: {fileID: 460945448} + - component: {fileID: 460945449} m_Layer: 5 m_Name: failure m_TagString: Untagged @@ -657,6 +675,24 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &460945449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460945446} + 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_Failure + maxCount: 0 --- !u!1 &509156287 GameObject: m_ObjectHideFlags: 0 @@ -817,6 +853,7 @@ GameObject: m_Component: - component: {fileID: 642263094} - component: {fileID: 642263095} + - component: {fileID: 642263096} m_Layer: 5 m_Name: GreatSuccess m_TagString: Untagged @@ -864,6 +901,24 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &642263096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642263093} + 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_success + maxCount: 0 --- !u!1 &683199237 GameObject: m_ObjectHideFlags: 0 @@ -1154,6 +1209,7 @@ GameObject: - component: {fileID: 781751672} - component: {fileID: 781751671} - component: {fileID: 781751670} + - component: {fileID: 781751673} m_Layer: 5 m_Name: Button_destruction m_TagString: Untagged @@ -1261,6 +1317,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781751668} m_CullTransparentMesh: 0 +--- !u!114 &781751673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781751668} + 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 &832390346 GameObject: m_ObjectHideFlags: 0 @@ -1963,6 +2035,7 @@ GameObject: m_Component: - component: {fileID: 1370567322} - component: {fileID: 1370567323} + - component: {fileID: 1370567324} m_Layer: 5 m_Name: success m_TagString: Untagged @@ -2010,6 +2083,24 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1370567324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370567321} + 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_success + maxCount: 0 --- !u!114 &1459407280 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8869708493587088493, guid: 4d49c71079a444963857b600f7b6384c, @@ -6923,6 +7014,7 @@ GameObject: - component: {fileID: 1887559737} - component: {fileID: 1887559736} - component: {fileID: 1887559735} + - component: {fileID: 1887559738} m_Layer: 5 m_Name: Button_GreatSuccess m_TagString: Untagged @@ -7031,6 +7123,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887559733} m_CullTransparentMesh: 0 +--- !u!114 &1887559738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887559733} + 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 &1906782494 GameObject: m_ObjectHideFlags: 0 @@ -12154,6 +12262,7 @@ GameObject: - component: {fileID: 2137066053} - component: {fileID: 2137066052} - component: {fileID: 2137066051} + - component: {fileID: 2137066054} m_Layer: 5 m_Name: Button_ok m_TagString: Untagged @@ -12261,6 +12370,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137066049} m_CullTransparentMesh: 0 +--- !u!114 &2137066054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137066049} + 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!4 &947177465739795016 Transform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/WatchMovie.unity b/popcorn/Assets/MyGame/Scenes/Cooking/WatchMovie.unity index 28ad1fef..1f896c5f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/WatchMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/WatchMovie.unity @@ -282,6 +282,7 @@ GameObject: - component: {fileID: 455625262} - component: {fileID: 455625261} - component: {fileID: 455625260} + - component: {fileID: 455625263} m_Layer: 5 m_Name: Button_movie m_TagString: Untagged @@ -389,6 +390,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 455625258} m_CullTransparentMesh: 0 +--- !u!114 &455625263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455625258} + 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 &642536138 GameObject: m_ObjectHideFlags: 0 @@ -401,6 +418,7 @@ GameObject: - component: {fileID: 642536142} - component: {fileID: 642536141} - component: {fileID: 642536140} + - component: {fileID: 642536143} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -508,6 +526,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 642536138} m_CullTransparentMesh: 0 +--- !u!114 &642536143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642536138} + 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 &988145656 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 0ac74edf..5741f769 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -765,6 +765,7 @@ GameObject: - component: {fileID: 8736114270417149857} - component: {fileID: 8736114270417149858} - component: {fileID: 8736114270417149859} + - component: {fileID: 8272109616915045574} m_Layer: 5 m_Name: Button_release_on m_TagString: Untagged @@ -872,6 +873,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &8272109616915045574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8736114270417149869} + 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 &8736114270452900669 GameObject: m_ObjectHideFlags: 0 @@ -1144,6 +1161,7 @@ GameObject: - component: {fileID: 8736114270625729310} - component: {fileID: 8736114270625729311} - component: {fileID: 8736114270625729304} + - component: {fileID: 2161770440214534665} m_Layer: 5 m_Name: Button_strengthening_on m_TagString: Untagged @@ -1251,6 +1269,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &2161770440214534665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8736114270625729306} + 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 &8736114270758350255 GameObject: m_ObjectHideFlags: 0 @@ -3078,6 +3112,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3} +--- !u!224 &8736114270235223148 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, + type: 3} + m_PrefabInstance: {fileID: 7159613405573062692} + m_PrefabAsset: {fileID: 0} --- !u!114 &5298427820679491484 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf, @@ -3090,12 +3130,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &8736114270235223148 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, - type: 3} - m_PrefabInstance: {fileID: 7159613405573062692} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114270722190697 PrefabInstance: m_ObjectHideFlags: 0 @@ -3340,6 +3374,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3} +--- !u!224 &7159613406184650565 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, + type: 3} + m_PrefabInstance: {fileID: 8736114270831080205} + m_PrefabAsset: {fileID: 0} --- !u!114 &6045849226816011445 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf, @@ -3352,12 +3392,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7159613406184650565 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, - type: 3} - m_PrefabInstance: {fileID: 8736114270831080205} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271242800391 PrefabInstance: m_ObjectHideFlags: 0 @@ -3492,6 +3526,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} +--- !u!224 &5404513298107476707 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, + type: 3} + m_PrefabInstance: {fileID: 8736114271242800391} + m_PrefabAsset: {fileID: 0} --- !u!114 &5404513298100535288 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, @@ -3504,12 +3544,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5404513298107476707 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, - type: 3} - m_PrefabInstance: {fileID: 8736114271242800391} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271678039720 PrefabInstance: m_ObjectHideFlags: 0 @@ -3644,6 +3678,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} +--- !u!224 &5404513298611757388 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, + type: 3} + m_PrefabInstance: {fileID: 8736114271678039720} + m_PrefabAsset: {fileID: 0} --- !u!114 &5404513298602980439 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, @@ -3656,12 +3696,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5404513298611757388 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, - type: 3} - m_PrefabInstance: {fileID: 8736114271678039720} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271969069798 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 467056f5..6c09351d 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -395,6 +395,7 @@ GameObject: - component: {fileID: 2616693359888773727} - component: {fileID: 2616693359888773726} - component: {fileID: 2616693359888773713} + - component: {fileID: 8569165178849007725} m_Layer: 5 m_Name: Button_strengthening_on m_TagString: Untagged @@ -502,6 +503,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &8569165178849007725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2616693359888773715} + 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 &2616693359959091458 GameObject: m_ObjectHideFlags: 0 @@ -1998,18 +2015,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} ---- !u!224 &8010842515348788198 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, - type: 3} - m_PrefabInstance: {fileID: 1723792222401182694} - m_PrefabAsset: {fileID: 0} --- !u!224 &2010328485157376592 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} m_PrefabInstance: {fileID: 1723792222401182694} m_PrefabAsset: {fileID: 0} +--- !u!224 &8010842515348788198 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 1723792222401182694} + m_PrefabAsset: {fileID: 0} --- !u!114 &5369860504688840119 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2, @@ -2146,6 +2163,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} +--- !u!224 &2907742340702408742 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 2616693360228055440} + m_PrefabAsset: {fileID: 0} --- !u!114 &8735273494761787329 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2, @@ -2158,12 +2181,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2907742340702408742 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, - type: 3} - m_PrefabInstance: {fileID: 2616693360228055440} - m_PrefabAsset: {fileID: 0} --- !u!224 &6669907502491996560 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, @@ -2294,6 +2311,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} +--- !u!224 &5201530277052463945 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 3526200919544632137} + m_PrefabAsset: {fileID: 0} --- !u!114 &7892036374385157400 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2, @@ -2306,12 +2329,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5201530277052463945 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, - type: 3} - m_PrefabInstance: {fileID: 3526200919544632137} - m_PrefabAsset: {fileID: 0} --- !u!224 &4388100270089255679 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 63660d70..98e1441b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -804,6 +804,7 @@ GameObject: - component: {fileID: 1440832247} - component: {fileID: 1440832246} - component: {fileID: 1440832245} + - component: {fileID: 1440832248} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -911,6 +912,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440832243} m_CullTransparentMesh: 0 +--- !u!114 &1440832248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440832243} + 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!224 &1530261473 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616693360086915591, guid: 8990d570a96764364823ea362803dfcf, diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index aa0941b3..7a471e2a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -902,6 +902,7 @@ GameObject: - component: {fileID: 865761138} - component: {fileID: 865761137} - component: {fileID: 865761136} + - component: {fileID: 865761139} m_Layer: 5 m_Name: Button_release m_TagString: Untagged @@ -1009,6 +1010,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865761134} m_CullTransparentMesh: 0 +--- !u!114 &865761139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865761134} + 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 &884928057 GameObject: m_ObjectHideFlags: 0 @@ -1473,6 +1490,7 @@ GameObject: - component: {fileID: 1130921228} - component: {fileID: 1130921227} - component: {fileID: 1130921226} + - component: {fileID: 1130921229} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1580,6 +1598,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1130921224} m_CullTransparentMesh: 0 +--- !u!114 &1130921229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1130921224} + 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 &1133773167 GameObject: m_ObjectHideFlags: 0 @@ -1670,6 +1704,7 @@ GameObject: - component: {fileID: 1192264085} - component: {fileID: 1192264084} - component: {fileID: 1192264083} + - component: {fileID: 1192264086} m_Layer: 5 m_Name: Button_Purchase m_TagString: Untagged @@ -1777,6 +1812,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192264081} m_CullTransparentMesh: 0 +--- !u!114 &1192264086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192264081} + 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 &1361833951 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index 0c9828dc..a6cfa8d2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -4483,6 +4483,7 @@ GameObject: - component: {fileID: 1173753731} - component: {fileID: 1173753730} - component: {fileID: 1173753729} + - component: {fileID: 1173753732} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -4590,6 +4591,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173753727} m_CullTransparentMesh: 0 +--- !u!114 &1173753732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173753727} + 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 &1227838249 GameObject: m_ObjectHideFlags: 0 @@ -7135,6 +7152,7 @@ GameObject: - component: {fileID: 1893360809} - component: {fileID: 1893360808} - component: {fileID: 1893360807} + - component: {fileID: 1893360810} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -7242,6 +7260,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1893360805} m_CullTransparentMesh: 0 +--- !u!114 &1893360810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1893360805} + 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 &1893886298 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 a4aba3fc..0328f77b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -1429,6 +1429,7 @@ GameObject: - component: {fileID: 4082915278992014883} - component: {fileID: 4082915278992014892} - component: {fileID: 4082915278992014893} + - component: {fileID: 991718238697775203} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1536,6 +1537,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &991718238697775203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082915278992014895} + 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 &4082915279019759821 GameObject: m_ObjectHideFlags: 0 @@ -1548,6 +1565,7 @@ GameObject: - component: {fileID: 4082915279019759809} - component: {fileID: 4082915279019759810} - component: {fileID: 4082915279019759811} + - component: {fileID: 542356541909780473} m_Layer: 5 m_Name: Button_delivery m_TagString: Untagged @@ -1655,6 +1673,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &542356541909780473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082915279019759821} + 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 &4082915279096126314 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index c68008bf..536b7788 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -237,7 +237,7 @@ GameObject: - component: {fileID: 4187074209012466683} - component: {fileID: 4187074209012466680} m_Layer: 5 - m_Name: Canvas + m_Name: CanvasCancel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -335,6 +335,7 @@ GameObject: - component: {fileID: 4187074209150459481} - component: {fileID: 4187074209150459462} - component: {fileID: 4187074209150459463} + - component: {fileID: 5366079809211700077} m_Layer: 5 m_Name: Button_cancel m_TagString: Untagged @@ -442,6 +443,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5366079809211700077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187074209150459461} + 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 &4187074209167193799 GameObject: m_ObjectHideFlags: 0 @@ -682,6 +699,7 @@ GameObject: - component: {fileID: 4187074209291994454} - component: {fileID: 4187074209291994455} - component: {fileID: 4187074209291994452} + - component: {fileID: 5785080575303838487} m_Layer: 5 m_Name: Button_DoNot m_TagString: Untagged @@ -789,6 +807,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5785080575303838487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187074209291994450} + 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 &4187074209382484541 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index ee17c4dd..f7fd77c3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -747,7 +747,7 @@ GameObject: - component: {fileID: 4315754687615340682} - component: {fileID: 4315754687615340677} m_Layer: 5 - m_Name: Canvas + m_Name: CanvasTelePhone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -845,6 +845,7 @@ GameObject: - component: {fileID: 4315754687626831808} - component: {fileID: 4315754687626831811} - component: {fileID: 4315754687626831810} + - component: {fileID: 1760860610951527796} m_Layer: 5 m_Name: Button_ok m_TagString: Untagged @@ -952,6 +953,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &1760860610951527796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4315754687626831868} + 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 &4315754687733902320 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 1c4e5d22..20160476 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -611,6 +611,7 @@ GameObject: - component: {fileID: 3658417434522814402} - component: {fileID: 3658417434522814403} - component: {fileID: 3658417434522814400} + - component: {fileID: 2104778534835377116} m_Layer: 5 m_Name: Button_on m_TagString: Untagged @@ -718,6 +719,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &2104778534835377116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3658417434522814406} + 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 &3658417434568161586 GameObject: m_ObjectHideFlags: 0 @@ -1522,6 +1539,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lockPanel: {fileID: 0} + lockPanelText: {fileID: 0} detailButton: {fileID: 0} flavorName: {fileID: 6701890202664346918} flavorPrice: {fileID: 6701890202901161252} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index f3162170..1774f6ec 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2792,6 +2792,7 @@ GameObject: - component: {fileID: 2660639677226913018} - component: {fileID: 2660639677226912965} - component: {fileID: 2660639677226912964} + - component: {fileID: 4925914480728758062} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -2899,6 +2900,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4925914480728758062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2660639677226912966} + 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 &2660639677480706699 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index 4fd6dbbc..00a9990c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -133,6 +133,7 @@ GameObject: - component: {fileID: 4540748} - component: {fileID: 4540747} - component: {fileID: 4540746} + - component: {fileID: 4540749} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -240,6 +241,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4540744} m_CullTransparentMesh: 0 +--- !u!114 &4540749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4540744} + 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 &60737795 GameObject: m_ObjectHideFlags: 0 @@ -425,6 +442,7 @@ GameObject: - component: {fileID: 208413213} - component: {fileID: 208413212} - component: {fileID: 208413211} + - component: {fileID: 208413214} m_Layer: 5 m_Name: Button_movie m_TagString: Untagged @@ -532,6 +550,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 208413209} m_CullTransparentMesh: 0 +--- !u!114 &208413214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 208413209} + 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 &251547152 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index 0c646996..ac17d80d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -1369,6 +1369,7 @@ GameObject: - component: {fileID: 2088564209} - component: {fileID: 2088564208} - component: {fileID: 2088564207} + - component: {fileID: 2088564210} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1476,6 +1477,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088564205} m_CullTransparentMesh: 0 +--- !u!114 &2088564210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088564205} + 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 &2114469660 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity index 5bed3d11..902fcbc9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity @@ -716,6 +716,7 @@ GameObject: - component: {fileID: 1544360573} - component: {fileID: 1544360572} - component: {fileID: 1544360571} + - component: {fileID: 1544360574} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -823,6 +824,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544360569} m_CullTransparentMesh: 0 +--- !u!114 &1544360574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544360569} + 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 &1919735134 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 2cbdf33e..e2b4ed55 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -1652,6 +1652,7 @@ GameObject: - component: {fileID: 3856012876379087775} - component: {fileID: 3856012876379087772} - component: {fileID: 3856012876379087773} + - component: {fileID: 6219500175688171105} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1759,6 +1760,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6219500175688171105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3856012876379087771} + 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 &3856012876432300749 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab index 7c5e215f..9cb3d321 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab @@ -86,6 +86,7 @@ GameObject: - component: {fileID: 8159396421809467551} - component: {fileID: 8159396421809467536} - component: {fileID: 8159396421809467537} + - component: {fileID: 3622916551152426226} m_Layer: 5 m_Name: EarnedCoins m_TagString: Untagged @@ -172,6 +173,24 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3622916551152426226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8159396421809467539} + 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_buy + maxCount: 0 --- !u!1 &8159396422412942368 GameObject: m_ObjectHideFlags: 0 @@ -246,7 +265,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279644505 + rgba: 1454425 m_fontColor: {r: 0.34901962, g: 0.19215687, b: 0.08627451, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index e5d2d687..94749a06 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -289} + m_AnchoredPosition: {x: 0, y: -327} m_SizeDelta: {x: 900, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127956927218630 @@ -115,7 +115,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -410, y: 292} + m_AnchoredPosition: {x: -410, y: 248} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6124127957040273547 @@ -342,10 +342,10 @@ RectTransform: m_Father: {fileID: 6124127957792349541} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -379} - m_SizeDelta: {x: 0, y: -100} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -353.1} + m_SizeDelta: {x: 0, y: 1642} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6124127957362852792 MonoBehaviour: @@ -634,7 +634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 396.99994} + m_AnchoredPosition: {x: 0, y: -439} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957932188849 @@ -911,6 +911,7 @@ GameObject: - component: {fileID: 6124127958242834726} - component: {fileID: 6124127958242834725} - component: {fileID: 2571460208686409723} + - component: {fileID: 1517642633439779677} m_Layer: 5 m_Name: Button_frame_off m_TagString: Untagged @@ -1018,6 +1019,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &1517642633439779677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124127958242834722} + 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 &6124127958482727412 GameObject: m_ObjectHideFlags: 0 @@ -1252,6 +1269,7 @@ GameObject: - component: {fileID: 6124127958658035354} - component: {fileID: 6124127958658035353} - component: {fileID: 2475725912389513548} + - component: {fileID: 485700740423432956} m_Layer: 5 m_Name: Button_frame_off m_TagString: Untagged @@ -1359,6 +1377,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &485700740423432956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124127958658035366} + 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 &6124127958769025432 GameObject: m_ObjectHideFlags: 0 @@ -1762,12 +1796,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} ---- !u!224 &6124127957488033513 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, - type: 3} - m_PrefabInstance: {fileID: 2705466137574694683} - m_PrefabAsset: {fileID: 0} --- !u!114 &1703305198614521804 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, @@ -1780,6 +1808,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6124127957488033513 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 2705466137574694683} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6124127957283136057 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 48042372..df311ba8 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -290,6 +290,7 @@ GameObject: - component: {fileID: 5089467466492122886} - component: {fileID: 5089467466492122887} - component: {fileID: 5089467466492122904} + - component: {fileID: 1748740973054975540} m_Layer: 5 m_Name: Button_Tasting m_TagString: Untagged @@ -397,6 +398,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &1748740973054975540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089467466492122906} + 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 &5089467466529880977 GameObject: m_ObjectHideFlags: 0 @@ -1153,6 +1170,7 @@ GameObject: - component: {fileID: 5089467467567286952} - component: {fileID: 5089467467567286953} - component: {fileID: 5089467467567286954} + - component: {fileID: 6500128189054498548} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1260,6 +1278,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6500128189054498548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089467467567286956} + 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 &5089467467585629821 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index 4e33cb60..f51622b8 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -2136,6 +2136,7 @@ GameObject: - component: {fileID: 8175998083657673472} - component: {fileID: 8175998083657673473} - component: {fileID: 8175998083657673474} + - component: {fileID: 6796859240407644646} m_Layer: 5 m_Name: Button_purchase m_TagString: Untagged @@ -2243,6 +2244,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6796859240407644646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8175998083657673532} + 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 &8175998084009524129 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 663617fc..10ea23e6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -329,7 +329,7 @@ PrefabInstance: - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -671,6 +671,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} + - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -1661,6 +1666,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6124127957362852678, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1176 + objectReference: {fileID: 0} - target: {fileID: 6124127957792349540, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Name @@ -1776,6 +1786,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 376.00027 + objectReference: {fileID: 0} - target: {fileID: 6124127958085519822, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_AnchorMax.y @@ -2273,6 +2288,7 @@ GameObject: - component: {fileID: 1280872483} - component: {fileID: 1280872482} - component: {fileID: 1280872481} + - component: {fileID: 1280872484} m_Layer: 5 m_Name: Button_Tasting m_TagString: Untagged @@ -2380,6 +2396,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280872479} m_CullTransparentMesh: 0 +--- !u!114 &1280872484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1280872479} + 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 &1322368921 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab index 1d0e66cb..4a58b780 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 2408256986298540651} - component: {fileID: 4182884651870997439} - component: {fileID: 3235806894350595316} + - component: {fileID: 481714593640448268} m_Layer: 5 m_Name: Button_Arrow_left m_TagString: Untagged @@ -118,3 +119,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &481714593640448268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215640756857435475} + 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 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index fa5b2173..fd93c3dc 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -86,6 +86,7 @@ GameObject: - component: {fileID: 5776310992788139834} - component: {fileID: 1785032438920414220} - component: {fileID: 8320108874302735811} + - component: {fileID: 2305865187944384083} m_Layer: 0 m_Name: detail m_TagString: Untagged @@ -197,6 +198,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &2305865187944384083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908060699288711323} + 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 &2929932626248606813 GameObject: m_ObjectHideFlags: 0 @@ -672,7 +689,6 @@ MonoBehaviour: flavor1AmountText: {fileID: 2929932625557648441} flavor2AmountText: {fileID: 367551539734858426} flavor2View: {fileID: 367551539495355422} - lockPanelTextFormat: "\u5E97\u8217\u30EC\u30D9\u30EB{0}\u3067\u958B\u653E" --- !u!1 &2997770120253274331 GameObject: m_ObjectHideFlags: 0 @@ -1558,6 +1574,12 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!224 &6296255899524172857 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 8101979052737494168} + m_PrefabAsset: {fileID: 0} --- !u!114 &6296255899301773980 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1570,9 +1592,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &6296255899524172857 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 8101979052737494168} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 8a07e262..799bd0e3 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -1636,6 +1636,7 @@ GameObject: - component: {fileID: 968322479} - component: {fileID: 968322478} - component: {fileID: 968322477} + - component: {fileID: 968322480} m_Layer: 0 m_Name: Button_Close m_TagString: Untagged @@ -1743,6 +1744,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968322475} m_CullTransparentMesh: 0 +--- !u!114 &968322480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968322475} + 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!1001 &1022328681 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 4614ee02..7f64d645 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -122,6 +122,8 @@ GameObject: - component: {fileID: 8536603422629144348} - component: {fileID: 8536603422629144345} - component: {fileID: 8536603422629144346} + - component: {fileID: 3348363390361919889} + - component: {fileID: 5389499483672338342} m_Layer: 5 m_Name: Button_on m_TagString: Untagged @@ -186,6 +188,65 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3348363390361919889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536603422629144349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8536603422629144346} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5389499483672338342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536603422629144349} + 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 &8536603422802196746 GameObject: m_ObjectHideFlags: 0 @@ -809,6 +870,7 @@ GameObject: - component: {fileID: 8536603424057203240} - component: {fileID: 8536603424057203241} - component: {fileID: 8536603424057203242} + - component: {fileID: 6982733142161436622} m_Layer: 5 m_Name: Button_detail m_TagString: Untagged @@ -915,6 +977,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6982733142161436622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536603424057203244} + 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 &8536603424202476249 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 7bcc4209..7fc56bdb 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 3033445367999946803} - component: {fileID: 3033445367999946800} - component: {fileID: 3033445367999946801} + - component: {fileID: 6615583607661858082} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -119,6 +120,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6615583607661858082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3033445367999946807} + 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 &3033445368104864271 GameObject: m_ObjectHideFlags: 0 @@ -696,7 +713,7 @@ GameObject: - component: {fileID: 3033445369676262434} - component: {fileID: 3033445369676262435} m_Layer: 5 - m_Name: Canvas + m_Name: ItemDetail m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index 961c18b1..8e88e22d 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -301,6 +301,7 @@ GameObject: - component: {fileID: 9133304335268316948} - component: {fileID: 9133304335268316949} - component: {fileID: 9133304335268316946} + - component: {fileID: 5308044469581607396} m_Layer: 5 m_Name: Button_Purchase_On m_TagString: Untagged @@ -408,6 +409,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5308044469581607396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9133304335268316944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_buy + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &9133304335307007779 GameObject: m_ObjectHideFlags: 0 @@ -1269,6 +1286,7 @@ GameObject: - component: {fileID: 9133304335940276439} - component: {fileID: 9133304335940276436} - component: {fileID: 9133304335940276437} + - component: {fileID: 1407101663160306030} m_Layer: 5 m_Name: Button_close m_TagString: Untagged @@ -1376,6 +1394,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &1407101663160306030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9133304335940276435} + 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 &9133304336128604252 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index aa386278..9e49d627 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -420,6 +420,8 @@ GameObject: - component: {fileID: 2912042418451981108} - component: {fileID: 2912042418451981107} - component: {fileID: 2912042418451981106} + - component: {fileID: 2307080139950086264} + - component: {fileID: 6688088654144562926} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -484,6 +486,65 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2307080139950086264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042418451981111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2912042418451981106} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6688088654144562926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042418451981111} + 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 &2912042418533327959 GameObject: m_ObjectHideFlags: 0 @@ -1550,6 +1611,8 @@ GameObject: - component: {fileID: 2912042419946951651} - component: {fileID: 2912042419946951662} - component: {fileID: 2912042419946951649} + - component: {fileID: 4039810787608905224} + - component: {fileID: 3708771606325861741} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -1614,6 +1677,65 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4039810787608905224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042419946951650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2912042419946951649} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3708771606325861741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2912042419946951650} + 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!1001 &2912042418075147293 PrefabInstance: m_ObjectHideFlags: 0