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

カスタマイズ機能修正

This commit is contained in:
kimura 2022-05-19 15:08:42 +09:00
parent fe48169373
commit 90a5b39aaa
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,19 @@ 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<int> levelNotify = new Subject<int>();
private void Start() private void Start()
{ {
levelNotify.AddTo(this);
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet); var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet);
var customizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeLevelData>(Const.ShopCustomizeLevelDataSheet); #if UNITY_EDITOR
var customizeBonusList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeBonusData>(Const.ShopCustomizeBonusDataSheet); Debug.Log($@"
coin {gameData.ShopCustomizeCoin}
myItems {string.Join(",", gameData.ShopCustomizeMyItems.Select(x => x.ToString()))}
");
#endif
if (!gameData.FinishedFlags.HasFlag(TutorialFlag.ShopCustomize)) if (!gameData.FinishedFlags.HasFlag(TutorialFlag.ShopCustomize))
{ {
@ -67,6 +74,13 @@ namespace MyGame.Scenes.marketing.Scripts
else else
{ {
item.SetState(ShopCustomizeItemState.Lock); item.SetState(ShopCustomizeItemState.Lock);
levelNotify.Distinct()
.Where(x => x >= customizeData.level)
.Take(1)
.Subscribe(x =>
{
item.SetState(ShopCustomizeItemState.Unlock);
}).AddTo(this);
} }
item.SelectObservable.Merge(selectSubject).Subscribe(_ => item.SelectObservable.Merge(selectSubject).Subscribe(_ =>
@ -118,6 +132,7 @@ namespace MyGame.Scenes.marketing.Scripts
var customizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeLevelData>(Const.ShopCustomizeLevelDataSheet); var customizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeLevelData>(Const.ShopCustomizeLevelDataSheet);
var level = customizeLevelList.LastOrDefault(data => data.point <= gameData.ShopCustomizePoint)?.level ?? 1; var level = customizeLevelList.LastOrDefault(data => data.point <= gameData.ShopCustomizePoint)?.level ?? 1;
levelNotify.OnNext(level);
gameData.ShopCustomizeLevel = level; gameData.ShopCustomizeLevel = level;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
} }