Merge branch 'pr-bash' into main

4 年前 · 290cf250
--- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
--- a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
+++ b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
  m_Children:
  - {fileID: 1806157293}
  m_Father: {fileID: 2140469183}
-  m_RootOrder: 2
+  m_RootOrder: 3
-  m_AnchoredPosition: {x: 0, y: -323.2}
-  m_SizeDelta: {x: 337.9086, y: 144.69672}
+  m_AnchoredPosition: {x: 0, y: -255.3}
+  m_SizeDelta: {x: 240.65524, y: 116.64508}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &403475998
 MonoBehaviour:
      objectReference: {fileID: 0}
    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
-        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 60
+    m_FontSize: 40
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 4
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 622178817}
  m_CullTransparentMesh: 0
+--- !u!1 &684748716
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 684748717}
+  - component: {fileID: 684748719}
+  - component: {fileID: 684748718}
+  m_Layer: 5
+  m_Name: Disclaimer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &684748717
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 684748716}
+  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_Children: []
+  m_Father: {fileID: 2140469183}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -965.44}
+  m_SizeDelta: {x: -112.24219, y: 114.56348}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &684748718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 684748716}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 120
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Work in progress. This game is being made as a collaborative effort by
+    Unity and the community.
+--- !u!222 &684748719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 684748716}
+  m_CullTransparentMesh: 0
+--- !u!1 &821853654
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 821853655}
+  - component: {fileID: 821853657}
+  - component: {fileID: 821853656}
+  m_Layer: 5
+  m_Name: VersionNo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &821853655
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821853654}
+  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_Children: []
+  m_Father: {fileID: 2140469183}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -76.27, y: 114.56348}
+  m_SizeDelta: {x: 152.53586, y: 114.56348}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &821853656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821853654}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 120
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: v 0.6
+--- !u!222 &821853657
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821853654}
+  m_CullTransparentMesh: 0
 --- !u!1 &1228641979
 GameObject:
  m_ObjectHideFlags: 0
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 2140469183}
-  m_RootOrder: 0
+  m_RootOrder: 1
-  m_AnchoredPosition: {x: 0, y: -39.30005}
-  m_SizeDelta: {x: 0, y: 441.28995}
+  m_AnchoredPosition: {x: 0, y: -123.1}
+  m_SizeDelta: {x: 0, y: 280.2737}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1228641981
 MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 120
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    m_FontSize: 150
+    m_FontStyle: 1
-    m_MaxSize: 120
+    m_MaxSize: 150
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-  m_Text: 'Open Project #1:
-
-    Chop Chop'
+  m_Text: CHOP CHOP
 --- !u!222 &1228641982
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_GameObject: {fileID: 1228641979}
  m_CullTransparentMesh: 0
+--- !u!1 &1312122615
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1312122616}
+  - component: {fileID: 1312122618}
+  - component: {fileID: 1312122617}
+  m_Layer: 5
+  m_Name: UOP
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1312122616
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1312122615}
+  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_Children: []
+  m_Father: {fileID: 2140469183}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -49.1}
+  m_SizeDelta: {x: 0, y: 157.00864}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1312122617
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1312122615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 120
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Open Project #1
+--- !u!222 &1312122618
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1312122615}
+  m_CullTransparentMesh: 0
 --- !u!1 &1367871825
 GameObject:
  m_ObjectHideFlags: 0
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 60
+    m_FontSize: 40
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 4
  m_Children:
  - {fileID: 622178818}
  m_Father: {fileID: 2140469183}
-  m_RootOrder: 1
+  m_RootOrder: 2
-  m_AnchoredPosition: {x: 0, y: -107}
-  m_SizeDelta: {x: 337.9086, y: 144.69672}
+  m_AnchoredPosition: {x: 0, y: -81}
+  m_SizeDelta: {x: 240.65524, y: 116.64508}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1967191112
 MonoBehaviour:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children:
+  - {fileID: 1312122616}
+  - {fileID: 684748717}
+  - {fileID: 821853655}
  m_Father: {fileID: 1367871826}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset
+++ b/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset
  m_Script: {fileID: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3}
  m_Name: PaniniProjection
  m_EditorClassIdentifier: 
-  active: 1
+  active: 0
  m_AdvancedMode: 0
  distance:
    m_OverrideState: 0
--- a/UOP1_Project/ProjectSettings/ProjectSettings.asset
+++ b/UOP1_Project/ProjectSettings/ProjectSettings.asset
    16:10: 1
    16:9: 1
    Others: 1
-  bundleVersion: 0.6.5
+  bundleVersion: 0.6
  preloadedAssets:
  - {fileID: 11400000, guid: 56b1c58ec65bd4151b3054a32d1f7b69, type: 2}
  - {fileID: 11400000, guid: bf2387135d5fdc745b74293cd27573be, type: 2}
  resolutionScalingMode: 0
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Standalone: com.openprojects.chopchop
  buildNumber: {}
  AndroidBundleVersionCode: 1
  AndroidMinSdkVersion: 19