hot fixes - Questline integration

3 年前 · ad52a32a
--- a/UOP1_Project/Assets/Prefabs/UI/GameplayScene/Canvas-Gameplay.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/GameplayScene/Canvas-Gameplay.prefab
  _popupPanel: {fileID: 2221699335589323001}
  _dialogueController: {fileID: 5434846252492230143}
  _inventoryPanel: {fileID: 3875863410152603130}
-  _interactionPanel: {fileID: 0}
+  _interactionPanel: {fileID: 2999915212724989254}
  _pauseScreen: {fileID: 5235689906329165859}
  _settingScreen: {fileID: 5966779880233791231}
  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
  _openUIDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
    type: 2}
-  _closeUIDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae,
+  _closeUIDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c,
    type: 2}
  _openInventoryScreenForCookingEvent: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765,
    type: 2}
  _onInteractionEndedEvent: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d,
    type: 2}
+  _mainProtagonist: {fileID: 11400000, guid: c7902af5c8e25244f94914ce51e7ea8a, type: 2}
 --- !u!114 &5434846252280455341
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_Modification:
    m_TransformParent: {fileID: 5434846252280455342}
    m_Modifications:
+    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 83.05115
+      objectReference: {fileID: 0}
+    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 653.8782
+      objectReference: {fileID: 0}
+    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -93.05115
+      objectReference: {fileID: 0}
    - target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
      propertyPath: m_Pivot.x
      propertyPath: m_Name
      value: InGameScreen
      objectReference: {fileID: 0}
+    - target: {fileID: 8320703179963651321, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
 --- !u!224 &5434846252551575277 stripped
  m_PrefabInstance: {fileID: 1568038478660161257}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &2999915212724989254 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4351352784699630511, guid: 1d09c349511c34e2d8b16f139aadb731,
+    type: 3}
+  m_PrefabInstance: {fileID: 1568038478660161257}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &3875863411324803208
 PrefabInstance:
  m_ObjectHideFlags: 0
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 2340965687570063786, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
+    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
 --- !u!224 &5434846252994748354 stripped
 RectTransform:
--- a/UOP1_Project/Assets/Prefabs/UI/GameplayScene/Dialogue/DialoguePanel.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/GameplayScene/Dialogue/DialoguePanel.prefab
  - {fileID: 3687453176493695291}
  - {fileID: 3787434768372665207}
  m_Father: {fileID: 3687453176568796422}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.3, y: -0.2}
  m_AnchorMax: {x: 0.7, y: 0.2}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -20}
+  m_AnchoredPosition: {x: 0, y: -0.53700256}
+  m_SizeDelta: {x: -20, y: -21.074}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &608682647154712064
 CanvasRenderer:
  - {fileID: 3687453178306247935}
  - {fileID: 3687453177589032025}
  - {fileID: 508816027883578973}
+  - {fileID: 9174077455468900772}
  - {fileID: 1284969402}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_EditorClassIdentifier: 
  _lineText: {fileID: 3687453177589032020}
  _actorNameText: {fileID: 3687453177247957428}
+  _mainProtagonistNameText: {fileID: 1717550391877885972}
+  _actorNamePanel: {fileID: 8871128358663421882}
+  _mainProtagonistNamePanel: {fileID: 6775198520747334479}
  _choicesManager: {fileID: 1284969405}
  _showChoicesEvent: {fileID: 11400000, guid: a4e5e48a0f3430c4197b317e650727c6, type: 2}
 --- !u!1 &3687453177247957432
  m_fontSizeMin: 36
  m_fontSizeMax: 72
  m_fontStyle: 1
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
  m_VerticalAlignment: 8192
  m_textAlignment: 65535
  m_characterSpacing: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 11.074}
+  m_SizeDelta: {x: 0, y: 22.148}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3687453178306247929
 CanvasRenderer:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6686754168844083945
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6558888704246330642}
+  - component: {fileID: 1578336456206000090}
+  - component: {fileID: 8435563916340845349}
+  - component: {fileID: 1717550391877885972}
+  m_Layer: 5
+  m_Name: ActorName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6558888704246330642
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6686754168844083945}
+  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: 9174077455468900772}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 20, y: 10}
+  m_SizeDelta: {x: -40, y: -20}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &1578336456206000090
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6686754168844083945}
+  m_CullTransparentMesh: 0
+--- !u!114 &8435563916340845349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6686754168844083945}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: fe129390af88b40faa85c89db6820ea6, type: 2}
+  m_sharedMaterial: {fileID: -5592514773993622969, guid: fe129390af88b40faa85c89db6820ea6,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4279575352
+  m_fontColor: {r: 0.21960784, g: 0.13725491, b: 0.08235294, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 72
+  m_fontSizeBase: 72
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 36
+  m_fontSizeMax: 72
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 8192
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1717550391877885972
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6686754168844083945}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_StringReference:
+    m_TableReference:
+      m_TableCollectionName: 
+    m_TableEntryReference:
+      m_KeyId: 0
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 1
+  m_FormatArguments: []
+  m_UpdateString:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8435563916340845349}
+        m_TargetAssemblyTypeName: 
+        m_MethodName: set_text
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &6775198520747334479
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9174077455468900772}
+  - component: {fileID: 1150394826157705389}
+  - component: {fileID: 3264012998857144091}
+  m_Layer: 5
+  m_Name: BG Pig Chef Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9174077455468900772
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6775198520747334479}
+  m_LocalRotation: {x: 0, y: 0, z: -0.01745245, w: 0.99984777}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6558888704246330642}
+  m_Father: {fileID: 3687453176568796422}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -2}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 30, y: 5}
+  m_SizeDelta: {x: 419.573, y: 93.757}
+  m_Pivot: {x: 1, y: 0.3}
+--- !u!222 &1150394826157705389
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6775198520747334479}
+  m_CullTransparentMesh: 0
+--- !u!114 &3264012998857144091
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6775198520747334479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: db58c6ea924fb4a56b58fedd4358b2f2, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8871128358663421882
 GameObject:
  m_ObjectHideFlags: 0
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &508816027883578973
 RectTransform:
  m_ObjectHideFlags: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -1.302002, y: 5.623993}
+  m_AnchoredPosition: {x: -30, y: 5}
  m_SizeDelta: {x: 419.573, y: 93.757}
  m_Pivot: {x: 0, y: 0.3}
 --- !u!222 &6423381960315871341
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 135.91998
+      value: 366.11832
-      value: 33.520004
+      value: 86.4
      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 223.87997
+      value: 569.1775
-      value: -16.760002
+      value: -43.2
      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_Name
      value: ButtonChoice2
      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381840, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
+      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_text
+      value: No translation found for 'New Entry' in Scene Names
+      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 24.65
+      objectReference: {fileID: 0}
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 135.91998
+      value: 366.11832
-      value: 33.520004
+      value: 86.4
      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 67.95999
+      value: 183.05916
-      value: -16.760002
+      value: -43.2
      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_Name
      value: ButtonChoice1
      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381840, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
+      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_text
+      value: No translation found for 'New Entry' in Scene Names
+      objectReference: {fileID: 0}
+    - target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 24.65
+      objectReference: {fileID: 0}
-      value: 1
+      value: 0
--- !u!224 &3687453176493695291 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
-    type: 3}
-  m_PrefabInstance: {fileID: 3787434767474088557}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3787434768243464469 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 1448887160, guid: bde732562bbef3c4785f9ce7c0af8047,
  m_Script: {fileID: 11500000, guid: b29347f90d2dc4d44a9f055fd9e1bf64, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!224 &3687453176493695291 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
+    type: 3}
+  m_PrefabInstance: {fileID: 3787434767474088557}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
  _loadMenuEvent: {fileID: 11400000, guid: 33cec85652903d245b99985f9cec9841, type: 2}
  _onInteractionEndedEvent: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d,
    type: 2}
+  _mainProtagonist: {fileID: 11400000, guid: c7902af5c8e25244f94914ce51e7ea8a, type: 2}
 --- !u!1001 &1395789391981611399
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest2/Q2-QL2.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest2/Q2-QL2.asset
  _steps:
  - {fileID: 11400000, guid: 70582a92306013d4e9fddbb0b43df1ea, type: 2}
  - {fileID: 11400000, guid: 8d18ae4e1aa3383459d7e78c9ad6782f, type: 2}
-  - {fileID: 11400000, guid: d65b049cbdc2d994ead13d53f75610b5, type: 2}
  _isDone: 0
  _endQuestEvent: {fileID: 0}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: ec1c0d3018291d9408fa1e33f1dae787, type: 2}
      Operator: 0
+  - FromState: {fileID: 11400000, guid: 614eeb7e93a91a949b3d833d68f347e5, type: 2}
+    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 050fbbaa48ac74961952b20dabfd6e88, type: 2}
+      Operator: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
  - FromState: {fileID: 11400000, guid: a31b3419615ff8241b5cabe8d29ef4d0, type: 2}
    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
      Operator: 0
-  - FromState: {fileID: 11400000, guid: 614eeb7e93a91a949b3d833d68f347e5, type: 2}
-    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 050fbbaa48ac74961952b20dabfd6e88, type: 2}
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
-      Operator: 0
--- a/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs
 	[SerializeField] private InputReader _inputReader = default;
 	public TransformAnchor gameplayCameraTransform;

-	[SerializeField] private VoidEventChannelSO _openInventoryChannel = default;
-
 	private Vector2 _inputVector;
 	private float _previousSpeed;


 	private void GroundCheck()
 	{
-		
+
 	}

 	private void RecalculateMovement()

 	private void OnMove(Vector2 movement)
 	{
-		Debug.Log("Move " + movement);
+
 		_inputVector = movement;
 	}

--- a/UOP1_Project/Assets/Scripts/Gameplay/GameStateSO.cs
+++ b/UOP1_Project/Assets/Scripts/Gameplay/GameStateSO.cs

 	public void UpdateGameState(GameState newGameState)
 	{
-		_previousGameState = _currentGameState;
-		_currentGameState = newGameState;
+		if (newGameState != CurrentGameState)
+		{
+			_previousGameState = _currentGameState;
+			_currentGameState = newGameState;
+		}

 	}
 	public void ResetToPreviousGameState()
--- a/UOP1_Project/Assets/Scripts/Input/InputReader.cs
+++ b/UOP1_Project/Assets/Scripts/Input/InputReader.cs

 	public void EnableDialogueInput()
 	{
-		Debug.Log("EnableDialogueInput");
 		gameInput.Menus.Enable();
 		gameInput.Gameplay.Disable();
 		gameInput.Dialogues.Enable();
 	{
-		Debug.Log("EnableGameplayInput");
 		gameInput.Menus.Disable();
 		gameInput.Dialogues.Disable();
 		gameInput.Gameplay.Enable();
 	{
-		Debug.Log("EnableMenuInput");
 		gameInput.Dialogues.Disable();
 		gameInput.Gameplay.Disable();

 	public void DisableAllInput()
 	{
-		Debug.Log("DisableAllInput");
 		gameInput.Gameplay.Disable();
 		gameInput.Menus.Disable();
 		gameInput.Dialogues.Disable();
--- a/UOP1_Project/Assets/Scripts/UI/Dialogue/UIDialogueManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/Dialogue/UIDialogueManager.cs

 	[SerializeField] private LocalizeStringEvent _actorNameText = default;

+	[SerializeField] private LocalizeStringEvent _mainProtagonistNameText = default;
+
+	[SerializeField] private GameObject _actorNamePanel = default;
+
+	[SerializeField] private GameObject _mainProtagonistNamePanel = default;
+
 	[SerializeField] private UIDialogueChoicesManager _choicesManager = default;

 	[SerializeField] private DialogueChoicesChannelSO _showChoicesEvent = default;
 		_showChoicesEvent.OnEventRaised -= ShowChoices;

 	}
-	public void SetDialogue(LocalizedString dialogueLine, ActorSO actor)
+	public void SetDialogue(LocalizedString dialogueLine, ActorSO actor, bool isMainProtagonist)
-		_actorNameText.StringReference = actor.ActorName;
+		_actorNamePanel.SetActive(!isMainProtagonist);
+		_mainProtagonistNamePanel.SetActive(isMainProtagonist);
+		if (!isMainProtagonist)
+		{
+			_actorNameText.StringReference = actor.ActorName;
+		}
+		else
+		{
+			_mainProtagonistNameText.StringReference = actor.ActorName;
+		}
+
+

 	void ShowChoices(List<Choice> choices)
 	{
--- a/UOP1_Project/Assets/Scripts/UI/UIManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIManager.cs
 	[SerializeField] private VoidEventChannelSO _onInteractionEndedEvent = default;


+	[SerializeField] private ActorSO _mainProtagonist = default;
 	bool isForCooking = false;

 	private void Start()
 		Time.timeScale = 1;

 	}
+
-		_dialogueController.SetDialogue(dialogueLine, actor);
+		bool isProtagonistTalking = (actor == _mainProtagonist);
+		_dialogueController.SetDialogue(dialogueLine, actor, isProtagonistTalking);
 		_dialogueController.gameObject.SetActive(true);
 	}
 	void CloseUIDialogue(int dialogueType)
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest2/Step3.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest2/Step3.meta
-fileFormatVersion: 2
-guid: 5d2a4f8bf8e32b8488bce3fe6a0595d6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: