Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main

4 年前 · 7120f338
--- a/UOP1_Project/Assets/Prefabs/UI/GameScreen.prefab
+++ b/UOP1_Project/Assets/Prefabs/UI/GameScreen.prefab
  m_ChildScaleWidth: 0
  m_ChildScaleHeight: 0
  m_ReverseArrangement: 0
--- !u!114 &5928792209263973793
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6560401829490015095}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a40d14d4203a8e14e9cc748b46975252, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  currentInteractionType: 0
-  _inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
-  _onObjectPickUp: {fileID: 11400000, guid: f3027c4528b8e794f940a4696506f0c3, type: 2}
-  _onCookingStart: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765, type: 2}
-  _startTalking: {fileID: 11400000, guid: bff3df361fa61684386f84b5b062875a, type: 2}
-  _toggleInteractionUI: {fileID: 11400000, guid: 818cc55cb05226248bdb15ace58eab84,
-    type: 2}
-  _onInteractionEnded: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d,
-    type: 2}
 --- !u!1 &6822594373627009031
 GameObject:
  m_ObjectHideFlags: 0
  m_Modification:
    m_TransformParent: {fileID: 5405141848621952428}
    m_Modifications:
-    - target: {fileID: 256747372567420556, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1006702126982453226, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -1.4999924
-      objectReference: {fileID: 0}
-    - target: {fileID: 2265646551561389826, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 5.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2325994533620355897, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_text
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2325994533620355897, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontSize
-      value: 36
-      objectReference: {fileID: 0}
-    - target: {fileID: 2325994533620355897, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_enableAutoSizing
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2325994533620355897, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontColor32.rgba
-      value: 4279575352
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_text
-      value: E
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_margin.w
-      value: 4.238579
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_margin.y
-      value: 3.72703
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontColor.b
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontColor.g
-      value: 0.13725491
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontColor.r
-      value: 0.22352943
-      objectReference: {fileID: 0}
-    - target: {fileID: 7011926376560294723, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_fontColor32.rgba
-      value: 4278199097
-      objectReference: {fileID: 0}
    - target: {fileID: 7833966164169029321, guid: db08b77f6847f4a8eb29ee9db04444e9,
        type: 3}
      propertyPath: m_Pivot.x
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7993859469109541865, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 90d21c5e366e84dfca8fa91810fcb031,
-        type: 3}
-    - target: {fileID: 8561783461039203306, guid: db08b77f6847f4a8eb29ee9db04444e9,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -3
-      objectReference: {fileID: 0}
    - target: {fileID: 9211289335331061973, guid: db08b77f6847f4a8eb29ee9db04444e9,
        type: 3}
      propertyPath: m_Name
  m_SourcePrefab: {fileID: 100100000, guid: db08b77f6847f4a8eb29ee9db04444e9, type: 3}
+--- !u!224 &5217981830189993323 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7833966164169029321, guid: db08b77f6847f4a8eb29ee9db04444e9,
+    type: 3}
+  m_PrefabInstance: {fileID: 2656605275679865762}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1190722457586240764 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 3771874263071569758, guid: db08b77f6847f4a8eb29ee9db04444e9,
-  m_GameObject: {fileID: 6560401829490015095}
+  m_GameObject: {fileID: 0}
--- !u!224 &5217981830189993323 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7833966164169029321, guid: db08b77f6847f4a8eb29ee9db04444e9,
-    type: 3}
-  m_PrefabInstance: {fileID: 2656605275679865762}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &6560401829490015095 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 9211289335331061973, guid: db08b77f6847f4a8eb29ee9db04444e9,
-    type: 3}
-  m_PrefabInstance: {fileID: 2656605275679865762}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6822594372048639223
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.12731713, g: 0.13414736, b: 0.121078536, a: 1}
+  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
  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}
-    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
-      propertyPath: m_fontSize
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: fe129390af88b40faa85c89db6820ea6,
-        type: 2}
-    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
-      propertyPath: m_fontSizeBase
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 1981595050, guid: 1d09c349511c34e2d8b16f139aadb731, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: -5592514773993622969, guid: fe129390af88b40faa85c89db6820ea6,
-        type: 2}
-    - 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: 1063572125930110014, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: fe129390af88b40faa85c89db6820ea6,
-        type: 2}
-    - target: {fileID: 1063572125930110014, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: -5592514773993622969, guid: fe129390af88b40faa85c89db6820ea6,
-        type: 2}
-    - target: {fileID: 1063572125930110014, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_hasFontAssetChanged
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3879092395767892524, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3879092395767892524, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_Navigation.m_Mode
-      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: 366.21387
+      value: 653.8782
-      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}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6638366390932958226, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6638366390932958226, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6638366390932958226, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6638366390932958226, guid: 1d09c349511c34e2d8b16f139aadb731,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 6822594373627009028, guid: 1d09c349511c34e2d8b16f139aadb731,
        type: 3}