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

キッチンチュートリアル2追加

This commit is contained in:
kimura 2021-10-26 14:04:23 +09:00
parent 7c4bbea1ff
commit 2f1ab7341c
3 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -31,7 +31,7 @@ public class KitchenManager : MonoBehaviour
{ {
RecipeSelectDialog.ShowDialog(ProductViewType.Default, () => RecipeSelectDialog.ShowDialog(ProductViewType.Default, () =>
{ {
if (gameData.isFirstPlay) if (gameData.isFirstPlay && TutorialManager.Instance.Index == 1)
{ {
var go = FindObjectOfType<FooterManager>().transform; var go = FindObjectOfType<FooterManager>().transform;
go.transform.FindChildByName("Button_field", t => go.transform.FindChildByName("Button_field", t =>
@ -48,13 +48,32 @@ public class KitchenManager : MonoBehaviour
#endif #endif
if (gameData.isFirstPlay) if (gameData.isFirstPlay)
{ {
gameData.CornSeed = 90; if (TutorialManager.Instance.Index == 1)
gameData.Coin = 10;
// 店舗レベル1達成表示
LocalCacheManager.Save(ShopLevelUp.DataTag, 1);
LocalCacheManager.Save(ShopLevelUp.CallbackTag, new Action(() =>
{ {
TutorialManager.Instance.ShowTutorialConversation(1, () => gameData.CornSeed = 90;
gameData.Coin = 10;
// 店舗レベル1達成表示
LocalCacheManager.Save(ShopLevelUp.DataTag, 1);
LocalCacheManager.Save(ShopLevelUp.CallbackTag, new Action(() =>
{
TutorialManager.Instance.ShowTutorialConversation(1, () =>
{
// マスク表示
var buttonRectTransform = cookingButton.transform as RectTransform;
var go = TutorialManager.Instance.ShowTutorialMask(buttonRectTransform.parent, buttonRectTransform);
cookingButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
DestroyImmediate(go);
}).AddTo(this);
});
}));
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
}
else if (TutorialManager.Instance.Index == 6)
{
gameData.CornSeed = 150;
gameData.Material.First(m => m.Id == 2).Amount = 1;
TutorialManager.Instance.ShowTutorialConversation(7, () =>
{ {
// マスク表示 // マスク表示
var buttonRectTransform = cookingButton.transform as RectTransform; var buttonRectTransform = cookingButton.transform as RectTransform;
@ -64,8 +83,7 @@ public class KitchenManager : MonoBehaviour
DestroyImmediate(go); DestroyImmediate(go);
}).AddTo(this); }).AddTo(this);
}); });
})); }
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
} }
CoinManager.Instance.ChangeCoin(gameData.Coin); CoinManager.Instance.ChangeCoin(gameData.Coin);

2
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -985,7 +985,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25 m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 200 m_SortingOrder: 201
m_TargetDisplay: 0 m_TargetDisplay: 0
--- !u!224 &679566765 --- !u!224 &679566765
RectTransform: RectTransform:

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

@ -45,12 +45,24 @@ public class RecipeDetailView : MonoBehaviour
if (gameData.isFirstPlay) if (gameData.isFirstPlay)
{ {
TutorialManager.Instance.ShowTutorialConversation(2, () => if (TutorialManager.Instance.Index == 1)
{ {
LocalCacheManager.Load<Action>(CallbackTag, null)?.Invoke(); TutorialManager.Instance.ShowTutorialConversation(2, () =>
TransitionManager.Instance.UnloadScene(GameScenes.RecipeChoice); {
TransitionManager.Instance.UnloadScene(GameScenes.Recipe); LocalCacheManager.Load<Action>(CallbackTag, null)?.Invoke();
}); TransitionManager.Instance.UnloadScene(GameScenes.RecipeChoice);
TransitionManager.Instance.UnloadScene(GameScenes.Recipe);
});
}
else if (TutorialManager.Instance.Index == 7)
{
// マスク表示
var go = TutorialManager.Instance.ShowTutorialMask(transform.parent.parent, nextButton.transform as RectTransform);
nextButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
DestroyImmediate(go);
}).AddTo(this);
}
} }
cancelButton.OnClickAsObservable().Subscribe(_ => cancelButton.OnClickAsObservable().Subscribe(_ =>