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

かご変化対応

This commit is contained in:
kimura 2022-06-29 16:17:35 +09:00
parent c663ea59f7
commit 70ed5a22f3
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab
View File

@ -524,6 +524,9 @@ MonoBehaviour:
fallTime: 0.5 fallTime: 0.5
hitTime: 1.5 hitTime: 1.5
hitWaitTime: 1 hitWaitTime: 1
level1: {fileID: 775281020594132328}
level2: {fileID: 7545235244005095164}
level3: {fileID: 3741799588110921262}
--- !u!61 &6629287981537804912 --- !u!61 &6629287981537804912
BoxCollider2D: BoxCollider2D:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -643,7 +646,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &3831921166531092831 --- !u!4 &3831921166531092831
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

4
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
View File

@ -108,6 +108,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
gameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary(); gameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary();
gameData.ScrollGameTodayPlayCount++; gameData.ScrollGameTodayPlayCount++;
// ステージ読み込み // ステージ読み込み
stageManager.SetBeginStages(stageData.GetBeginStagePrefabs());
ResetGame(levelPlaceList, stageData); ResetGame(levelPlaceList, stageData);
menuState.Value = MenuState.Game; menuState.Value = MenuState.Game;
return; return;
@ -119,6 +120,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
gameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary(); gameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary();
gameData.ScrollGameTodayPlayCount++; gameData.ScrollGameTodayPlayCount++;
// ステージ読み込み // ステージ読み込み
stageManager.SetBeginStages(stageData.GetBeginStagePrefabs());
ResetGame(levelPlaceList, stageData); ResetGame(levelPlaceList, stageData);
menuState.Value = MenuState.Game; menuState.Value = MenuState.Game;
}); });
@ -242,6 +244,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
{ {
case StageItem.Type.Item1: case StageItem.Type.Item1:
scoreCount.Value += item.Point; scoreCount.Value += item.Point;
player.AddCount();
break; break;
case StageItem.Type.Obstacle: case StageItem.Type.Obstacle:
player.Hit(); player.Hit();
@ -257,6 +260,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
stageManager.ResetStage(); stageManager.ResetStage();
player.transform.position = characterBeginPos; player.transform.position = characterBeginPos;
player.Stay(); player.Stay();
player.ResetCount();
scoreCount.Value = 0; scoreCount.Value = 0;
headerView.ChangeTimeCount(timeLimit); headerView.ChangeTimeCount(timeLimit);
resultManager.Reset(); resultManager.Reset();

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

@ -13,6 +13,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
[SerializeField] private float fallTime = 1f; [SerializeField] private float fallTime = 1f;
[SerializeField] private float hitTime = 1.5f; [SerializeField] private float hitTime = 1.5f;
[SerializeField] private float hitWaitTime = 1f; [SerializeField] private float hitWaitTime = 1f;
[SerializeField] private GameObject level1;
[SerializeField] private GameObject level2;
[SerializeField] private GameObject level3;
private Animator animator; private Animator animator;
private bool isJump; private bool isJump;
private bool isPreHit; private bool isPreHit;
@ -20,6 +23,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
private IDisposable hitDisposable; private IDisposable hitDisposable;
private Coroutine jumpCoroutine; private Coroutine jumpCoroutine;
private Vector3 basePos; private Vector3 basePos;
private int count;
private void Start() private void Start()
{ {
@ -103,5 +107,18 @@ namespace MyGame.Scenes.MiniGame.Scripts
}); });
}); });
} }
public void AddCount()
{
count++;
level1.SetActive(count >= 5);
level2.SetActive(count >= 10);
level3.SetActive(count >= 15);
}
public void ResetCount()
{
count = 0;
}
} }
} }