small improvements

4 年前 · da6359bd
--- a/UOP1_Project/Assets/Prefabs/UI/Button.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/Button.prefab
      m_Calls: []
  m_text: X
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 0433667788cf3482abe18682de8c4d08, type: 2}
-  m_sharedMaterial: {fileID: 4291236748259981690, guid: 0433667788cf3482abe18682de8c4d08,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/UI/ButtonChoice.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/ButtonChoice.prefab
      m_Calls: []
  m_text: 
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295, type: 2}
-  m_sharedMaterial: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
  m_tintAllSprites: 0
  m_StyleSheet: {fileID: 0}
  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
+  m_overrideHtmlColors: 1
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
--- a/UOP1_Project/Assets/Prefabs/UI/DialoguePanel.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/DialoguePanel.prefab
  m_Father: {fileID: 3687453176568796422}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.3, y: -0.4}
-  m_AnchorMax: {x: 0.7, y: 0}
+  m_AnchorMin: {x: 0.3, y: -0.2}
+  m_AnchorMax: {x: 0.7, y: 0.2}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 1}
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: Kink
+  m_text: 
-  m_fontAsset: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295, type: 2}
-  m_sharedMaterial: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.02, y: 0.3}
-  m_AnchorMax: {x: 0.8, y: 0.7}
+  m_AnchorMax: {x: 0.98, y: 0.7}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
      m_Calls: []
  m_text: 
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295, type: 2}
-  m_sharedMaterial: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
  m_Modification:
    m_TransformParent: {fileID: 1284969402}
    m_Modifications:
-    - target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0.0008544922
-      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_Pivot.x
      propertyPath: m_Name
      value: ButtonChoice2
      objectReference: {fileID: 0}
-    - target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 2.3599854
-      objectReference: {fileID: 0}
-    - target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -0.009994507
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
 --- !u!224 &3787434768372665207 stripped
  m_Modification:
    m_TransformParent: {fileID: 1284969402}
    m_Modifications:
-    - target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0.0008544922
-      objectReference: {fileID: 0}
    - target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
        type: 3}
      propertyPath: m_Pivot.x
        type: 3}
      propertyPath: m_Name
      value: ButtonChoice1
-      objectReference: {fileID: 0}
-    - target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 2.3599854
-      objectReference: {fileID: 0}
-    - target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -0.009994507
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
--- a/UOP1_Project/Assets/Prefabs/UI/IngredientForRecipe.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/IngredientForRecipe.prefab
  m_Father: {fileID: 8641244786037450274}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMin: {x: 0.7, y: 0}
+  m_AnchorMax: {x: 1, y: 0.3}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
      m_Calls: []
  m_text: 3
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295, type: 2}
-  m_sharedMaterial: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 22.5
+  m_fontSize: 48.5
  m_fontSizeBase: 36
  m_fontWeight: 400
  m_enableAutoSizing: 1
--- a/UOP1_Project/Assets/Prefabs/UI/InventoryItem.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/InventoryItem.prefab
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 56.345062, y: 57.34552}
+  m_AnchoredPosition: {x: -4.82, y: 8.25}
+  m_SizeDelta: {x: 37.736374, y: 42.281708}
  m_Pivot: {x: 0.872194, y: 0.1950179}
 --- !u!222 &1189222223
 CanvasRenderer:
  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}
+  m_AnchoredPosition: {x: -0.003665924, y: 0.002105713}
+  m_SizeDelta: {x: -10.192535, y: -14.615784}
+  m_Pivot: {x: -0.0000011250377, y: 1.0000004}
 --- !u!222 &2019030447
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: 0
+  m_text: 
-  m_fontAsset: {fileID: 11400000, guid: 0433667788cf3482abe18682de8c4d08, type: 2}
-  m_sharedMaterial: {fileID: 4291236748259981690, guid: 0433667788cf3482abe18682de8c4d08,
+  m_fontAsset: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4, type: 2}
+  m_sharedMaterial: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 25.85
+  m_fontSize: 25
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMin: 10
+  m_fontSizeMax: 25
-  m_VerticalAlignment: 512
+  m_VerticalAlignment: 1024
  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
--- a/UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab
    - target: {fileID: 5875391952262063890, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 6117516323272882909, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 6284766384174538896, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8684897513429970688, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      objectReference: {fileID: 0}
    - target: {fileID: 8886944926927287629, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
+      propertyPath: m_text
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8886944926927287629, guid: d3899a1f923ed45d9a4474970d199c2d,
+        type: 3}
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 9095186734729422978, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 5875391952262063890, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 6117516323272882909, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 6284766384174538896, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8684897513429970688, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 8886944926927287629, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 9095186734729422978, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 182579719192307743, guid: 87ec0c6e99b114ddb9aec2a692e59eb1,
        type: 3}
      propertyPath: m_fontSize
-      value: 16.1
+      value: 27.85
      objectReference: {fileID: 0}
    - target: {fileID: 596569509949012314, guid: 87ec0c6e99b114ddb9aec2a692e59eb1,
        type: 3}
    - target: {fileID: 8215832079168058909, guid: 87ec0c6e99b114ddb9aec2a692e59eb1,
        type: 3}
      propertyPath: m_fontSize
-      value: 16.1
+      value: 27.85
-      value: 16.1
+      value: 27.85
-      value: 16.1
+      value: 27.85
-      value: 16.1
+      value: 27.85
      objectReference: {fileID: 0}
    - target: {fileID: 8704235664652183384, guid: 87ec0c6e99b114ddb9aec2a692e59eb1,
        type: 3}
    - target: {fileID: 5875391952262063890, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 6117516323272882909, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 6284766384174538896, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8684897513429970688, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 8886944926927287629, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 9095186734729422978, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 5875391952262063890, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 6117516323272882909, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 6284766384174538896, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 8684897513429970688, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 8886944926927287629, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
      propertyPath: m_fontSize
-      value: 25.85
+      value: 25
      objectReference: {fileID: 0}
    - target: {fileID: 9095186734729422978, guid: d3899a1f923ed45d9a4474970d199c2d,
        type: 3}
    - target: {fileID: 5418752264980940646, guid: fca99b3d000214a42a6c17cebaa4fffb,
        type: 3}
      propertyPath: m_fontSize
-      value: 19.1
+      value: 54.95
-      objectReference: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295,
+      objectReference: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4,
-      objectReference: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+      objectReference: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
        type: 2}
    - target: {fileID: 7245790260144332785, guid: fca99b3d000214a42a6c17cebaa4fffb,
        type: 3}
        type: 3}
      propertyPath: m_fontAsset
      value: 
-      objectReference: {fileID: 11400000, guid: 628bbc3932bce414d9b0a1791e6e5295,
+      objectReference: {fileID: 11400000, guid: bb1c0fa0546634b36a7684080c5e13b4,
-      objectReference: {fileID: 6854374191994729357, guid: 628bbc3932bce414d9b0a1791e6e5295,
+      objectReference: {fileID: 2296753957421111848, guid: bb1c0fa0546634b36a7684080c5e13b4,
        type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fca99b3d000214a42a6c17cebaa4fffb, type: 3}
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0.9
-      value: 0.2
+      value: 0.3
-      value: 0
+      value: 0.1
-      value: 0
+      value: 0.1
      objectReference: {fileID: 0}
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
-      value: -0
+      value: 0
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3687453176568796422, guid: 0ac9fcac72b964a9181545df5e543b03,
        type: 3}
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 4.599991
+      objectReference: {fileID: 0}
+    - target: {fileID: 8947289629008582571, guid: 42ed5ae1f90714c4488cfabda2298591,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 6.892578
      objectReference: {fileID: 0}
    - target: {fileID: 9077787785633350048, guid: 42ed5ae1f90714c4488cfabda2298591,
        type: 3}
--- a/UOP1_Project/Assets/Art/Font/Baloo_Tammudu_2/BalooTammudu2-BoldTest.asset.meta
+++ b/UOP1_Project/Assets/Art/Font/Baloo_Tammudu_2/BalooTammudu2-BoldTest.asset.meta
+fileFormatVersion: 2
+guid: bb1c0fa0546634b36a7684080c5e13b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: