player interact with cola freezer, improvement in movements

2023-02-28 19:14:01 +02:00
parent 4a0e00d862
commit ee07359c50
13 changed files with 298 additions and 137 deletions
@@ -0,0 +1,100 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7642835775543905443
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2680879424619819010}
+  - component: {fileID: 7774043156322841003}
+  - component: {fileID: 2250778480304515286}
+  - component: {fileID: 1996526453472525189}
+  m_Layer: 0
+  m_Name: Cola
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2680879424619819010
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7642835775543905443}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7774043156322841003
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7642835775543905443}
+  m_Mesh: {fileID: -6054235262271532674, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
+--- !u!23 &2250778480304515286
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7642835775543905443}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 7626191068330388430, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
+  - {fileID: -2983951116456068170, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &1996526453472525189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7642835775543905443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef8197297f5651a4082c2562c95e5cd5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _foodObjectSO: {fileID: 11400000, guid: a4db4c329bb512349bf5373c80e7b84a, type: 2}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 48940f42625c11541b2ebe92e86b6314
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1320,6 +1320,12 @@ MonoBehaviour:
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls: []
+--- !u!4 &656725490 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1852576806548013000, guid: 32790d47acc86814982f18993097a759,
+    type: 3}
+  m_PrefabInstance: {fileID: 890616016}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &673370222
 GameObject:
  m_ObjectHideFlags: 0
@@ -1412,8 +1418,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 681272906}
-  - component: {fileID: 681272907}
  - component: {fileID: 681272908}
+  - component: {fileID: 681272909}
  m_Layer: 6
  m_Name: StoreFrizer
  m_TagString: Untagged
@@ -1433,25 +1439,12 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 4790579152836847417}
  - {fileID: 456771680}
+  - {fileID: 4790579152836847417}
  - {fileID: 946643838}
  m_Father: {fileID: 274182514}
  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &681272907
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 681272905}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2af31bf77e63ee64da69d7c708550949, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _playerArrivePoint: {fileID: 456771680}
 --- !u!65 &681272908
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -1473,6 +1466,20 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 1, y: 2.2, z: 1}
  m_Center: {x: 0, y: 1.2, z: 0}
+--- !u!114 &681272909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 681272905}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 476179b02ece27040b9373a7668b7a28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _playerArrivePoint: {fileID: 456771680}
+  _foodObjectSO: {fileID: 11400000, guid: a4db4c329bb512349bf5373c80e7b84a, type: 2}
 --- !u!1 &696070341
 GameObject:
  m_ObjectHideFlags: 0
@@ -2269,6 +2276,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _navAgent: {fileID: 871823190}
  _animator: {fileID: 1476341268}
+  _holdPoint: {fileID: 1930608033}
 --- !u!143 &871823192
 CharacterController:
  m_ObjectHideFlags: 0
@@ -3160,7 +3168,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: 32790d47acc86814982f18993097a759,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1930608033}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 32790d47acc86814982f18993097a759,
        type: 3}
@@ -3391,7 +3403,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c67621cbedb3453428fcc7207806f507, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _selectedObject: {fileID: 681272907}
+  _selectedObject: {fileID: 681272909}
  visualGameObjectArray:
  - {fileID: 215962540}
 --- !u!1 &952219224
@@ -10642,6 +10654,37 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1920515679}
  m_CullTransparentMesh: 1
+--- !u!1 &1930608032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1930608033}
+  m_Layer: 0
+  m_Name: HoldPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1930608033
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1930608032}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.12, z: 0.0384}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 656725490}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2047049764
 GameObject:
  m_ObjectHideFlags: 0
@@ -11169,14 +11212,6 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &7492295192890400
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 137539666115735848}
-  m_Mesh: {fileID: -6054235262271532674, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
 --- !u!23 &19869387480350122
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -11427,24 +11462,6 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4780422445240591524}
  m_Mesh: {fileID: 304437516661596947, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
--- !u!1 &137539666115735848
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5677922704749333897}
-  - component: {fileID: 7492295192890400}
-  - component: {fileID: 8413905143733376349}
-  m_Layer: 0
-  m_Name: Cylinder127
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!23 &145545407355753871
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -18184,10 +18201,8 @@ Transform:
  - {fileID: 8961106705260600445}
  - {fileID: 6927545172188517136}
  - {fileID: 2237955704771104196}
-  - {fileID: 6834454987115829747}
  - {fileID: 3333244364124688977}
  - {fileID: 7382436667305329019}
-  - {fileID: 5677922704749333897}
  - {fileID: 8884841177423131589}
  - {fileID: 168920522562548980}
  - {fileID: 2056828492885237708}
@@ -19497,21 +19512,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &5677922704749333897
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 137539666115735848}
-  m_LocalRotation: {x: 0, y: 0, z: 0.953717, w: -0.30070567}
-  m_LocalPosition: {x: 0.7107053, y: -0.053886633, z: -2.1400414}
-  m_LocalScale: {x: 0.50181866, y: 0.50181866, z: 0.50181866}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4790579152836847417}
-  m_RootOrder: -1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5681765647060277878
 GameObject:
  m_ObjectHideFlags: 0
@@ -20752,21 +20752,6 @@ Transform:
  m_Father: {fileID: 4790579152836847417}
  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &6834454987115829747
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8256721562958633510}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.2401125, y: 0.454318, z: -2.0600152}
-  m_LocalScale: {x: 0.50181866, y: 0.50181866, z: 0.50181866}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4790579152836847417}
-  m_RootOrder: -1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &6852200627649330763
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -22768,22 +22753,6 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8256721562958633510
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6834454987115829747}
-  m_Layer: 0
-  m_Name: Cylinder113
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &8278623102948831887
 GameObject:
  m_ObjectHideFlags: 0
@@ -22942,49 +22911,6 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &8413905143733376349
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 137539666115735848}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 7626191068330388430, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
-  - {fileID: -2983951116456068170, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!4 &8422821402538028328
 Transform:
  m_ObjectHideFlags: 0
@@ -0,0 +1,12 @@
+using UnityEngine;
+
+public class FoodObject : MonoBehaviour
+{
+    [SerializeField]
+    private FoodObjectSO _foodObjectSO;
+
+    public FoodObjectSO GetFoodObjectSO()
+    {
+        return _foodObjectSO;
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ef8197297f5651a4082c2562c95e5cd5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,16 @@
+
+using UnityEngine;
+
+public class ColaFreezer : BaseInteractableObject
+{
+    [SerializeField]
+    private FoodObjectSO _foodObjectSO;
+
+    public override void Interact(Player player)
+    {
+        var transform = Instantiate(_foodObjectSO.prefab, _playerArrivePoint);
+        var foodObject = transform.GetComponent<FoodObject>();
+        player.SetFoodObject(foodObject);
+    }
+
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 476179b02ece27040b9373a7668b7a28
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -38,7 +38,9 @@ public class Player : MonoBehaviour
    [SerializeField]
    public Animator _animator;

-    private bool _isAllowMovement;
+    [SerializeField]
+    private Transform _holdPoint;
+
    private AnimationStates _currentAnimation;
    private Vector3 _groundDeltaPosition;

@@ -50,6 +52,8 @@ public class Player : MonoBehaviour

    private const string WALK_VELOCITY = "WalkVelocity";

+    private FoodObject _foodObject;
+
    private void Awake()
    {
        if (Instance != null)
@@ -62,7 +66,6 @@ public class Player : MonoBehaviour
    private void Start()
    {
        TimeManager.OnMinuteChanged += UpdateStatsByClock;
-        _isAllowMovement = true;
        _navAgent.updatePosition = false;
        Stats = PlayerStats.CreateInitialStats();
    }
@@ -117,6 +120,23 @@ public class Player : MonoBehaviour
        }
    }

+    public void SetFoodObject(FoodObject foodObject)
+    {
+        foodObject.transform.parent = _holdPoint;
+        foodObject.transform.localPosition = Vector3.zero;
+        _foodObject = foodObject;
+        Debug.Log($"player hold {foodObject.GetFoodObjectSO().name}");
+
+    }
+    public FoodObject GetFoodObject()
+    {
+        return _foodObject;
+    }
+    public void ClearFoodObject()
+    {
+        _foodObject = null;
+    }
+
    private TaskStatus MoveToPoint()
    {
        SetPlayerAnimation(AnimationStates.Walking);
@@ -151,13 +171,18 @@ public class Player : MonoBehaviour
        Quaternion rotation = Quaternion.Slerp(transform.rotation, Quaternion.LookRotation(target), 10 * Time.deltaTime);
        rotation.x = 0;
        transform.rotation = rotation;
-        if (targetRot == transform.rotation)
+        if (IsApproximate(targetRot, transform.rotation, 0.000004f))
        {
            return TaskStatus.Complete;
        }
        return TaskStatus.InProgress;
    }

+    public static bool IsApproximate(Quaternion q1, Quaternion q2, float precision)
+    {
+        return Mathf.Abs(Quaternion.Dot(q1, q2)) >= 1 - precision;
+    }
+
    private TaskStatus InteractWithObject(BaseInteractableObject interactableObject)
    {
        interactableObject.Interact(this);
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c652740f6fc755242a12d600538e087a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aec77d0318a147746a02df3c98dc1b76, type: 3}
+  m_Name: Cola
+  m_EditorClassIdentifier: 
+  prefab: {fileID: 2680879424619819010, guid: 48940f42625c11541b2ebe92e86b6314, type: 3}
+  objectName: Cola
+  objectPrice: 0
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a4db4c329bb512349bf5373c80e7b84a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,9 @@
+using UnityEngine;
+
+[CreateAssetMenu()]
+public class FoodObjectSO : ScriptableObject
+{
+    public Transform prefab;
+    public string objectName;
+    public float objectPrice;
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aec77d0318a147746a02df3c98dc1b76
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: