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

レシピUI修正

This commit is contained in:
kimura 2021-09-24 17:31:10 +09:00
parent b54c87d16f
commit 699d9dfc8d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,9 @@ public class RecipeDetailView : MonoBehaviour
var isPassedAmount = CheckAmount(data); var isPassedAmount = CheckAmount(data);
var isPassedTank = CheckTank(data); var isPassedTank = CheckTank(data);
nextButton.interactable = isPassedAmount && isPassedTank; nextButton.interactable = isPassedAmount && isPassedTank;
panSelector.gameObject.SetActive(isPassedTank); panSelector.gameObject.SetActive(!isPassedAmount || isPassedTank);
disabledNextButton.SetActive(!isPassedAmount || !isPassedTank); disabledNextButton.SetActive(!isPassedAmount || !isPassedTank);
tankCaution.SetActive(!isPassedTank); tankCaution.SetActive(isPassedAmount && !isPassedTank);
} }
public void SetRecipe(ProductData data) public void SetRecipe(ProductData data)

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

@ -13,6 +13,7 @@ public class RecipeSelectDialog : MonoBehaviour
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
var gameData = GameDataManager.GameData;
closeButton.OnClickAsObservable().Subscribe(_ => closeButton.OnClickAsObservable().Subscribe(_ =>
{ {
TransitionManager.Instance.UnloadScene(GameScenes.Recipe); TransitionManager.Instance.UnloadScene(GameScenes.Recipe);
@ -27,7 +28,7 @@ public class RecipeSelectDialog : MonoBehaviour
var view = Instantiate(recipePrefab, content.transform); var view = Instantiate(recipePrefab, content.transform);
view.SetRecipe(productData); view.SetRecipe(productData);
// 所持レシピ確認 // 所持レシピ確認
if (GameDataManager.GameData.MyRecipes.Contains(productData.id)) if (gameData.MyRecipes.Contains(productData.id) || productData.shopLevel <= HeartMeter.Instance.ShopLevel.Value)
{ {
view.SetLockPanel(false); view.SetLockPanel(false);
view.RecipeClickObservable.Subscribe(_ => view.RecipeClickObservable.Subscribe(_ =>