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

カスタマイズ機能修正

This commit is contained in:
kimura 2022-05-20 11:46:31 +09:00
parent 89476907b8
commit 91e0ffbf09
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomize.cs
View File

@ -12,11 +12,8 @@ namespace MyGame.Scenes.marketing.Scripts
[SerializeField] private MarketView marketView; [SerializeField] private MarketView marketView;
[SerializeField] private ShopCustomizeView customizeView; [SerializeField] private ShopCustomizeView customizeView;
[SerializeField] private ShopCustomizeSelector customizeSelector; [SerializeField] private ShopCustomizeSelector customizeSelector;
private readonly Subject<Unit> purchasedNotify = new Subject<Unit>();
private void Start() private void Start()
{ {
purchasedNotify.AddTo(this);
SoundManager.Instance.PlayBGM("bgm_marketing"); SoundManager.Instance.PlayBGM("bgm_marketing");
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet); var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet);
@ -70,20 +67,13 @@ myItems {string.Join(",", gameData.ShopCustomizeMyItems.Select(x => x.ToString()
{ {
item.SetState(ShopCustomizeItemState.Purchased); item.SetState(ShopCustomizeItemState.Purchased);
} }
else if (gameData.ShopCustomizeLevel >= customizeData.level) else if (gameData.ViewedShopLevel >= customizeData.level)
{ {
item.SetState(ShopCustomizeItemState.Unlock); item.SetState(ShopCustomizeItemState.Unlock);
} }
else else
{ {
item.SetState(ShopCustomizeItemState.Lock); item.SetState(ShopCustomizeItemState.Lock);
purchasedNotify.Distinct()
.Where(_ => gameData.ShopCustomizeLevel >= customizeData.level)
.Take(1)
.Subscribe(x =>
{
item.SetState(ShopCustomizeItemState.Unlock);
}).AddTo(this);
} }
item.SelectObservable.Merge(selectSubject).Subscribe(_ => item.SelectObservable.Merge(selectSubject).Subscribe(_ =>
@ -139,7 +129,6 @@ myItems {string.Join(",", gameData.ShopCustomizeMyItems.Select(x => x.ToString()
gameData.ShopCustomizeLevel = level; gameData.ShopCustomizeLevel = level;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
customizeView.SetLevel(gameData.ShopCustomizeLevel); customizeView.SetLevel(gameData.ShopCustomizeLevel);
purchasedNotify.OnNext(Unit.Default);
} }
/* /*