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

develop を distribution にマージしました。

This commit is contained in:
shogo kimura 2021-07-09 17:59:43 +09:00
parent 1ff8b166c0 1033e6eec6
commit 0334d1ed25
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
popcorn/Assets/MyGame/Resource/Animation/corn.controller
View File

@ -45,13 +45,13 @@ AnimatorState:
m_Mirror: 0 m_Mirror: 0
m_SpeedParameterActive: 0 m_SpeedParameterActive: 0
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 1
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8c4b5f3aaed7b46c3819cf3123e9b292, type: 2} m_Motion: {fileID: 7400000, guid: 8c4b5f3aaed7b46c3819cf3123e9b292, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter: WaitOffset
m_TimeParameter: m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
@ -67,13 +67,19 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: CornBurn - m_Name: CornBurn
m_Type: 9 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: WaitOffset
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer

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

@ -8013,10 +8013,10 @@ MonoBehaviour:
temperature: 0 temperature: 0
temperatureSpeed: 0 temperatureSpeed: 0
panSpeed: 0 panSpeed: 0
panFactor: 0.21 panFactor: 0.34
deadZone: 0.05 deadZone: 0.03
baseIncreaseSpeed: 0.12 baseIncreaseSpeed: 0.12
hotIncreaseSpeed: 0.16 hotIncreaseSpeed: 0.15
maxDecreaseSpeed: 0.07 maxDecreaseSpeed: 0.07
coldValue: 0.26 coldValue: 0.26
hotValue: 0.67 hotValue: 0.67

2
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
View File

@ -19,6 +19,7 @@ public class Corn : MonoBehaviour
{ {
private static readonly int HashCornGrow = Animator.StringToHash("CornGrow"); private static readonly int HashCornGrow = Animator.StringToHash("CornGrow");
private static readonly int HashCornBurn = Animator.StringToHash("CornBurn"); private static readonly int HashCornBurn = Animator.StringToHash("CornBurn");
private static readonly int HashWaitOffset = Animator.StringToHash("WaitOffset");
[SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private SpriteRenderer spriteRenderer;
[SerializeField] private Sprite cornSeedSprite; [SerializeField] private Sprite cornSeedSprite;
@ -57,6 +58,7 @@ public class Corn : MonoBehaviour
var rightTop = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, 0)); var rightTop = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, 0));
worldWidth = rightTop.x; worldWidth = rightTop.x;
animator.SetFloat(HashWaitOffset, Random.value/2);
} }
private void Start() private void Start()

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

@ -31,7 +31,8 @@ public class ThermalControl : MonoBehaviour
[SerializeField] private float coldValue = 0.32f; [SerializeField] private float coldValue = 0.32f;
[SerializeField] private float hotValue = 0.67f; [SerializeField] private float hotValue = 0.67f;
private float duration = 0.3f; private float increaseDuration = 0.3f;
private float decreaseDuration = 0.1f;
private bool isMove; private bool isMove;
public IReadOnlyReactiveProperty<ThermalCondition> Condition => condition; public IReadOnlyReactiveProperty<ThermalCondition> Condition => condition;
@ -57,17 +58,17 @@ public class ThermalControl : MonoBehaviour
panSpeed = panController.Delta.magnitude * panFactor; panSpeed = panController.Delta.magnitude * panFactor;
if (panSpeed > deadZone) if (panSpeed > deadZone)
{ {
temperatureSpeed = Mathf.Lerp(temperatureSpeed, -Mathf.Min(panSpeed, maxDecreaseSpeed), Time.deltaTime / duration); temperatureSpeed = Mathf.Lerp(temperatureSpeed, -Mathf.Min(panSpeed, maxDecreaseSpeed), Time.deltaTime / decreaseDuration);
} }
else else
{ {
if (condition.Value == ThermalCondition.Hot) if (condition.Value == ThermalCondition.Hot)
{ {
temperatureSpeed = Mathf.Lerp(temperatureSpeed, hotIncreaseSpeed, Time.deltaTime / duration); temperatureSpeed = Mathf.Lerp(temperatureSpeed, hotIncreaseSpeed, Time.deltaTime / increaseDuration);
} }
else else
{ {
temperatureSpeed = Mathf.Lerp(temperatureSpeed, baseIncreaseSpeed, Time.deltaTime / duration); temperatureSpeed = Mathf.Lerp(temperatureSpeed, baseIncreaseSpeed, Time.deltaTime / increaseDuration);
} }
} }
temperature = Mathf.Clamp01(temperature + temperatureSpeed * Time.deltaTime); temperature = Mathf.Clamp01(temperature + temperatureSpeed * Time.deltaTime);