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

fix result

This commit is contained in:
kimura 2022-06-28 14:50:49 +09:00
parent 930234b0d1
commit 1ece653773
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab
View File

@ -1115,7 +1115,7 @@ MonoBehaviour:
materialAmountText: {fileID: 5034752974931089885} materialAmountText: {fileID: 5034752974931089885}
detailOffset: 250 detailOffset: 250
progressDuration: 1.5 progressDuration: 1.5
waitButtonActive: 3 waitButtonActive: 1.5
waitProgress: 1.5 waitProgress: 1.5
--- !u!1 &5034752975247083714 --- !u!1 &5034752975247083714
GameObject: GameObject:

17
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs
View File

@ -82,7 +82,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
#if UNITY_EDITOR #if UNITY_EDITOR
recipePlaceData = prevPlaceScore < recipePlaceData.needScore ? recipePlaceData : null; recipePlaceData = prevPlaceScore < recipePlaceData.needScore ? recipePlaceData : null;
#endif #endif
if (recipePlaceData != null && placeScoreData.Score >= recipePlaceData.needScore) var hasRecipeData = recipePlaceData != null;
var achievedRecipe = hasRecipeData && placeScoreData.Score >= recipePlaceData.needScore;
if (achievedRecipe)
{ {
if (!gameData.MyRecipes.Contains(recipePlaceData.recipeId)) if (!gameData.MyRecipes.Contains(recipePlaceData.recipeId))
{ {
@ -96,30 +98,25 @@ namespace MyGame.Scenes.MiniGame.Scripts
gameObject.SetActive(true); gameObject.SetActive(true);
titleObject.SetActive(true); titleObject.SetActive(true);
detailObject.SetActive(true); detailObject.SetActive(true);
detailObject.transform.SetLocalPositionY(hasRecipeData ? defaultDetailObjectPos.y : detailOffset);
// 商品獲得済みならレシピ非表示 // 商品獲得済みならレシピ非表示
if (recipePlaceData is null) if (hasRecipeData)
{ {
// detailの表示位置変更
detailObject.transform.SetLocalPositionY(detailOffset);
}
else
{
detailObject.transform.SetLocalPositionY(defaultDetailObjectPos.y);
meterObject.SetActive(true); meterObject.SetActive(true);
SetProgress((float)prevPlaceScore / recipePlaceData.needScore, false); SetProgress((float)prevPlaceScore / recipePlaceData.needScore, false);
this.CallWaitForSeconds(waitProgress, () => this.CallWaitForSeconds(waitProgress, () =>
{ {
SetProgress((float)placeScoreData.Score / recipePlaceData.needScore, true, () => SetProgress((float)placeScoreData.Score / recipePlaceData.needScore, true, () =>
{ {
if (placeScoreData.Score >= recipePlaceData.needScore) if (achievedRecipe)
{ {
ShopItemExchangeView.ShowDialog(shopDataList.FirstOrDefault(data => data.itemId == recipePlaceData.recipeId && data.Category == ItemCategory.Recipe)); ShopItemExchangeView.ShowDialog(shopDataList.FirstOrDefault(data => data.itemId == recipePlaceData.recipeId && data.Category == ItemCategory.Recipe));
} }
}); });
}); });
} }
this.CallWaitForSeconds(waitButtonActive, () => this.CallWaitForSeconds(hasRecipeData ? waitProgress + waitButtonActive : waitButtonActive, () =>
{ {
closeButton.gameObject.SetActive(true); closeButton.gameObject.SetActive(true);
retryButton.gameObject.SetActive(true); retryButton.gameObject.SetActive(true);