Merge branch 'master' into ui_graphics

Assets/Data/Adena.asset

@@ -36,4 +36,5 @@ MonoBehaviour:
   - text: Away from this place and being worshipped as the goddess that I am, of
       course.
     bulletizedText: Being worshipped as a "goddess"...
-  m_typingSfx: {fileID: 0}
+  m_typingSfx: {fileID: 8300000, guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7, type: 3}
+  m_sfxPitch: 1.5

Assets/Data/Adventure Cat.asset

@@ -32,4 +32,5 @@ MonoBehaviour:
   - text: "<i>\u2026 (Although cats are far from stupid, you don\u2019t think that
       an adventure cat would necessarily think about this)</i>"
     bulletizedText: N/A
-  m_typingSfx: {fileID: 0}
+  m_typingSfx: {fileID: 8300000, guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7, type: 3}
+  m_sfxPitch: 1

Assets/Data/Amadeus.asset

@@ -32,4 +32,5 @@ MonoBehaviour:
     bulletizedText: Playing instruments... Really badly...
   - text: "As a free robot on an exciting adventure. No people tho, I hate people\u2026"
     bulletizedText: As a free robot with no people...
-  m_typingSfx: {fileID: 0}
+  m_typingSfx: {fileID: 8300000, guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7, type: 3}
+  m_sfxPitch: 1

Assets/Data/Derk.asset

@@ -31,4 +31,5 @@ MonoBehaviour:
     bulletizedText: Helped a lady get onto a high speed train.
   - text: "\u2026 (drools)"
     bulletizedText: ...
-  m_typingSfx: {fileID: 0}
+  m_typingSfx: {fileID: 8300000, guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7, type: 3}
+  m_sfxPitch: 1

Assets/Data/Rufus.asset

@@ -32,4 +32,5 @@ MonoBehaviour:
     bulletizedText: Told the authorities about the guy who stole his bone.
   - text: Hmm, probably going on adventures with my 5 kids.
     bulletizedText: Going on adventures with his kids.
-  m_typingSfx: {fileID: 0}
+  m_typingSfx: {fileID: 8300000, guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7, type: 3}
+  m_sfxPitch: 1.1

Assets/Prefabs/DialoguePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f18b8f083472d6b4ab442aca0ce66627
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/DialogueSfxSource.prefab

@@ -0,0 +1,130 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1175974429687692433
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2011489342914203193}
+  - component: {fileID: 9137333980855746299}
+  m_Layer: 0
+  m_Name: DialogueSfxSource
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2011489342914203193
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1175974429687692433}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 578.47845, y: 242.2219, z: 85.59771}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 36
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &9137333980855746299
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1175974429687692433}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Prefabs/DialogueSfxSource.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 91f02597aaae7b3469f33ab4837c4279
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/AdventurerInteractable.cs

@@ -32,7 +32,7 @@ public class AdventurerInteractable : MonoBehaviour
             return;
 
         GameManager.Instance.uiManager.BlockInput(true);
-        //PlayerController.Instance.cameraMovement = false;
+        PlayerController.Instance.cameraMovement = false;
         CharacterData character = CharacterManager.Instance.GetCharacterDataByName(m_name);
         GameManager.Instance.dialogueController.DisplayCharacterText(character);
     }

Assets/Scripts/DialogueSystem/CharacterData.cs

@@ -16,5 +16,6 @@ public class CharacterData : ScriptableObject
     [Header("The index of the dialogue relates to what question it should link too.")]
     public List<Dialogue> m_dialogueOptions;
 
-    public AudioSource m_typingSfx;
+    public AudioClip m_typingSfx;
+    public float m_sfxPitch = 1;
 }

Assets/Scripts/DialogueSystem/CharacterSheet.cs

@@ -49,6 +49,7 @@ public class CharacterSheet : MonoBehaviour
     public void Action_Close()
     {
         PlayerController.Instance.cameraMovement = true;
+        GameManager.Instance.uiManager.BlockInput(false);
         gameObject.SetActive(false);
     }
 }

Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs

@@ -17,6 +17,8 @@ public class DialoguePanel : MonoBehaviour
     [SerializeField] private TMP_Text m_characterText;
     [SerializeField] private CharacterSheetController m_characterSheetController;
     [SerializeField] private GameObject m_dialogueEndedIndicator;
+    [SerializeField] private AudioSource m_sfxSource;
+    [SerializeField] private Image m_characterImage;
 
     private const float TypingSpeed = 0.03f;
 
@@ -45,6 +47,9 @@ public class DialoguePanel : MonoBehaviour
     {
         m_questionIndexAsked.Clear();
 
+        m_characterImage.sprite = characterData.m_avatar;
+        m_sfxSource.pitch = characterData.m_sfxPitch;
+
         Cleanup();
 
         if (m_characterSheet != null)
@@ -53,6 +58,11 @@ public class DialoguePanel : MonoBehaviour
             m_characterSheet.gameObject.SetActive(false);
         }
 
+        if (characterData.m_typingSfx != null)
+        {
+            m_sfxSource.clip = characterData.m_typingSfx;
+        }
+
         m_questionsAsked = 0;
         m_currentCharacter = characterData;
         SetCharacterName();
@@ -141,6 +151,10 @@ public class DialoguePanel : MonoBehaviour
             }
 
             m_characterText.text += letter;
+
+            if (!m_sfxSource.isPlaying)
+                m_sfxSource.Play();
+
             yield return new WaitForSeconds(TypingSpeed);
         }
 

Assets/Scripts/PlayerController.cs

@@ -27,13 +27,16 @@ public class PlayerController : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (cameraMovement)
+        if (Input.GetMouseButton(1))
         {
-            float mouseX = 2 * (Input.mousePosition.x / playerCam.pixelWidth) - 1;
-            float mouseY = -(2 * (Input.mousePosition.y / playerCam.pixelHeight) - 1);
+            if (cameraMovement)
+            {
+                float mouseX = 2 * (Input.mousePosition.x / playerCam.pixelWidth) - 1;
+                float mouseY = -(2 * (Input.mousePosition.y / playerCam.pixelHeight) - 1);
 
-            Quaternion rotation = Quaternion.Euler(yLimit * mouseY, xLimit * mouseX, 0);
-            playerCam.transform.rotation = rotation;
+                Quaternion rotation = Quaternion.Euler(yLimit * mouseY, xLimit * mouseX, 0);
+                playerCam.transform.rotation = rotation;
+            }
         }
     }
 }

Assets/Sounds/asmadeus_typing_blip.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e6a0bdb8ea983384688879ba8f12ea65
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sounds/new_blip.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 4f0796ad7a8d5fc4f824fccd94e2e8e7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: