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

試食と宣伝の排他制御追加

This commit is contained in:
kimura 2021-12-14 13:38:45 +09:00
parent 922d9b898d
commit 9a3089a4f6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerFlow.cs
View File

@ -23,6 +23,9 @@ public class CustomerFlow : MonoBehaviour
[Header("試食のお客さん出現間隔(秒)")] [Header("試食のお客さん出現間隔(秒)")]
[SerializeField] private float tastingCustomerInterval = 5f; [SerializeField] private float tastingCustomerInterval = 5f;
public float TastingCustomerInterval => tastingCustomerInterval;
private int adActiveCount = 0;
public IObservable<bool> Flow => walkerObservable.Merge(customerObservable, adWalkerObservable, tastingCustomerObservable); public IObservable<bool> Flow => walkerObservable.Merge(customerObservable, adWalkerObservable, tastingCustomerObservable);
private void Awake() private void Awake()
@ -66,8 +69,11 @@ public class CustomerFlow : MonoBehaviour
} }
#endif #endif
// 試食 // 試食
// tastingCustomerInterval毎にTastingCountを確認
var tastingTimer = Observable.Interval(TimeSpan.FromSeconds(tastingCustomerInterval)) var tastingTimer = Observable.Interval(TimeSpan.FromSeconds(tastingCustomerInterval))
.Where(_ => GameDataManager.GameData.TastingCount > 0) .Where(_ => adActiveCount <= 0) // 宣伝中判定
.Where(_ => GameDataManager.GameData.ShopStock.Count > 0) // 在庫ゼロ判定
.Where(_ => GameDataManager.GameData.TastingCount > 0) // 試食残り判定
.Publish() .Publish()
.RefCount(); .RefCount();
// 試食残りカウントを減らす // 試食残りカウントを減らす
@ -84,8 +90,10 @@ public class CustomerFlow : MonoBehaviour
{ {
var timerObservable = AdWalkerTimer().Publish().RefCount(); var timerObservable = AdWalkerTimer().Publish().RefCount();
adStartObservable.OnNext(timerObservable); adStartObservable.OnNext(timerObservable);
adActiveCount++;
timerObservable.Subscribe(_ => { }, () => timerObservable.Subscribe(_ => { }, () =>
{ {
adActiveCount--;
onComplete?.Invoke(); onComplete?.Invoke();
}).AddTo(this); }).AddTo(this);
} }