From 12cb013e93b4f1e37c4938a5e93b00ebebd09de5 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 1 Jul 2021 10:10:18 +0900 Subject: [PATCH] =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E3=83=A1=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 147 ++++++++++++++++-- .../Scenes/Cooking/Scripts/ThermalControl.cs | 29 ++++ .../Cooking/Scripts/ThermalControl.cs.meta | 11 ++ .../Scenes/Cooking/Scripts/ThermoMeter.cs | 24 +++ .../Cooking/Scripts/ThermoMeter.cs.meta | 11 ++ 5 files changed, 207 insertions(+), 15 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index e1e19837..a6871b88 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -905,10 +905,10 @@ RectTransform: m_Father: {fileID: 649269357} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 588, y: 94} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &609798733 MonoBehaviour: @@ -956,6 +956,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 649269357} + - component: {fileID: 649269358} m_Layer: 5 m_Name: Meter m_TagString: Untagged @@ -985,6 +986,56 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 588, y: 94} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &649269358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649269356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 2109518760} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &676036206 GameObject: m_ObjectHideFlags: 0 @@ -2219,14 +2270,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1932605391} + - {fileID: 2109518760} m_Father: {fileID: 649269357} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -488, y: 100} + m_SizeDelta: {x: -40, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1615437024 GameObject: @@ -2616,6 +2667,7 @@ GameObject: m_Component: - component: {fileID: 1870432534} - component: {fileID: 1870432533} + - component: {fileID: 1870432535} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -2636,10 +2688,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startingGuide: {fileID: 8786490829224139677} - powerMeter: {fileID: 0} powerResultText: {fileID: 0} gameResultText: {fileID: 1003859323} - panController: {fileID: 402129742} + thermalControl: {fileID: 0} + thermoMeter: {fileID: 0} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -2654,6 +2706,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1870432535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870432532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce6034eae9ce487a80e8c440340e9f9, type: 3} + m_Name: + m_EditorClassIdentifier: + panController: {fileID: 402129742} + thermoMeter: {fileID: 0} + factor: 0.1 --- !u!1001 &1883189159 PrefabInstance: m_ObjectHideFlags: 0 @@ -2742,6 +2809,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1928679190} + - component: {fileID: 1928679192} m_Layer: 5 m_Name: TemperatureMeter m_TagString: Untagged @@ -2769,6 +2837,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 620} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1928679192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1928679189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf4e82fd19f14bf98aae9f891ec09360, type: 3} + m_Name: + m_EditorClassIdentifier: + slider: {fileID: 0} --- !u!1 &1932605390 GameObject: m_ObjectHideFlags: 0 @@ -2794,17 +2875,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932605390} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1585657224} + m_Father: {fileID: 2109518760} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -233, y: 98} - m_SizeDelta: {x: 148, y: 40} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 148, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1932605392 MonoBehaviour: @@ -3023,6 +3104,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2101756924} m_CullTransparentMesh: 0 +--- !u!1 &2109518759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2109518760} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2109518760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109518759} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1932605391} + m_Father: {fileID: 1585657224} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &2137549891 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs new file mode 100644 index 00000000..75a18f88 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -0,0 +1,29 @@ +using System; +using UnityEngine; + +public class ThermalControl : MonoBehaviour +{ + [SerializeField] private PanController panController; + [SerializeField] private ThermoMeter thermoMeter; + [SerializeField] private float speed = 1f; + [SerializeField] private float panFactor = .1f; + private float temperature; + + private void Start() + { + } + + private void Update() + { + if (panController.Delta != Vector2.zero) + { + temperature -= panController.Delta.magnitude * panFactor; + } + else + { + temperature += Time.deltaTime * speed; + } + temperature = Mathf.Clamp01(temperature); + thermoMeter.SetValue(temperature); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs.meta new file mode 100644 index 00000000..c999fb45 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cce6034eae9ce487a80e8c440340e9f9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs new file mode 100644 index 00000000..d99caa72 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs @@ -0,0 +1,24 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +public class ThermoMeter : MonoBehaviour +{ + [SerializeField] private Slider slider; + + private void Start() + { + slider.value = 0f; + } + + // 温度の目盛りの幅を設定 + private void SetScale((float blue, float yellow, float red) scale) + { + + } + + public void SetValue(float value) + { + slider.value = value; + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs.meta new file mode 100644 index 00000000..2a17f85b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermoMeter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bf4e82fd19f14bf98aae9f891ec09360 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: