From 1f5af82dcc6be855381c5085e958c95c76739ce7 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 30 Jul 2021 18:36:17 +0900
Subject: [PATCH] =?UTF-8?q?=E6=A0=AA=E3=81=AE=E5=BC=B7=E5=8C=96=E5=B7=AE?=
 =?UTF-8?q?=E5=88=86=E8=A1=A8=E7=A4=BA=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/CornField/Prefabs/Seedling.prefab  |  8 +++++
 .../Scenes/CornField/Scripts/CornSeedling.cs  | 12 ++-----
 .../CornField/Scripts/CornSeedlingView.cs     | 31 +++++++++++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling.prefab
index 2e63baef..e1434727 100644
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling.prefab
@@ -498,3 +498,11 @@ MonoBehaviour:
   seedlingStage4: {fileID: 875275074368017847}
   growingArrowPrefab: {fileID: 4493492865567033234, guid: b3d641214f420f74290147d368b221fa,
     type: 3}
+  seedlingSprite21: {fileID: 21300000, guid: da009276a810df347be2ff12e1393dc6, type: 3}
+  seedlingSprite22: {fileID: 21300000, guid: 9d8c1a3297d9f6a4d825d887c815867f, type: 3}
+  seedlingSprite23: {fileID: 21300000, guid: 0fc14792e9b679f4ba71c703f8400243, type: 3}
+  seedlingSprite24: {fileID: 21300000, guid: 54809ccaffeeb7448a678de69ad4996b, type: 3}
+  seedlingSprite31: {fileID: 21300000, guid: 043ca56f95c36394c9fc906d75911ed7, type: 3}
+  seedlingSprite32: {fileID: 21300000, guid: 8ff872438e213ce42b96ee6d0c4da98c, type: 3}
+  seedlingSprite33: {fileID: 21300000, guid: c9c2c3c3fe1349042a518a711a023dd8, type: 3}
+  seedlingSprite34: {fileID: 21300000, guid: 87c3532876a47b24d8d80ad90bf34317, type: 3}
diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs
index 76f1b5fe..c1f1ed38 100644
--- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs
@@ -12,13 +12,6 @@ public enum SeedlingStage
     Stage4
 }
 
-public enum SeedlingRank
-{
-    Rank1,
-    Rank2,
-    Rank3
-}
-
 public class CornSeedling : MonoBehaviour, IPointerEnterHandler
 {
     [SerializeField] private CornSeedlingView seedlingView;
@@ -29,7 +22,6 @@ public class CornSeedling : MonoBehaviour, IPointerEnterHandler
 
     private int period;
     private DateTime beginTime;
-    private SeedlingRank seedlingRank; // 苗の良さ(1~3
     private bool completed;
     
     public IObservable<Unit> Harvested => harvested; 
@@ -60,7 +52,7 @@ public class CornSeedling : MonoBehaviour, IPointerEnterHandler
         seedlingView.EffectGrowth();
     }
 
-    public void SetSeedlingGene(DateTime dateTime, int periodTime, SeedlingRank rank)
+    public void SetSeedlingGene(DateTime dateTime, int periodTime, CornFieldRank rank)
     {
         completed = false;
         compositeDisposable.Clear();
@@ -68,10 +60,10 @@ public class CornSeedling : MonoBehaviour, IPointerEnterHandler
         seedlingStage.SetValueAndForceNotify(SeedlingStage.Stage0);
         beginTime = dateTime;
         period = periodTime;
-        seedlingRank = rank;
         
         // resume対応
         // 苗の状態復元
+        seedlingView.SetRank(rank);
         seedlingView.SetView(GetCurrentStage());
 
         // 成長進捗度更新
diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingView.cs
index 6f6dd7ba..25fecf93 100644
--- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingView.cs
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingView.cs
@@ -11,6 +11,14 @@ public class CornSeedlingView : MonoBehaviour
     [SerializeField] private GameObject seedlingStage3;
     [SerializeField] private GameObject seedlingStage4;
     [SerializeField] private GameObject growingArrowPrefab;
+    [SerializeField] private Sprite seedlingSprite21;
+    [SerializeField] private Sprite seedlingSprite22;
+    [SerializeField] private Sprite seedlingSprite23;
+    [SerializeField] private Sprite seedlingSprite24;
+    [SerializeField] private Sprite seedlingSprite31;
+    [SerializeField] private Sprite seedlingSprite32;
+    [SerializeField] private Sprite seedlingSprite33;
+    [SerializeField] private Sprite seedlingSprite34;
     private readonly int nextStageTriggerHash = Animator.StringToHash("NextStageTrigger");
     private readonly int buddingTriggerHash = Animator.StringToHash("BuddingTrigger");
 
@@ -22,6 +30,29 @@ public class CornSeedlingView : MonoBehaviour
         seedlingStage4.SetActive(false);
     }
 
+    public void SetRank(CornFieldRank rank)
+    {
+        switch (rank)
+        {
+            case CornFieldRank.Rank1:
+                break;
+            case CornFieldRank.Rank2:
+                seedlingStage1.GetComponent<SpriteRenderer>().sprite = seedlingSprite21;
+                seedlingStage2.GetComponent<SpriteRenderer>().sprite = seedlingSprite22;
+                seedlingStage3.GetComponent<SpriteRenderer>().sprite = seedlingSprite23;
+                seedlingStage4.GetComponent<SpriteRenderer>().sprite = seedlingSprite24;
+                break;
+            case CornFieldRank.Rank3:
+                seedlingStage1.GetComponent<SpriteRenderer>().sprite = seedlingSprite31;
+                seedlingStage2.GetComponent<SpriteRenderer>().sprite = seedlingSprite32;
+                seedlingStage3.GetComponent<SpriteRenderer>().sprite = seedlingSprite33;
+                seedlingStage4.GetComponent<SpriteRenderer>().sprite = seedlingSprite34;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rank), rank, null);
+        }
+    }
+
     public void SetView(SeedlingStage stage)
     {
         switch (stage)