yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1度のみ使用されるボタンにタップ制限追加

This commit is contained in:
kimura 2021-10-29 10:23:42 +09:00
parent 822e194979
commit cd4f408ad6
19 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs
View File

@ -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);

5
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs
View File

@ -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();

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
View File

@ -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<Action>(BulkOrder.AchievedCallbackTag, null) is Action callback)
{

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs
View File

@ -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<Action>(BulkOrder.CancelCallbackTag, null) is Action callback)
{

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/Settings/Scripts/SettingDialog.cs
View File

@ -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();

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs
View File

@ -24,7 +24,7 @@ public class ShopLevelUp : MonoBehaviour
var shopLevel = LocalCacheManager.Load<int>(DataTag);
var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(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);

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs
View File

@ -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, () =>

4
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
View File

@ -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);
// 消費

2
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs
View File

@ -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);

2
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs
View File

@ -19,7 +19,7 @@ public class ShopItemDetailView : MonoBehaviour
{
var data = LocalCacheManager.Load<ShopData>(ItemDetailTag);
SetData(data);
closeButton.OnClickAsObservable().Subscribe(_ =>
closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
transform.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger);

4
popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs
View File

@ -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<Action>(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<Action<int>>(PurchaseCallbackTag, null)?.Invoke(currentCount.Value);
transform.SetLocalScale(0);

1
popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs
View File

@ -16,6 +16,7 @@ public sealed class ApplicationExitConfirmDialogManager : MonoBehaviour
{
backButton.OnClickAsObservable()
.Merge(closeButton.OnClickAsObservable())
.Take(1)
.Subscribe(_ =>
{
transform.parent.SetLocalScale(0);

2
popcorn/Assets/MyGame/Scripts/VideoFailToLoadDialog.cs
View File

@ -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);