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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-07-21 16:12:36 +09:00
parent 7bd8561c8e 059c6c17e2
commit 21c81e95b1
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
View File

@ -8924,9 +8924,8 @@ MonoBehaviour:
coldGrowSpeed: 0.1 coldGrowSpeed: 0.1
hotGrowSpeed: 2 hotGrowSpeed: 2
baseCornPopTime: 12.5 baseCornPopTime: 12.5
cornPopRandom: 5
cornBurntDuration: 1.5 cornBurntDuration: 1.5
cornBurntRandom: 1 cornBurntRandom: 5
cornSpillSpeed: 70 cornSpillSpeed: 70
cornPopSpeed: 20 cornPopSpeed: 20
cornCountSlider: {fileID: 657773260} cornCountSlider: {fileID: 657773260}

20
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
View File

@ -29,7 +29,6 @@ public class CornManager : MonoBehaviour
[SerializeField] private float coldGrowSpeed = .1f; [SerializeField] private float coldGrowSpeed = .1f;
[SerializeField] private float hotGrowSpeed = 2f; [SerializeField] private float hotGrowSpeed = 2f;
[SerializeField] private float baseCornPopTime = 5f; [SerializeField] private float baseCornPopTime = 5f;
[SerializeField] private float cornPopRandom = 5f;
[SerializeField] private float cornBurntDuration = 5f; [SerializeField] private float cornBurntDuration = 5f;
[SerializeField] private float cornBurntRandom = 1f; [SerializeField] private float cornBurntRandom = 1f;
[SerializeField] private float cornSpillSpeed = 50f; [SerializeField] private float cornSpillSpeed = 50f;
@ -138,12 +137,27 @@ public class CornManager : MonoBehaviour
} }
cornArray = new Corn[cornSpawnCount]; cornArray = new Corn[cornSpawnCount];
// コーン生成
var popTime = 1f;
for (int i = 0; i < cornSpawnCount; i++) for (int i = 0; i < cornSpawnCount; i++)
{ {
// コーン生成テーブル
if (1 <= i && i <= 5)
{
popTime += 3 - (i - 1) * .5f;
}
else if (6 <= i && i <= 10)
{
popTime += 0.5f - (i - 6) * .1f;
}
else if (11 <= i)
{
popTime += .1f;
}
var corn = Instantiate(cornPrefab, cornSpawnTarget); var corn = Instantiate(cornPrefab, cornSpawnTarget);
cornArray[i] = corn; cornArray[i] = corn;
corn.SetCornProperty(baseCornPopTime + Random.Range(0f, cornPopRandom), cornBurntDuration + Random.Range(0f, cornBurntRandom), cornSpillSpeed, cornPopSpeed); corn.SetCornProperty(popTime, cornBurntDuration + Random.Range(0, cornBurntRandom), cornSpillSpeed, cornPopSpeed);
// 進行速度の変更時、コーン速度変更 // 進行速度の変更時、コーン速度変更
cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x => cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x =>
{ {

3
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs
View File

@ -55,7 +55,7 @@ public class CornField : MonoBehaviour
plants[ii].Harvested.Subscribe(_ => plants[ii].Harvested.Subscribe(_ =>
{ {
// 収穫 // 収穫
VibrationManager.Instance.PlayVibrationOnce();
var harvest = Instantiate(harvestPrefab, plants[ii].transform); var harvest = Instantiate(harvestPrefab, plants[ii].transform);
this.CallWaitForSeconds(.5f, () => this.CallWaitForSeconds(.5f, () =>
{ {
@ -77,6 +77,7 @@ public class CornField : MonoBehaviour
promoteGrowthButton.OnClickAsObservable().Subscribe(_ => promoteGrowthButton.OnClickAsObservable().Subscribe(_ =>
{ {
VibrationManager.Instance.PlayVibrationOnce();
for (int i = 0; i < plants.Count; i++) for (int i = 0; i < plants.Count; i++)
{ {
if (Random.Range(0, 2) == 0){ if (Random.Range(0, 2) == 0){