From dfb907eea6ffe5d187d1f06748b1c1eb187792a0 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 22 Nov 2021 18:02:15 +0900 Subject: [PATCH] =?UTF-8?q?Result=E3=81=ABPrice=E8=A1=A8=E7=A4=BA=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0/=E7=B6=9A=E3=81=91=E3=81=A6=E8=AA=BF=E7=90=86?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/CookingResults.unity | 927 +----------------- .../Scenes/Cooking/Scripts/CookingResult.cs | 125 ++- 2 files changed, 68 insertions(+), 984 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index 53945a88..c906c3f8 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -175,154 +175,6 @@ MonoBehaviour: coinAnimator: {fileID: 731070674} basePriceText: {fileID: 1015662795} perfectPriceText: {fileID: 1667225192} ---- !u!1 &144061146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 144061147} - - component: {fileID: 144061149} - - component: {fileID: 144061148} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &144061147 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144061146} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 312157411} - m_RootOrder: 0 - 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: 4} - m_SizeDelta: {x: 126, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &144061148 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144061146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be43441773844e241b0f8b046b68e8f8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &144061149 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144061146} - m_CullTransparentMesh: 0 ---- !u!1 &168647011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 168647012} - - component: {fileID: 168647014} - - component: {fileID: 168647013} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &168647012 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168647011} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2137066050} - m_RootOrder: 0 - 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: 4} - m_SizeDelta: {x: 126, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &168647013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168647011} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be43441773844e241b0f8b046b68e8f8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &168647014 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 168647011} - m_CullTransparentMesh: 0 --- !u!224 &237413689 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3402059229817004136, guid: 9cd0f85cb815c374a913cf9c1a825d1b, @@ -403,142 +255,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283934329} m_CullTransparentMesh: 0 ---- !u!1 &312157410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 312157411} - - component: {fileID: 312157414} - - component: {fileID: 312157413} - - component: {fileID: 312157412} - - component: {fileID: 312157415} - m_Layer: 5 - m_Name: Button_ok - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &312157411 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 312157410} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 144061147} - m_Father: {fileID: 1022708888} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 290, y: 138} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &312157412 -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: 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: 312157413} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &312157413 -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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9762a7e9197d4454eae77ff830bb26d9, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &312157414 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - 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 &313093298 GameObject: m_ObjectHideFlags: 0 @@ -1708,116 +1424,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 683199237} m_CullTransparentMesh: 0 ---- !u!1 &691436328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 691436329} - m_Layer: 5 - m_Name: left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &691436329 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691436328} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2132786137} - m_Father: {fileID: 995508294} - m_RootOrder: 0 - 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: -186, y: -318} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &717022731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 717022732} - - component: {fileID: 717022734} - - component: {fileID: 717022733} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &717022732 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717022731} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 781751669} - m_RootOrder: 0 - 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: 4} - m_SizeDelta: {x: 162, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &717022733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717022731} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 171ed0d11d66f6a4d8c147aa7cd31fde, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &717022734 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717022731} - m_CullTransparentMesh: 0 --- !u!1 &731070671 GameObject: m_ObjectHideFlags: 0 @@ -2076,142 +1682,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &781751668 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 781751669} - - component: {fileID: 781751672} - - component: {fileID: 781751671} - - component: {fileID: 781751670} - - component: {fileID: 781751673} - m_Layer: 5 - m_Name: Button_destruction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &781751669 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781751668} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 717022732} - m_Father: {fileID: 1022708888} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 290, y: 138} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &781751670 -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: 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: 781751671} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &781751671 -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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a6cca279e97f364d8f452938df94f16, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &781751672 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - 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 @@ -2648,9 +2118,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 691436329} - - {fileID: 1022708888} - - {fileID: 2137066050} - {fileID: 1887559734} - {fileID: 1828335168} m_Father: {fileID: 2075176185} @@ -2739,43 +2206,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1015662793} m_CullTransparentMesh: 0 ---- !u!1 &1022708887 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1022708888} - m_Layer: 5 - m_Name: right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1022708888 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1022708887} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 312157411} - - {fileID: 781751669} - m_Father: {fileID: 995508294} - m_RootOrder: 1 - 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: 186, y: -318} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1030818594 GameObject: m_ObjectHideFlags: 0 @@ -3564,80 +2994,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1330096119} m_CullTransparentMesh: 0 ---- !u!1 &1358716283 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1358716284} - - component: {fileID: 1358716286} - - component: {fileID: 1358716285} - m_Layer: 5 - m_Name: Image_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1358716284 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358716283} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2132786137} - m_RootOrder: 0 - 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: 4} - m_SizeDelta: {x: 232, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1358716285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358716283} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a87a9337eaa8d394ab3e9f2a130777ee, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1358716286 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358716283} - m_CullTransparentMesh: 0 --- !u!1 &1360125025 GameObject: m_ObjectHideFlags: 0 @@ -8874,7 +8230,7 @@ RectTransform: - {fileID: 1275284630} - {fileID: 641247138} m_Father: {fileID: 995508294} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -8940,7 +8296,7 @@ RectTransform: - {fileID: 885194170} - {fileID: 509156288} m_Father: {fileID: 995508294} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -13994,10 +13350,10 @@ MonoBehaviour: m_EditorClassIdentifier: smokeEffect: {fileID: 947177465739795019} glitterEffect: {fileID: 1807287602921740329} - centerOkButton: {fileID: 2137066051} perfectButton: {fileID: 1887559735} - leftOkButton: {fileID: 312157412} - destructionButton: {fileID: 781751670} + okButton: {fileID: 1275284632} + destructionButton: {fileID: 641247140} + makeOneButton: {fileID: 419955112} popcornTarget: {fileID: 977215193} popcornText: {fileID: 2078519775} popcornTextPerfect: {fileID: 1906782496} @@ -14010,6 +13366,7 @@ MonoBehaviour: perfectResultObject: {fileID: 642263093} goodResultObject: {fileID: 1370567321} failureResultObject: {fileID: 460945446} + coinView: {fileID: 22866708} --- !u!4 &2067961728 Transform: m_ObjectHideFlags: 0 @@ -14154,278 +13511,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2078519773} m_CullTransparentMesh: 0 ---- !u!1 &2132786136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2132786137} - - component: {fileID: 2132786141} - - component: {fileID: 2132786140} - - component: {fileID: 2132786139} - - component: {fileID: 2132786138} - m_Layer: 5 - m_Name: Button_make_one - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2132786137 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132786136} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1358716284} - m_Father: {fileID: 691436329} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 290, y: 138} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2132786138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132786136} - 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!114 &2132786139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132786136} - 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: 2132786140} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &2132786140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132786136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1e213d73b33ff794db73d36f9663a3c6, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2132786141 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2132786136} - m_CullTransparentMesh: 0 ---- !u!1 &2137066049 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2137066050} - - component: {fileID: 2137066053} - - component: {fileID: 2137066052} - - component: {fileID: 2137066051} - - component: {fileID: 2137066054} - m_Layer: 5 - m_Name: Button_ok - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2137066050 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2137066049} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 168647012} - m_Father: {fileID: 995508294} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 186, y: -318} - m_SizeDelta: {x: 290, y: 138} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2137066051 -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: 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: 2137066052} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &2137066052 -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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9762a7e9197d4454eae77ff830bb26d9, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2137066053 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - 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/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 84971cef..a9beafd0 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using MyGame.Scenes.Cooking.Scripts; using MyGame.Scripts; using TMPro; using UniRx; @@ -10,12 +11,13 @@ public class CookingResult : MonoBehaviour { private static readonly string BulkOrderRarityTextFormat = "大成功ボーナス獲得"; private static readonly string QuantityTextFormat = "x{0}"; + private static readonly float BulkOrderExplainHeight = 200f; [SerializeField] private GameObject smokeEffect; [SerializeField] private GameObject glitterEffect; - [SerializeField] private Button centerOkButton; [SerializeField] private Button perfectButton; - [SerializeField] private Button leftOkButton; + [SerializeField] private Button okButton; [SerializeField] private Button destructionButton; + [SerializeField] private Button makeOneButton; [SerializeField] private Transform popcornTarget; [SerializeField] private Text popcornText; [SerializeField] private Text popcornTextPerfect; @@ -28,6 +30,7 @@ public class CookingResult : MonoBehaviour [SerializeField] private GameObject perfectResultObject; [SerializeField] private GameObject goodResultObject; [SerializeField] private GameObject failureResultObject; + [SerializeField] private ResultCoinView coinView; ReactiveProperty result = new ReactiveProperty(); @@ -41,11 +44,19 @@ public class CookingResult : MonoBehaviour var (rarityData, resultData, successAction) = LocalCacheManager.Load<(RarityData, CornResult, Action)>(PopcornGameManager.CookingResultDataTag); result.Value = resultData; SetData(productData, rarityData, viewType); + + // 続けて料理を作ることができるかどうか判定 + var hasSpace = RecipeDetailView.CheckTank(productData); + var checkResult = RecipeDetailView.CheckAmount(productData); + var hasMaterials = checkResult.material1 && checkResult.material2 && checkResult.material3; + var isMakeOne = hasSpace && hasMaterials; if (GameDataManager.GameData.isFirstPlay) { - SetUI(resultData, rarityData.Rarity != ProductRarity.Normal, true); // ボタン非表示 + SetUI(resultData, viewType, isMakeOne, true); + + // 失敗したら再チャレンジ if (resultData == CornResult.Failure) { TutorialManager.Instance.ShowTutorialConversation(9, () => @@ -54,31 +65,22 @@ public class CookingResult : MonoBehaviour TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); }); + return; } - else + successAction?.Invoke(); + okButton.gameObject.SetActive(true); + okButton.OnClickAsObservable().Take(1).Subscribe(_ => { - successAction?.Invoke(); - centerOkButton.gameObject.SetActive(true); - centerOkButton.OnClickAsObservable().Subscribe(_ => - { - // 獲得、遷移 - if (resultData == CornResult.Perfect) - { - AddStock(productData, rarityData.Rarity); - } - else - { - AddStock(productData); - } - TransitionManager.Instance.LoadScene(GameScenes.Main); - }).AddTo(this); - } + // 獲得、遷移 + AddStock(productData, resultData == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); + TransitionManager.Instance.LoadScene(GameScenes.Main); + }).AddTo(this); return; } result.Subscribe(r => { - SetUI(r, rarityData.Rarity != ProductRarity.Normal); + SetUI(r, viewType, isMakeOne); if (r != CornResult.Failure) { successAction?.Invoke(); @@ -89,17 +91,10 @@ public class CookingResult : MonoBehaviour if (viewType == ProductViewType.Default) { Market.Instance.IsPause.Value = true; - centerOkButton.OnClickAsObservable().Subscribe(_ => + okButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 - AddStock(productData, rarityData.Rarity); - Market.Instance.IsPause.Value = false; - TransitionManager.Instance.LoadScene(GameScenes.Main); - }).AddTo(this); - leftOkButton.OnClickAsObservable().Subscribe(_ => - { - // 獲得、遷移 - AddStock(productData); + AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); @@ -108,22 +103,13 @@ public class CookingResult : MonoBehaviour { // 大量注文時処理 var materialNumber = LocalCacheManager.Load(BulkOrder.MaterialNumberTag); - centerOkButton.OnClickAsObservable().Take(1).Subscribe(_ => + okButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移 if (!GameDataManager.GameData.CompletedProductList.Exists(data => data.Number == materialNumber)) { - GameDataManager.GameData.CompletedProductList.Add(new BulkOrderResultData(){Number = materialNumber, Rarity = rarityData.Rarity}); - GameDataManager.SaveGameData(); - } - TransitionManager.Instance.LoadScene(GameScenes.Main); - }).AddTo(this); - leftOkButton.OnClickAsObservable().Take(1).Subscribe(_ => - { - // 獲得、遷移 - if (!GameDataManager.GameData.CompletedProductList.Exists(data => data.Number == materialNumber)) - { - GameDataManager.GameData.CompletedProductList.Add(new BulkOrderResultData(){Number = materialNumber, Rarity = ProductRarity.Normal}); + var rarity = result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal; + GameDataManager.GameData.CompletedProductList.Add(new BulkOrderResultData(){Number = materialNumber, Rarity = rarity}); GameDataManager.SaveGameData(); } TransitionManager.Instance.LoadScene(GameScenes.Main); @@ -143,6 +129,15 @@ public class CookingResult : MonoBehaviour // 遷移 TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); + makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => + { + // 獲得、遷移 + AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); + Market.Instance.IsPause.Value = false; + SoundManager.Instance.ChangeVolumeUniqueBGM(1f); + TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); + LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); + }).AddTo(this); } private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType) @@ -151,49 +146,53 @@ public class CookingResult : MonoBehaviour popcornText.text = recipe.name; popcornTextPerfect.text = recipe.name; quantityText.text = string.Format(QuantityTextFormat, recipe.volume); + coinView.SetPrice(recipe.GetRarityPrice(ProductRarity.Normal), recipe.GetRarityPrice(rarity.Rarity)); var rarityFormat = viewType == ProductViewType.Default ? rarity.text : BulkOrderRarityTextFormat; rarityText.text = rarityFormat; rarityView.SetRarity(rarity.Rarity); popcornTarget.DestroyAllChildrens(); Instantiate(recipe.GetLargePrefab(), popcornTarget); } - - private void SetUI(CornResult result, bool hasRarity, bool isTutorial = false) + + private void SetUI(CornResult cornResult, ProductViewType viewType, bool isMakeOne, bool isTutorial = false) { - centerOkButton.gameObject.SetActive(false); perfectButton.gameObject.SetActive(false); - leftOkButton.gameObject.SetActive(false); + okButton.gameObject.SetActive(false); destructionButton.gameObject.SetActive(false); + makeOneButton.gameObject.SetActive(false); if (!isTutorial) { this.CallWaitForSeconds(1.25f, () => { - centerOkButton.gameObject.SetActive(result == CornResult.Perfect); - perfectButton.gameObject.SetActive(result != CornResult.Perfect); - leftOkButton.gameObject.SetActive(result == CornResult.Good); - destructionButton.gameObject.SetActive(result == CornResult.Failure); - }); + makeOneButton.gameObject.SetActive(viewType == ProductViewType.Default && isMakeOne); + perfectButton.gameObject.SetActive(cornResult != CornResult.Perfect); + destructionButton.gameObject.SetActive(cornResult == CornResult.Failure); + okButton.gameObject.SetActive(cornResult != CornResult.Failure); + }); } - perfectResultObject.SetActive(result == CornResult.Perfect); - goodResultObject.SetActive(result == CornResult.Good); - failureResultObject.SetActive(result == CornResult.Failure); + perfectResultObject.SetActive(cornResult == CornResult.Perfect); + goodResultObject.SetActive(cornResult == CornResult.Good); + failureResultObject.SetActive(cornResult == CornResult.Failure); - if (result == CornResult.Failure) + if (cornResult == CornResult.Failure) { VibrationManager.Instance.PlayVibrationDoubleStrong(); } - smokeEffect.SetActive(result == CornResult.Failure); - glitterEffect.SetActive(result == CornResult.Perfect); + smokeEffect.SetActive(cornResult == CornResult.Failure); + glitterEffect.SetActive(cornResult == CornResult.Perfect); - detailObject.SetActive(result != CornResult.Failure); - explainObject.SetActive(result == CornResult.Good); - explainWithRarityObject.SetActive(false); - if (result == CornResult.Perfect) + detailObject.SetActive(cornResult != CornResult.Failure); + explainObject.SetActive(cornResult == CornResult.Good); + explainWithRarityObject.SetActive(cornResult == CornResult.Perfect); + + if (viewType != ProductViewType.Default) { - explainWithRarityObject.SetActive(hasRarity); - explainObject.SetActive(!hasRarity); + coinView.gameObject.SetActive(false); + // 高さ調整 + var rect = explainWithRarityObject.transform as RectTransform; + rect.sizeDelta = new Vector2(rect.sizeDelta.x, BulkOrderExplainHeight); } }