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

店舗レベルの未使用データをマスクするように修正/ レシピ開放時に参照する変数を変更

This commit is contained in:
kimura 2021-11-11 15:38:28 +09:00
parent 5970912fea
commit c34eedd172
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
kdizmu3XG06QKMPtl9y7oL5PAlWIiub5fTdi2UD8aXRZ1JnzC6IgsWY3UfI2UPSq oZHfCs7SEPFZ7PATuTmLLCXSyHiCLqSbOQJqvzKURGDSKRP9QoHAwCQ2BfWEN7Ta

2
popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt
View File

@ -1 +1 @@
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

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

@ -68,6 +68,7 @@ public class Information : MonoBehaviour
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
shopLevelList = shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet); var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0]; var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0];
var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1); var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1);

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

@ -23,6 +23,7 @@ public class CustomerFlow : MonoBehaviour
adStartObservable.AddTo(this); adStartObservable.AddTo(this);
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
shopLevelList = shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
// 10分間期待値を来客の間隔に変換 // 10分間期待値を来客の間隔に変換
var intervalList = shopLevelList.Select(shopLevel => (heart: shopLevel.heart, interval: 60f * 10 / shopLevel.customer)); var intervalList = shopLevelList.Select(shopLevel => (heart: shopLevel.heart, interval: 60f * 10 / shopLevel.customer));

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

@ -46,7 +46,7 @@ public class RecipeSelectDialog : MonoBehaviour
{ {
hasRecipe = true; hasRecipe = true;
} }
else if (productData.shopLevel <= HeartMeter.Instance.ShopLevel.Value) else if (productData.shopLevel <= gameData.ViewedShopLevel)
{ {
// レシピ開放 // レシピ開放
gameData.MyRecipes = new List<int>(gameData.MyRecipes){productData.id}.ToArray(); gameData.MyRecipes = new List<int>(gameData.MyRecipes){productData.id}.ToArray();

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

@ -29,6 +29,7 @@ public class GameDataObserver : SingletonMonoBehaviour<GameDataObserver>
checkInterval.AddTo(this); checkInterval.AddTo(this);
updateMissionAchieved.AddTo(this); updateMissionAchieved.AddTo(this);
var levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
levelList = levelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
checkInterval.Select(x => Observable.Interval(TimeSpan.FromSeconds(x))).Switch().Subscribe(_ => checkInterval.Select(x => Observable.Interval(TimeSpan.FromSeconds(x))).Switch().Subscribe(_ =>
{ {
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;

9
popcorn/Assets/MyGame/Scripts/HeartMeter.cs
View File

@ -15,8 +15,8 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
private Coroutine coroutine; private Coroutine coroutine;
private List<ShopLevelData> shopLevelList = new List<ShopLevelData>(); private List<ShopLevelData> shopLevelList = new List<ShopLevelData>();
private int currentHeartCount; private int currentHeartCount;
private int maxLevel;
private readonly ReactiveProperty<float> viewHeartCount = new ReactiveProperty<float>(); private readonly ReactiveProperty<float> viewHeartCount = new ReactiveProperty<float>();
public IReadOnlyReactiveProperty<int> ShopLevel => shopLevel;
private readonly ReactiveProperty<int> shopLevel = new ReactiveProperty<int>(); private readonly ReactiveProperty<int> shopLevel = new ReactiveProperty<int>();
private CompositeDisposable compositeDisposable = new CompositeDisposable(); private CompositeDisposable compositeDisposable = new CompositeDisposable();
@ -39,10 +39,12 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
{ {
compositeDisposable.Clear(); compositeDisposable.Clear();
shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
shopLevelList = shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
maxLevel = shopLevelList.Last().shopLevel;
viewHeartCount.SkipLatestValueOnSubscribe().Subscribe(heartCount => viewHeartCount.SkipLatestValueOnSubscribe().Subscribe(heartCount =>
{ {
if (shopLevelList.Count == shopLevel.Value) if (shopLevel.Value == maxLevel)
{ {
slider.value = 1; slider.value = 1;
} }
@ -63,7 +65,6 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
public void SetShopLevel(int newShopLevel, bool animate = false) public void SetShopLevel(int newShopLevel, bool animate = false)
{ {
var maxLevel = shopLevelList.Last().shopLevel;
var level = Mathf.Min(newShopLevel, maxLevel); var level = Mathf.Min(newShopLevel, maxLevel);
if (level == maxLevel) if (level == maxLevel)
{ {