yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into feature/1.3.0

This commit is contained in:
koya_15 2022-05-09 19:29:25 +09:00
parent 5efc01ec4d ba2ba61615
commit 723a0acef5
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scripts/Const.cs
View File

@ -52,6 +52,9 @@ public static class Const {
public static readonly string ScriptDataSheet = "ScriptData"; public static readonly string ScriptDataSheet = "ScriptData";
public static readonly string TutorialScriptDataSheet = "TutorialData"; public static readonly string TutorialScriptDataSheet = "TutorialData";
public static readonly string AutoCookDataSheet = "AutoCookData"; public static readonly string AutoCookDataSheet = "AutoCookData";
public static readonly string ShopCustomizeDataSheet = "ShopCustomizeData";
public static readonly string ShopCustomizeLevelDataSheet = "ShopCustomizeLevelData";
public static readonly string ShopCustomizeBonusDataSheet = "ShopCustomizeBonusData";
// language // language
public static readonly string LangJapanDataSheet = "LangJapanData"; public static readonly string LangJapanDataSheet = "LangJapanData";
@ -86,6 +89,9 @@ public static class Const {
new SheetData(Const.ScriptDataSheet), new SheetData(Const.ScriptDataSheet),
new SheetData(Const.TutorialScriptDataSheet), new SheetData(Const.TutorialScriptDataSheet),
new SheetData(Const.AutoCookDataSheet), new SheetData(Const.AutoCookDataSheet),
new SheetData(Const.ShopCustomizeDataSheet),
new SheetData(Const.ShopCustomizeLevelDataSheet),
new SheetData(Const.ShopCustomizeBonusDataSheet),
}; };
public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{ public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
new SheetData(Const.LangJapanDataSheet, "LanguageData"), new SheetData(Const.LangJapanDataSheet, "LanguageData"),

47
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -143,6 +143,23 @@ public enum BrotherType
Both = 3, Both = 3,
} }
public enum ShopCustomizeCategory
{
Category1 = 1, // メイン看板
Category2 = 2, // 飾り付け
Category3 = 3, // 店本体
Category4 = 4, // 在庫メーター
Category5 = 5, // 立て看板
Category6 = 6, // 背景
}
public enum ShopCustomizeBonusCategory
{
Sales = 1,
Customer = 2,
AdWalker = 3,
}
[Serializable] [Serializable]
public sealed class MissionData public sealed class MissionData
{ {
@ -425,4 +442,34 @@ public sealed class AutoCookData {
public int duration; public int duration;
public int earnCount; public int earnCount;
public int clearCount; public int clearCount;
}
[Serializable]
public sealed class ShopCustomizeData {
public int id;
public int level;
public int category;
public int price;
public int point;
public string prefabName;
public ShopCustomizeCategory Category => (ShopCustomizeCategory)category;
}
[Serializable]
public sealed class ShopCustomizeLevelData
{
public int id;
public int level;
public int point;
}
[Serializable]
public sealed class ShopCustomizeBonusData
{
public int id;
public int level;
public int bonusLevel;
public int category;
public int value;
public ShopCustomizeBonusCategory Category => (ShopCustomizeBonusCategory)category;
} }