From 62856fe7e8181687a0c3932a2fbdd6c3b8fc56be Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 28 Sep 2021 18:04:29 +0900 Subject: [PATCH] =?UTF-8?q?=E7=95=91=E5=BC=B7=E5=8C=96=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resources/Data/DownloadDate.txt | 2 +- .../Resources/Data/FieldUpgradeData.txt | 1 + .../Resources/Data/FieldUpgradeData.txt.meta | 7 ++++ .../Assets/MyGame/Resources/Data/PanData.txt | 2 +- popcorn/Assets/MyGame/Scripts/Const.cs | 2 ++ .../Assets/MyGame/Scripts/SpreadsheetData.cs | 32 +++++++++++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt create mode 100644 popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt.meta diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 0fc1dd09..925fcf53 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -zFMH6JGKVYpnWtrDjce1KESRKBoQkRHKvczNdJN7mgXGh21g/yHdAGvAgvR5uAm9 \ No newline at end of file +sqmECWU/Fts3gpxlBzRWC/N+sNLi4rd8aYhTsfDfWPBBLFtWQizlpacHyUxHLh25 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt b/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt new file mode 100644 index 00000000..9d77c6d2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt @@ -0,0 +1 @@ +WJt4rX6J7CBFpFPaJ2+ioJaivPNHSQTRmnhpUWx6QqhLHM0uUKcgq3lMwywXH3U0gzyMKAiMuqzyp+VRZ+ZjjkkdqLWTLghmSntMek3eDsGvosovIQt3vGZWOVedGLxHBMwelddZMy3oP9YEAxN1l0WVdZM6Q3oeqDWZ1W0qYY0E5abIHqRUxAvDn67tDIlxUKpGJsXaxQQhUSDCCPZYA/pg4gZJpVhYfGnCNB9l5tSx198xoqR4TgO3DGrm8d3EstXLpaEhMn1DQz7AtDiktvYDReRSarfMsNf2C9/A5PorbTfHq7/o5CeNviMyC47s1oSsblXZA8ffPPt0NSHZChb3aUCDQes0P3wh6mvO1XDlvOR0rMFU34lkZM+YUWYf7DIzGf5K1iBlJhjKYtdMMaHqwn6oFk2XFZqu948FvVZVtVLrYmSW/YtVG7s0KZzbM8iSB/6vapSeFu/XMclnMGYW7Efmh6ocfUI/4gipljmRnQdSi6KLP+i1qAHKh8wOamE0S2/FCNUwhJyoCeLDtVYTeQSRDAFqIOCfp2bId2kx4uMXVWe2EvumyPm0ql75TPNfQBlZ8GDPg8vTV13t+TemOh23W+h2oT4wQRLuMZ0ksbLngKbxV1bjIw/PLS9o1hGOjbWHVmBOeuioi8r86aCAV9Z9SnvV1ve5ZlVcum1Sf0E7UUCgWvm57VLxR+8EtjlPNxbyc6PfRMQB9Yd3dyjnGkvnn/vGvVGRVFz+Vk7m5vOZlM6RNF0vR0xIL7TiwBh7VULN4JIJyoz/Tj32eed4+RR3LdoxSbDsRpTfVMv/yIiVc/Shm+OscvH+zheO+jhCIgEyO6F7Vj1rbF+bH53ABc1uskji2ru2IKBK8QP2sqm5e3Sf/LRo/cDU78IVWify0HkHS6g//PdNg7FSLaoSIpk74D8H//kAaOoLjSn1DjSFiyX2MKpo+dD8kkWcLfkdea3WUzvKPm5E9bwLs2I2iJ+fDGUC8oGXVYhIFq9smvdHKPof4kcxNcl/8WAU7uPuYUyqZemIJZ8dNThwS9SgPY1SMqw3AThJEsbIo30= \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt.meta b/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt.meta new file mode 100644 index 00000000..52fa9f08 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d5563d352b1404f23b98babd899b5edd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Data/PanData.txt b/popcorn/Assets/MyGame/Resources/Data/PanData.txt index 4637f94a..40969e9d 100644 --- a/popcorn/Assets/MyGame/Resources/Data/PanData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/PanData.txt @@ -1 +1 @@ -97oWHVSy4mXXW++Eig+bDh8Jedn+3DPlxpStzTGvB2tdYJtjw013U1VHQhppqD+YtxbBlgZckqf5WF/M4xwC504lK0tSRhAkXPzPdggZomnzCw9digb4hf9tGMqEXyNBuxxjisCKN3CSoEj9t1fFFEMJr4CAKKNAxGaiWJ1598WwfXasqus8Xhveqt1+Vcdu2/gKfHAi4Q/AYsHvzAeCcDKG+YgjYoxnK0TPS9h8fjZnMiEdhrhSlziaJP2fgytfn00pYu5JpEwTQkLY/Y39++ACy/MoKgl8lPkBitSUT3FdGm/ZlBeaUokUtak9bkXPpLDnBakY/pZ9lzrgpsmD9pTDZJn2UGCIPT53RCAfgr+tg/LQ/VlpIlNfQrcl7Q/aDKUY5uIuMwspIVGKq8bb0A== \ No newline at end of file +EnYKCQdX0S7nybjUaSVA43od6EK4loPNyR9ACcfwe97WyFKJrjPm7gTloN+L6RApOhbaL7ZNjwQEBM0VQDpPN9DL6tbROyQ+sqvq2dyozK4jmSvZao2DkrmFPdazPrfjoRBOIU7clSHeaObEJ4hxkNxgeAjEH313TdOmYOxdFHsR1nqMeu8VsBB2HECF5/GSZb9PnAmuVKEh0DbhNzfXb8l/KyPbluJhsmt8JaIwlZPoi5oE9m+GidtlEvqoqW8b8mMqlMgRsWJPN+MDlulkuRfeLC5SRO/dPALM5s1ZE1ir36r/nwiYDBicsPK8huRqcyffQrHYNBVojUJF1I2jAw== \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index 4609be27..fd3a037e 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -30,6 +30,7 @@ public static class Const { public static readonly string ProductDataSheet = "ProductData"; public static readonly string PanDataSheet = "PanData"; public static readonly string RarityDataSheet = "RarityData"; + public static readonly string FieldUpgradeDataSheet = "FieldUpgradeData"; // language public static readonly string LangJapanDataSheet = "LangJapanData"; @@ -58,6 +59,7 @@ public static class Const { new SheetData(Const.ProductDataSheet), new SheetData(Const.PanDataSheet), new SheetData(Const.RarityDataSheet), + new SheetData(Const.FieldUpgradeDataSheet), }; 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 a6101085..bbece051 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -26,6 +26,14 @@ public enum ProductRarity Rainbow = 6, } +public enum CornFieldUpgradeType +{ + FieldTop = 1, + FieldCenter = 2, + FieldBottom = 3, + Machine = 4, +} + [Serializable] public sealed class RarityData { @@ -46,6 +54,30 @@ public sealed class PanData public ProductRarity Rarity => (ProductRarity)rarity; } +[Serializable] +public sealed class FieldUpgradeData +{ + public int type; + public int level; + public int price; + public int harvested; + public CornFieldUpgradeType Type => (CornFieldUpgradeType) type; + public CornFieldUpgradeType PlantTypeToUpgradeType(PlantLineType lineType) + { + switch (lineType) + { + case PlantLineType.Top: + return CornFieldUpgradeType.FieldTop; + case PlantLineType.Center: + return CornFieldUpgradeType.FieldCenter; + case PlantLineType.Bottom: + return CornFieldUpgradeType.FieldBottom; + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } +} + [Serializable] public sealed class ProductData {