レシピ素材表示対応

2021-10-07 17:25:45 +09:00 · 2021-10-07 17:25:45 +09:00 · 894759e99e
parent 93121eaeec
commit 894759e99e
8 changed files with 618 additions and 558 deletions
--- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab
@ -297,8 +297,6 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2929932626576346080}
-  - component: {fileID: 2929932626576346094}
-  - component: {fileID: 2929932626576346095}
  m_Layer: 0
  m_Name: popcorn
  m_TagString: Untagged
@ -316,7 +314,8 @@ RectTransform:
  m_LocalRotation: {x: 0, y: 0, z: -0.067144625, w: 0.9977433}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_Children: []
+  m_Children:
+  - {fileID: 3383784790555608151}
  m_Father: {fileID: 2646634445844468798}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7}
@ -325,43 +324,6 @@ RectTransform:
  m_AnchoredPosition: {x: -135.2, y: 20.8}
  m_SizeDelta: {x: 92, y: 136}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2929932626576346094
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2929932626576346081}
-  m_CullTransparentMesh: 0
--- !u!114 &2929932626576346095
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2929932626576346081}
-  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: 99d426990eeb08d4d85ae03f04609196, 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!1 &2929932626624286251
 GameObject:
  m_ObjectHideFlags: 0
@ -685,9 +647,12 @@ MonoBehaviour:
  detailButton: {fileID: 8320108874302735811}
  flavorName: {fileID: 2929932626752093611}
  flavorPrice: {fileID: 2929932627123125673}
+  flavorImageTarget: {fileID: 2929932626576346080}
  cornAmountText: {fileID: 6296255899301773980}
  flavor1AmountText: {fileID: 2929932625557648441}
  flavor2AmountText: {fileID: 367551539734858426}
+  flavor1IconTarget: {fileID: 7519072249774920432}
+  flavor2IconTarget: {fileID: 5037808626432961651}
  flavor2View: {fileID: 367551539495355422}
 --- !u!1 &2997770120253274331
 GameObject:
@ -1219,12 +1184,143 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!224 &7519072249774920432 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340,
+    type: 3}
+  m_PrefabInstance: {fileID: 1133216431126940221}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &2929932625336302236 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340,
    type: 3}
  m_PrefabInstance: {fileID: 1133216431126940221}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1330168031711161346
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2929932626576346080}
+    m_Modifications:
+    - target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_Name
+      value: popcorn
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 92
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 136
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -7.7
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 84aaa57282766408683fbb28f556d547, type: 3}
+--- !u!224 &3383784790555608151 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
+    type: 3}
+  m_PrefabInstance: {fileID: 1330168031711161346}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2452498385069847742
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1390,6 +1486,24 @@ PrefabInstance:
    m_RemovedComponents:
    - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3}
+--- !u!1 &367551539495355422 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340,
+    type: 3}
+  m_PrefabInstance: {fileID: 2452498385069847742}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &367551539495355423 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340,
+    type: 3}
+  m_PrefabInstance: {fileID: 2452498385069847742}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &5037808626432961651 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340,
+    type: 3}
+  m_PrefabInstance: {fileID: 2452498385069847742}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &367551539734858426 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340,
@ -1402,18 +1516,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!224 &367551539495355423 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340,
-    type: 3}
-  m_PrefabInstance: {fileID: 2452498385069847742}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &367551539495355422 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340,
-    type: 3}
-  m_PrefabInstance: {fileID: 2452498385069847742}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8101979052737494168
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab
@ -199,77 +199,128 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1 &9022058312688212008
-GameObject:
+--- !u!1001 &942238507702582337
+PrefabInstance:
  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7483059290751347205}
-  - component: {fileID: 8202708994273755924}
-  - component: {fileID: 8770553785412743810}
-  m_Layer: 5
-  m_Name: material
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7483059290751347205
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7485231107204569293}
+    m_Modifications:
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 56
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 56
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8081510323215557737, guid: 21933a027d6844d1b8213bf5192430ac,
+        type: 3}
+      propertyPath: m_Name
+      value: material
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 21933a027d6844d1b8213bf5192430ac, type: 3}
+--- !u!224 &7483059290751347205 stripped
 RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac,
+    type: 3}
+  m_PrefabInstance: {fileID: 942238507702582337}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9022058312688212008}
-  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: 7485231107204569293}
-  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: 0}
-  m_SizeDelta: {x: 56, y: 56}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8202708994273755924
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9022058312688212008}
-  m_CullTransparentMesh: 0
--- !u!114 &8770553785412743810
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9022058312688212008}
-  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: ffa1614fb4f7b9d48b0530ce2f77f954, 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
--- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab
@ -74,6 +74,80 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2358514311597240715
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 150415631863662799}
+  - component: {fileID: 1740348503652499160}
+  - component: {fileID: 8656009127678696843}
+  m_Layer: 0
+  m_Name: material (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &150415631863662799
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2358514311597240715}
+  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: 6739113353957456840}
+  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: 0}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1740348503652499160
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2358514311597240715}
+  m_CullTransparentMesh: 0
+--- !u!114 &8656009127678696843
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2358514311597240715}
+  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: ffa1614fb4f7b9d48b0530ce2f77f954, 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!1 &4570586286644907414
 GameObject:
  m_ObjectHideFlags: 0
@ -199,8 +273,6 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 6739113353957456840}
-  - component: {fileID: 8715719486321133168}
-  - component: {fileID: 318270868077356309}
  m_Layer: 0
  m_Name: material
  m_TagString: Untagged
@ -218,7 +290,8 @@ RectTransform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 114}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 150415631863662799}
  m_Father: {fileID: 5352886967997046957}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -227,40 +300,3 @@ RectTransform:
  m_AnchoredPosition: {x: -66.89995, y: 0.29986572}
  m_SizeDelta: {x: 56, y: 56}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8715719486321133168
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8915749249284169289}
-  m_CullTransparentMesh: 0
--- !u!114 &318270868077356309
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8915749249284169289}
-  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: ffa1614fb4f7b9d48b0530ce2f77f954, 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
--- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab
@ -10,9 +10,8 @@ GameObject:
  m_Component:
  - component: {fileID: 2260898471005442079}
  - component: {fileID: 2260898471005442077}
-  - component: {fileID: 2260898471005442078}
  m_Layer: 5
-  m_Name: FryingPanl
+  m_Name: PanTarget
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -45,32 +44,3 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2260898471005442072}
  m_CullTransparentMesh: 0
--- !u!114 &2260898471005442078
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2260898471005442072}
-  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: 92c7166ea217de94594bc0f2667a7523, 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
--- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
+++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
@ -299,7 +299,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1487129869}
-  - {fileID: 670639509}
  m_Father: {fileID: 1160535647}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -460,84 +459,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 269597408}
  m_CullTransparentMesh: 0
--- !u!1 &326258101
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 326258102}
-  - component: {fileID: 326258104}
-  - component: {fileID: 326258103}
-  m_Layer: 5
-  m_Name: Text_FryingPanl
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &326258102
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 326258101}
-  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: 389422779}
-  m_RootOrder: 0
-  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: 5, y: -30}
-  m_SizeDelta: {x: 200, y: 34}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &326258103
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 326258101}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 26
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4F7F\u3046\u30D5\u30E9\u30A4\u30D1\u30F3"
--- !u!222 &326258104
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 326258101}
-  m_CullTransparentMesh: 0
 --- !u!1 &374985848
 GameObject:
  m_ObjectHideFlags: 0
@ -612,82 +533,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 374985848}
  m_CullTransparentMesh: 0
--- !u!1 &389422778
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 389422779}
-  - component: {fileID: 389422781}
-  - component: {fileID: 389422780}
-  m_Layer: 5
-  m_Name: FryingPanl_frame
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &389422779
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 389422778}
-  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: 326258102}
-  - {fileID: 2086901980}
-  m_Father: {fileID: 2135558976}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 537, y: 0}
-  m_SizeDelta: {x: 250, y: 252}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &389422780
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 389422778}
-  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: ad305bc75e53add488410a7400246330, type: 3}
-  m_Type: 2
-  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 &389422781
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 389422778}
-  m_CullTransparentMesh: 0
 --- !u!1 &430811414
 GameObject:
  m_ObjectHideFlags: 0
@ -993,12 +838,12 @@ PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
-    m_TransformParent: {fileID: 230185243}
+    m_TransformParent: {fileID: 1487129869}
    m_Modifications:
    - target: {fileID: 2260898471005442072, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
      propertyPath: m_Name
-      value: FryingPanl
+      value: PanTarget
      objectReference: {fileID: 0}
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
@ -1013,7 +858,7 @@ PrefabInstance:
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
@ -1098,12 +943,12 @@ PrefabInstance:
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: -186
+      value: 2.0000153
      objectReference: {fileID: 0}
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -181
+      value: -0.99998474
      objectReference: {fileID: 0}
    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
        type: 3}
@ -1120,7 +965,8 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents: [{fileID: 2260898471005442077, guid: 434f6174871f2dc4992321e9d579f138,
+        type: 3}]
  m_SourcePrefab: {fileID: 100100000, guid: 434f6174871f2dc4992321e9d579f138, type: 3}
 --- !u!224 &670639509 stripped
 RectTransform:
@ -1128,18 +974,6 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 670639508}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &670639510 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138,
-    type: 3}
-  m_PrefabInstance: {fileID: 670639508}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &679566761
 GameObject:
  m_ObjectHideFlags: 0
@ -1965,9 +1799,12 @@ MonoBehaviour:
  flavorPrice: {fileID: 498799267}
  flavorStock: {fileID: 1109202679}
  flavorText: {fileID: 1116792172}
+  flavorImageTarget: {fileID: 1826815494}
  cornAmountText: {fileID: 4654596182167880407}
  flavor1AmountText: {fileID: 5352886969301700758}
  flavor2AmountText: {fileID: 1408233927}
+  flavor1IconTarget: {fileID: 5352886969301700759}
+  flavor2IconTarget: {fileID: 1408233929}
  flavor2View: {fileID: 1408233928}
 --- !u!1 &1036314250
 GameObject:
@ -2482,12 +2319,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2992efc758994825b664d9d47a650b8a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  selectedPanIcon: {fileID: 2260898471079004356}
  prevPanButton: {fileID: 998259991263772436}
  nextPanButton: {fileID: 2073894620}
  panName: {fileID: 956402762}
  panText: {fileID: 2045825934}
-  panIcon: {fileID: 670639510}
+  panIconTarget: {fileID: 670639509}
 --- !u!1 &1170636683
 GameObject:
  m_ObjectHideFlags: 0
@ -2638,6 +2474,125 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1197864696}
  m_CullTransparentMesh: 0
+--- !u!1001 &1379860012
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 670639509}
+    m_Modifications:
+    - target: {fileID: 1135206952446428548, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_Name
+      value: pan_normal
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 174
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 154
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1525858592774698921, guid: 7926a2834eb0a469e8ab0491dde7c3ba,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7926a2834eb0a469e8ab0491dde7c3ba, type: 3}
 --- !u!224 &1380167736 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42,
@ -2844,6 +2799,12 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 1408233925}
  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1408233929 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6739113353957456840, guid: c84cc6844fe59ef4d8e52438b7bffa42,
+    type: 3}
+  m_PrefabInstance: {fileID: 1408233925}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1464412873
 GameObject:
  m_ObjectHideFlags: 0
@ -2984,7 +2945,7 @@ RectTransform:
  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_Children: [{fileID: 670639509}]
  m_Father: {fileID: 230185243}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3380,10 +3341,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1826815494}
-  - component: {fileID: 1826815496}
-  - component: {fileID: 1826815495}
  m_Layer: 5
-  m_Name: Image_Popcorn
+  m_Name: PopcornTarget
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -3399,7 +3358,7 @@ RectTransform:
  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_Children: [{fileID: 1971927379}]
  m_Father: {fileID: 1626721124}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3408,43 +3367,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 23.00003}
  m_SizeDelta: {x: 92, y: 136}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1826815495
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1826815493}
-  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: 99d426990eeb08d4d85ae03f04609196, 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 &1826815496
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1826815493}
-  m_CullTransparentMesh: 0
 --- !u!1 &1853630202
 GameObject:
  m_ObjectHideFlags: 0
@ -3565,6 +3487,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1853630202}
  m_CullTransparentMesh: 0
+--- !u!1 &1971927378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1971927379}
+  - component: {fileID: 1971927381}
+  - component: {fileID: 1971927380}
+  m_Layer: 5
+  m_Name: Image_Popcorn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1971927379
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1971927378}
+  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: 1826815494}
+  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: 0}
+  m_SizeDelta: {x: 92, y: 136}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1971927380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1971927378}
+  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: 99d426990eeb08d4d85ae03f04609196, 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 &1971927381
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1971927378}
+  m_CullTransparentMesh: 0
 --- !u!114 &1853630207
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -3897,12 +3893,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 700, y: 180}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &2086901980 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-    type: 3}
-  m_PrefabInstance: {fileID: 2260898471079004355}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2124266406
 GameObject:
  m_ObjectHideFlags: 0
@ -4005,7 +3995,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1197864697}
-  - {fileID: 389422779}
  m_Father: {fileID: 1001521034}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4203,137 +4192,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4570586285425884512}
  m_CullTransparentMesh: 0
--- !u!1001 &2260898471079004355
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 389422779}
-    m_Modifications:
-    - target: {fileID: 2260898471005442072, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_Name
-      value: FryingPanl
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 174
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 154
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -28
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2260898471005442079, guid: 434f6174871f2dc4992321e9d579f138,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 434f6174871f2dc4992321e9d579f138, type: 3}
--- !u!114 &2260898471079004356 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138,
-    type: 3}
-  m_PrefabInstance: {fileID: 2260898471079004355}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &4570586285425884512
 GameObject:
  m_ObjectHideFlags: 0
@ -4648,6 +4506,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!224 &5352886969301700759 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6739113353957456840, guid: c84cc6844fe59ef4d8e52438b7bffa42,
+    type: 3}
+  m_PrefabInstance: {fileID: 5352886969301700757}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6739113352738409278
 RectTransform:
  m_ObjectHideFlags: 0
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
@ -1,17 +1,17 @@
 using System;
+using System.Linq;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;

 public class PanSelector : MonoBehaviour
 {
-    [SerializeField] private Image selectedPanIcon;
    [SerializeField] private Button prevPanButton;
    [SerializeField] private Button nextPanButton;

    [SerializeField] private Text panName;
    [SerializeField] private Text panText;
-    [SerializeField] private Image panIcon;
+    [SerializeField] private Transform panIconTarget;
    public IReadOnlyReactiveProperty<PanData> SelectedPanData => selectedPanData;
    private readonly ReactiveProperty<PanData> selectedPanData = new ReactiveProperty<PanData>();
    private readonly ReactiveProperty<int> selectedIndex = new ReactiveProperty<int>();
@ -21,15 +21,18 @@ public class PanSelector : MonoBehaviour
        selectedPanData.AddTo(this);
        selectedIndex.AddTo(this);
        var panList = SpreadsheetDataManager.Instance.GetBaseDataList<PanData>(Const.PanDataSheet);
-        var panCount = panList.Count;
-        selectedPanData.Value = panList[0];
+        var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList();
+        var panCount = myPanList.Count;
+        Debug.Log(string.Join(",", panList.Select(data => data.id)));
+        Debug.Log(string.Join(",", GameDataManager.GameData.Pans));
+        selectedPanData.Value = myPanList[0];
        selectedPanData.Subscribe(data =>
        {
            SetData(data);
        }).AddTo(this);
        selectedIndex.Subscribe(x =>
        {
-            selectedPanData.Value = panList[x];
+            selectedPanData.Value = myPanList[x];
        }).AddTo(this);
        prevPanButton.OnClickAsObservable().Subscribe(_ =>
        {
@ -45,5 +48,7 @@ public class PanSelector : MonoBehaviour
    {
        panName.text = data.name;
        panText.text = data.text;
+        panIconTarget.DestroyAllChildrens();
+        Instantiate(data.GetIconPrefab(), panIconTarget);
    }
 }
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
@ -22,9 +22,12 @@ public class RecipeDetailView : MonoBehaviour
    [SerializeField] private Text flavorPrice;
    [SerializeField] private Text flavorStock;
    [SerializeField] private Text flavorText;
+    [SerializeField] private Transform flavorImageTarget;
    [SerializeField] private Text cornAmountText;
    [SerializeField] private Text flavor1AmountText;
    [SerializeField] private Text flavor2AmountText;
+    [SerializeField] private Transform flavor1IconTarget;
+    [SerializeField] private Transform flavor2IconTarget;
    [SerializeField] private GameObject flavor2View;

    private void Start()
@ -79,30 +82,43 @@ public class RecipeDetailView : MonoBehaviour
        flavorName.text = data.name;
        flavorPrice.text = data.price.ToString();
        flavorText.text = data.text;
+        flavorImageTarget.DestroyAllChildrens();
+        Instantiate(data.GetIconPrefab(), flavorImageTarget);
        cornAmountText.text = string.Format(cornAmountFormat, gameData.CornSeed, data.MaterialList[0].amount);

+        var shopData = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
        var flavor1Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id)?.Amount ?? 0;
        flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.MaterialList[1].amount);
+        if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1)
+        {
+            flavor1IconTarget.DestroyAllChildrens();
+            Instantiate(prefab1, flavor1IconTarget);
+        }
        var flavor2Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id)?.Amount ?? 0;
        flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.MaterialList[2].amount);
+        if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2)
+        {
+            flavor2IconTarget.DestroyAllChildrens();
+            Instantiate(prefab2, flavor2IconTarget);
+        }
        flavor2View.SetActive(data.GetMaterialCount() == 3);
    }

-    private bool CheckAmount(ProductData data)
+    private bool CheckAmount(ProductData productData)
    {
        var flag = true;
        var gameData = GameDataManager.GameData;
-        if (gameData.CornSeed < data.MaterialList[0].amount)
+        if (gameData.CornSeed < productData.MaterialList[0].amount)
        {
            flag = false;
            cornAmountText.color = Color.red;
        }
-        if (gameData.Material.Exists(x => x.Id == data.MaterialList[1].id && x.Amount < data.MaterialList[1].amount))
+        if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount)
        {
            flag = false;
            flavor1AmountText.color = Color.red;
        }
-        if (data.GetMaterialCount() == 3 && gameData.Material.Exists(x => x.Id == data.MaterialList[2].id && x.Amount < data.MaterialList[2].amount))
+        if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount)
        {
            flag = false;
            flavor2AmountText.color = Color.red;
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs
@ -11,9 +11,12 @@ public class RecipeView : MonoBehaviour
    [SerializeField] private Button detailButton;
    [SerializeField] private Text flavorName;
    [SerializeField] private Text flavorPrice;
+    [SerializeField] private Transform flavorImageTarget;
    [SerializeField] private Text cornAmountText;
    [SerializeField] private Text flavor1AmountText;
    [SerializeField] private Text flavor2AmountText;
+    [SerializeField] private Transform flavor1IconTarget;
+    [SerializeField] private Transform flavor2IconTarget;
    [SerializeField] private GameObject flavor2View;
    private static readonly string amountFormat = "x{0}";
    private static readonly string lockPanelTextFormat = "店舗レベル{0}で開放";
@ -28,12 +31,25 @@ public class RecipeView : MonoBehaviour
    {
        flavorName.text = data.name;
        flavorPrice.text = data.price.ToString();
+        flavorImageTarget.DestroyAllChildrens();
+        Instantiate(data.GetIconPrefab(), flavorImageTarget);
        cornAmountText.text = string.Format(amountFormat, data.MaterialList[0].amount);
        flavor1AmountText.text = string.Format(amountFormat, data.MaterialList[1].amount);
+        var shopData = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
+        if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[1].id)?.GetIconPrefab() is Transform prefab1)
+        {
+            flavor1IconTarget.DestroyAllChildrens();
+            Instantiate(prefab1, flavor1IconTarget);
+        }
        if (data.GetMaterialCount() == 3)
        {
            flavor2View.SetActive(true);
            flavor2AmountText.text = string.Format(amountFormat, data.MaterialList[2].amount);
+            if (shopData.FirstOrDefault(sData => sData.itemId == data.MaterialList[2].id)?.GetIconPrefab() is Transform prefab2)
+            {
+                flavor2IconTarget.DestroyAllChildrens();
+                Instantiate(prefab2, flavor2IconTarget);
+            }
        }
        else
        {