diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs new file mode 100644 index 00000000..225baf26 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs @@ -0,0 +1,41 @@ +using System; +using System.Runtime.Serialization; + +namespace MyGame.Scenes.marketing.Scripts +{ + [DataContract] + public class ShopCustomizeSettings + { + [DataMember] + public int SignBoard = Const.ShopCustomizeDefaultSignBoardId; + [DataMember] + public int Decoration1 = Const.ShopCustomizeDefaultDecoration1Id; + [DataMember] + public int Cart = Const.ShopCustomizeDefaultCartId; + [DataMember] + public int Stock = Const.ShopCustomizeDefaultStockId; + [DataMember] + public int Decoration2 = Const.ShopCustomizeDefaultDecoration2Id; // 立て看板 + + public int GetSetting(ShopCustomizeCategory category) + { + switch (category) + { + case ShopCustomizeCategory.Category1: + return SignBoard; + case ShopCustomizeCategory.Category2: + return Decoration1; + case ShopCustomizeCategory.Category3: + return Cart; + case ShopCustomizeCategory.Category4: + return Stock; + case ShopCustomizeCategory.Category5: + return Decoration2; + case ShopCustomizeCategory.Category6: + return 0; + default: + throw new ArgumentOutOfRangeException(nameof(category), category, null); + } + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs.meta new file mode 100644 index 00000000..3bd07e5f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomizeSettings.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 395f055656374dfd815a6754b6ff54fc +timeCreated: 1652246064 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index aa43cd9c..2320e5e6 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -25,6 +25,11 @@ public static class Const { public static readonly float VipCustomerRewardStock = 20; // Market.ShopStockCount以下にする public static readonly float VipCustomerRewardRate = 0.1f; public static readonly int AutoCookAvailableLevel = 7; + public static readonly int ShopCustomizeDefaultSignBoardId = 1; + public static readonly int ShopCustomizeDefaultDecoration1Id = 2; + public static readonly int ShopCustomizeDefaultCartId = 3; + public static readonly int ShopCustomizeDefaultStockId = 4; + public static readonly int ShopCustomizeDefaultDecoration2Id = 5; // tag public static readonly string GameDataTag = "GameData"; diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index af49fa1a..53c97d6f 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; +using MyGame.Scenes.marketing.Scripts; using MyGame.Scripts; public enum AdRewardType { @@ -161,6 +162,18 @@ public sealed class GameData { [DataMember(Name = "Data56")] public int[] AutoCookProducts; + + // カスタマイズ機能(v1.3追加) + [DataMember(Name = "Data57")] + public int ShopCustomizeCoin; + [DataMember(Name = "Data58")] + public int ShopCustomizePoint; + [DataMember(Name = "Data59")] + public int ShopCustomizeLevel; + [DataMember(Name = "Data60")] + public int[] ShopCustomizeMyItems; + [DataMember(Name = "Data61")] + public ShopCustomizeSettings ShopCustomizeSettings; // mission @@ -396,6 +409,11 @@ public sealed class GameData { { AutoCookLevel = 1; } + + if (ShopCustomizeLevel < 1) + { + ShopCustomizeLevel = 0; + } // 追加した要素の初期化用 // TODO Release前にまっさらにする @@ -418,6 +436,7 @@ public sealed class GameData { DailyTotalSalesList = DailyTotalSalesList ?? new List(); WaitAddStock = WaitAddStock ?? new ProductStockData{Rarity = ProductRarity.Normal}; AutoCookProducts = AutoCookProducts ?? Array.Empty(); + ShopCustomizeSettings = ShopCustomizeSettings ?? new ShopCustomizeSettings(); } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary(); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 89119ab0..d53cf599 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -453,6 +453,11 @@ public sealed class ShopCustomizeData { public int point; public string prefabName; public ShopCustomizeCategory Category => (ShopCustomizeCategory)category; + + public Transform GetPrefab() + { + return default; + } } [Serializable]