畑機械のアイコン指定修正/ 強化後Popupを閉じるよう修正

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

@@ -1 +1 @@
-DH/brbZswHxm1FXtLfhjp/6y1ufI9CTrzvSHJj5ZRtRvQIcbB8HO/RSDW8VB9YY9
+yWu/0KPlF9hB+Gay3WkE524M5fNj6jVpBq1gD0tsZK21RGIPwoazt4Hd5KKtZiSi

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

@@ -1 +1 @@
-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
+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

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

@@ -1 +1 @@
-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
+Ac7kiQiXA5RnXWMBSrSn7XGw6MzEXh7V5gBTEPcQCWgIq0J17qLhI6QhusXkqiB2DZTuPDijVK5prJj8IVU7dxBZx50ArbP1d8ug0YPYrBjkva+MB93WFEHzDWf4vpRx3o91/MMWwEq7j1S6AewXfemiE3q3+Junt74Aar4l0OAiMwdauDkXx5JCUcaD6wqLNmU7SJd2M8OMsUk4kCN1/7fw4Q08HJp//tx8oPowLQckQwg5m7WeGaAlOV112ru9ZBFz9B7XPq/jgDfdTs/bB94KpcDXq6oOenJvnE0XYr3CJ9SePX4ERNBDL3sZtoSRHOveOZlq0yToqLXkkoVt4CDd8brtDsH5KZYa0kmCmR+7qDVimoqcrLErfe8gHyt+sT/6NfGsff5Dmtt1YiAwYW/Fq6p84V6eWZyfB4h9OlBUYosVxv8D9D9JIOBFIibGO7iS0Op1vy8DG86fZ4FhFYnhdc9Zc/9zmkNnlntGjsEI5coWV1WJGnQTWkkQSbNw+mRzBLEXpGopWsqIq7wDTfyUYjtOCxCjfwtzEZ91Hfi0FJEQeXMC3ItuGadovXMc6IFOEH/nUYsMgxoyCyZzom9lQziTGpG0TiWs0XHHSgIeq0xTQGQvjwnQgJS/ORemE6+drU9zFbVdu0GLB1/q+AZsX+EfGiCy+f+xvgap+7zQVAkzvHey+sUm71j2RCWwo1vlTxSbfhrOrScy1AZqGNIjjT5qMFdGWOt0hHbI6cEouCcSdTbWPOMbSKcoXsverWVnQYt3mzZQpn4OTRlFlQ9+JmksK/QjtSKpuFgr+6mNab2DP1Ylme+N0Kuty1QlOuPiVEFuiQspoceJXfjIixdIMcI0EqTLlaBCBGw6aW6qXhPFA3xIPbSPrk2v3UvStUP8ltmwPh+d04TIuKPrcgXTCcq+4MA2LS03HMDV/Z0HPZAzio5bZMr1o2VAXkEGzhzOrsZdYkeqbhq64Qfgs+l2gc5sAB14Kv47bjaH8phGdPWN4aFfA4NAxjAji2MOWa5Sk3mJUX55xjKdyTlEMg==

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs

@@ -62,6 +62,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
             this.CallWaitForSeconds(.25f, () =>
             {
                 TransitionManager.Instance.UnloadScene(GameScenes.ReinforcementDetail);
+                TransitionManager.Instance.UnloadScene(GameScenes.Reinforcement);
             });
         }).AddTo(this);
         purchaseButton.OnClickAsObservable()
@@ -75,6 +76,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
                 this.CallWaitForSeconds(.25f, () =>
                 {
                     TransitionManager.Instance.UnloadScene(GameScenes.ReinforcementDetail);
+                    TransitionManager.Instance.UnloadScene(GameScenes.Reinforcement);
                 });
             }).AddTo(this);
     }

popcorn/Assets/MyGame/Scripts/Const.cs

@@ -7,6 +7,7 @@ public static class Const {
     public static readonly string DefaultAppVersion = "0.1.0";
 
     // parameter
+    public static readonly int DefaultMachineLevel = 1;
     public static readonly int DefaultRecipeId = 1;
     public static readonly int DefaultPanId = 1;
     public static readonly int SpecialShopLevel = 9999;

popcorn/Assets/MyGame/Scripts/GameDataManager.cs

@@ -64,7 +64,7 @@ public sealed class GameData {
     // [DataMember(Name = "Data13")] 
     
     [DataMember(Name = "Data14")] 
-    public int MachineLevel = 1;
+    public int MachineLevel;
     [DataMember(Name = "Data15")] 
     public List<SeedlingProgressData> SeedlingDataList = new List<SeedlingProgressData>();
     [DataMember(Name = "Data16")] 
@@ -222,6 +222,11 @@ public sealed class GameData {
         {
             Pans = new[] {Const.DefaultPanId};
         }
+
+        if (MachineLevel == 0)
+        {
+            MachineLevel = Const.DefaultMachineLevel;
+        }
         // 追加した要素の初期化用
         // TODO Release前にまっさらにする
     }