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 OnClick => (icon.GetComponent() ?? icon.gameObject.AddComponent()) .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