diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity
index fb65e1fd..08543f70 100644
--- a/Assets/Scenes/Previewer.unity
+++ b/Assets/Scenes/Previewer.unity
@@ -20,9 +20,9 @@ RenderSettings:
m_FogDensity: 0.017
m_LinearFogStart: 0
m_LinearFogEnd: 190
- m_AmbientSkyColor: {r: 0.05490196, g: 0.20392157, b: 0.29803923, a: 1}
- m_AmbientEquatorColor: {r: 0.4, g: 0.043137256, b: 0.043137256, a: 1}
- m_AmbientGroundColor: {r: 0.4, g: 0.04210527, b: 0.04210527, a: 1}
+ m_AmbientSkyColor: {r: 0.036842097, g: 0.13684209, b: 0.2, a: 1}
+ m_AmbientEquatorColor: {r: 0.2, g: 0.12894736, b: 0.18421052, a: 1}
+ m_AmbientGroundColor: {r: 0.2, g: 0.02156862, b: 0.02156862, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 1
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
@@ -455,6 +455,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
rule: hitsound
hideInWebGL: 0
+ requiredSetting:
+ enabled: 0
+ value:
+ Name:
+ Value: 0
+ ValueWebGL:
+ enabled: 0
+ value: 0
--- !u!114 &21018080
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2972,7 +2980,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3}
propertyPath: m_LocalPosition.x
@@ -3008,7 +3016,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 45
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -3310,7 +3318,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 157787857}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_ConstrainProportionsScale: 0
@@ -5475,6 +5483,11 @@ MonoBehaviour:
ValueWebGL:
enabled: 0
value: 0
+ - Name: dynamicreflections
+ Value: 1
+ ValueWebGL:
+ enabled: 1
+ value: 0
- Name: instantreflectionupdate
Value: 0
ValueWebGL:
@@ -5577,6 +5590,11 @@ MonoBehaviour:
ValueWebGL:
enabled: 0
value: 0
+ - Name: ambientlightbrightness
+ Value: 1
+ ValueWebGL:
+ enabled: 0
+ value: 0
- Name: lightreflectionbrightness
Value: 1
ValueWebGL:
@@ -6687,7 +6705,7 @@ RectTransform:
- {fileID: 1790001444}
- {fileID: 1366036431}
- {fileID: 945320143}
- - {fileID: 1966173302}
+ - {fileID: 1929824171}
- {fileID: 1533773246}
- {fileID: 978883079}
- {fileID: 1970197639}
@@ -8047,10 +8065,26 @@ PrefabInstance:
propertyPath: rule
value: staticlights
objectReference: {fileID: 0}
+ - target: {fileID: 9087878821805838481, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -40
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878821805838481, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -20
+ objectReference: {fileID: 0}
- target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_text
value: Static Lights
objectReference: {fileID: 0}
+ - target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_fontSize
+ value: 28
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_fontSizeBase
+ value: 28
+ objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -8085,7 +8119,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_SizeDelta.y
- value: 30
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_LocalPosition.x
@@ -8121,7 +8155,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 50
+ value: 55
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -8139,6 +8173,30 @@ PrefabInstance:
propertyPath: m_Name
value: StaticLightsToggle
objectReference: {fileID: 0}
+ - target: {fileID: 9087878822325604121, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 40
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822325604121, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 40
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878823131629686, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -14
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878823131629686, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: -14
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878823131629686, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878823131629686, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
--- !u!224 &414707492 stripped
@@ -8496,7 +8554,7 @@ MonoBehaviour:
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
- m_characterSpacing: 0
+ m_characterSpacing: -5
m_wordSpacing: 0
m_lineSpacing: -45
m_lineSpacingMax: 0
@@ -9955,6 +10013,84 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
+--- !u!1 &544070144
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 544070145}
+ - component: {fileID: 544070148}
+ - component: {fileID: 544070147}
+ m_Layer: 5
+ m_Name: Panel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &544070145
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 544070144}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 977786129}
+ - {fileID: 751222302}
+ m_Father: {fileID: 1100923271}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 300, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &544070147
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 544070144}
+ m_CullTransparentMesh: 1
+--- !u!114 &544070148
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 544070144}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ 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_Calls: []
+ m_Sprite: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &547325485
GameObject:
m_ObjectHideFlags: 0
@@ -12009,7 +12145,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
probe: {fileID: 1398062096}
defaultProbeIntensity: 0.5
- ambientLightBrightness: 0.6
+ ambientLightBrightness: 0.2
+ noReflectionAmbientBrightness: 0.5
+ ambientLightSaturation: 0.8
--- !u!1 &643289460
GameObject:
m_ObjectHideFlags: 0
@@ -12117,7 +12255,7 @@ RectTransform:
m_Father: {fileID: 222569108}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.43994582}
+ m_AnchorMin: {x: 0, y: 0.43994603}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
@@ -13804,6 +13942,96 @@ MonoBehaviour:
urlOutput: {fileID: 1687424028}
timeStampToggle: {fileID: 616199064}
timeStampToggleLabel: {fileID: 616199063}
+--- !u!1 &751222301
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 751222302}
+ - component: {fileID: 751222304}
+ - component: {fileID: 751222303}
+ - component: {fileID: 751222305}
+ m_Layer: 5
+ m_Name: LoadingIcon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &751222302
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751222301}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 544070145}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -30, y: 0}
+ m_SizeDelta: {x: 40, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &751222303
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751222301}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ 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_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 7ee48c5fba4919649a8a6094cbead669, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &751222304
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751222301}
+ m_CullTransparentMesh: 1
+--- !u!114 &751222305
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751222301}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4179ba28118d22245aec3e4728f8e95d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ rotationSpeed: -360
--- !u!1 &758716420
GameObject:
m_ObjectHideFlags: 0
@@ -14767,7 +14995,7 @@ RectTransform:
m_Children:
- {fileID: 828906996}
m_Father: {fileID: 1399682223}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -15672,8 +15900,8 @@ RectTransform:
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: -90}
- m_SizeDelta: {x: -120, y: 375.16003}
+ m_AnchoredPosition: {x: 0, y: -120}
+ m_SizeDelta: {x: -120, y: 330}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &842216064
MonoBehaviour:
@@ -15696,21 +15924,15 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_text: 'ArcViewer includes a feature to display a beatmap''s lightshow. These
- lightshows often include flashing lights that may cause discomfort or even seizures
- for some people.
-
- If you are someone who is affected by this, please enable
- the static lights setting below to disable the lightshow.
-
-
- Additionally,
- the lightshow graphics are resource intensive. If you are using slow/old hardware,
- or a mobile device, enabling static lights may drastically improve your framerate.
+ lightshows are made up of bright lasers and fast movement, and often include
+ flashing lights that may cause discomfort or even seizures for some people.
If
- either of the above apply to you, please turn on static lights below before continuing.
- This setting can be changed later at any time.'
+ you are someone who is affected by this, please
+
+ enable the static lights
+ setting below to turn off the lightshow before continuing.'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 78be5821565fc5848a05da897476c0d3, type: 2}
m_sharedMaterial: {fileID: -8419783504037868241, guid: 78be5821565fc5848a05da897476c0d3, type: 2}
@@ -15737,8 +15959,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 30
- m_fontSizeBase: 30
+ m_fontSize: 40
+ m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -15747,11 +15969,11 @@ MonoBehaviour:
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
- m_characterSpacing: 0
+ m_characterSpacing: -2
m_wordSpacing: 0
m_lineSpacing: -45
m_lineSpacingMax: 0
- m_paragraphSpacing: 20
+ m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
@@ -17554,6 +17776,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 976613778}
m_CullTransparentMesh: 1
+--- !u!1 &977786128
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 977786129}
+ - component: {fileID: 977786131}
+ - component: {fileID: 977786130}
+ m_Layer: 5
+ m_Name: NotificationText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &977786129
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 977786128}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 544070145}
+ 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_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &977786130
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 977786128}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ 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_Calls: []
+ m_text: Pre-warming shaders...
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 78be5821565fc5848a05da897476c0d3, type: 2}
+ m_sharedMaterial: {fileID: -8419783504037868241, guid: 78be5821565fc5848a05da897476c0d3, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 30
+ m_fontSizeBase: 30
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 8192
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 10, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &977786131
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 977786128}
+ m_CullTransparentMesh: 1
--- !u!1001 &978883078
PrefabInstance:
m_ObjectHideFlags: 0
@@ -19566,6 +19923,64 @@ MonoBehaviour:
AvailableObjects: []
ActiveObjects: []
prefab: {fileID: 8635635155791510051, guid: f1c4c49a48f936242bb3a78dc6035d99, type: 3}
+--- !u!1 &1100923270
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1100923271}
+ - component: {fileID: 1100923272}
+ m_Layer: 5
+ m_Name: ShaderWarmup
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1100923271
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1100923270}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 544070145}
+ m_Father: {fileID: 1399682223}
+ m_RootOrder: 13
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 300, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1100923272
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1100923270}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ae182a815e9fd2b4c898da841f3d76e6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ loadingPanel: {fileID: 544070144}
+ shaderCollections:
+ - {fileID: 20000000, guid: ddf6c0ce6655c92498a9345f531cb9e4, type: 2}
+ - {fileID: 20000000, guid: ed149418bea37034b9bded9f6f0fb5bd, type: 2}
+ - {fileID: 20000000, guid: da8a1b7762aa3034ba50f7324a0d91f5, type: 2}
+ - {fileID: 20000000, guid: 586412f92993b8b4a8b288de00c0a1fa, type: 2}
+ - {fileID: 20000000, guid: 68d72bcf34617f74499e0403f5a8394a, type: 2}
+ - {fileID: 20000000, guid: ca1f26319f48e7645a0747c6d97bb75c, type: 2}
--- !u!1 &1101988757
GameObject:
m_ObjectHideFlags: 0
@@ -24101,7 +24516,7 @@ ReflectionProbe:
m_CullingMask:
serializedVersion: 2
m_Bits: 3072
- m_IntensityMultiplier: 1
+ m_IntensityMultiplier: 0.5
m_BlendDistance: 1
m_HDR: 1
m_BoxProjection: 0
@@ -24153,6 +24568,7 @@ RectTransform:
- {fileID: 1578724047}
- {fileID: 1883172698}
- {fileID: 1592427290}
+ - {fileID: 1100923271}
- {fileID: 791807445}
m_Father: {fileID: 372932182}
m_RootOrder: 1
@@ -25723,7 +26139,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 660384184}
m_HandleRect: {fileID: 660384183}
m_Direction: 2
- m_Value: 0.9999996
+ m_Value: 1.0000001
m_Size: 0.56005394
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -29057,7 +29473,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1024758075}
m_HandleRect: {fileID: 1024758074}
m_Direction: 2
- m_Value: 0
+ m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -30066,7 +30482,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5665982775677310986, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: requiredSetting.enabled
- value: 0
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5665982775677310986, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: requiredSetting.value.Name
+ value: dynamicreflections
+ objectReference: {fileID: 0}
+ - target: {fileID: 5665982775677310986, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: requiredSetting.value.Value
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_text
@@ -30082,7 +30506,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_AnchorMax.x
@@ -30142,7 +30566,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -461
+ value: -601
objectReference: {fileID: 0}
- target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -30948,6 +31372,8 @@ RectTransform:
- {fileID: 1920767030}
- {fileID: 1029762458}
- {fileID: 281177665}
+ - {fileID: 1889944895}
+ - {fileID: 1966173302}
- {fileID: 1771876894}
- {fileID: 1859545663}
m_Father: {fileID: 2041664874}
@@ -30956,7 +31382,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10.000305, y: 0}
- m_SizeDelta: {x: -20, y: 601}
+ m_SizeDelta: {x: -20, y: 741}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1816189417
MonoBehaviour:
@@ -32239,7 +32665,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3}
propertyPath: m_AnchorMax.x
@@ -32299,7 +32725,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -546
+ value: -686
objectReference: {fileID: 0}
- target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -32372,6 +32798,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
rule: reflectionquality
hideInWebGL: 0
+ requiredSetting:
+ enabled: 1
+ value:
+ Name: dynamicreflections
+ Value: 1
+ ValueWebGL:
+ enabled: 0
+ value: 0
--- !u!1001 &1859765867
PrefabInstance:
m_ObjectHideFlags: 0
@@ -33116,6 +33550,135 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Text: Allows you to set your own custom colors
+--- !u!1001 &1889944894
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1816189416}
+ m_Modifications:
+ - target: {fileID: 5665982775677310986, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: rule
+ value: dynamicreflections
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_text
+ value: Dynamic Reflections
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 250
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 165
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -461
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9087878822117837791, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ propertyPath: m_Name
+ value: ReflectionsToggle
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+--- !u!224 &1889944895 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ m_PrefabInstance: {fileID: 1889944894}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1889944896 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 9087878822117837791, guid: a7f0a55a68792b5458628d0091c80d18, type: 3}
+ m_PrefabInstance: {fileID: 1889944894}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1889944897
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1889944896}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50a1bb069cc015242a8fd646a471379c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Text: Enables light reflections in the environment
(VERY HIGH performance impact
+ in browser version)
--- !u!1001 &1895200222
PrefabInstance:
m_ObjectHideFlags: 0
@@ -33708,6 +34271,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
rule: antialiasing
hideInWebGL: 1
+ requiredSetting:
+ enabled: 0
+ value:
+ Name:
+ Value: 0
+ ValueWebGL:
+ enabled: 0
+ value: 0
--- !u!114 &1920767035
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -34007,6 +34578,154 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Text: Restores the map's default settings
+--- !u!1001 &1929824170
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 344917548}
+ m_Modifications:
+ - target: {fileID: 4378467592403539595, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592403539595, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592403539595, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974616, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: rule
+ value: ambientlightbrightness
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974617, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_MaxValue
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974617, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_MinValue
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_RootOrder
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 250
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 60
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 165
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -566
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974619, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_Name
+ value: AmbientLightSlider
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592935618693, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: m_text
+ value: Ambient Light
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+--- !u!224 &1929824171 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ m_PrefabInstance: {fileID: 1929824170}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1929824172 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4378467592763974619, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ m_PrefabInstance: {fileID: 1929824170}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1929824173
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1929824172}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 50a1bb069cc015242a8fd646a471379c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Text: Adjusts the baseline brightness of the environment
--- !u!1 &1935205301
GameObject:
m_ObjectHideFlags: 0
@@ -34298,7 +35017,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 344917548}
+ m_TransformParent: {fileID: 1816189416}
m_Modifications:
- target: {fileID: 4378467592403539595, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_AnchorMax.x
@@ -34320,6 +35039,18 @@ PrefabInstance:
propertyPath: minOverride
value: Off
objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974616, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: requiredSetting.enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974616, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: requiredSetting.value.Name
+ value: dynamicreflections
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378467592763974616, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
+ propertyPath: requiredSetting.value.Value
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4378467592763974617, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_MaxValue
value: 2
@@ -34338,7 +35069,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_RootOrder
- value: 9
+ value: 7
objectReference: {fileID: 0}
- target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_AnchorMax.x
@@ -34398,7 +35129,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -566
+ value: -516
objectReference: {fileID: 0}
- target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Shaders/Objects/ArcShader.shadergraph b/Assets/Shaders/Objects/ArcShader.shadergraph
index e133bbf1..b2723cc8 100644
--- a/Assets/Shaders/Objects/ArcShader.shadergraph
+++ b/Assets/Shaders/Objects/ArcShader.shadergraph
@@ -299,6 +299,18 @@
},
{
"m_Id": "4d737e52749744eeb77be43e6a4b2ddd"
+ },
+ {
+ "m_Id": "af0c62685c584374b7325a325265e381"
+ },
+ {
+ "m_Id": "378cd6e559414544be7278d56cb8d569"
+ },
+ {
+ "m_Id": "5d708b789e7c4e93ac00d373a64a423d"
+ },
+ {
+ "m_Id": "69762896d21b4337bcfb3f63c5c25a2e"
}
],
"m_GroupDatas": [],
@@ -1722,6 +1734,18 @@
},
{
"m_Id": "6f06abf75e1741dcbe5617be5f5d0042"
+ },
+ {
+ "m_Id": "af0c62685c584374b7325a325265e381"
+ },
+ {
+ "m_Id": "378cd6e559414544be7278d56cb8d569"
+ },
+ {
+ "m_Id": "5d708b789e7c4e93ac00d373a64a423d"
+ },
+ {
+ "m_Id": "69762896d21b4337bcfb3f63c5c25a2e"
}
]
},
@@ -2000,6 +2024,30 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+ "m_ObjectId": "0936387b691e466c92fb3305fd26332b",
+ "m_Id": 0,
+ "m_DisplayName": "Normal (Tangent Space)",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "NormalTS",
+ "m_StageCapability": 2,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": [],
+ "m_Space": 3
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -3417,8 +3465,8 @@
"m_AlphaMode": 0,
"m_RenderFace": 2,
"m_AlphaClip": false,
- "m_CastShadows": true,
- "m_ReceiveShadows": true,
+ "m_CastShadows": false,
+ "m_ReceiveShadows": false,
"m_CustomEditorGUI": "",
"m_SupportVFX": false
}
@@ -4037,6 +4085,39 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "378cd6e559414544be7278d56cb8d569",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "SurfaceDescription.NormalTS",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "0936387b691e466c92fb3305fd26332b"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -5694,6 +5775,39 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "5d708b789e7c4e93ac00d373a64a423d",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "SurfaceDescription.Occlusion",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "e9b595159fdc492096c2f302779e43d2"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -6047,6 +6161,39 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "69762896d21b4337bcfb3f63c5c25a2e",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "SurfaceDescription.Metallic",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "8280c5e1761e45c4888fc204a3b3460e"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "SurfaceDescription.Metallic"
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -6837,6 +6984,21 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "8280c5e1761e45c4888fc204a3b3460e",
+ "m_Id": 0,
+ "m_DisplayName": "Metallic",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Metallic",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -7763,6 +7925,21 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "94240524621d48e0b9cb66663ae3d2aa",
+ "m_Id": 0,
+ "m_DisplayName": "Smoothness",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Smoothness",
+ "m_StageCapability": 2,
+ "m_Value": 0.5,
+ "m_DefaultValue": 0.5,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -8914,6 +9091,39 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "af0c62685c584374b7325a325265e381",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "SurfaceDescription.Smoothness",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "94240524621d48e0b9cb66663ae3d2aa"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "SurfaceDescription.Smoothness"
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.AddNode",
@@ -11164,6 +11374,21 @@
}
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "e9b595159fdc492096c2f302779e43d2",
+ "m_Id": 0,
+ "m_DisplayName": "Ambient Occlusion",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Occlusion",
+ "m_StageCapability": 2,
+ "m_Value": 1.0,
+ "m_DefaultValue": 1.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
diff --git a/Assets/Shaders/Objects/BombShader.shadergraph b/Assets/Shaders/Objects/BombShader.shadergraph
index dfdff738..5af6d079 100644
--- a/Assets/Shaders/Objects/BombShader.shadergraph
+++ b/Assets/Shaders/Objects/BombShader.shadergraph
@@ -73,12 +73,6 @@
{
"m_Id": "a0986eaca0404bf69bd58b3890b478a7"
},
- {
- "m_Id": "bfb167d57ba54893b71342b3d561365b"
- },
- {
- "m_Id": "933935d5b9d345168bdc5b414af6eb91"
- },
{
"m_Id": "4ce1048b0a8349efb86523867202e577"
},
@@ -274,12 +268,6 @@
},
{
"m_Id": "a0986eaca0404bf69bd58b3890b478a7"
- },
- {
- "m_Id": "bfb167d57ba54893b71342b3d561365b"
- },
- {
- "m_Id": "933935d5b9d345168bdc5b414af6eb91"
}
]
},
@@ -1150,39 +1138,6 @@
"m_SerializedDescriptor": "VertexDescription.Tangent"
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "933935d5b9d345168bdc5b414af6eb91",
- "m_Group": {
- "m_Id": ""
- },
- "m_Name": "SurfaceDescription.AlphaClipThreshold",
- "m_DrawState": {
- "m_Expanded": true,
- "m_Position": {
- "serializedVersion": "2",
- "x": 0.0,
- "y": 0.0,
- "width": 0.0,
- "height": 0.0
- }
- },
- "m_Slots": [
- {
- "m_Id": "f10f564e536c4ab89ecfff6ab60e97ea"
- }
- ],
- "synonyms": [],
- "m_Precision": 0,
- "m_PreviewExpanded": true,
- "m_PreviewMode": 0,
- "m_CustomColors": {
- "m_SerializableColors": []
- },
- "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
-}
-
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
@@ -1267,21 +1222,6 @@
}
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
- "m_ObjectId": "ac83dbb049ca4904a99b326cfbd5a7b8",
- "m_Id": 0,
- "m_DisplayName": "Alpha",
- "m_SlotType": 0,
- "m_Hidden": false,
- "m_ShaderOutputName": "Alpha",
- "m_StageCapability": 2,
- "m_Value": 1.0,
- "m_DefaultValue": 1.0,
- "m_Labels": []
-}
-
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -1423,7 +1363,7 @@
"m_ActiveSubTarget": {
"m_Id": "c446922c3eca472195de6c423474062a"
},
- "m_AllowMaterialOverride": true,
+ "m_AllowMaterialOverride": false,
"m_SurfaceType": 0,
"m_ZTestMode": 4,
"m_ZWriteControl": 0,
@@ -1436,39 +1376,6 @@
"m_SupportVFX": false
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "bfb167d57ba54893b71342b3d561365b",
- "m_Group": {
- "m_Id": ""
- },
- "m_Name": "SurfaceDescription.Alpha",
- "m_DrawState": {
- "m_Expanded": true,
- "m_Position": {
- "serializedVersion": "2",
- "x": 0.0,
- "y": 0.0,
- "width": 0.0,
- "height": 0.0
- }
- },
- "m_Slots": [
- {
- "m_Id": "ac83dbb049ca4904a99b326cfbd5a7b8"
- }
- ],
- "synonyms": [],
- "m_Precision": 0,
- "m_PreviewExpanded": true,
- "m_PreviewMode": 0,
- "m_CustomColors": {
- "m_SerializableColors": []
- },
- "m_SerializedDescriptor": "SurfaceDescription.Alpha"
-}
-
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
@@ -1952,21 +1859,6 @@
}
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
- "m_ObjectId": "f10f564e536c4ab89ecfff6ab60e97ea",
- "m_Id": 0,
- "m_DisplayName": "Alpha Clip Threshold",
- "m_SlotType": 0,
- "m_Hidden": false,
- "m_ShaderOutputName": "AlphaClipThreshold",
- "m_StageCapability": 2,
- "m_Value": 0.5,
- "m_DefaultValue": 0.5,
- "m_Labels": []
-}
-
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ViewDirectionMaterialSlot",
diff --git a/Assets/Shaders/Objects/NoteShader.shadergraph b/Assets/Shaders/Objects/NoteShader.shadergraph
index 133f850d..dfdf472f 100644
--- a/Assets/Shaders/Objects/NoteShader.shadergraph
+++ b/Assets/Shaders/Objects/NoteShader.shadergraph
@@ -88,12 +88,6 @@
{
"m_Id": "a0986eaca0404bf69bd58b3890b478a7"
},
- {
- "m_Id": "bfb167d57ba54893b71342b3d561365b"
- },
- {
- "m_Id": "933935d5b9d345168bdc5b414af6eb91"
- },
{
"m_Id": "66a14cbf3f9546fba68ac9b8c087180a"
},
@@ -535,12 +529,6 @@
{
"m_Id": "a0986eaca0404bf69bd58b3890b478a7"
},
- {
- "m_Id": "bfb167d57ba54893b71342b3d561365b"
- },
- {
- "m_Id": "933935d5b9d345168bdc5b414af6eb91"
- },
{
"m_Id": "8fb68f91d3ac4fe9848b9a1ae57b5624"
},
@@ -2470,39 +2458,6 @@
"m_SerializedDescriptor": "VertexDescription.Tangent"
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "933935d5b9d345168bdc5b414af6eb91",
- "m_Group": {
- "m_Id": ""
- },
- "m_Name": "SurfaceDescription.AlphaClipThreshold",
- "m_DrawState": {
- "m_Expanded": true,
- "m_Position": {
- "serializedVersion": "2",
- "x": 0.0,
- "y": 0.0,
- "width": 0.0,
- "height": 0.0
- }
- },
- "m_Slots": [
- {
- "m_Id": "f10f564e536c4ab89ecfff6ab60e97ea"
- }
- ],
- "synonyms": [],
- "m_Precision": 0,
- "m_PreviewExpanded": true,
- "m_PreviewMode": 0,
- "m_CustomColors": {
- "m_SerializableColors": []
- },
- "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
-}
-
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
@@ -2631,21 +2586,6 @@
"m_Labels": []
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
- "m_ObjectId": "ac83dbb049ca4904a99b326cfbd5a7b8",
- "m_Id": 0,
- "m_DisplayName": "Alpha",
- "m_SlotType": 0,
- "m_Hidden": false,
- "m_ShaderOutputName": "Alpha",
- "m_StageCapability": 2,
- "m_Value": 1.0,
- "m_DefaultValue": 1.0,
- "m_Labels": []
-}
-
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -2942,7 +2882,7 @@
"m_ActiveSubTarget": {
"m_Id": "c446922c3eca472195de6c423474062a"
},
- "m_AllowMaterialOverride": true,
+ "m_AllowMaterialOverride": false,
"m_SurfaceType": 0,
"m_ZTestMode": 4,
"m_ZWriteControl": 0,
@@ -2955,39 +2895,6 @@
"m_SupportVFX": false
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "bfb167d57ba54893b71342b3d561365b",
- "m_Group": {
- "m_Id": ""
- },
- "m_Name": "SurfaceDescription.Alpha",
- "m_DrawState": {
- "m_Expanded": true,
- "m_Position": {
- "serializedVersion": "2",
- "x": 0.0,
- "y": 0.0,
- "width": 0.0,
- "height": 0.0
- }
- },
- "m_Slots": [
- {
- "m_Id": "ac83dbb049ca4904a99b326cfbd5a7b8"
- }
- ],
- "synonyms": [],
- "m_Precision": 0,
- "m_PreviewExpanded": true,
- "m_PreviewMode": 0,
- "m_CustomColors": {
- "m_SerializableColors": []
- },
- "m_SerializedDescriptor": "SurfaceDescription.Alpha"
-}
-
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -3610,21 +3517,6 @@
"m_Labels": []
}
-{
- "m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
- "m_ObjectId": "f10f564e536c4ab89ecfff6ab60e97ea",
- "m_Id": 0,
- "m_DisplayName": "Alpha Clip Threshold",
- "m_SlotType": 0,
- "m_Hidden": false,
- "m_ShaderOutputName": "AlphaClipThreshold",
- "m_StageCapability": 2,
- "m_Value": 0.5,
- "m_DefaultValue": 0.5,
- "m_Labels": []
-}
-
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ViewDirectionMaterialSlot",
diff --git a/Assets/Shaders/PreloadedShaders.shadervariants b/Assets/Shaders/PreloadedShaders.shadervariants
deleted file mode 100644
index a7260737..00000000
--- a/Assets/Shaders/PreloadedShaders.shadervariants
+++ /dev/null
@@ -1,224 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!200 &20000000
-ShaderVariantCollection:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: PreloadedShaders
- m_Shaders:
- - first: {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - keywords: UNITY_UI_CLIP_RECT
- passType: 0
- - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 9104, guid: 0000000000000000f000000000000000, type: 0}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - keywords: UNITY_UI_CLIP_RECT
- passType: 0
- - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - keywords: _DEPTH_MSAA_8
- passType: 0
- - first: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
- second:
- variants:
- - keywords: _BLOOM_LQ _DITHERING _HDR_GRADING
- passType: 0
- - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
- second:
- variants:
- - keywords:
- passType: 8
- - keywords: INSTANCING_ON
- passType: 8
- - keywords:
- passType: 13
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _EMISSION
- _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
- passType: 13
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS
- _RECEIVE_SHADOWS_OFF
- passType: 13
- - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _EMISSION _MAIN_LIGHT_SHADOWS
- _RECEIVE_SHADOWS_OFF
- passType: 13
- - keywords: _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS
- _RECEIVE_SHADOWS_OFF
- passType: 13
- - first: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
- second:
- variants:
- - keywords: INSTANCING_ON
- passType: 8
- - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
- _EMISSION _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
- passType: 13
- - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
- _EMISSION _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF _SPECULAR_COLOR
- passType: 13
- - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _EMISSION _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
- passType: 13
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
- passType: 13
- - keywords: _ADDITIONAL_LIGHTS _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
- passType: 13
- - first: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
- second:
- variants:
- - keywords: _SMAA_PRESET_MEDIUM
- passType: 0
- - first: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3}
- second:
- variants:
- - keywords:
- passType: 0
- - first: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
- second:
- variants:
- - keywords: FOG_LINEAR INSTANCING_ON _SURFACE_TYPE_TRANSPARENT
- passType: 0
- - first: {fileID: -6465566751694194690, guid: 80258e4e9b4a5264ba5ec405f90e8db1, type: 3}
- second:
- variants:
- - keywords: INSTANCING_ON _ENVIRONMENTREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
- passType: 8
- - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
- _ENVIRONMENTREFLECTIONS_OFF _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF _SPECULARHIGHLIGHTS_OFF
- passType: 13
- - first: {fileID: -6465566751694194690, guid: 66d8d206117ffc94c9a79e46f82c556a, type: 3}
- second:
- variants:
- - keywords: INSTANCING_ON
- passType: 8
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS
- passType: 13
- - first: {fileID: -6465566751694194690, guid: a4af4af1e37e0e1458b48051e4ec8856, type: 3}
- second:
- variants:
- - keywords: INSTANCING_ON _ENVIRONMENTREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
- passType: 8
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ENVIRONMENTREFLECTIONS_OFF
- _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF _SPECULARHIGHLIGHTS_OFF
- passType: 13
- - first: {fileID: -6465566751694194690, guid: 35057e9060088dc4cb0a7f25885463b7, type: 3}
- second:
- variants:
- - keywords:
- passType: 13
- - first: {fileID: -6465566751694194690, guid: 5bfd0c6538974e64ab616dce89c1baf9, type: 3}
- second:
- variants:
- - keywords:
- passType: 13
- - first: {fileID: -6465566751694194690, guid: 1d9643761d2cd0148afc09c3646f1865, type: 3}
- second:
- variants:
- - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS
- passType: 13
- - first: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3}
- second:
- variants:
- - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
- _MAIN_LIGHT_SHADOWS
- passType: 13
diff --git a/Assets/Shaders/VariantCollections.meta b/Assets/Shaders/VariantCollections.meta
new file mode 100644
index 00000000..8436b6e6
--- /dev/null
+++ b/Assets/Shaders/VariantCollections.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3b8b754584807e949827d6d2abb21e70
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/ArcShader.shadervariants b/Assets/Shaders/VariantCollections/ArcShader.shadervariants
new file mode 100644
index 00000000..cb19c49e
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/ArcShader.shadervariants
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ArcShader
+ m_Shaders:
+ - first: {fileID: -6465566751694194690, guid: 66d8d206117ffc94c9a79e46f82c556a, type: 3}
+ second:
+ variants:
+ - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS
+ passType: 13
diff --git a/Assets/Shaders/PreloadedShaders.shadervariants.meta b/Assets/Shaders/VariantCollections/ArcShader.shadervariants.meta
similarity index 79%
rename from Assets/Shaders/PreloadedShaders.shadervariants.meta
rename to Assets/Shaders/VariantCollections/ArcShader.shadervariants.meta
index 4b78f2fd..a6fde3e3 100644
--- a/Assets/Shaders/PreloadedShaders.shadervariants.meta
+++ b/Assets/Shaders/VariantCollections/ArcShader.shadervariants.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6a1aa0ab0b56dba41a1789dff69ac449
+guid: 68d72bcf34617f74499e0403f5a8394a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 20000000
diff --git a/Assets/Shaders/VariantCollections/BombShader.shadervariants b/Assets/Shaders/VariantCollections/BombShader.shadervariants
new file mode 100644
index 00000000..f9c2b971
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/BombShader.shadervariants
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: BombShader
+ m_Shaders:
+ - first: {fileID: -6465566751694194690, guid: a4af4af1e37e0e1458b48051e4ec8856, type: 3}
+ second:
+ variants:
+ - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ENVIRONMENTREFLECTIONS_OFF
+ _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF
+ passType: 13
+ - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ENVIRONMENTREFLECTIONS_OFF _MAIN_LIGHT_SHADOWS
+ _SPECULARHIGHLIGHTS_OFF
+ passType: 13
diff --git a/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta b/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta
new file mode 100644
index 00000000..95d45d0a
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 586412f92993b8b4a8b288de00c0a1fa
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/NoteShader.shadervariants b/Assets/Shaders/VariantCollections/NoteShader.shadervariants
new file mode 100644
index 00000000..ca1a16bb
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/NoteShader.shadervariants
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: NoteShader
+ m_Shaders:
+ - first: {fileID: -6465566751694194690, guid: 80258e4e9b4a5264ba5ec405f90e8db1, type: 3}
+ second:
+ variants:
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
+ _ENVIRONMENTREFLECTIONS_OFF _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF
+ passType: 13
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ENVIRONMENTREFLECTIONS_OFF
+ _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF
+ passType: 13
diff --git a/Assets/Shaders/VariantCollections/NoteShader.shadervariants.meta b/Assets/Shaders/VariantCollections/NoteShader.shadervariants.meta
new file mode 100644
index 00000000..e5ad2a63
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/NoteShader.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed149418bea37034b9bded9f6f0fb5bd
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/SimpleLit.shadervariants b/Assets/Shaders/VariantCollections/SimpleLit.shadervariants
new file mode 100644
index 00000000..a56eab41
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/SimpleLit.shadervariants
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SimpleLit
+ m_Shaders:
+ - first: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+ second:
+ variants:
+ - keywords: INSTANCING_ON
+ passType: 8
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
+ _EMISSION _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
+ passType: 13
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
+ _EMISSION _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF _SPECULAR_COLOR
+ passType: 13
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _EMISSION _RECEIVE_SHADOWS_OFF
+ _SURFACE_TYPE_TRANSPARENT
+ passType: 13
diff --git a/Assets/Shaders/VariantCollections/SimpleLit.shadervariants.meta b/Assets/Shaders/VariantCollections/SimpleLit.shadervariants.meta
new file mode 100644
index 00000000..ae34f865
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/SimpleLit.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 64130ef7f3a87e846addd9ab057a00d9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants b/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants
new file mode 100644
index 00000000..ba660a55
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SimpleNoteShader
+ m_Shaders:
+ - first: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3}
+ second:
+ variants:
+ - keywords: FOG_LINEAR INSTANCING_ON _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS
+ _MAIN_LIGHT_SHADOWS
+ passType: 13
diff --git a/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants.meta b/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants.meta
new file mode 100644
index 00000000..07255f23
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: da8a1b7762aa3034ba50f7324a0d91f5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/UI.shadervariants b/Assets/Shaders/VariantCollections/UI.shadervariants
new file mode 100644
index 00000000..732d3729
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/UI.shadervariants
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: UI
+ m_Shaders:
+ - first: {fileID: -6465566751694194690, guid: 35057e9060088dc4cb0a7f25885463b7, type: 3}
+ second:
+ variants:
+ - keywords:
+ passType: 0
+ - first: {fileID: -6465566751694194690, guid: 5bfd0c6538974e64ab616dce89c1baf9, type: 3}
+ second:
+ variants:
+ - keywords:
+ passType: 0
diff --git a/Assets/Shaders/VariantCollections/UI.shadervariants.meta b/Assets/Shaders/VariantCollections/UI.shadervariants.meta
new file mode 100644
index 00000000..a96f2da7
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/UI.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ddf6c0ce6655c92498a9345f531cb9e4
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/VariantCollections/Unlit.shadervariants b/Assets/Shaders/VariantCollections/Unlit.shadervariants
new file mode 100644
index 00000000..d4687711
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/Unlit.shadervariants
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Unlit
+ m_Shaders:
+ - first: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+ second:
+ variants:
+ - keywords: FOG_LINEAR INSTANCING_ON _SURFACE_TYPE_TRANSPARENT
+ passType: 0
diff --git a/Assets/Shaders/VariantCollections/Unlit.shadervariants.meta b/Assets/Shaders/VariantCollections/Unlit.shadervariants.meta
new file mode 100644
index 00000000..88d43634
--- /dev/null
+++ b/Assets/Shaders/VariantCollections/Unlit.shadervariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ca1f26319f48e7645a0747c6d97bb75c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 20000000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Materials/Environment/Lights/PersistentLaser.mat b/Assets/_Materials/Environment/Lights/PersistentLaser.mat
index 9bae6c5c..9bec1644 100644
--- a/Assets/_Materials/Environment/Lights/PersistentLaser.mat
+++ b/Assets/_Materials/Environment/Lights/PersistentLaser.mat
@@ -95,12 +95,12 @@ Material:
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- - _Metallic: 0.6
+ - _Metallic: 0.5
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 0
- - _Smoothness: 0.7
+ - _Smoothness: 0.8
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/_Materials/Environment/Platform.mat b/Assets/_Materials/Environment/Platform.mat
index 4dac915c..39244c7d 100644
--- a/Assets/_Materials/Environment/Platform.mat
+++ b/Assets/_Materials/Environment/Platform.mat
@@ -122,7 +122,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.7
- _GlossyReflections: 1
- - _Metallic: 0.6
+ - _Metallic: 0.5
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
@@ -130,7 +130,7 @@ Material:
- _ReceiveShadows: 0
- _ReflectionSteps: 16
- _ReflectionsSource: 0
- - _Smoothness: 0.7
+ - _Smoothness: 0.8
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/_Materials/Objects/Bomb.mat b/Assets/_Materials/Objects/Bomb.mat
index 8aa08444..4b07a1c5 100644
--- a/Assets/_Materials/Objects/Bomb.mat
+++ b/Assets/_Materials/Objects/Bomb.mat
@@ -24,17 +24,15 @@ Material:
m_Shader: {fileID: -6465566751694194690, guid: a4af4af1e37e0e1458b48051e4ec8856, type: 3}
m_ValidKeywords:
- _ENVIRONMENTREFLECTIONS_OFF
- - _RECEIVE_SHADOWS_OFF
- _SPECULARHIGHLIGHTS_OFF
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _RECEIVE_SHADOWS_OFF
m_LightmapFlags: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
- stringTagMap:
- RenderType: Opaque
- disabledShaderPasses:
- - SHADOWCASTER
+ stringTagMap: {}
+ disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
diff --git a/Assets/_Materials/Objects/Notes/Note.mat b/Assets/_Materials/Objects/Notes/Note.mat
index d388bd02..0bd5fbe3 100644
--- a/Assets/_Materials/Objects/Notes/Note.mat
+++ b/Assets/_Materials/Objects/Notes/Note.mat
@@ -24,17 +24,15 @@ Material:
m_Shader: {fileID: -6465566751694194690, guid: 80258e4e9b4a5264ba5ec405f90e8db1, type: 3}
m_ValidKeywords:
- _ENVIRONMENTREFLECTIONS_OFF
- - _RECEIVE_SHADOWS_OFF
- _SPECULARHIGHLIGHTS_OFF
- m_InvalidKeywords: []
+ m_InvalidKeywords:
+ - _RECEIVE_SHADOWS_OFF
m_LightmapFlags: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
- disabledShaderPasses:
- - SHADOWCASTER
+ stringTagMap: {}
+ disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
diff --git a/Assets/_Prefabs/UI/EnumPicker.prefab b/Assets/_Prefabs/UI/EnumPicker.prefab
index 3f55e3c9..cafdf0d7 100644
--- a/Assets/_Prefabs/UI/EnumPicker.prefab
+++ b/Assets/_Prefabs/UI/EnumPicker.prefab
@@ -247,7 +247,13 @@ MonoBehaviour:
ValueNames: []
leftButton: {fileID: 8451347854270134142}
rightButton: {fileID: 8451347854602967183}
+ labelText: {fileID: 5241766548641530022}
valueText: {fileID: 5241766549002488903}
+ valueContainerImage: {fileID: 5241766548028883366}
+ enabledTextColor: {r: 1, g: 1, b: 1, a: 1}
+ disabledTextColor: {r: 0.19607843, g: 0.2, b: 0.20784314, a: 1}
+ enabledPanelSprite: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3}
+ disabledPanelSprite: {fileID: 97385571, guid: a6a675725f9775246bb4332629dcce11, type: 3}
--- !u!1 &5241766548641530016
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/__Scripts/Previewer/Graphics/EnvironmentLightingUpdater.cs b/Assets/__Scripts/Previewer/Graphics/EnvironmentLightingUpdater.cs
index ebe861d4..bbd75dd8 100644
--- a/Assets/__Scripts/Previewer/Graphics/EnvironmentLightingUpdater.cs
+++ b/Assets/__Scripts/Previewer/Graphics/EnvironmentLightingUpdater.cs
@@ -8,21 +8,30 @@ public class EnvironmentLightingUpdater : MonoBehaviour
[SerializeField] private ReflectionProbe probe;
[SerializeField] private float defaultProbeIntensity;
[SerializeField, Range(0f, 1f)] private float ambientLightBrightness;
+ [SerializeField, Range(0f, 1f)] private float noReflectionAmbientBrightness;
+ [SerializeField, Range(0f, 1f)] private float ambientLightSaturation;
private static readonly string[] lightingSettings = new string[]
{
+ "dynamicreflections",
"instantreflectionupdate",
"reflectionquality",
- "lightreflectionbrightness"
+ "lightreflectionbrightness",
+ "ambientlightbrightness"
};
+ private bool dynamicReflections;
private int renderId;
- private bool isRendering => !probe.IsFinishedRendering(renderId) && probe.timeSlicingMode != ReflectionProbeTimeSlicingMode.NoTimeSlicing;
+ private bool isRendering => dynamicReflections && !probe.IsFinishedRendering(renderId) && probe.timeSlicingMode != ReflectionProbeTimeSlicingMode.NoTimeSlicing;
+ private float ambientBrightness => (dynamicReflections ? ambientLightBrightness : noReflectionAmbientBrightness) * SettingsManager.GetFloat("ambientlightbrightness");
private void UpdateReflection()
{
- renderId = probe.RenderProbe();
+ if(dynamicReflections)
+ {
+ renderId = probe.RenderProbe();
+ }
}
@@ -35,14 +44,21 @@ private IEnumerator UpdateStaticLightsCoroutine()
public void UpdateStaticLights()
{
- if(LightManager.StaticLights && probe.timeSlicingMode != ReflectionProbeTimeSlicingMode.NoTimeSlicing)
+ if(dynamicReflections)
{
- //Wait for the current rendering to finish so lighting correctly updates
- StartCoroutine(UpdateStaticLightsCoroutine());
+ if(LightManager.StaticLights && probe.timeSlicingMode != ReflectionProbeTimeSlicingMode.NoTimeSlicing)
+ {
+ //Wait for the current rendering to finish so lighting correctly updates
+ StartCoroutine(UpdateStaticLightsCoroutine());
+ }
+ else
+ {
+ UpdateReflection();
+ }
}
else
{
- UpdateReflection();
+ UpdateColors(ColorManager.CurrentColors);
}
}
@@ -56,14 +72,20 @@ public void UpdateBeat(float beat)
}
- public void UpdateColors(ColorPalette newColors)
+ private void SetGradient(ColorPalette colors, float brightness)
{
- Color redColor = newColors.LightColor1.SetValue(ambientLightBrightness);
- Color blueColor = newColors.LightColor2.SetValue(ambientLightBrightness);
+ Color redColor = colors.LightColor1.SetHSV(null, ambientLightSaturation, ambientBrightness);
+ Color blueColor = colors.LightColor2.SetHSV(null, ambientLightSaturation, ambientBrightness);
RenderSettings.ambientGroundColor = redColor;
RenderSettings.ambientEquatorColor = Color.Lerp(redColor, blueColor, 0.5f);
RenderSettings.ambientSkyColor = blueColor;
DynamicGI.UpdateEnvironment();
+ }
+
+
+ public void UpdateColors(ColorPalette newColors)
+ {
+ SetGradient(newColors, ambientBrightness);
UpdateReflection();
}
@@ -72,31 +94,39 @@ public void UpdateSettings(string setting)
{
if(setting == "all" || lightingSettings.Contains(setting))
{
- probe.intensity = defaultProbeIntensity * SettingsManager.GetFloat("lightreflectionbrightness");
-
- bool instantUpdate = SettingsManager.GetBool("instantreflectionupdate");
- probe.timeSlicingMode = instantUpdate ? ReflectionProbeTimeSlicingMode.NoTimeSlicing : ReflectionProbeTimeSlicingMode.AllFacesAtOnce;
-
- switch(SettingsManager.GetInt("reflectionquality"))
+ dynamicReflections = SettingsManager.GetBool("dynamicreflections");
+ if(dynamicReflections)
{
- default:
- case 0:
- probe.resolution = 32;
- break;
- case 1:
- probe.resolution = 64;
- break;
- case 2:
- probe.resolution = 128;
- break;
- case 3:
- probe.resolution = 256;
- break;
- case 4:
- probe.resolution = 512;
- break;
+ probe.intensity = defaultProbeIntensity * SettingsManager.GetFloat("lightreflectionbrightness");
+
+ bool instantUpdate = SettingsManager.GetBool("instantreflectionupdate");
+ probe.timeSlicingMode = instantUpdate ? ReflectionProbeTimeSlicingMode.NoTimeSlicing : ReflectionProbeTimeSlicingMode.AllFacesAtOnce;
+
+ switch(SettingsManager.GetInt("reflectionquality"))
+ {
+ default:
+ case 0:
+ probe.resolution = 32;
+ break;
+ case 1:
+ probe.resolution = 64;
+ break;
+ case 2:
+ probe.resolution = 128;
+ break;
+ case 3:
+ probe.resolution = 256;
+ break;
+ case 4:
+ probe.resolution = 512;
+ break;
+ }
}
- UpdateReflection();
+ else
+ {
+ probe.intensity = 0f;
+ }
+ UpdateColors(ColorManager.CurrentColors);
}
else if(setting == "staticlights" || setting == "lightglowbrightness")
{
diff --git a/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs b/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs
new file mode 100644
index 00000000..eba28a08
--- /dev/null
+++ b/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using UnityEngine;
+
+public class ShaderWarmup : MonoBehaviour
+{
+ [SerializeField] private GameObject loadingPanel;
+ [SerializeField] private ShaderVariantCollection[] shaderCollections;
+
+
+ private IEnumerator WarmupShadersCoroutine()
+ {
+ loadingPanel.SetActive(true);
+ //Wait two frames to allow UI to render
+ yield return null;
+ yield return null;
+
+ foreach(ShaderVariantCollection collection in shaderCollections)
+ {
+ collection.WarmUp();
+ yield return null;
+ }
+
+ gameObject.SetActive(false);
+ Destroy(gameObject);
+ }
+
+
+ private void Start()
+ {
+ StartCoroutine(WarmupShadersCoroutine());
+ }
+}
\ No newline at end of file
diff --git a/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs.meta b/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs.meta
new file mode 100644
index 00000000..2c35d1d7
--- /dev/null
+++ b/Assets/__Scripts/Previewer/Graphics/ShaderWarmup.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ae182a815e9fd2b4c898da841f3d76e6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/__Scripts/Previewer/MapControl/Lightshow/LightManager.cs b/Assets/__Scripts/Previewer/MapControl/Lightshow/LightManager.cs
index 98124770..ffec8602 100644
--- a/Assets/__Scripts/Previewer/MapControl/Lightshow/LightManager.cs
+++ b/Assets/__Scripts/Previewer/MapControl/Lightshow/LightManager.cs
@@ -32,6 +32,8 @@ public static bool BoostActive
public static event Action OnLaserRotationsChanged;
public static event Action OnStaticLightsChanged;
+ public const float FlashIntensity = 1.2f;
+
private static ColorPalette colors => ColorManager.CurrentColors;
private static Color lightColor1 => BoostActive ? colors.BoostLightColor1 : colors.LightColor1;
private static Color lightColor2 => BoostActive ? colors.BoostLightColor2 : colors.LightColor2;
@@ -289,42 +291,47 @@ private Color GetOnColor(LightEvent lightEvent, Color baseColor, LightEvent next
private Color GetFlashColor(LightEvent lightEvent, Color baseColor)
{
- const float flashIntensity = 1.5f;
- const float fadeTime = 0.5f;
+ const float fadeTime = 0.6f;
float floatValue = lightEvent.FloatValue;
- float flashBrightness = floatValue * flashIntensity;
-
- baseColor.a = GetV1TransitionAlpha(flashBrightness, floatValue, fadeTime, lightEvent.Time);
+ float timeDifference = TimeManager.CurrentTime - lightEvent.Time;
+ if(timeDifference >= fadeTime)
+ {
+ baseColor.a = floatValue;
+ }
+ else
+ {
+ float t = timeDifference / fadeTime;
+ float flashBrightness = floatValue * FlashIntensity;
+ baseColor.a = Mathf.Lerp(flashBrightness, floatValue, Easings.Cubic.Out(t));
+ }
return baseColor;
}
private Color GetFadeColor(LightEvent lightEvent, Color baseColor)
{
- const float flashIntensity = 1.2f;
- const float fadeTime = 0.8f;
+ const float fadeTime = 1.5f;
float floatValue = lightEvent.FloatValue;
- float flashBrightness = floatValue * flashIntensity;
-
- baseColor.a = GetV1TransitionAlpha(flashBrightness, 0f, fadeTime, lightEvent.Time);
- return baseColor;
- }
-
-
- private float GetV1TransitionAlpha(float startAlpha, float endAlpha, float fadeTime, float eventTime)
- {
- float timeDifference = TimeManager.CurrentTime - eventTime;
+ float timeDifference = TimeManager.CurrentTime - lightEvent.Time;
if(timeDifference >= fadeTime)
{
- return endAlpha;
+ baseColor.a = 0f;
}
- if(timeDifference >= 0)
+ else
{
float t = timeDifference / fadeTime;
- return Mathf.Lerp(startAlpha, endAlpha, Easings.Quad.Out(t));
+ float flashBrightness = floatValue * FlashIntensity;
+ baseColor.a = Mathf.Lerp(flashBrightness, 0f, Easings.Expo.Out(t));
}
+ return baseColor;
+ }
+
+
+ private float GetV1TransitionAlpha(float startAlpha, float endAlpha, float fadeTime, float eventTime)
+ {
+
return 0f;
}
diff --git a/Assets/__Scripts/Previewer/MapControl/Lightshow/RingManager.cs b/Assets/__Scripts/Previewer/MapControl/Lightshow/RingManager.cs
index 53b5959b..68f85002 100644
--- a/Assets/__Scripts/Previewer/MapControl/Lightshow/RingManager.cs
+++ b/Assets/__Scripts/Previewer/MapControl/Lightshow/RingManager.cs
@@ -23,12 +23,13 @@ public class RingManager : MonoBehaviour
public const float BigRingStartStep = 0f;
public const bool StartRingZoomParity = true;
+ public const float StartRingZoomPosition = StartRingZoomParity ? 1f : 0f;
public static void UpdateRings()
{
- UpdateRingRotations();
UpdateRingZoom();
+ UpdateRingRotations();
}
@@ -63,18 +64,23 @@ public static void SetStaticRings()
eventArgs.affectBigRings = true;
OnRingRotationsChanged?.Invoke(eventArgs);
- OnRingZoomPositionChanged?.Invoke(StartRingZoomParity ? 1f : 0f);
+ OnRingZoomPositionChanged?.Invoke(StartRingZoomPosition);
}
private static void UpdateRingZoom()
{
+ if(RingZoomEvents.Count == 0)
+ {
+ OnRingZoomPositionChanged?.Invoke(StartRingZoomPosition);
+ return;
+ }
+
int lastIndex = RingZoomEvents.FindLastIndex(x => x.Beat <= TimeManager.CurrentBeat);
if(lastIndex < 0)
{
//No ring zoom has taken affect, set defaults
- float defaultPosition = StartRingZoomParity ? 1f : 0f;
- OnRingZoomPositionChanged?.Invoke(defaultPosition);
+ OnRingZoomPositionChanged?.Invoke(StartRingZoomPosition);
return;
}
diff --git a/Assets/__Scripts/Settings/Elements/SettingsEnumPicker.cs b/Assets/__Scripts/Settings/Elements/SettingsEnumPicker.cs
index 2db0959c..e0d60925 100644
--- a/Assets/__Scripts/Settings/Elements/SettingsEnumPicker.cs
+++ b/Assets/__Scripts/Settings/Elements/SettingsEnumPicker.cs
@@ -4,16 +4,27 @@ public class SettingsEnumPicker : MonoBehaviour
{
[SerializeField] private string rule;
[SerializeField] private bool hideInWebGL;
+ [SerializeField] private Optional> requiredSetting;
private EnumPicker enumPicker;
- public void SetRule(int value)
+ public void SetValue(int value)
{
SettingsManager.SetRule(rule, value);
}
+ public void UpdateSettings(string changedSetting)
+ {
+ SerializedOption option = requiredSetting.Value;
+ if(changedSetting == "all" || changedSetting == option.Name)
+ {
+ enumPicker.SetInteractable(option.Value == SettingsManager.GetBool(option.Name));
+ }
+ }
+
+
private void OnEnable()
{
#if UNITY_WEBGL
@@ -26,7 +37,19 @@ private void OnEnable()
enumPicker = GetComponent();
- enumPicker.OnValueChanged += SetRule;
+ enumPicker.OnValueChanged += SetValue;
enumPicker.SetValueWithoutNotify(SettingsManager.GetInt(rule));
+
+ if(requiredSetting.Enabled)
+ {
+ SettingsManager.OnSettingsUpdated += UpdateSettings;
+ UpdateSettings("all");
+ }
+ }
+
+
+ private void OnDisable()
+ {
+ SettingsManager.OnSettingsUpdated -= UpdateSettings;
}
}
\ No newline at end of file
diff --git a/Assets/__Scripts/UI/CustomElements/EnumPicker.cs b/Assets/__Scripts/UI/CustomElements/EnumPicker.cs
index f53941ea..867c5a4e 100644
--- a/Assets/__Scripts/UI/CustomElements/EnumPicker.cs
+++ b/Assets/__Scripts/UI/CustomElements/EnumPicker.cs
@@ -23,7 +23,15 @@ public int Value
[SerializeField] private Button leftButton;
[SerializeField] private Button rightButton;
+ [SerializeField] private TextMeshProUGUI labelText;
[SerializeField] private TextMeshProUGUI valueText;
+ [SerializeField] private Image valueContainerImage;
+
+ [Space]
+ [SerializeField] private Color enabledTextColor;
+ [SerializeField] private Color disabledTextColor;
+ [SerializeField] private Sprite enabledPanelSprite;
+ [SerializeField] private Sprite disabledPanelSprite;
private int maxValue => ValueNames.Length - 1;
@@ -49,6 +57,19 @@ public void SetValueWithoutNotify(int value)
}
+ public void SetInteractable(bool interactable)
+ {
+ leftButton.interactable = interactable;
+ rightButton.interactable = interactable;
+
+ Color textColor = interactable ? enabledTextColor : disabledTextColor;
+ labelText.color = textColor;
+ valueText.color = textColor;
+
+ valueContainerImage.sprite = interactable ? enabledPanelSprite : disabledPanelSprite;
+ }
+
+
private void UpdateElements()
{
valueText.text = ValueNames[Value];
diff --git a/Assets/__Scripts/Utilities/Easings.cs b/Assets/__Scripts/Utilities/Easings.cs
index 74088fa3..9b70f0ec 100644
--- a/Assets/__Scripts/Utilities/Easings.cs
+++ b/Assets/__Scripts/Utilities/Easings.cs
@@ -21,6 +21,27 @@ public static float InOut(float x)
}
+ public class Expo
+ {
+ public static float In(float x)
+ {
+ return x == 0 ? 0 : Mathf.Pow(2, 10 * x - 10);
+ }
+
+ public static float Out(float x)
+ {
+ return x == 1 ? 1 : 1 - Mathf.Pow(2, -10 * x);
+ }
+
+ public static float InOut(float x)
+ {
+ return x == 0 ? 0 : x == 1 ? 1 :
+ x < 0.5 ? Mathf.Pow(2, 20 * x - 10) / 2 :
+ (2 - Mathf.Pow(2, -20 * x + 10)) / 2;
+ }
+ }
+
+
public class Quad
{
public static float In(float x)
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 7f3bbc7c..4f7cc8ca 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -30,14 +30,12 @@ GraphicsSettings:
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
m_VideoShadersIncludeMode: 2
m_AlwaysIncludedShaders:
- - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- m_PreloadedShaders:
- - {fileID: 20000000, guid: 6a1aa0ab0b56dba41a1789dff69ac449, type: 2}
+ m_PreloadedShaders: []
m_PreloadShadersBatchTimeLimit: -1
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_CustomRenderPipeline: {fileID: 11400000, guid: c36b488ba5a463442ac014cb1880b3cb, type: 2}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index d0f56920..2547bc88 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
- bundleVersion: 0.3.0
+ bundleVersion: 0.3.1
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@@ -299,6 +299,10 @@ PlayerSettings:
m_ChunkSizeInMB: 16
m_MaxChunks: 0
m_OverrideDefaultSettings: 0
+ - m_BuildTarget: WebGL
+ m_ChunkSizeInMB: 16
+ m_MaxChunks: 0
+ m_OverrideDefaultSettings: 0
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0
@@ -371,7 +375,10 @@ PlayerSettings:
m_EncodingQuality: 0
- m_BuildTarget: Standalone
m_EncodingQuality: 0
- m_BuildTargetGroupLightmapSettings: []
+ m_BuildTargetGroupLightmapSettings:
+ - m_BuildTarget: WebGL
+ m_TextureStreamingEnabled: 0
+ m_TextureStreamingPriority: 0
m_BuildTargetNormalMapEncoding:
- m_BuildTarget: Android
m_Encoding: 1
@@ -625,7 +632,7 @@ PlayerSettings:
webGLTemplate: PROJECT:Fullscreen
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
- webGLCompressionFormat: 1
+ webGLCompressionFormat: 2
webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0