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

コーン挙動修正

This commit is contained in:
kimura 2021-07-21 15:41:35 +09:00
parent d8d7149d98
commit 059c6c17e2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -29,6 +29,8 @@ 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 cornBurntDuration = 5f;
[SerializeField] private float cornBurntRandom = 1f;
[SerializeField] private float cornSpillSpeed = 50f; [SerializeField] private float cornSpillSpeed = 50f;
[SerializeField] private float cornPopSpeed = 20f; [SerializeField] private float cornPopSpeed = 20f;
@ -101,6 +103,8 @@ public class CornManager : MonoBehaviour
coldGrowSpeedSlider.value = coldGrowSpeed; coldGrowSpeedSlider.value = coldGrowSpeed;
hotGrowSpeedSlider.value = hotGrowSpeed; hotGrowSpeedSlider.value = hotGrowSpeed;
popTimeSlider.value = baseCornPopTime; popTimeSlider.value = baseCornPopTime;
burntDurationSlider.value = cornBurntDuration;
burntRandomSlider.value = cornBurntRandom;
spilledSpeedSlider.value = cornSpillSpeed; spilledSpeedSlider.value = cornSpillSpeed;
popSpeedSlider.value = cornPopSpeed; popSpeedSlider.value = cornPopSpeed;
@ -109,6 +113,8 @@ public class CornManager : MonoBehaviour
coldGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldGrowSpeed = x).AddTo(this); coldGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldGrowSpeed = x).AddTo(this);
hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this); hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this);
popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this); popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this);
burntDurationSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntDuration = x).AddTo(this);
burntRandomSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntRandom = x).AddTo(this);
spilledSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornSpillSpeed = x).AddTo(this); spilledSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornSpillSpeed = x).AddTo(this);
popSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornPopSpeed = x).AddTo(this); popSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornPopSpeed = x).AddTo(this);
#endif #endif
@ -151,8 +157,7 @@ public class CornManager : MonoBehaviour
var corn = Instantiate(cornPrefab, cornSpawnTarget); var corn = Instantiate(cornPrefab, cornSpawnTarget);
cornArray[i] = corn; cornArray[i] = corn;
corn.SetCornProperty(popTime, baseCornPopTime - popTime, cornSpillSpeed, cornPopSpeed); corn.SetCornProperty(popTime, cornBurntDuration + Random.Range(0, cornBurntRandom), cornSpillSpeed, cornPopSpeed);
// 進行速度の変更時、コーン速度変更 // 進行速度の変更時、コーン速度変更
cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x => cornGrowSpeed.TakeWhile(_ => !isCompleted).Subscribe(x =>
{ {