From 22ae9d6f70b8e1ffc1e2bab9e4320820f41bbedc Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 15 Sep 2022 17:36:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E6=A7=8B=E9=80=A0?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/WorldMap/Scripts/CityIcon.cs       |  2 ++
 popcorn/Assets/MyGame/Scripts/Const.cs        |  6 ++++
 .../Assets/MyGame/Scripts/SpreadsheetData.cs  | 34 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs
index cb338e53..4a0e1051 100644
--- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs
+++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs
@@ -8,6 +8,8 @@ namespace MyGame.Scenes.WorldMap.Scripts
     public class CityIcon : MonoBehaviour
     {
         [SerializeField] private Transform icon;
+        [SerializeField] private int cityId;
+        public int CityId => cityId;
         public IObservable<Unit> OnClick =>
             (icon.GetComponent<ObservableEventTrigger>() ?? icon.gameObject.AddComponent<ObservableEventTrigger>())
             .OnPointerClickAsObservable()
diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs
index 958d9152..009fcf19 100644
--- a/popcorn/Assets/MyGame/Scripts/Const.cs
+++ b/popcorn/Assets/MyGame/Scripts/Const.cs
@@ -69,6 +69,9 @@ public static class Const {
     public static readonly string ScrollGamePlaceDataSheet = "ScrollGamePlaceData";
     public static readonly string ScrollGameStageDataSheet = "ScrollGameStageData";
     public static readonly string ScrollGameStageDifficultyDataSheet = "ScrollGameStageDifficultyData";
+    public static readonly string CityDataSheet = "CityData";
+    public static readonly string FundingDataSheet = "FundingData";
+    public static readonly string PartTimerDataSheet = "PartTimerData";
 
     // language
     public static readonly string LangJapanDataSheet = "LangJapanData";
@@ -109,6 +112,9 @@ public static class Const {
         new SheetData(Const.ScrollGamePlaceDataSheet),
         new SheetData(Const.ScrollGameStageDataSheet),
         new SheetData(Const.ScrollGameStageDifficultyDataSheet),
+        new SheetData(Const.CityDataSheet),
+        new SheetData(Const.FundingDataSheet),
+        new SheetData(Const.PartTimerDataSheet),
     };
     public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
         new SheetData(Const.LangJapanDataSheet, "LanguageData"),
diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
index 444560c6..1d4d6812 100644
--- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
+++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
@@ -606,4 +606,38 @@ public sealed class ScrollGameStageDifficultyData
         }
         return ScrollGameDifficulty.Easy;
     }
+}
+
+[Serializable]
+public sealed class CityData
+{
+    public int id;
+    public int needHeart;
+    public int scriptId;
+    public string prefabName;
+}
+
+[Serializable]
+public sealed class FundingData
+{
+    public int id;
+    public int cityId;
+    public int fundingCityId;
+    public int needAmount;
+}
+
+[Serializable]
+public sealed class PartTimerData
+{
+    public int id;
+    public int cityId;
+    public int level;
+    public int needHeartCityId;
+    public int needHeart;
+    public int needAmount;
+    public int sales;
+    public int heart;
+    public int maxSales;
+    public int maxHeart;
+    public string prefabName;
 }
\ No newline at end of file