畑強化表示処理追加

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_small.prefab

@@ -83,6 +83,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1900773928035009608}
+  - component: {fileID: 3088275765983924152}
   m_Layer: 5
   m_Name: Seedling_small
   m_TagString: Untagged
@@ -112,6 +113,21 @@ RectTransform:
   m_AnchoredPosition: {x: -250, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3088275765983924152
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773928035009609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rank1Seedling: {fileID: 1900773928939151480}
+  rank2Seedling: {fileID: 1900773929261835485}
+  rank3Seedling: {fileID: 1900773927654150363}
 --- !u!1 &1900773928939151480
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 8736114269955797017}
   - component: {fileID: 8736114269955797022}
   - component: {fileID: 8736114269955797023}
-  - component: {fileID: 8736114269955797016}
   m_Layer: 5
   m_Name: Button_release_off
   m_TagString: Untagged
@@ -76,49 +75,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8736114269955797016
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8736114269955797018}
-  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: 8736114269955797023}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &8736114269978908596
 GameObject:
   m_ObjectHideFlags: 0
@@ -743,7 +699,6 @@ GameObject:
   - component: {fileID: 8736114270758350254}
   - component: {fileID: 8736114270758350243}
   - component: {fileID: 8736114270758350252}
-  - component: {fileID: 8736114270758350253}
   m_Layer: 5
   m_Name: Button_strengthening_off
   m_TagString: Untagged
@@ -808,49 +763,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8736114270758350253
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8736114270758350255}
-  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: 8736114270758350252}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &8736114270761815182
 GameObject:
   m_ObjectHideFlags: 0
@@ -860,6 +772,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8736114270761815181}
+  - component: {fileID: 2746775699208038261}
   m_Layer: 5
   m_Name: detail
   m_TagString: Untagged
@@ -888,6 +801,33 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 862, y: 252}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2746775699208038261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8736114270761815182}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lineType: 0
+  dialogButton: {fileID: 8736114270625729304}
+  dialogButton2: {fileID: 8736114270417149859}
+  disableButton: {fileID: 8736114270758350255}
+  disableButton2: {fileID: 8736114269955797018}
+  reinforcementWindow: {fileID: 8736114270973342973}
+  releaseWindow: {fileID: 8736114270187051288}
+  currentSeedling: {fileID: 5298427820679491484}
+  nextSeedling: {fileID: 6045849226816011445}
+  currentSignBoard: {fileID: 5404513298100535288}
+  nextSignBoard: {fileID: 5404513298602980439}
+  reinforceText: {fileID: 8736114271533156906}
+  releaseText: {fileID: 8736114271738746592}
+  reinforcePriceText: {fileID: 8736114271522345134}
+  releasePriceText: {fileID: 8736114271730917468}
 --- !u!1 &8736114270874397687
 GameObject:
   m_ObjectHideFlags: 0
@@ -2289,10 +2229,22 @@ PrefabInstance:
     - target: {fileID: 1900773928035009609, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
         type: 3}
       propertyPath: m_Name
-      value: Seedling_small
+      value: CurrentSeedling
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3}
+--- !u!114 &5298427820679491484 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
+    type: 3}
+  m_PrefabInstance: {fileID: 7159613405573062692}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8736114270235223148 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
@@ -2414,7 +2366,7 @@ PrefabInstance:
     - target: {fileID: 1900773928035009609, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
         type: 3}
       propertyPath: m_Name
-      value: Seedling_small
+      value: ReleaseSeedling
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3}
@@ -2539,10 +2491,22 @@ PrefabInstance:
     - target: {fileID: 1900773928035009609, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
         type: 3}
       propertyPath: m_Name
-      value: Seedling_small (1)
+      value: NextSeedling
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3}
+--- !u!114 &6045849226816011445 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
+    type: 3}
+  m_PrefabInstance: {fileID: 8736114270831080205}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &7159613406184650565 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf,
@@ -2679,7 +2643,7 @@ PrefabInstance:
     - target: {fileID: 3619866680260814821, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
         type: 3}
       propertyPath: m_Name
-      value: signboard
+      value: CurrentSignboard
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3}
@@ -2689,6 +2653,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 8736114271242800391}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5404513298100535288 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
+    type: 3}
+  m_PrefabInstance: {fileID: 8736114271242800391}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8736114271678039720
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2819,7 +2795,7 @@ PrefabInstance:
     - target: {fileID: 3619866680260814821, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
         type: 3}
       propertyPath: m_Name
-      value: signboard (1)
+      value: NextSignboard
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3}
@@ -2829,6 +2805,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 8736114271678039720}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5404513298602980439 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
+    type: 3}
+  m_PrefabInstance: {fileID: 8736114271678039720}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8736114271969069798
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab.meta

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

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs

@@ -246,7 +246,7 @@ public class CornField : MonoBehaviour
         return new SeedlingData(DateTime.Now, Random.Range(minPeriod, maxPeriod + 1), level);
     }
 
-    private int GetHarvestCount(CornFieldRank rank)
+    public static int GetHarvestCount(CornFieldRank rank)
     {
         switch (rank)
         {
@@ -261,7 +261,7 @@ public class CornField : MonoBehaviour
         }
     }
 
-    private int GetHarvestedCornCount(int level)
+    public static int GetHarvestedCornCount(int level)
     {
         switch (level)
         {

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
@@ -16,7 +17,22 @@ public class CornFieldReinforcement : MonoBehaviour
         {
             TransitionManager.Instance.UnloadScene(GameScenes.Reinforcement);
         }).AddTo(this);
+        var gameData = GameDataManager.GameData;
+        var price = 100;
+        foreach (var view in reinforcementViews)
+        {
+            if (gameData.PlantLineDataList.FirstOrDefault(x => x.Type == view.LineType) is PlantLineData lineData)
+            {
+                view.SetReinforcement(lineData, price);
+            }
+            else
+            {
+                view.SetRelease(price);
+            }
+        }
+        machineUpgradeView.SetData(gameData.MachineLevel, price);
     }
+    
 }
 
 public class UpgradeData

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementView.cs

@@ -1,17 +1,91 @@
 using System;
+using TMPro;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class CornFieldReinforcementView : MonoBehaviour
 {
+    private static readonly string ReinforceFormat = "1株から{0}本収穫できます";
+    private static readonly string ReleaseFormat = "畑の{0}が耕されます\n1株から1本収穫できます";
+    private static readonly string SigbBoardFormat = "x{0}";
+    [SerializeField] private PlantLineType lineType;
+    public PlantLineType LineType => lineType;
     [SerializeField] private Button dialogButton;
+    [SerializeField] private Button dialogButton2;
+    [SerializeField] private GameObject disableButton;
+    [SerializeField] private GameObject disableButton2;
+    [SerializeField] private GameObject reinforcementWindow;
+    [SerializeField] private GameObject releaseWindow;
+    [SerializeField] private ReinforcementSeedlingView currentSeedling;
+    [SerializeField] private ReinforcementSeedlingView nextSeedling;
+    [SerializeField] private TextMeshProUGUI currentSignBoard;
+    [SerializeField] private TextMeshProUGUI nextSignBoard;
+    [SerializeField] private Text reinforceText;
+    [SerializeField] private Text releaseText;
+    [SerializeField] private Text reinforcePriceText;
+    [SerializeField] private Text releasePriceText;
 
     private void Start()
     {
-        dialogButton.OnClickAsObservable().Subscribe(_ =>
+        dialogButton.OnClickAsObservable()
+            .Merge(dialogButton2.OnClickAsObservable())
+            .Subscribe(_ =>
+            {
+                TransitionManager.Instance.LoadSceneAdditive(GameScenes.ReinforcementDetail);
+            }).AddTo(this);
+    }
+
+    public void SetReinforcement(PlantLineData data, int price)
+    {
+        reinforcementWindow.SetActive(true);
+        releaseWindow.SetActive(false);
+        if (data.Level == CornFieldRank.Rank3)
         {
-            TransitionManager.Instance.LoadSceneAdditive(GameScenes.ReinforcementDetail);
+            reinforcementWindow.SetActive(false);
-        }).AddTo(this);
+            disableButton.SetActive(true);
+            return;
+        }
+        reinforcePriceText.text = price.ToString();
+        currentSeedling.SetSeedling(data.Level);
+        currentSignBoard.text = string.Format(SigbBoardFormat, CornField.GetHarvestCount(data.Level));
+        nextSeedling.SetSeedling(GetNextRank(data.Level));
+        nextSignBoard.text = string.Format(SigbBoardFormat, CornField.GetHarvestCount(GetNextRank(data.Level)));
+        reinforceText.text = string.Format(ReinforceFormat, CornField.GetHarvestCount(GetNextRank(data.Level)));
+    }
+
+    public void SetRelease(int price)
+    {
+        reinforcementWindow.SetActive(false);
+        releaseWindow.SetActive(true);
+        releasePriceText.text = price.ToString();
+        releaseText.text = string.Format(ReleaseFormat, GetPlantTypeText(lineType));
+    }
+
+    private CornFieldRank GetNextRank(CornFieldRank rank)
+    {
+        switch (rank)
+        {
+            case CornFieldRank.Rank1:
+                return CornFieldRank.Rank2;
+            case CornFieldRank.Rank2:
+                return CornFieldRank.Rank3;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rank), rank, null);
+        }
+    }
+    private string GetPlantTypeText(PlantLineType type)
+    {
+        switch (type)
+        {
+            case PlantLineType.Top:
+                return "上段";
+            case PlantLineType.Center:
+                return "中段";
+            case PlantLineType.Bottom:
+                return "下段";
+            default:
+                throw new ArgumentOutOfRangeException(nameof(type), type, null);
+        }
     }
 }

popcorn/Assets/MyGame/Scenes/CornField/Scripts/MachineUpgradeView.cs

@@ -1,6 +1,36 @@
+using System;
+using UniRx;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class MachineUpgradeView : MonoBehaviour
 {
-    
+    private static readonly string SigbBoardFormat = "x{0}";
+    [SerializeField] private Text priceText;
+    [SerializeField] private Text currentHarvestedText;
+    [SerializeField] private Text nextHarvestedText;
+    [SerializeField] private Button dialogButton;
+    [SerializeField] private GameObject disableButton;
+    private static readonly int MaxMachineLevel = 6;
+
+    private void Start()
+    {
+        dialogButton.OnClickAsObservable()
+        .Subscribe(_ =>
+        {
+            TransitionManager.Instance.LoadSceneAdditive(GameScenes.ReinforcementDetail);
+        }).AddTo(this);
+    }
+
+    public void SetData(int level, int price)
+    {
+        if (level == MaxMachineLevel)
+        {
+            disableButton.SetActive(true);
+            return;
+        }
+        priceText.text = price.ToString();
+        currentHarvestedText.text = CornField.GetHarvestedCornCount(level).ToString();
+        nextHarvestedText.text = CornField.GetHarvestedCornCount(level+1).ToString();
+    }
 }

popcorn/Assets/MyGame/Scenes/CornField/Scripts/ReinforcementSeedlingView.cs

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+public class ReinforcementSeedlingView : MonoBehaviour
+{
+    [SerializeField] private GameObject rank1Seedling;
+    [SerializeField] private GameObject rank2Seedling;
+    [SerializeField] private GameObject rank3Seedling;
+
+    public void SetSeedling(CornFieldRank rank)
+    {
+        rank1Seedling.SetActive(rank == CornFieldRank.Rank1);
+        rank2Seedling.SetActive(rank == CornFieldRank.Rank2);
+        rank3Seedling.SetActive(rank == CornFieldRank.Rank3);
+    }
+}

popcorn/Assets/MyGame/Scenes/CornField/Scripts/ReinforcementSeedlingView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7e220d0668504fe99a65270586553f5a
+timeCreated: 1632805223