diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs index 2c17fe2e..690d1b24 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs @@ -19,7 +19,7 @@ public class CornFieldReinforcement : MonoBehaviour private void Start() { compositeDisposable.AddTo(this); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Remove(CornFieldReinforcementDataTypeTag); LocalCacheManager.Remove(CornFieldReinforcementDataTag); diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs index 6c0b56ac..586a7268 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs @@ -55,7 +55,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour default: throw new ArgumentOutOfRangeException(); } - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); @@ -66,7 +66,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour }).AddTo(this); purchaseButton.OnClickAsObservable() .Merge(releaseButton.OnClickAsObservable()) - .Subscribe(_ => + .Take(1) + .Subscribe(_ => { }, () => { // 購入処理 callback?.Invoke(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 3543065f..689ec0cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -35,7 +35,7 @@ public class BulkOrder : MonoBehaviour private void Start() { - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs index 2aa8998a..93f179a5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -32,7 +32,7 @@ public class BulkOrderAchievedView : MonoBehaviour messageText.text = messageList.First(data => data.id == gameData.OrderTextId).thanksText; orderCharacterImage.sprite = bulkOrderCharacter.GetThanksIcon(gameData.OrderIconIndex); } - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { if (LocalCacheManager.Load(BulkOrder.AchievedCallbackTag, null) is Action callback) { diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs index 68d8d48b..3c0b95c4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs @@ -21,7 +21,7 @@ public class BulkOrderCancelView : MonoBehaviour coinText.text = orderData.rewardCoin.ToString(); heartText.text = orderData.rewardHeart.ToString(); } - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); @@ -30,7 +30,7 @@ public class BulkOrderCancelView : MonoBehaviour TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderCancel); }); }).AddTo(this); - cancelButton.OnClickAsObservable().Subscribe(_ => + cancelButton.OnClickAsObservable().Take(1).Subscribe(_ => { if (LocalCacheManager.Load(BulkOrder.CancelCallbackTag, null) is Action callback) { diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs index f8ef649b..ff77445f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -64,7 +64,7 @@ public class BulkOrderNotifyView : MonoBehaviour itemView3.SetActive(false); } } - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index e251225c..8b96e619 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -43,7 +43,7 @@ public class Information : MonoBehaviour private void Start() { - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs index 5e59eb2f..b370492f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs @@ -18,7 +18,7 @@ public class MissionCompleteView : MonoBehaviour { var (missionData, callback) = LocalCacheManager.Load< (MissionData, Action)>(MissionManager.MissionDataTag); LocalCacheManager.Remove(MissionManager.MissionDataTag); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { callback?.Invoke(); transform.SetLocalScale(0); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index 580d966e..b671bb16 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -22,7 +22,7 @@ public class MissionManager : MonoBehaviour private void Start() { - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Remove(MissionDataTag); transform.SetLocalScale(0); diff --git a/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs b/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs index ab3504a4..ee0b9afe 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs @@ -19,7 +19,7 @@ namespace MyGame.Scenes.Settings.Scripts private void Start() { - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { SoundManager.Instance.SaveVolumeBGM(); SoundManager.Instance.SaveVolumeSE(); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index 45460ff8..bf766b1f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -24,7 +24,7 @@ public class ShopLevelUp : MonoBehaviour var shopLevel = LocalCacheManager.Load(DataTag); var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); var targetScriptList = scriptList.Where(data => data.id == shopLevel).ToList(); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs index dc89ab24..3ce1d8b2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs @@ -26,7 +26,7 @@ public class TankDetailView : MonoBehaviour private void Start() { var data = LocalCacheManager.Load<(int tankNum, int totalStock, StorageTank tankData, ProductData productData, List<(ProductRarity rarity, int price, int stock)> raritySummaryData)>(TankDetailDataTag); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs index eeb9d40c..f1b668b3 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs @@ -25,7 +25,7 @@ public class TastingView : MonoBehaviour packageImageTarget.DestroyAllChildrens(); Instantiate(x.productData.GetIconPrefab(), packageImageTarget); }).AddTo(this); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.5f, () => diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 44a54ce6..afb2501a 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -65,7 +65,7 @@ public class RecipeDetailView : MonoBehaviour } } - cancelButton.OnClickAsObservable().Subscribe(_ => + cancelButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); @@ -76,7 +76,7 @@ public class RecipeDetailView : MonoBehaviour }); }).AddTo(this); - nextButton.OnClickAsObservable().Subscribe(_ => + nextButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value); // 消費 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs index b82ea051..7ea19498 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -21,7 +21,7 @@ public class RecipeSelectDialog : MonoBehaviour void Start() { var gameData = GameDataManager.GameData; - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs index 79a73562..0fb0102a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs @@ -19,7 +19,7 @@ public class ShopItemDetailView : MonoBehaviour { var data = LocalCacheManager.Load(ItemDetailTag); SetData(data); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs index d4b5f4b8..66b15e1e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs @@ -43,7 +43,7 @@ public class ShopItemPurchaseView : MonoBehaviour var data = LocalCacheManager.Load<(ShopData shopData, int stockCount)>(ItemPurchaseTag); LocalCacheManager.Remove(ItemPurchaseTag); SetData(data.shopData, data.stockCount); - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); transform.SetLocalScale(0); @@ -53,7 +53,7 @@ public class ShopItemPurchaseView : MonoBehaviour TransitionManager.Instance.UnloadScene(GameScenes.Purchase); }); }).AddTo(this); - purchaseOnButton.OnClickAsObservable().Subscribe(_ => + purchaseOnButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Load>(PurchaseCallbackTag, null)?.Invoke(currentCount.Value); transform.SetLocalScale(0); diff --git a/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs b/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs index 79c5ef33..97d48265 100644 --- a/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs +++ b/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs @@ -16,6 +16,7 @@ public sealed class ApplicationExitConfirmDialogManager : MonoBehaviour { backButton.OnClickAsObservable() .Merge(closeButton.OnClickAsObservable()) + .Take(1) .Subscribe(_ => { transform.parent.SetLocalScale(0); diff --git a/popcorn/Assets/MyGame/Scripts/VideoFailToLoadDialog.cs b/popcorn/Assets/MyGame/Scripts/VideoFailToLoadDialog.cs index 17bed5dc..de7b5afb 100644 --- a/popcorn/Assets/MyGame/Scripts/VideoFailToLoadDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/VideoFailToLoadDialog.cs @@ -15,7 +15,7 @@ namespace MyGame.Scripts private void Start() { - closeButton.OnClickAsObservable().Subscribe(_ => + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger);