Merge branch 'feture/update_ver1.1.0' of bitbucket.org:usaya/popcorn into feture/update_ver1.1.0

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

@@ -1 +1 @@
-+v3OI9XtIFCNekPxrkidi3J3p7ZEJc1OTMiePYxzePploIy3AAndU23cXv0bH68e
+hIwB0Z1HjYg91BzMbYeKMwmkJdXASDzSCIhLmhd0XymiK6YfcOk+neSeux6yb5Nv

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

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

popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab

@@ -66,6 +66,11 @@ MonoBehaviour:
     type: 3}
   coinCount: 5
   heartCount: 5
+  minCurve: 100
+  maxCurve: 400
+  waitTime: 0.3
+  curveTime: 0.5
+  linerTime: 0.3
 --- !u!1 &137127162501263386
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -16,6 +16,7 @@ namespace MyGame.Scenes.Main.Scripts
         [SerializeField] private int heartCount = 5;
         [SerializeField] private float minCurve = 100f;
         [SerializeField] private float maxCurve = 400f;
+        [SerializeField] private float waitTime = .3f;
         [SerializeField] private float curveTime = .5f;
         [SerializeField] private float linerTime = .5f;
         private readonly Subject<Unit> effectCompleteSubject = new Subject<Unit>();
@@ -77,7 +78,7 @@ namespace MyGame.Scenes.Main.Scripts
             
             var direction = Random.value <= .5f ? -1 : 1;
             var depth = Random.Range(minCurve, maxCurve);
-            this.CallWaitForSeconds(beginDuration, () =>
+            this.CallWaitForSeconds(waitTime, () =>
             {
                 animator.Play(nameHash, 0, beginNormalizedTime);
                 animator.speed = 0f;

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

@@ -127,7 +127,12 @@ public class KitchenManager : MonoBehaviour
             .DelaySubscription(TimeSpan.FromSeconds(.4f))
             .Subscribe(_ =>
             {
-                ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1, CheckOrderAndSetPhoneTap);
+                kitchenView.SetActive(false);
+                ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1, () =>
+                {
+                    kitchenView.SetActive(true);
+                    CheckOrderAndSetPhoneTap();
+                });
             }).AddTo(this);
 
         GameDataObserver.Instance.HeartObserver

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

@@ -115,4 +115,10 @@ public class KitchenView : MonoBehaviour
         SetPinkMove();
         blueBrotherAnimator.SetTrigger(Flame);
     }
+
+    public void SetActive(bool active)
+    {
+        blueBrotherAnimator.transform.SetLocalScale(active ? 1f : 0f);
+        pinkBrotherAnimator.transform.SetLocalScale(active ? 1f : 0f);
+    }
 }

popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs

@@ -9,6 +9,12 @@ public class BrotherBlueView : MonoBehaviour
     private static readonly int CleaningB = Animator.StringToHash("CleaningB");
     private static readonly int MoveSideways = Animator.StringToHash("MoveSideways");
     private static readonly int[] CloseTriggerArray = {CleaningA, CleaningB, MoveSideways};
+    private Vector3 initScale;
+
+    private void Awake()
+    {
+        initScale = transform.localScale;
+    }
 
     public void SellAction()
     {
@@ -24,4 +30,9 @@ public class BrotherBlueView : MonoBehaviour
     {
         animator.SetTrigger(CloseTriggerArray.RandomChoose());
     }
+
+    public void SetActive(bool active)
+    {
+        transform.localScale = active ? initScale : Vector3.zero;
+    }
 }

popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherPinkView.cs

@@ -263,4 +263,12 @@ public class BrotherPinkView : SingletonMonoBehaviour<BrotherPinkView>
         waitMove = false;
         SetPinkMove();
     }
+    
+    public void SetActive(bool active)
+    {
+        if (animator != null)
+        {
+            animator.transform.localScale = active ? Vector3.one : Vector3.zero;
+        }
+    }
 }

popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs

@@ -32,6 +32,7 @@ public class CustomerAnimator : MonoBehaviour
     [SerializeField] private TextMeshPro wantFlavorAmountText;
     
     private readonly ReactiveProperty<int> triggerName = new ReactiveProperty<int>();
+    public readonly ReactiveProperty<bool> IsPause = new ReactiveProperty<bool>();
 
     private void Start()
     {
@@ -40,6 +41,12 @@ public class CustomerAnimator : MonoBehaviour
         {
             animator.SetTrigger(x);
         }).AddTo(this);
+        IsPause.AddTo(this);
+        IsPause.DistinctUntilChanged().Subscribe(x =>
+        {
+            animator.speed = x ? 0f : 1f;
+            orderAnimator.speed = x ? 0f : 1f;
+        }).AddTo(this);
     }
 
     public void SetTrigger(CustomerMovingType movingType, float duration)

popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs

@@ -81,12 +81,24 @@ public class MarketManager : MonoBehaviour
         CoinManager.Instance.ChangeCoin(gameData.Coin);
         HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
 
+        market.IsPause.Subscribe(isPause =>
+        {
+            vipCustomerButtonView.IsPause.Value = isPause;
+            // ポーズ中非表示
+            blueView.SetActive(!isPause);
+            BrotherPinkView.Instance.SetActive(!isPause);
+        }).AddTo(this);
+        
         // ハートゲージがフルかつダイアログが開いていない場合レベルアップ
         HeartMeter.Instance.FulledHeart
             .DelaySubscription(TimeSpan.FromSeconds(.4f))
             .Subscribe(_ =>
             {
-                ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1);
+                market.IsPause.Value = true;
+                ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1, () =>
+                {
+                    market.IsPause.Value = false;
+                });
             }).AddTo(this);
         
         productDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
@@ -377,6 +389,8 @@ public class MarketManager : MonoBehaviour
         }).AddTo(customerObject);
         
         var customerAnimator = Instantiate(controller.CustomerPrefab, customerObject.transform);
+        // pause処理
+        market.IsPause.Subscribe(x => customerAnimator.IsPause.Value = x).AddTo(customerObject);
         controller.CurrentMovingType.Subscribe(x =>
         {
             customerAnimator.SetTrigger(x, controller.DurationDelta);

popcorn/Assets/MyGame/Scenes/marketing/Scripts/VipCustomerButtonView.cs

@@ -15,6 +15,7 @@ namespace MyGame.Scenes.marketing.Scripts
         [SerializeField] private GameObject vipSpeechBubbleObject;
         [SerializeField] private Transform vipStayPosTransform;
         [SerializeField] private float vipMoveSpeed;
+        public readonly BoolReactiveProperty IsPause = new BoolReactiveProperty();
         public IObservable<Unit> VipButton { get; private set; }
         private IDisposable timerDisposable;
         private IDisposable moveDisposable;
@@ -29,6 +30,13 @@ namespace MyGame.Scenes.marketing.Scripts
             VipButton = vipButton.OnClickAsObservable()
                 .Merge(eventTrigger.OnPointerClickAsObservable().AsUnitObservable())
                 .TakeUntilDestroy(this);
+            IsPause.AddTo(this);
+            IsPause.DistinctUntilChanged().Subscribe(x =>
+            {
+                vipSpeechBubbleObject.transform.SetLocalScale(x ? 0f : 1f);
+                buttonAnimator.speed = x ? 0f : 1f;
+                vipCustomerAnimator.speed = x ? 0f : 1f;
+            }).AddTo(this);
         }
 
         public void ShowButton(bool animated)
@@ -48,6 +56,10 @@ namespace MyGame.Scenes.marketing.Scripts
                     .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, vipStayPosTransform.localPosition) > .01f)
                     .Subscribe(_ =>
                     {
+                        if (IsPause.Value)
+                        {
+                            return;
+                        }
                         var localPosition = vipTransform.localPosition;
                         localPosition = Vector2.MoveTowards(localPosition, vipStayPosTransform.localPosition, vipMoveSpeed * Time.deltaTime);
                         vipTransform.localPosition = localPosition.SetZ(initialPos.z);
@@ -82,6 +94,10 @@ namespace MyGame.Scenes.marketing.Scripts
                 .TakeWhile(_ => Vector2.Distance(vipTransform.localPosition, initialPos) > .01f)
                 .Subscribe(_ =>
                 {
+                    if (IsPause.Value)
+                    {
+                        return;
+                    }
                     var localPosition = vipTransform.localPosition;
                     localPosition = Vector2.MoveTowards(localPosition, initialPos, vipMoveSpeed * Time.deltaTime);
                     vipTransform.localPosition = localPosition.SetZ(initialPos.z);

popcorn/Assets/MyGame/Scripts/Const.cs

@@ -11,7 +11,7 @@ public static class Const {
     public static readonly int DefaultRecipeId = 1;
     public static readonly int DefaultPanId = 1;
     public static readonly int ShopTankId = 20;
-    public static readonly int MaxShopLevel = 14;
+    public static readonly int MaxShopLevel = 16;
     public static readonly int TankCapacity = 20;
     public static readonly int SpecialShopLevel = 9999;
     public static readonly int SpecialCategory = 9999;

popcorn/Assets/Resources/I2Languages.asset

@@ -1543,9 +1543,9 @@ MonoBehaviour:
       TermType: 0
       Description: 
       Languages:
-      - "\u5E97\u8217\u30EC\u30D9\u30EB15\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D"
+      - "\u5E97\u8217\u30EC\u30D9\u30EB17\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D"
-      - "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u523015\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01"
+      - "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u523017\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01"
-      - "\u5E97\u92EA\u7B49\u7D1A\u5728\u9054\u523015\u7D1A\u4EE5\u5F8C\u6B61\u8FCE\u60A8\u7B49\u5F85\u6211\u5011\u7684\u904A\u6232\u5167\u5BB9\u66F4\u65B0\uFF01"
+      - "\u5E97\u92EA\u7B49\u7D1A\u5728\u9054\u523017\u7D1A\u4EE5\u5F8C\u6B61\u8FCE\u60A8\u7B49\u5F85\u6211\u5011\u7684\u904A\u6232\u5167\u5BB9\u66F4\u65B0\uFF01"
       - LevelUpdateComingSoon
       Flags: 00000000
       Languages_Touch: []
@@ -6093,7 +6093,7 @@ MonoBehaviour:
       TermType: 0
       Description: 
       Languages:
-      - "\u3055\u3063\u304D\u306E\u304A\u5BA2\u3055\u3093\u3001\u98DB\u884C\u6A5F\u30672\u6642\u9593\u3082\u304B\u3051\u3066\n\u50D5\u305F\u3061\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u8CB7\u3044\u306B\u6765\u3066\u304F\u308C\u305F\u3093\u3060\u3063\u3066\uFF01"
+      - "\u3055\u3063\u304D\u306E\u304A\u5BA2\u3055\u3093\u3001\u98DB\u884C\u6A5F\u30672\u6642\u9593\u3082\u304B\u3051\u3066\n\u50D5\u305F\u3061\u306E\u304A\u5E97\u307E\u3067\u8CB7\u3044\u306B\u6765\u3066\u304F\u308C\u305F\u3093\u3060\u3063\u3066\uFF01"
       - 
       - 
       - BrotherScript10084
@@ -9090,7 +9090,7 @@ MonoBehaviour:
     Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec
     Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8
     Google_SpreadsheetName: I2Loc popcorn Localization
-    Google_LastUpdatedVersion: 1644473644101
+    Google_LastUpdatedVersion: 1644478360263
     Google_Password: change_this
     GoogleUpdateFrequency: 1
     GoogleInEditorCheckFrequency: 1