Merge branch 'master' into journal_ui

Add Rufus and Adventure Cat graphics

Assets/Images/Adventurers/Materials.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c62ed72fa2d3d5d45aca3f46f1c39d50
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Images/Adventurers/Materials/Derk.mat

@@ -1,40 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Derk
-  m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 2100000, guid: 0fd304c7a800a6b42b0ec7c79b4df005, type: 2}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _ALPHATEST_ON
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 0.85, y: 0.91}
-        m_Offset: {x: 0, y: 0.1}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 65b4f7abd9c8f374b94ba0e2b96a5829, type: 3}
-        m_Scale: {x: 0.85, y: 0.91}
-        m_Offset: {x: 0, y: 0.1}
-    m_Ints: []
-    m_Floats:
-    - _Glossiness: 0
-    - _Mode: 1
-    m_Colors: []
-  m_BuildTextureStacks: []

Assets/Images/Adventurers/Materials/Derk.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 163c5d738f93312448aa7c15dc910950
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/CharacterSheet.prefab

@@ -1,5 +1,140 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1723325277277634772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4479143234962749487}
+  - component: {fileID: 3385463958533993443}
+  - component: {fileID: 9149606548924611677}
+  - component: {fileID: 367220285745793740}
+  m_Layer: 5
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4479143234962749487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723325277277634772}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1229904979450104971}
+  - {fileID: 32996209149543633}
+  m_Father: {fileID: 6878822692408269584}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -1.2000122, y: -4.7}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &3385463958533993443
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723325277277634772}
+  m_CullTransparentMesh: 1
+--- !u!114 &9149606548924611677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723325277277634772}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  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!114 &367220285745793740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723325277277634772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  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: 9149606548924611677}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 6559301228595398145}
+        m_TargetAssemblyTypeName: CharacterSheet, Assembly-CSharp
+        m_MethodName: Action_Close
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &3648372493333439738
 GameObject:
   m_ObjectHideFlags: 0
@@ -153,7 +288,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6878822692408269584
 RectTransform:
   m_ObjectHideFlags: 0
@@ -168,6 +303,7 @@ RectTransform:
   m_Children:
   - {fileID: 1347195527817132476}
   - {fileID: 1377112572425850770}
+  - {fileID: 4479143234962749487}
   m_Father: {fileID: 0}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -229,6 +365,141 @@ MonoBehaviour:
   m_characterNameText: {fileID: 8516805613777976566}
   m_line: {fileID: 8356091297438698885}
   m_lineHolder: {fileID: 1377112572425850770}
+--- !u!1 &5732817486438337881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1229904979450104971}
+  - component: {fileID: 5213587678416575177}
+  - component: {fileID: 8418193166419577808}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1229904979450104971
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5732817486438337881}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4479143234962749487}
+  m_RootOrder: -1
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5213587678416575177
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5732817486438337881}
+  m_CullTransparentMesh: 1
+--- !u!114 &8418193166419577808
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5732817486438337881}
+  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: X
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4281479730
+  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 18
+  m_fontSizeBase: 18
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  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: 0
+  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!1 &6850406712601294282
 GameObject:
   m_ObjectHideFlags: 0
@@ -366,6 +637,82 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &8259641090681693092
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 32996209149543633}
+  - component: {fileID: 7928291291526589643}
+  - component: {fileID: 5967375585909443453}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &32996209149543633
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8259641090681693092}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4479143234962749487}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: 39.4857, y: -10}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &7928291291526589643
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8259641090681693092}
+  m_CullTransparentMesh: 1
+--- !u!114 &5967375585909443453
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8259641090681693092}
+  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: 35501749b39a2f64383e8c1d43146b28, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8872162762679651495
 GameObject:
   m_ObjectHideFlags: 0
@@ -401,7 +748,7 @@ RectTransform:
   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: -20.165}
+  m_AnchoredPosition: {x: 0, y: -20.164978}
   m_SizeDelta: {x: 0, y: -40.33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7384642251273810012

Assets/Scripts/DialogueSystem/CharacterSheet.cs

@@ -45,4 +45,10 @@ public class CharacterSheet : MonoBehaviour
     {
         return m_lines.ContainsKey(lineText);
     }
+
+    public void Action_Close()
+    {
+        PlayerController.Instance.cameraMovement = true;
+        gameObject.SetActive(false);
+    }
 }

Assets/Scripts/DialogueSystem/DialogueController.cs

@@ -27,11 +27,7 @@ public class DialogueController : MonoBehaviour
     public void OnQuestionsFinished(string characterName)
     {
         Debug.Log($"DialogueController: Character {characterName} finished interviewing");
-
         CharacterManager.Instance.SetInterviewed(characterName);
-        PlayerController.Instance.cameraMovement = true;
-
-        m_dialoguePanel.gameObject.SetActive(false);
     }
 
     public void Debug_NextCharacter()

Assets/Scripts/DialogueSystem/Mouse_Left_Key_Dark.png.meta

@@ -0,0 +1,166 @@
+fileFormatVersion: 2
+guid: 35501749b39a2f64383e8c1d43146b28
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs

@@ -16,6 +16,7 @@ public class DialoguePanel : MonoBehaviour
     [SerializeField] private TMP_Text m_characterNameText;
     [SerializeField] private TMP_Text m_characterText;
     [SerializeField] private CharacterSheetController m_characterSheetController;
+    [SerializeField] private GameObject m_dialogueEndedIndicator;
 
     private const float TypingSpeed = 0.03f;
 
@@ -42,6 +43,8 @@ public class DialoguePanel : MonoBehaviour
     // Sets the reference to the characterData to use.
     public void Setup(CharacterData characterData)
     {
+        m_questionIndexAsked.Clear();
+
         Cleanup();
 
         if (m_characterSheet != null)
@@ -52,12 +55,13 @@ public class DialoguePanel : MonoBehaviour
 
         m_questionsAsked = 0;
         m_currentCharacter = characterData;
-        m_characterNameText.text = characterData.name;
+        SetCharacterName();
 
         m_characterText.text = "Select an option...";
 
         SetupCharacterSheet();
 
+        // Only show the character sheet if they have already been interviewed.
         if (CharacterManager.Instance.CharacterInterviewed(characterData.name))
         {
             m_characterSheet.SetName(characterData.name);
@@ -69,7 +73,6 @@ public class DialoguePanel : MonoBehaviour
             return;
         }
 
-        m_questionIndexAsked.Clear();
         m_questionHolder.gameObject.SetActive(true);
         gameObject.SetActive(true);
 
@@ -77,6 +80,8 @@ public class DialoguePanel : MonoBehaviour
         {
             button.interactable = true;
         }
+
+        m_dialogueEndedIndicator.SetActive(false);
     }
 
     private void SetupCharacterSheet()
@@ -148,14 +153,29 @@ public class DialoguePanel : MonoBehaviour
         // If we've asked all the questions we should mark this character as interviewed and continue.
         if (QuestionsFinished)
         {
+            m_dialogueEndedIndicator.SetActive(true);
+
             OnQuestionsFinished?.Invoke(m_currentCharacter.name);
-            yield break;
         }
 
         // Re-enable the questions.
         m_questionHolder.gameObject.SetActive(true);
     }
 
+    private void SetCharacterName()
+    {
+        // NOTE - the "who are you?" question is always in the first index. Remember that...
+        var introduced = m_questionIndexAsked.Contains(0);
+
+        if (introduced)
+        {
+            m_characterNameText.text = m_currentCharacter.name;
+            return;
+        }
+
+        m_characterNameText.text = "???";
+    }
+
     // Handles displaying the correct dialogue for the question.
     private void OnQuestionButtonClicked(int index)
     {
@@ -181,6 +201,9 @@ public class DialoguePanel : MonoBehaviour
         m_questionIndexAsked.Add(index);
 
         m_questionButtons[index].interactable = false;
+
+        // Check if we can reveal the character's name.
+        SetCharacterName();
     }
 
     private void PopulateCharacterSheet()
@@ -192,6 +215,16 @@ public class DialoguePanel : MonoBehaviour
     // Callback from Unity on the skip button.
     public void Action_SkipButtonClicked()
     {
+        if (m_skipped && QuestionsFinished)
+            DialogueEndedClicked();
+
         m_skipped = true;
     }
+
+    // Sets the character as interviewed and releases control back to player.
+    public void DialogueEndedClicked()
+    {
+        PlayerController.Instance.cameraMovement = true;
+        gameObject.SetActive(false);
+    }
 }

Assets/Scripts/GameManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -13,6 +14,7 @@ public class GameManager : MonoBehaviour
     private float m_fadeTotal;
     [SerializeField] private bool m_showFade = false;
     [SerializeField] private float m_fadeDuration = 1;
+    private Action m_fadeCallback;
 
     private void Awake()
     {
@@ -36,6 +38,8 @@ public class GameManager : MonoBehaviour
                 m_fadeT += Time.deltaTime;
             } else
             {
+                m_fadeCallback?.Invoke();
+                m_fadeCallback = null;
                 m_fadeT -= Time.deltaTime;
             }
             m_fadeTotal += Time.deltaTime;
@@ -55,8 +59,9 @@ public class GameManager : MonoBehaviour
 
     }
 
-    public void FadePingPong()
+    public void FadePingPong(Action callback = null)
     {
+        m_fadeCallback = callback;
         m_fadeTotal = 0;
         m_showFade = true;
     }

Assets/Scripts/Journal.cs

@@ -95,7 +95,9 @@ public class Journal : MonoBehaviour
         bool success = QuestManager.Instance.RunQuestWithAdventurer(m_availableAdventurers[m_selectedAdventurer], activeQuest);
         Debug.Log("THE QUESTR ESULT WAS: " + success);
         adventurerPage.gameObject.SetActive(false);
-        if(success)
+
+        questPage.Find("QuestResult").gameObject.SetActive(true);
+        if (success)
         {
             questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true);
             questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false);
@@ -106,7 +108,7 @@ public class Journal : MonoBehaviour
         }
 
         questPage.Find("QuestResult/QuestResultText").gameObject.GetComponent<TMP_Text>().text = success ? activeQuest.successStr : activeQuest.failedStr;
-        questPage.Find("QuestResult").gameObject.SetActive(true);
+        
     }
 
     public void StartNextQuest()

Assets/Scripts/QuestManager.cs

@@ -60,6 +60,17 @@ public class QuestManager : MonoBehaviour
         return true;
     }
 
+    public void SpawnAdventurers()
+    {
+        foreach (var adventurer in Resources.FindObjectsOfTypeAll<AdventurerInteractable>())
+        {
+            if (adventurer.m_spawnQuestID == activeQuest)
+            {
+                adventurer.gameObject.SetActive(true);
+            }
+        }
+    }
+
     public void NextQuest()
     {
         activeQuest++;
@@ -68,14 +79,8 @@ public class QuestManager : MonoBehaviour
             Debug.Log("All quests completed");
         }
 
-        foreach (var adventurer in Resources.FindObjectsOfTypeAll<AdventurerInteractable>())
+        
-        {
+        GameManager.Instance.FadePingPong(SpawnAdventurers);
-            if (adventurer.m_spawnQuestID == activeQuest)
-            {
-                adventurer.gameObject.SetActive(true);
-            }
-        }
-        GameManager.Instance.FadePingPong();
     }
 
     public void RetryQuest()