フライパン表示切り替え対応

popcorn/Assets/MyGame/Resources/Pans/pan_iron.prefab

@@ -16,7 +16,7 @@ PrefabInstance:
     - target: {fileID: 2877015880150917582, guid: c9b7e191d22a840ff900b9fe4a00375d,
         type: 3}
       propertyPath: m_Name
-      value: PanSprite3
+      value: pan_iron
       objectReference: {fileID: 0}
     - target: {fileID: 3184272677406202284, guid: c9b7e191d22a840ff900b9fe4a00375d,
         type: 3}
@@ -79,5 +79,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 21300000, guid: d90fed0872f4344438544040f9beed4d,
         type: 3}
+    - target: {fileID: 6200982828795924748, guid: c9b7e191d22a840ff900b9fe4a00375d,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 5a562f247e60fff4baad240e4fe45fe9,
+        type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c9b7e191d22a840ff900b9fe4a00375d, type: 3}

popcorn/Assets/MyGame/Resources/Pans/pan_normal.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5ba6c2765c65c4041aafb60a68f5c10e
+guid: c9b7e191d22a840ff900b9fe4a00375d
 PrefabImporter:
   externalObjects: {}
   userData: 

popcorn/Assets/MyGame/Resources/Pans/pan_stainless.prefab

@@ -16,7 +16,7 @@ PrefabInstance:
     - target: {fileID: 2877015880150917582, guid: c9b7e191d22a840ff900b9fe4a00375d,
         type: 3}
       propertyPath: m_Name
-      value: PanSprite2
+      value: pan_stainless
       objectReference: {fileID: 0}
     - target: {fileID: 3184272677406202284, guid: c9b7e191d22a840ff900b9fe4a00375d,
         type: 3}
@@ -79,5 +79,17 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 21300000, guid: 69d24e44a9bf0ed48a0cb568eba43cbf,
         type: 3}
+    - target: {fileID: 4995642622110259143, guid: c9b7e191d22a840ff900b9fe4a00375d,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 69d24e44a9bf0ed48a0cb568eba43cbf,
+        type: 3}
+    - target: {fileID: 6200982828795924748, guid: c9b7e191d22a840ff900b9fe4a00375d,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 7ffd28dda35f61147b57a12308d809b3,
+        type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c9b7e191d22a840ff900b9fe4a00375d, type: 3}

popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity

@@ -127,12 +127,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1244643143}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &158786353 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6414470378191658949, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
-    type: 3}
-  m_PrefabInstance: {fileID: 2137549891}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &162168169
 GameObject:
   m_ObjectHideFlags: 0
@@ -978,7 +972,7 @@ PrefabInstance:
     - target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1018,7 +1012,7 @@ PrefabInstance:
     - target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1058,7 +1052,7 @@ PrefabInstance:
     - target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1088,7 +1082,7 @@ PrefabInstance:
     - target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1143,7 +1137,7 @@ PrefabInstance:
     - target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1173,7 +1167,7 @@ PrefabInstance:
     - target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1213,7 +1207,7 @@ PrefabInstance:
     - target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1248,7 +1242,7 @@ PrefabInstance:
     - target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1283,7 +1277,7 @@ PrefabInstance:
     - target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1328,7 +1322,7 @@ PrefabInstance:
     - target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1358,7 +1352,7 @@ PrefabInstance:
     - target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1393,7 +1387,7 @@ PrefabInstance:
     - target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1538,7 +1532,7 @@ PrefabInstance:
     - target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1598,7 +1592,7 @@ PrefabInstance:
     - target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -1638,7 +1632,7 @@ PrefabInstance:
     - target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 510.10715
+      value: 510.10547
       objectReference: {fileID: 0}
     - target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
@@ -3693,10 +3687,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   startingGuide: {fileID: 8786490829224139677}
   fire: {fileID: 1295632042}
-  oilEffect: {fileID: 2137549893}
+  oilEffect: {fileID: 2137549894}
-  streamEffect: {fileID: 158786353}
+  streamEffect: {fileID: 2137549893}
   characterSweat: {fileID: 580170368}
   characterFlower: {fileID: 785034261}
+  panImageTarget: {fileID: 2137549895}
 --- !u!224 &1871878299 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f,
@@ -4063,7 +4058,7 @@ PrefabInstance:
     - target: {fileID: 826135729361595564, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1453251556377932392, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
         type: 3}
@@ -4130,6 +4125,26 @@ PrefabInstance:
       propertyPath: controller
       value: 
       objectReference: {fileID: 2603874727618424762}
+    - target: {fileID: 1927945816428339244, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2913010803782575260, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3636982047875102261, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+        type: 3}
+      propertyPath: m_Name
+      value: PanAnimation
+      objectReference: {fileID: 0}
+    - target: {fileID: 5557436537419873106, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5661155712791166697, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
         type: 3}
       propertyPath: InitialModule.startColor.maxColor.b
@@ -4165,28 +4180,22 @@ Transform:
   m_PrefabAsset: {fileID: 0}
 --- !u!1 &2137549893 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 5067414111534552334, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+  m_CorrespondingSourceObject: {fileID: 1927945816428339244, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
     type: 3}
   m_PrefabInstance: {fileID: 2137549891}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &2137549894
+--- !u!1 &2137549894 stripped
-MonoBehaviour:
+GameObject:
-  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 402689651423963879, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
-  m_CorrespondingSourceObject: {fileID: 0}
+    type: 3}
-  m_PrefabInstance: {fileID: 0}
+  m_PrefabInstance: {fileID: 2137549891}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2137549895 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7757628169495878517, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+    type: 3}
+  m_PrefabInstance: {fileID: 2137549891}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2137549893}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  seInfoArray:
-  - delay: 0
-    time: 0
-    interval: 0
-    filename: se_cooking_corn_bake
-    maxCount: 0
 --- !u!1 &2603874726320550220
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/PanSprite.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c9b7e191d22a840ff900b9fe4a00375d
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs

@@ -108,6 +108,7 @@ public class PopcornGameManager : MonoBehaviour
         var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
         var rarityData = rarityList.First(data => data.Rarity == panData.Rarity);
         // フライパン設定
+        gameView.SetPan(panData.GetPrefab());
         // setPanData();
         cornManager.SetCornsActive(true);
         compositeDisposable.Clear();

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs

@@ -9,6 +9,7 @@ public class PopcornGameView : MonoBehaviour
     [SerializeField] private GameObject streamEffect;
     [SerializeField] private GameObject characterSweat;
     [SerializeField] private GameObject characterFlower;
+    [SerializeField] private Transform panImageTarget;
 
     public void ChangeUI(GameState state)
     {
@@ -70,4 +71,10 @@ public class PopcornGameView : MonoBehaviour
                 throw new ArgumentOutOfRangeException(nameof(condition), condition, null);
         }
     }
+
+    public void SetPan(Transform prefab)
+    {
+        panImageTarget.DestroyAllChildrens();
+        Instantiate(prefab, panImageTarget);
+    }
 }

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -96,9 +96,9 @@ public sealed class PanData
     public int rarity;
     public string prefabName;
     public ProductRarity Rarity => (ProductRarity)rarity;
-    public RectTransform GetPrefab()
+    public Transform GetPrefab()
     {
-        return Resources.Load<RectTransform>("Pans/" + prefabName);
+        return Resources.Load<Transform>("Pans/" + prefabName);
     }
     public RectTransform GetIconPrefab()
     {