Control Dialogue with keyboard/controller

3 年前 · 129eaee3
--- a/UOP1_Project/Assets/Prefabs/UI/ButtonChoice.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/ButtonChoice.prefab
  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_EditorClassIdentifier: 
  m_Navigation:
    m_Mode: 1
+    m_WrapAround: 0
    m_SelectOnUp: {fileID: 0}
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_HighlightedSprite: {fileID: 21300000, guid: cc08ac3a6d81f4dcca62fa2c47106cdf,
      type: 3}
    m_PressedSprite: {fileID: 21300000, guid: 13a92ae90ccfc4d149b1e8e75b939eea, type: 3}
-    m_SelectedSprite: {fileID: 21300000, guid: cc08ac3a6d81f4dcca62fa2c47106cdf, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: cef813fa90c604e8b9174b485411e5b1, type: 3}
    m_DisabledSprite: {fileID: 21300000, guid: de74024259ffb4053bd23f3f7d26e397, type: 3}
  m_AnimationTriggers:
    m_NormalTrigger: Normal
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 1448887160}
+        m_TargetAssemblyTypeName: 
        m_MethodName: ButtonClicked
        m_Mode: 1
        m_Arguments:
  m_EditorClassIdentifier: 
  _choiceText: {fileID: 550526547636381840}
  _makeAChoiceEvent: {fileID: 11400000, guid: f7b40077957f3834a8d5354c3e4ce759, type: 2}
+  _actionButton: {fileID: 20254461}
 --- !u!1 &550526547636381838
 GameObject:
  m_ObjectHideFlags: 0
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
-  m_fontAsset: {fileID: 0}
-  m_sharedMaterial: {fileID: 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_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 550526547636381843}
+        m_TargetAssemblyTypeName: 
        m_MethodName: set_text
        m_Mode: 0
        m_Arguments:
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &670213351 stripped
 MonoBehaviour:
  - {fileID: 1540519754}
  - {fileID: 1172743537}
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
    - target: {fileID: 3687453176493695291, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 305.48352
+      value: 342.49884
+      objectReference: {fileID: 0}
+    - target: {fileID: 3687453176493695291, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 86.4
-      value: 152.74176
+      value: 171.24942
-      value: -48.699997
+      value: -43.2
      objectReference: {fileID: 0}
    - target: {fileID: 3687453176568796421, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3687453177247957434, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
+        type: 2}
+    - target: {fileID: 3687453177247957434, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - target: {fileID: 3687453177589032026, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
+        type: 2}
+    - target: {fileID: 3687453177589032026, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - target: {fileID: 3687453177890222846, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
+        type: 2}
+    - target: {fileID: 3687453177890222846, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+    - target: {fileID: 3787434767487850674, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
+        type: 2}
+    - target: {fileID: 3787434767487850674, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
    - target: {fileID: 3787434768372665207, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_AnchorMax.y
    - target: {fileID: 3787434768372665207, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_SizeDelta.x
-      value: 305.48352
+      value: 342.49884
+      objectReference: {fileID: 0}
+    - target: {fileID: 3787434768372665207, guid: 0ac9fcac72b964a9181545df5e543b03,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 86.4
-      value: 152.74176
+      value: 533.7483
-      value: -156.09999
+      value: -43.2
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0ac9fcac72b964a9181545df5e543b03, type: 3}
  m_Modification:
    m_TransformParent: {fileID: 1869732381}
    m_Modifications:
+    - target: {fileID: 968371501, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 968371502, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 13.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 968371503, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_fontSize
+      value: 39.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 968371503, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_margin.y
+      value: 26.23859
+      objectReference: {fileID: 0}
+    - target: {fileID: 968371503, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: fe129390af88b40faa85c89db6820ea6,
+        type: 2}
+    - target: {fileID: 968371503, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: -5592514773993622969, guid: fe129390af88b40faa85c89db6820ea6,
+        type: 2}
+    - target: {fileID: 968371503, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_HorizontalAlignment
+      value: 2
+      objectReference: {fileID: 0}
-      value: 27.2
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
      propertyPath: m_fontAsset
+    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
+      propertyPath: m_enableAutoSizing
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 331506982569814171, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_text
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 331506982569814171, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 331506982569814171, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_fontSizeBase
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 331506982569814171, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_enableAutoSizing
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 331506982569814171, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4279575352
+      objectReference: {fileID: 0}
+    - target: {fileID: 3879092395767892524, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4300684638909922464, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 1.4000015
+      objectReference: {fileID: 0}
    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
      propertyPath: m_AnchorMax.y
    - target: {fileID: 5405141848621952428, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 235.29004
+      value: 366.21387
+      objectReference: {fileID: 0}
+    - target: {fileID: 6560401829490015095, guid: 1d09c349511c34e2d8b16f139aadb731,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6638366390932958226, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
-    m_TransformParent: {fileID: 1598614622}
+    m_TransformParent: {fileID: 0}
-      value: 1
+      value: 4
-      value: 2.084942
+      value: 2.030888
-      value: 2.084942
+      value: 2.030888
-      value: 2.084942
+      value: 2.030888
-      value: 195.39575
+      value: 1263.33
-      value: -307.80307
+      value: 226.177
-      value: 129.12236
+      value: 125.77474
      objectReference: {fileID: 0}
    - target: {fileID: 8313085416397863404, guid: 2af68f4e6b94140cfbcdee05fcc28ce3,
        type: 3}
--- a/UOP1_Project/Assets/Scripts/UI/UIDialogueChoiceFiller.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIDialogueChoiceFiller.cs
 using UnityEngine;
 using TMPro;
 using UnityEngine.Localization.Components;
+using UnityEngine.UI;

 public class UIDialogueChoiceFiller : MonoBehaviour
 {
+	[SerializeField] private Button _actionButton = default; 

 	Choice currentChoice;

 	{
 		if (_makeAChoiceEvent != null)
 			_makeAChoiceEvent.RaiseEvent(currentChoice);
+	}
+	public void SetSelected()
+	{
+		if(_actionButton != null)
+			_actionButton.Select(); 
+
 	}
 }
--- a/UOP1_Project/Assets/Scripts/UI/UIDialogueChoicesManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIDialogueChoicesManager.cs
 				}

 			}
+			if(choices.Count> 0)
+			{
+				listChoiceButtons[0].SetSelected(); 
+
+			}

 		}

--- a/UOP1_Project/Assets/Art/UI/UI
+++ b/UOP1_Project/Assets/Art/UI/UI
--- a/Proposition/Selected.png.meta
+++ b/Proposition/Selected.png.meta
+fileFormatVersion: 2
+guid: cef813fa90c604e8b9174b485411e5b1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  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: 165, y: 36, z: 163, w: 34}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: