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:
hirokei 2021-07-26 13:22:40 +09:00
parent 36aea7cb15 7994d4ad10
commit a7096c279d
3 changed files with 112 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,26 +126,11 @@ public class CornManager : MonoBehaviour
cornArray = new Corn[cornSpawnCount];
// コーン生成
var popTime = 1f;
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);
cornArray[i] = corn;
corn.SetCornProperty(popTime, cornBurntDuration + Random.Range(0, cornBurntRandom), cornSpillSpeed, cornPopSpeed);
corn.SetCornProperty( CornPopParameters.CornPopTimeArray[i], CornPopParameters.CornBurntTimeArray[i], cornSpillSpeed, cornPopSpeed);
// 進行速度の変更時、コーン速度変更
cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x =>
{

108
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs Normal file
View File

@ -0,0 +1,108 @@
public class CornPopParameters
{
public static readonly float[] CornPopTimeArray = {
1f,
4f,
6.5f,
8.5f,
10f,
11f,
11.5f,
11.9f,
12.2f,
12.4f,
12.5f,
12.6f,
12.7f,
12.8f,
12.9f,
13f,
13.1f,
13.2f,
13.3f,
13.4f,
13.5f,
13.6f,
13.7f,
13.8f,
13.9f,
14f,
14.1f,
14.2f,
14.3f,
14.4f,
14.5f,
14.6f,
14.7f,
14.8f,
14.9f,
15f,
15.1f,
15.2f,
15.3f,
15.4f,
15.5f,
15.6f,
15.7f,
15.8f,
15.9f,
16f,
16.1f,
16.2f,
16.3f,
16.4f,
};
public static readonly float[] CornBurntTimeArray = {
7.6f,
6.085f,
4.82f,
3.805f,
3.04f,
2.525f,
2.26f,
2.045f,
1.88f,
1.765f,
1.7f,
1.635f,
1.57f,
1.505f,
1.44f,
1.375f,
1.31f,
1.245f,
1.18f,
1.115f,
1.05f,
0.985f,
0.92f,
0.855f,
0.8f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
1.5f,
};
}

3
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4a39eee460c642d5a761191849b7ff22
timeCreated: 1627272430