From 1527c2f9113f77fc510e186807ef9f7264fee8d9 Mon Sep 17 00:00:00 2001
From: "https://gl.mathhub.info/SESch93" <john.schihada@hotmail.com>
Date: Tue, 27 Jul 2021 11:05:55 +0200
Subject: [PATCH] Added the possibility to enable/disable the features
DynamicScrollDescriptions and AutomaticHintGeneration
---
.../Prefabs/ScrollParameterDisplay.prefab | 229 +++++++++---------
Assets/Scenes/TreeWorld.unity | 84 ++++++-
.../Scripts/InventoryStuff/ScrollDetails.cs | 28 ++-
3 files changed, 218 insertions(+), 123 deletions(-)
diff --git a/Assets/Resources/Prefabs/ScrollParameterDisplay.prefab b/Assets/Resources/Prefabs/ScrollParameterDisplay.prefab
index 16eb5f10..b102e2fb 100644
--- a/Assets/Resources/Prefabs/ScrollParameterDisplay.prefab
+++ b/Assets/Resources/Prefabs/ScrollParameterDisplay.prefab
@@ -13,10 +13,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
imageToChange: {fileID: 8358525157842135572}
- animationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1}
- animationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1}
- animationTrigger: 0
- animateDuration: 5
--- !u!33 &5935859409558485024
MeshFilter:
m_ObjectHideFlags: 0
@@ -40,15 +36,15 @@ 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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Hint
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: e102aafbe9ad5444aa6caf6c496a8c72, type: 2}
- m_sharedMaterial: {fileID: -2291642635969528081, guid: e102aafbe9ad5444aa6caf6c496a8c72,
- type: 2}
+ m_fontAsset: {fileID: 0}
+ m_sharedMaterial: {fileID: 0}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -66,20 +62,21 @@ 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
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 26
m_fontSizeBase: 26
m_fontWeight: 400
- m_enableAutoSizing: 0
+ m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
m_textAlignment: 514
m_characterSpacing: 0
m_wordSpacing: 0
@@ -90,10 +87,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -101,40 +96,18 @@ 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
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 6723528486337534183}
- characterCount: 4
- spriteCount: 0
- spaceCount: 0
- wordCount: 1
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
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!1001 &8313031688112979328
@@ -146,108 +119,108 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
+ propertyPath: m_Pivot.x
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
+ propertyPath: m_Pivot.y
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalPosition.z
+ propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
+ propertyPath: m_AnchorMax.x
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
+ propertyPath: m_AnchorMax.y
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
+ propertyPath: m_AnchorMin.x
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalRotation.w
+ propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_RootOrder
- value: 0
+ propertyPath: m_SizeDelta.x
+ value: 120
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
+ propertyPath: m_SizeDelta.y
+ value: 210
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
+ propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
+ propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchoredPosition.x
+ propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -70
+ propertyPath: m_LocalRotation.w
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_SizeDelta.x
- value: 120
+ propertyPath: m_LocalRotation.x
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_SizeDelta.y
- value: 210
+ propertyPath: m_LocalRotation.y
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
+ propertyPath: m_LocalRotation.z
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
+ propertyPath: m_AnchoredPosition.x
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
+ propertyPath: m_AnchoredPosition.y
+ value: -70
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492117, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 45775000557492118, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -276,28 +249,28 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultColor.r
- value: 1
+ propertyPath: defaultColor.a
+ value: 0.5294118
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultColor.g
+ propertyPath: defaultColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultColor.b
+ propertyPath: defaultColor.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultColor.a
- value: 0.5294118
+ propertyPath: defaultColor.r
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: highlightColor.r
- value: 0.9529412
+ propertyPath: highlightColor.b
+ value: 0.07058824
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -306,33 +279,33 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: highlightColor.b
- value: 0.07058824
+ propertyPath: highlightColor.r
+ value: 0.9529412
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultHintButtonColor.r
- value: 1
+ propertyPath: defaultHintButtonColor.a
+ value: 0.5294118
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultHintButtonColor.g
+ propertyPath: defaultHintButtonColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultHintButtonColor.b
+ propertyPath: defaultHintButtonColor.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: defaultHintButtonColor.a
- value: 0.5294118
+ propertyPath: defaultHintButtonColor.r
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: availableHintButtonColor.r
- value: 0.9529412
+ propertyPath: availableHintButtonColor.b
+ value: 0.07058824
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -341,23 +314,50 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1430730640409366961, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: availableHintButtonColor.b
- value: 0.07058824
+ propertyPath: availableHintButtonColor.r
+ value: 0.9529412
objectReference: {fileID: 0}
- target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
propertyPath: m_fontSize
- value: 40
+ value: 36
+ objectReference: {fileID: 0}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_margin.y
+ value: -5.0954895
objectReference: {fileID: 0}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_fontAsset
+ value:
+ objectReference: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150,
+ type: 2}
- target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
propertyPath: m_fontSizeBase
- value: 40
+ value: 36
objectReference: {fileID: 0}
- target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_firstOverflowCharacterIndex
- value: -1
+ propertyPath: m_textAlignment
+ value: 65535
+ objectReference: {fileID: 0}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_sharedMaterial
+ value:
+ objectReference: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150,
+ type: 2}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_TextStyleHashCode
+ value: -1183493901
+ objectReference: {fileID: 0}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_VerticalAlignment
+ value: 512
objectReference: {fileID: 0}
- target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -366,8 +366,13 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_margin.y
- value: -5.0954895
+ propertyPath: m_HorizontalAlignment
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1686984722580339795, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 5738028260646118123, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -381,28 +386,28 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7669725544194832573, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -193.3
+ propertyPath: m_SizeDelta.x
+ value: 70
objectReference: {fileID: 0}
- target: {fileID: 7669725544194832573, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -63.7
+ propertyPath: m_SizeDelta.y
+ value: 30
objectReference: {fileID: 0}
- target: {fileID: 7669725544194832573, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_SizeDelta.x
- value: 70
+ propertyPath: m_AnchoredPosition.x
+ value: -63.7
objectReference: {fileID: 0}
- target: {fileID: 7669725544194832573, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_SizeDelta.y
- value: 30
+ propertyPath: m_AnchoredPosition.y
+ value: -193.3
objectReference: {fileID: 0}
- target: {fileID: 7707475700987653288, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -40.5
+ propertyPath: m_SizeDelta.y
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 7707475700987653288, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
@@ -411,8 +416,8 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7707475700987653288, guid: 0f75dbd3f5b33b040948ba58d3b90cb0,
type: 3}
- propertyPath: m_SizeDelta.y
- value: 50
+ propertyPath: m_AnchoredPosition.y
+ value: -40.5
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 6410099383612658499, guid: 0f75dbd3f5b33b040948ba58d3b90cb0, type: 3}
diff --git a/Assets/Scenes/TreeWorld.unity b/Assets/Scenes/TreeWorld.unity
index 9ed29692..ca9fe993 100644
--- a/Assets/Scenes/TreeWorld.unity
+++ b/Assets/Scenes/TreeWorld.unity
@@ -38,12 +38,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 138245306}
- m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+ m_IndirectSpecularColor: {r: 0.4410863, g: 0.4898401, b: 0.5699197, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
- serializedVersion: 11
+ serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
@@ -98,7 +98,8 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
- m_UseShadowmask: 1
+ m_LightingSettings: {fileID: 4890085278179872738, guid: 14e5ba440f2fdd14bb575936dddde1b0,
+ type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
@@ -118,6 +119,8 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
+ maxJobWorkers: 0
+ preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
@@ -2855,6 +2858,7 @@ Light:
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &138245307
@@ -6283,6 +6287,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -6307,6 +6312,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &318619250
MeshFilter:
m_ObjectHideFlags: 0
@@ -8183,6 +8189,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -8207,6 +8214,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &422404980
MeshFilter:
m_ObjectHideFlags: 0
@@ -8786,6 +8794,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -8810,6 +8819,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &444871398
MeshFilter:
m_ObjectHideFlags: 0
@@ -9874,6 +9884,7 @@ LineRenderer:
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -10898,6 +10909,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -10922,6 +10934,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &535944727
MeshFilter:
m_ObjectHideFlags: 0
@@ -20430,6 +20443,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -20454,6 +20468,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1009368152
MeshFilter:
m_ObjectHideFlags: 0
@@ -31682,6 +31697,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -31706,6 +31722,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1563243736
MeshFilter:
m_ObjectHideFlags: 0
@@ -33983,6 +34000,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -34007,6 +34025,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1675643437
MeshFilter:
m_ObjectHideFlags: 0
@@ -40358,6 +40377,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -40382,6 +40402,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2019831182
MeshFilter:
m_ObjectHideFlags: 0
@@ -44261,6 +44282,7 @@ Light:
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &685153537209802452
@@ -44518,6 +44540,16 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1274450867600639853, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: automaticHintGenerationActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1274450867600639853, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: dynamicScrollDescriptionsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 5237843606108538431, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -44578,6 +44610,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -44603,6 +44636,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1017499588648496289
GameObject:
m_ObjectHideFlags: 0
@@ -44642,6 +44676,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -44666,6 +44701,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &1099843466031652983
MeshRenderer:
m_ObjectHideFlags: 0
@@ -44681,6 +44717,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -44705,6 +44742,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1316124618987194725
GameObject:
m_ObjectHideFlags: 0
@@ -44824,6 +44862,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -44848,6 +44887,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1745987128933336103
MeshFilter:
m_ObjectHideFlags: 0
@@ -45422,6 +45462,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45447,6 +45488,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &2600518979547571749
MeshRenderer:
m_ObjectHideFlags: 0
@@ -45462,6 +45504,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45486,6 +45529,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!4 &2609522164336802835
Transform:
m_ObjectHideFlags: 0
@@ -45640,6 +45684,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45664,6 +45709,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4170768673617977780
GameObject:
m_ObjectHideFlags: 0
@@ -45759,6 +45805,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45783,6 +45830,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!4 &4565031082369432565
Transform:
m_ObjectHideFlags: 0
@@ -45829,6 +45877,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45853,6 +45902,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &5064968614624445547
MeshFilter:
m_ObjectHideFlags: 0
@@ -45920,6 +45970,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -45944,6 +45995,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!4 &5537943171067704051
Transform:
m_ObjectHideFlags: 0
@@ -46001,6 +46053,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46025,6 +46078,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &5951941432316338672
MeshFilter:
m_ObjectHideFlags: 0
@@ -46066,6 +46120,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46091,6 +46146,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &6256956892669881441
GameObject:
m_ObjectHideFlags: 0
@@ -46160,6 +46216,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46184,6 +46241,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1001 &6999573641241424516
PrefabInstance:
m_ObjectHideFlags: 0
@@ -46341,7 +46399,9 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 6999573642288568606, guid: 8590393c51194934a95cdc2075fc4dec, type: 3}
+ - {fileID: 6999573640440716766, guid: 8590393c51194934a95cdc2075fc4dec, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 8590393c51194934a95cdc2075fc4dec, type: 3}
--- !u!4 &6999573641241424517 stripped
Transform:
@@ -46414,6 +46474,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46438,6 +46499,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &7643328943036952926
MeshRenderer:
m_ObjectHideFlags: 0
@@ -46453,6 +46515,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46479,6 +46542,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &7649001581117388135
MeshFilter:
m_ObjectHideFlags: 0
@@ -46502,6 +46566,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46526,6 +46591,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8037038874798551250
GameObject:
m_ObjectHideFlags: 0
@@ -46573,6 +46639,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46597,6 +46664,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &8284392456268054784
MeshRenderer:
m_ObjectHideFlags: 0
@@ -46612,6 +46680,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46636,6 +46705,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &8379924837567921489
MeshRenderer:
m_ObjectHideFlags: 0
@@ -46651,6 +46721,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46675,6 +46746,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &8393955356175092067
MeshFilter:
m_ObjectHideFlags: 0
@@ -46720,6 +46792,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46744,6 +46817,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!23 &8509506421963195749
MeshRenderer:
m_ObjectHideFlags: 0
@@ -46759,6 +46833,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -46783,6 +46858,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &8656279830196498237
MeshFilter:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/InventoryStuff/ScrollDetails.cs b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
index ea4a0946..57413cc3 100644
--- a/Assets/Scripts/InventoryStuff/ScrollDetails.cs
+++ b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
@@ -22,6 +22,9 @@ public class ScrollDetails : MonoBehaviour
public string currentMmtAnswer;
+ public bool dynamicScrollDescriptionsActive = true;
+ public bool automaticHintGenerationActive = true;
+
public Vector3 GetPosition(int i)
{
return new Vector3(x_Start, y_Start + i * (-y_Paece_Between_Items), 0f);
@@ -88,7 +91,8 @@ IEnumerator magicButton()
}
public void newAssignmentTrigger() {
- StartCoroutine(newAssignment());
+ if(this.automaticHintGenerationActive || this.dynamicScrollDescriptionsActive)
+ StartCoroutine(newAssignment());
}
IEnumerator newAssignment()
@@ -195,22 +199,32 @@ public void processScrollDynamicInfo(Scroll.ScrollDynamicInfo scrollDynamicInfo)
//Update Scroll, process data for later hints and update Uri-List for which hints are available
hintUris = processRenderedScroll(scrollDynamicInfo.rendered, hintUris);
- //Show that Hint is available for ScrollParameter
- HintAvailableEvent.Invoke(hintUris);
+ if (this.automaticHintGenerationActive)
+ {
+ //Show that Hint is available for ScrollParameter
+ HintAvailableEvent.Invoke(hintUris);
+ }
}
public List<string> processRenderedScroll(Scroll rendered, List<string> hintUris)
{
Transform scroll = gameObject.transform.GetChild(1).transform;
- //Update scroll-description
- scroll.GetChild(0).GetComponent<TextMeshProUGUI>().text = rendered.description;
+ if (this.dynamicScrollDescriptionsActive)
+ {
+ //Update scroll-description
+ scroll.GetChild(0).GetComponent<TextMeshProUGUI>().text = rendered.description;
+ }
for (int i = 0; i < rendered.requiredFacts.Count; i++)
{
- //Update ScrollParameter label
var obj = ParameterDisplays.Find(x => x.transform.GetChild(0).GetComponent<RenderedScrollFact>().factUri.Equals(rendered.requiredFacts[i].@ref.uri));
- obj.transform.GetChild(0).GetComponent<RenderedScrollFact>().Label = rendered.requiredFacts[i].label;
+
+ if (this.dynamicScrollDescriptionsActive)
+ {
+ //Update ScrollParameter label
+ obj.transform.GetChild(0).GetComponent<RenderedScrollFact>().Label = rendered.requiredFacts[i].label;
+ }
//Check Hint Informations
//If ScrollFact is assigned -> No Hint
--
GitLab