Skip to content

Commit

Permalink
Upgrade to 2020.1 (#7)
Browse files Browse the repository at this point in the history
* Updated to 2020.1a25 / 8.0.1

* Removed Unused Meta

* Added Target Framerate Option

* Updated to 2020.1.0f1

* Rebuilt lighting / VFX

* Rebuilt VFX

* updated CHANGELOG

* Updated README

Co-authored-by: Thomas ICHÉ <[email protected]>
  • Loading branch information
2 people authored and GitHub Enterprise committed Aug 6, 2020
1 parent 9e65bb1 commit b545258
Show file tree
Hide file tree
Showing 143 changed files with 5,675 additions and 69,576 deletions.
203 changes: 183 additions & 20 deletions Assets/Prefabs/UI/Options.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ MonoBehaviour:
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_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -191,6 +192,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3033398032675037666}
m_TargetAssemblyTypeName:
m_MethodName: Execute
m_Mode: 2
m_Arguments:
Expand All @@ -202,6 +204,7 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 3033398032675037670}
m_TargetAssemblyTypeName:
m_MethodName: Execute
m_Mode: 2
m_Arguments:
Expand Down Expand Up @@ -301,6 +304,7 @@ MonoBehaviour:
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_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand All @@ -326,6 +330,8 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
Expand All @@ -340,7 +346,10 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 516
m_isAlignmentEnumConverted: 0
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
Expand All @@ -352,7 +361,7 @@ MonoBehaviour:
m_overflowMode: 0
m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
parentLinkedComponent: {fileID: 0}
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
Expand All @@ -361,12 +370,12 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
Expand All @@ -386,15 +395,6 @@ MonoBehaviour:
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3524314482005887629
Expand Down Expand Up @@ -523,6 +523,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -605,6 +606,7 @@ MonoBehaviour:
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_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -710,8 +712,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -532.8, y: 476.5}
m_SizeDelta: {x: 935.6, y: 697}
m_AnchoredPosition: {x: -532.8, y: 521.8}
m_SizeDelta: {x: 935.6, y: 787.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8142071519371754441
CanvasRenderer:
Expand All @@ -736,6 +738,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.122641504, g: 0.122641504, b: 0.122641504, a: 0.99215686}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -810,6 +813,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -855,13 +859,14 @@ RectTransform:
- {fileID: 5548295505014957772}
- {fileID: 2032306197566446541}
- {fileID: 6030618246111798086}
- {fileID: 206520303812377283}
m_Father: {fileID: 8142071520102037208}
m_RootOrder: 0
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_SizeDelta: {x: 0, y: 91.6}
m_Pivot: {x: 0, y: 1}
--- !u!1 &8142071520866886643
GameObject:
Expand Down Expand Up @@ -923,6 +928,7 @@ MonoBehaviour:
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_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -1519,12 +1525,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6699389971860966280}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8681898421450852366 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2631596636220687238, guid: 8d2637a16f26d3a4cb26406c0db41e12,
type: 3}
m_PrefabInstance: {fileID: 6699389971860966280}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8681898422574575154 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2631596637209929146, guid: 8d2637a16f26d3a4cb26406c0db41e12,
Expand All @@ -1537,6 +1537,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8681898421450852366 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2631596636220687238, guid: 8d2637a16f26d3a4cb26406c0db41e12,
type: 3}
m_PrefabInstance: {fileID: 6699389971860966280}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8368201313267918168
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1918,3 +1924,160 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 8979729373484668186}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9008337465571099857
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8142071520797425369}
m_Modifications:
- target: {fileID: 4888742712370141929, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 67fbc7cad5a2e2b4ea3b147ab1869c5a,
type: 3}
- target: {fileID: 4888742712370141929, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 32
objectReference: {fileID: 0}
- target: {fileID: 4888742712370141929, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_MaxSize
value: 64
objectReference: {fileID: 0}
- target: {fileID: 8303849751464023101, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_Name
value: Target Framerate DropDown Variant
objectReference: {fileID: 0}
- target: {fileID: 8321613433154358908, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: dd750e88610afec418f910cb7f12bc69,
type: 3}
- target: {fileID: 8321613433154358908, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 32
objectReference: {fileID: 0}
- target: {fileID: 8321613433154358908, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_FontData.m_MaxSize
value: 64
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -480
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_SizeDelta.y
value: 96
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1aece9899e7ced74ba3009297e04de95, type: 3}
--- !u!224 &206520303812377283 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 9212603613775478290, guid: 1aece9899e7ced74ba3009297e04de95,
type: 3}
m_PrefabInstance: {fileID: 9008337465571099857}
m_PrefabAsset: {fileID: 0}
Loading

0 comments on commit b545258

Please sign in to comment.