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

popcorn/Assets/MyGame/Resources/Data/BulkOrderData.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a4d8d401525e0469dbb66bee75273670
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Resources/Data/BulkOrderTextData.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1fa584f28cb5e453ba331ecabbe68bbb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1 +1 @@
-d6nFPZZhlYdDyGZ6n15DKpArgW5OB8V48w728pljKoWl6CVgQ1rYuvJoYP31pXeG
+DG6up9orSeH3ovydPZZH0/qgmkTfS+5nkvFvi/LynNAaP9+9LdwoaqMDJQOZQwqy

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

@@ -84,7 +84,7 @@ public class MissionManager : MonoBehaviour
             case MissionCondition.SaltSalesCount:
                 return gameData.GetTotalSalesByFlavor(2);
             default:
-                throw new ArgumentOutOfRangeException();
+                return 0;
         }
     }
 

popcorn/Assets/MyGame/Scripts/Const.cs

@@ -32,6 +32,8 @@ public static class Const {
     public static readonly string RarityDataSheet = "RarityData";
     public static readonly string FieldUpgradeDataSheet = "FieldUpgradeData";
     public static readonly string MissionDataSheet = "MissionData";
+    public static readonly string BulkOrderDataSheet = "BulkOrderData";
+    public static readonly string BulkOrderTextDataSheet = "BulkOrderTextData";
 
     // language
     public static readonly string LangJapanDataSheet = "LangJapanData";
@@ -62,6 +64,8 @@ public static class Const {
         new SheetData(Const.RarityDataSheet),
         new SheetData(Const.FieldUpgradeDataSheet),
         new SheetData(Const.MissionDataSheet),
+        new SheetData(Const.BulkOrderDataSheet),
+        new SheetData(Const.BulkOrderTextDataSheet),
     };
     public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
         new SheetData(Const.LangJapanDataSheet, "LanguageData"),

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -177,6 +177,33 @@ public sealed class ProductData
     }
 }
 
+[Serializable]
+public sealed class BulkOrderData
+{
+    public int id;
+    public int shopLevel;
+    public int maxOrder;
+    public int firstOrderCondition;
+    public int retryCondition;
+    public int productId1;
+    public int count1;
+    public int productId2;
+    public int count2;
+    public int productId3;
+    public int count3;
+    public int rewardCoin;
+    public int rewardHeart;
+}
+
+[Serializable]
+public sealed class BulkOrderTextData
+{
+    public int id;
+    public int shopLevel;
+    public string requestText;
+    public string thanksText;
+}
+
 [Serializable]
 public sealed class ShopLevelData
 {