Merge remote-tracking branch 'tech-mkt/main'

Author: CiroContnsUnity

UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab

@@ -172,6 +172,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sfxEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
   _audioConfig: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a, type: 2}
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
   singShort: {fileID: 11400000, guid: dc084ea80fc70c74c95fa8e7c4ff13eb, type: 2}
   singLong: {fileID: 11400000, guid: 998031b022f319e4c9ec9642c83bdc0c, type: 2}
   talk: {fileID: 11400000, guid: dc084ea80fc70c74c95fa8e7c4ff13eb, type: 2}

UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab

@@ -322,6 +322,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _sfxEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
   _audioConfig: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a, type: 2}
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
   singShort: {fileID: 0}
   singLong: {fileID: 0}
   talk: {fileID: 11400000, guid: 580085b9570e66a47b71870d84097990, type: 2}
@@ -396,32 +397,32 @@ PrefabInstance:
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 2.1800003
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.01
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 1.6499996
+      value: -10
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.60620785
+      value: 0.9989147
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: -0.04657678
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.7953063
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 201382439289553597, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
         type: 3}
@@ -463,6 +464,11 @@ PrefabInstance:
       propertyPath: m_ComponentOwner
       value: 
       objectReference: {fileID: 8489273322263003005}
+    - target: {fileID: 5170601539462982588, guid: 2f2b34bb9de172f478cdd8e33a4589a9,
+        type: 3}
+      propertyPath: m_Lens.m_SensorSize.x
+      value: 2.440945
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2f2b34bb9de172f478cdd8e33a4589a9, type: 3}
 --- !u!1 &254623157318905803 stripped
@@ -611,7 +617,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
         type: 3}
       propertyPath: m_Name
-      value: FryKing
+      value: ChefComb
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
         type: 3}