diff --git a/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt new file mode 100644 index 00000000..f0dae863 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt @@ -0,0 +1 @@ +tH3z3Et10Knf4DgmAzuyNeZ7dYAsZVGGIxyUvbKPolUDqZJeexF/XwPpsBiPbouNvG39NB9EZOmGMlUZ1m980sZTu9k8bIFfmKQlHcJLjTdpITS5YMOfyUNNM/HIO9Nf \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt.meta b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt.meta new file mode 100644 index 00000000..b145ff94 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 421e6ff37efa34561b5988b4609d80d6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index f3c2634b..16c3a746 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -74,6 +74,9 @@ public static class Const { public static readonly string CityDataSheet = "CityData"; public static readonly string FundingDataSheet = "FundingData"; public static readonly string PartTimerDataSheet = "PartTimerData"; + public static readonly string CityShopLevelDataSheet = "CityShopLevelData"; + public static readonly string ItemConditionDataSheet = "ItemConditionData"; + public static readonly string ScriptConditionDataSheet = "ScriptConditionData"; // language public static readonly string LangJapanDataSheet = "LangJapanData"; @@ -118,6 +121,9 @@ public static class Const { new SheetData(Const.CityDataSheet), new SheetData(Const.FundingDataSheet), new SheetData(Const.PartTimerDataSheet), + new SheetData(Const.CityShopLevelDataSheet), + new SheetData(Const.ItemConditionDataSheet), + new SheetData(Const.ScriptConditionDataSheet), }; 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 8fb1466c..df054ad7 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -181,6 +181,16 @@ public enum ScrollGameDifficulty Extra = 4 } +public enum ItemCondition +{ + TotalHeart = 1 +} + +public enum RewardActionType +{ + CustomizeCoin = 1 +} + [Serializable] public sealed class MissionData { @@ -677,4 +687,37 @@ public sealed class PartTimerData public int maxSales; public int maxHeart; public string prefabName; +} + +[Serializable] +public sealed class CityShopLevelData +{ + public int id; + public int cityId; + public int shopLevel; + public int heart; +} + +[Serializable] +public sealed class ItemConditionData +{ + public int id; + public int cityId; + public int condition; + public int needValue; + public int action; + public int value; + public ItemCondition Condition => (ItemCondition) condition; + public RewardActionType RewardActionType => (RewardActionType) action; +} + +[Serializable] +public sealed class ScriptConditionData +{ + public int id; + public int cityId; + public int condition; + public int needValue; + public int scriptId; + public ItemCondition Condition => (ItemCondition) condition; } \ No newline at end of file