新たにコーン飛び出し処理を追加

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab

@@ -67,10 +67,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 175dce409df2f4d3aa1941a08822e03e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  spriteRenderer: {fileID: 8958880017665793879}
+  cornSkin: {fileID: 7130900939474693981}
-  cornSeedSprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3}
-  cornSimpleSprite: {fileID: 21300000, guid: 041ad2539ff56d945ab2da4be6a02f04, type: 3}
-  cornBurntSprite: {fileID: 21300000, guid: a9d669186411b2b4da1511f59a91b4c9, type: 3}
   effectBurnt: {fileID: 3984349228049242719, guid: 02298b5aac4434a4c81aec58ad2caa9d,
     type: 3}
   animator: {fileID: 5972257590091015193}
@@ -121,6 +118,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9198528551727453440}
   - component: {fileID: 8958880017665793879}
+  - component: {fileID: 7130900939474693981}
   m_Layer: 0
   m_Name: Image_corn
   m_TagString: Untagged
@@ -192,6 +190,22 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &7130900939474693981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3431194784518736845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c466f7c9f9e84d04b4a0afae69c08384, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  spriteRenderer: {fileID: 8958880017665793879}
+  cornSeedSprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3}
+  cornSimpleSprite: {fileID: 21300000, guid: 041ad2539ff56d945ab2da4be6a02f04, type: 3}
+  cornBurntSprite: {fileID: 21300000, guid: a9d669186411b2b4da1511f59a91b4c9, type: 3}
 --- !u!1 &4761356856374534614
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -20,11 +20,8 @@ public class Corn : MonoBehaviour
     private static readonly int HashCornGrow = Animator.StringToHash("CornGrow");
     private static readonly int HashCornBurn = Animator.StringToHash("CornBurn");
     private static readonly int HashWaitOffset = Animator.StringToHash("WaitOffset");
-    
+
-    [SerializeField] private SpriteRenderer spriteRenderer;
+    [SerializeField] private CornSkin cornSkin;
-    [SerializeField] private Sprite cornSeedSprite;
-    [SerializeField] private Sprite cornSimpleSprite;
-    [SerializeField] private Sprite cornBurntSprite;
     [SerializeField] private GameObject effectBurnt;
     [SerializeField] private Animator animator;
 
@@ -48,9 +45,8 @@ public class Corn : MonoBehaviour
     {
         condition.AddTo(this);
         rigidbody = GetComponent<Rigidbody2D>();
-        spriteRenderer.sprite = cornSeedSprite;
+
-        
+        spriteTransform = cornSkin.transform;
-        spriteTransform = spriteRenderer.transform;
         rotationResolverTransform = spriteTransform.parent.parent;
         
         animator.SetFloat(HashWaitOffset, Random.value/2);
@@ -60,6 +56,7 @@ public class Corn : MonoBehaviour
     {
         rigidbody.MovePosition(new Vector2(Random.value * 2 - 1, Random.value * 2 - 1));
         rigidbody.SetRotation(Random.value * 360);
+        cornSkin.ChangeSkin(condition.Value);
 
         // コーンが飛んでいく
         this.ObserveEveryValueChanged(x => x.rigidbody.velocity.magnitude)
@@ -119,7 +116,7 @@ public class Corn : MonoBehaviour
 
     private void CornPop()
     {
-        spriteRenderer.sprite = cornSimpleSprite;
+        cornSkin.ChangeSkin(condition.Value);
         rigidbody.AddForce(cornPopSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse);
         animator.SetTrigger(HashCornGrow);
         VibrationManager.Instance.PlayVibrationOnce();
@@ -127,7 +124,7 @@ public class Corn : MonoBehaviour
 
     private void CornBurnt()
     {
-        spriteRenderer.sprite = cornBurntSprite;
+        cornSkin.ChangeSkin(condition.Value);
         animator.SetTrigger(HashCornBurn);
         var effect = Instantiate(effectBurnt, transform);
         this.CallWaitForSeconds(.8f, () => Destroy(effect));
@@ -135,6 +132,12 @@ public class Corn : MonoBehaviour
 
     private void CornSpilled(CornCondition prevCondition)
     {
+        var clone = Instantiate(cornSkin);
+        clone.ChangeSkin(prevCondition);
+        var cloneRigidBody = clone.gameObject.AddComponent<Rigidbody2D>();
+        cloneRigidBody.gravityScale = 0;
+        cloneRigidBody.AddForce(rigidbody.velocity.normalized * cornSpillSpeed, ForceMode2D.Impulse);
+        this.CallWaitForSeconds(2f, () => Destroy(clone.gameObject));
     }
 
     public void SetCornProperty(float popTime, float burntDuration, float spillSpeed, float popSpeed)

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

@@ -0,0 +1,30 @@
+using System;
+using UnityEngine;
+
+public class CornSkin : MonoBehaviour
+{
+    [SerializeField] private SpriteRenderer spriteRenderer;
+    [SerializeField] private Sprite cornSeedSprite;
+    [SerializeField] private Sprite cornSimpleSprite;
+    [SerializeField] private Sprite cornBurntSprite;
+    
+    public void ChangeSkin(CornCondition condition)
+    {
+        switch (condition)
+        {
+            case CornCondition.Seed:
+                spriteRenderer.sprite = cornSeedSprite;
+                break;
+            case CornCondition.Simple:
+                spriteRenderer.sprite = cornSimpleSprite;
+                break;
+            case CornCondition.Burnt:
+                spriteRenderer.sprite = cornBurntSprite;
+                break;
+            case CornCondition.Spilled:
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(condition), condition, null);
+        }
+    }
+}

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornSkin.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c466f7c9f9e84d04b4a0afae69c08384
+timeCreated: 1626764991