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

素材消費処理をpublic化/ 続けて調理する場合に使用

This commit is contained in:
kimura 2021-11-24 15:21:28 +09:00
parent 59b0f85d2f
commit ad0ea26505
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
View File

@ -127,6 +127,7 @@ public class CookingResult : MonoBehaviour
{ {
// 獲得、遷移 // 獲得、遷移
AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal); AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal);
RecipeDetailView.ConsumeMaterial(productData);
Market.Instance.IsPause.Value = false; Market.Instance.IsPause.Value = false;
SoundManager.Instance.ChangeVolumeUniqueBGM(1f); SoundManager.Instance.ChangeVolumeUniqueBGM(1f);
TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); TransitionManager.Instance.UnloadScene(GameScenes.CookingResults);

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

@ -80,16 +80,7 @@ public class RecipeDetailView : MonoBehaviour
{ {
LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value); LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value);
// 消費 // 消費
gameData.CornSeed -= data.MaterialList[0].amount; ConsumeMaterial(data);
if (gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id) is MaterialData material1)
{
material1.Amount -= data.MaterialList[1].amount;
}
if (data.GetMaterialCount() == 3 && gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id) is MaterialData material2)
{
material2.Amount -= data.MaterialList[2].amount;
}
GameDataManager.SaveGameData();
TransitionManager.Instance.LoadScene(GameScenes.Cooking); TransitionManager.Instance.LoadScene(GameScenes.Cooking);
}).AddTo(this); }).AddTo(this);
@ -116,6 +107,21 @@ public class RecipeDetailView : MonoBehaviour
} }
} }
public static void ConsumeMaterial(ProductData productData)
{
var gameData = GameDataManager.GameData;
gameData.CornSeed -= productData.MaterialList[0].amount;
if (gameData.Material.FirstOrDefault(x => x.Id == productData.MaterialList[1].id) is MaterialData material1)
{
material1.Amount -= productData.MaterialList[1].amount;
}
if (productData.GetMaterialCount() == 3 && gameData.Material.FirstOrDefault(x => x.Id == productData.MaterialList[2].id) is MaterialData material2)
{
material2.Amount -= productData.MaterialList[2].amount;
}
GameDataManager.SaveGameData();
}
public void SetRecipe(ProductData data, ProductViewType viewType) public void SetRecipe(ProductData data, ProductViewType viewType)
{ {
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;