シートのデータ構造一部変更

popcorn/Assets/MyGame/Resources/Data/CityData.txt

@@ -1 +1 @@
-wEWKiu1uJ1P1GSr3GuMlaLHvTtskSvV5BLiLb4Zp9NQ2IxKmGV+V/n1Qfdmej6gJ8RTCjDF8OZMdCNmP/Tn8t+ZBK+oUyhs99ZXuLsjhhtATfO9d3Iud2urCXjG3Lwmq/Oj5ZsxGgagAbEyosa5xcASQvHjrCkfgypf175Ou7W0C4at7Y9Nx8Ks3LJTIjox45E/VyYo0jPhnSnWionz6gT+WeEsVqw0tTVIxt2Mw9sUmnugrfbhjDccibVA2PgD69iSxKCO3UP5lrgLRXVv7rcXFe6yCnzSb+Vt3eqjJ5cRHc3M2iPPTz9fppDsS1TcnUGDsV/fJyxg57CeFKE84sOiKu9XYMQ92wtdRi3QGfub43kiqlkVJvOn+T6Ff+kOk
+UwrDzfUkFfJUmZJNKn0/0XAYTYNt6qoqJzqgmT7liKdEqfEuTTblsAMQ3yjgCvGwd5KjWpUGETJ2D1RnZdMPg4qswVaFPXOdDG6bZVynUNJyDaBkdcdpOVn2bP7WEoJqjT/1+gNdq+lqQ2UR2NOk/LeZGifb5bOjEdd13bzSnlXtMRu90Gmf4mpSiQvpBNIEF8WpEjuDh7qQ8gcPXO70Dm0HAnzH564KPePDn27SF+wpqcx02i12kY57X+lJZKDN

popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs

@@ -48,7 +48,7 @@ public class BulkOrder : MonoBehaviour
 
         var cityGameData = GameDataManager.GetCurrentCityGameData();
         var globalGameData = GameDataManager.GameData;
-        var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
+        var bulkOrderList = GetCityOrderList(GameDataManager.GameData.CurrentCityId);
         var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet);
         var bulkOrderData = bulkOrderList.First(data => data.id == cityGameData.OrderIdInProgress);
         messageText.text = messageList.First(data => data.id == cityGameData.OrderTextId).RequestText;
@@ -72,7 +72,7 @@ public class BulkOrder : MonoBehaviour
                 }
                 cityGameData.CancelOrderId = cityGameData.OrderIdInProgress;
                 // カウントリセット
-                globalGameData.OrderConditionCount = 0;
+                cityGameData.OrderConditionCount = 0;
                 GameDataManager.SaveGameData();
                 // 試食スタート
                 BrotherPinkView.Instance.StartTasting();
@@ -120,7 +120,7 @@ public class BulkOrder : MonoBehaviour
                 });
                 
                 // カウントリセット
-                globalGameData.OrderConditionCount = 0;
+                cityGameData.OrderConditionCount = 0;
                 cityGameData.DeliveredOrder.Add(bulkOrderData.id);
                 cityGameData.BulkOrderDeliveredCount++;
                 globalGameData.DailyBulkOrderDeliveredCount++;
@@ -199,16 +199,25 @@ public class BulkOrder : MonoBehaviour
         return Mathf.CeilToInt(totalBonus / resultData.Count);
     }
 
+    public static List<BulkOrderData> GetCityOrderList(int cityId)
+    {
+        return SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet)
+            .Where(data => data.cityId == cityId).ToList();
+    }
+
     public static BulkOrderData CheckBulkOrder()
     {
-        var globalGameData = GameDataManager.GameData;
+        /*
+         * ViewedShopLevelをcityData毎に持つようにする
+         * cityごとにハートレベルテーブルを用意する（shopLevelDataみたいな感じ）
+         */
         var cityGameData = GameDataManager.GetCurrentCityGameData();
         var nextOrderLevel = cityGameData.AchievedOrderLevel + 1;
-        if (globalGameData.ViewedShopLevel < nextOrderLevel)
+        if (cityGameData.ViewedShopLevel < nextOrderLevel)
         {
             return null;
         }
-        var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
+        var bulkOrderList = GetCityOrderList(GameDataManager.GameData.CurrentCityId);
         if (!bulkOrderList.Exists(data => data.shopLevel == nextOrderLevel))
         {
             return null;
@@ -220,7 +229,7 @@ public class BulkOrder : MonoBehaviour
 #if UNITY_EDITOR
         Debug.Log("delivered:"+cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}"));
         Debug.Log($@"CheckBulkOrder NextOrder
-shopLevel: {globalGameData.ViewedShopLevel} nextOrderLevel: {nextOrderLevel}
+shopLevel: {cityGameData.ViewedShopLevel} nextOrderLevel: {nextOrderLevel}
 firstTime: {firstTime} achieved: {achieved} canceled: {canceled} {cityGameData.OrderIdInProgress} == {cityGameData.CancelOrderId}
 next: {nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.shopLevel} {data.maxOrder}")}
 ");
@@ -249,8 +258,8 @@ delivered:{cityGameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s
         // キャンセル時retryConditionを使う
         var condition = canceled ? orderData.retryCondition : orderData.firstOrderCondition;
 #if UNITY_EDITOR
-        Debug.Log($"nextOrderId: {orderData.id} use {(canceled ? "retryCondition" : "firstOrderCondition")} ({globalGameData.OrderConditionCount}/{condition})");
+        Debug.Log($"nextOrderId: {orderData.id} use {(canceled ? "retryCondition" : "firstOrderCondition")} ({cityGameData.OrderConditionCount}/{condition})");
 #endif
-        return condition <= globalGameData.OrderConditionCount ? orderData : null;
+        return condition <= cityGameData.OrderConditionCount ? orderData : null;
     }
 }

popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs

@@ -103,7 +103,7 @@ public class KitchenManager : MonoBehaviour
             if (!hasNewOrder)
             {
                 // 大量注文達成通知
-                var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
+                var bulkOrderList = BulkOrder.GetCityOrderList(GameDataManager.GameData.CurrentCityId);
                 if (bulkOrderList.FirstOrDefault(data => data.id == cityGameData.OrderIdInProgress) is { } bulkOrderData)
                 {
                     var completed = cityGameData.CompletedProductList.Count == bulkOrderData.OrderList.Count(tuple => tuple.productId != 0);

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -183,7 +183,11 @@ public enum ScrollGameDifficulty
 
 public enum ItemCondition
 {
-    TotalHeart = 1
+    TotalHeart = 1,
+    CityHeart = 2,
+    CityLevel = 3,
+    CityUnlock = 4,
+    CityFundingCompleted = 5,
 }
 
 public enum RewardActionType
@@ -404,6 +408,7 @@ public sealed class ProductData
 public sealed class BulkOrderData
 {
     public int id;
+    public int cityId;
     public int shopLevel;
     public int maxOrder;
     public int firstOrderCondition;
@@ -631,8 +636,6 @@ public sealed class ScrollGameStageDifficultyData
 public sealed class CityData
 {
     public int id;
-    public int needHeart;
-    public int scriptId;
     public string prefabName;
     public string Name => name;
     public string name;