diff --git a/Assets/Prefab/UI/PlayerDialogueViwer.prefab b/Assets/Prefab/UI/PlayerDialogueViwer.prefab index 3386092..f2ce85f 100644 --- a/Assets/Prefab/UI/PlayerDialogueViwer.prefab +++ b/Assets/Prefab/UI/PlayerDialogueViwer.prefab @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -163,7 +163,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6562215877067561314} m_Father: {fileID: 137519622818440187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -262,3 +263,137 @@ MonoBehaviour: IsOpenOnFirstLoad: 0 dialogueText: {fileID: 8851227466014393207} panel: {fileID: 4131091626654046850} +--- !u!1 &6242942909134640294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6562215877067561314} + - component: {fileID: 4143157757514703146} + - component: {fileID: 2860391209909992059} + m_Layer: 5 + m_Name: Click + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6562215877067561314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242942909134640294} + 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: 2911880712525793305} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -78, y: 43.566498} + m_SizeDelta: {x: 100, y: 43.133} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4143157757514703146 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242942909134640294} + m_CullTransparentMesh: 1 +--- !u!114 &2860391209909992059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6242942909134640294} + 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: Click To Next + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 2 + 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: -37.768677, 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} diff --git a/Assets/Script/Gameplay/Player/PlayerDialogueController.cs b/Assets/Script/Gameplay/Player/PlayerDialogueController.cs index db0afbd..e44119d 100644 --- a/Assets/Script/Gameplay/Player/PlayerDialogueController.cs +++ b/Assets/Script/Gameplay/Player/PlayerDialogueController.cs @@ -19,6 +19,9 @@ namespace Script.Gameplay.Player public event Action OnPlayerEndDialogue; public event Action OnGazeEnterDialogue; public event Action OnGazeExitDialogue; + + private InputManager inputManager; + private Queue dialogueQueue = new Queue(); private PlayerDialogueViewer playerDialogueViewer; @@ -55,7 +58,8 @@ namespace Script.Gameplay.Player if (firstPersonRaycaster == null) Debug.LogWarning("FirstPersonRaycaster not found! Please assign or add it to the player."); - var input = InputManager.Instance.Input; + inputManager = InputManager.Instance; + var input = inputManager.Input; input.Player.Read.performed += ctx => { if (!isEnablePlayerDialogue) return; @@ -95,6 +99,8 @@ namespace Script.Gameplay.Player OnPlayerBeginDialogue?.Invoke(); CurrentDialogueTarget.OnBeginDialogue?.Invoke(true); dialogueQueue = SplitDialogue(CurrentDialogueTarget.DialogueContent); + inputManager.SetInputForLook(false); + inputManager.SetInputForMove(false); PassNextDialogue(); } } @@ -124,6 +130,8 @@ namespace Script.Gameplay.Player isReadingDialogue = false; OnPlayerEndDialogue?.Invoke(); CurrentDialogueTarget.OnEndDialogue?.Invoke(true); + inputManager.SetInputForLook(true); + inputManager.SetInputForMove(true); if (playerDialogueViewer != null) { playerDialogueViewer.ClosePanel();