フライパン周り調整

popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity

@@ -208,6 +208,38 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &262390139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 262390140}
+  m_Layer: 0
+  m_Name: Game
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &262390140
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 262390139}
+  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: 2603874727618424763}
+  - {fileID: 2603874726320550222}
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &337575052
 GameObject:
   m_ObjectHideFlags: 0
@@ -318,18 +350,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 397601217}
   m_CullTransparentMesh: 0
---- !u!114 &402129742 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1453251556377932374, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
-    type: 3}
-  m_PrefabInstance: {fileID: 2137549891}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 722195db1b0214a7ab110e4cf4c2a7ce, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &403015967
 GameObject:
   m_ObjectHideFlags: 0
@@ -570,7 +590,7 @@ RectTransform:
   m_Children:
   - {fileID: 676036207}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -719,7 +739,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &582721657
 PrefabInstance:
@@ -2350,6 +2370,12 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1412360753}
   m_CullTransparentMesh: 0
+--- !u!4 &1440136003 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1453251556440263711, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+    type: 3}
+  m_PrefabInstance: {fileID: 2137549891}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1448897406
 GameObject:
   m_ObjectHideFlags: 0
@@ -2382,7 +2408,7 @@ Transform:
   - {fileID: 162168170}
   - {fileID: 1295632043}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1458768863
 GameObject:
@@ -2944,7 +2970,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1693325334
 GameObject:
@@ -3069,6 +3095,7 @@ GameObject:
   - component: {fileID: 1870432534}
   - component: {fileID: 1870432533}
   - component: {fileID: 1870432535}
+  - component: {fileID: 1870432536}
   m_Layer: 0
   m_Name: Manager
   m_TagString: Untagged
@@ -3089,10 +3116,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   startingGuide: {fileID: 8786490829224139677}
-  powerMeter: {fileID: 0}
   powerResultText: {fileID: 0}
   gameResultText: {fileID: 1003859323}
-  panController: {fileID: 0}
+  thermalControl: {fileID: 0}
+  thermoMeter: {fileID: 0}
 --- !u!4 &1870432534
 Transform:
   m_ObjectHideFlags: 0
@@ -3105,7 +3132,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1870432535
 MonoBehaviour:
@@ -3119,7 +3146,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cce6034eae9ce487a80e8c440340e9f9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  panController: {fileID: 402129742}
+  panController: {fileID: 2603874727618424762}
   thermoMeter: {fileID: 1928679192}
   temperature: 0
   panSpeed: 0
@@ -3127,6 +3154,22 @@ MonoBehaviour:
   deadZone: 0.08
   baseIncreaseSpeed: 0.06
   maxDecreaseSpeed: 0.09
+--- !u!114 &1870432536
+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: f16b861cdcc84ae9a3bf105ff59a1f49, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cornSpawnTarget: {fileID: 1440136003}
+  cornPrefab: {fileID: 5499754490129207122, guid: 2b790fd908bd14de4a601c21374fb55b,
+    type: 3}
+  cornSpawnCount: 20
 --- !u!1 &1928679189
 GameObject:
   m_ObjectHideFlags: 0
@@ -3556,7 +3599,7 @@ PrefabInstance:
     - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
         type: 3}
@@ -3608,8 +3651,149 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1453251556405238011, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+        type: 3}
+      propertyPath: controller
+      value: 
+      objectReference: {fileID: 2603874727618424762}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3}
+--- !u!4 &2137549892 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
+    type: 3}
+  m_PrefabInstance: {fileID: 2137549891}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2603874726320550220
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2603874726320550222}
+  - component: {fileID: 2603874726320550221}
+  m_Layer: 0
+  m_Name: PanBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &2603874726320550221
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2603874726320550220}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.8001499}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 7.198184, y: 5.4916825}
+  m_EdgeRadius: 0
+--- !u!4 &2603874726320550222
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2603874726320550220}
+  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: 262390140}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2603874727618424760
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2603874727618424763}
+  - component: {fileID: 2603874727618424762}
+  - component: {fileID: 2603874727618424761}
+  m_Layer: 0
+  m_Name: Controller
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &2603874727618424761
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2603874727618424760}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: -0.0062975883}
+  m_SpriteTilingProperty:
+    border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.16, y: 0.16}
+    newSize: {x: 0.16, y: 0.16}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 17.924976, y: 9.255624}
+  m_EdgeRadius: 0
+--- !u!114 &2603874727618424762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2603874727618424760}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 722195db1b0214a7ab110e4cf4c2a7ce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 2137549892}
+  targetBorder: {fileID: 2603874726320550221}
+  deltaString: 
+--- !u!4 &2603874727618424763
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2603874727618424760}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 262390140}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8786490829224139677
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Pan.cs

@@ -5,13 +5,8 @@ namespace MyGame.Scenes.Main
 {
     public class Pan : MonoBehaviour
     {
+        [SerializeField] private PanController controller;
         [SerializeField] private float thrust;
-        private PanController controller;
-
-        private void Start()
-        {
-            controller = GetComponentInParent<PanController>();
-        }
 
         private void OnTriggerStay2D(Collider2D other)
         {

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanController.cs

@@ -8,80 +8,52 @@ using UnityEngine.EventSystems;
 [RequireComponent(typeof(BoxCollider2D))]
 public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler
 {
-    [SerializeField] private float lerpTime = 0.1f;
+    [SerializeField] private Transform target;
-    private Transform cacheTransform;
+    [SerializeField] private Collider2D targetBorder;
+    [SerializeField, ReadOnly] private string deltaString;
     private Vector3 firstPos;
+    private Vector3 prevPos;
     private Vector3 offset;
-    private readonly (float min, float max) borderX = (-1.2f, 3.1f);
-    private readonly (float min, float max) borderY = (-2.1f, 1.3f);
     
-    private Vector2 direction;
-    // public Vector2 Direction => direction;
     private Vector2 delta;
     public Vector2 Delta => delta;
-    private Vector3 prevPos;
-    private float deltaTime = 0f;
-    private bool isMove;
 
     // Start is called before the first frame update
     void Start()
     {
-        cacheTransform = gameObject.transform;
+        firstPos = target.position;
-        firstPos = cacheTransform.position;
+        prevPos = firstPos;
-        prevPos = cacheTransform.position;
-        deltaTime = 0.5f;
-        direction = Vector2.left;
-        target = transform.position + 1.5f / 2 * new Vector3(direction.x, direction.y, 0f);
     }
 
-    private Vector3 target;
-
-    private static float time = .5f;
-    private float freq = 1f / time;
-    
     // Update is called once per frame
     void Update()
     {
-        // OnDragが更新されていない場合は方向をゼロにしたいがUpdateでゼロにすると使えなくなるため保留
+        // OnDragが更新されていないフレームでは0にする
-        if (cacheTransform.position == prevPos)
+        if (target.position == prevPos)
         {
-            direction = Vector2.zero;
+            delta = Vector2.zero;
+        }
+        prevPos = target.position;
     }
 
-        if (deltaTime >= 1.0f)
-        {
-            isMove = !isMove;
-            deltaTime = 0f;
-        }
-        if (isMove)
-        {
-            // transform.position = firstPos + new Vector3(Mathf.Sin(2 * (float)Math.PI * freq * deltaTime) / 2, 0f);
-        }
-
-        delta = cacheTransform.position - prevPos;
-        prevPos = cacheTransform.position;
-        deltaTime += Time.deltaTime;
-    }
 
     public void OnDrag(PointerEventData eventData)
     {
-        var currentPoint = Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y,
+        var targetPos = target.position;
-            cacheTransform.position.z));
+        var currentPoint = Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y, targetPos.z));
         var pos = currentPoint + offset;
         // 移動範囲を制限
-        pos.x = Mathf.Clamp(pos.x, borderX.min, borderX.max);
+        pos = targetBorder.bounds.ClosestPoint(pos);
-        pos.y = Mathf.Clamp(pos.y, borderY.min, borderY.max);
+        delta = pos - targetPos;
-        
+        deltaString = $"delta: {delta.normalized} {delta.magnitude:F3}";
-        // Debug.Log($"delta: {eventData.delta.magnitude} localDelta: {(pos - cacheTransform.position).magnitude}");
+        target.position = pos;
-        delta = pos - cacheTransform.position;
-        Debug.Log($"delta: {delta.magnitude}");
-        cacheTransform.position = pos;
     }
 
     public void OnBeginDrag(PointerEventData eventData)
     {
         // ドラッグ開始時のobjectのpositionからのズレを記憶
-        offset = cacheTransform.position - Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y,
+        var targetPos = target.position;
-            cacheTransform.position.z));
+        offset = targetPos - Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y,
+            targetPos.z));
     }
 }