Setup "Click to exit" on the dialogue to prevent snapping on end

This commit is contained in:
Amaan Shawkath
2023-07-09 10:07:14 +01:00
parent d2bea3814a
commit d17c7b59e3
5 changed files with 440 additions and 9 deletions

View File

@@ -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()

BIN
Assets/Scripts/DialogueSystem/Mouse_Left_Key_Dark.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -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:

View File

@@ -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;
@@ -58,6 +59,7 @@ public class DialoguePanel : MonoBehaviour
SetupCharacterSheet();
// Only show the character sheet if they have already been interviewed.
if (CharacterManager.Instance.CharacterInterviewed(characterData.name))
{
m_characterSheet.SetName(characterData.name);
@@ -77,6 +79,8 @@ public class DialoguePanel : MonoBehaviour
{
button.interactable = true;
}
m_dialogueEndedIndicator.SetActive(false);
}
private void SetupCharacterSheet()
@@ -148,8 +152,9 @@ 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.
@@ -192,6 +197,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);
}
}