diff --git a/Demo2/Assets/Scenes/SampleScene.unity b/Demo2/Assets/Scenes/SampleScene.unity index fd55b0b..dfa672c 100644 --- a/Demo2/Assets/Scenes/SampleScene.unity +++ b/Demo2/Assets/Scenes/SampleScene.unity @@ -397,6 +397,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &861778305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861778306} + - component: {fileID: 861778308} + - component: {fileID: 861778307} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &861778306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861778305} + 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: 958859449} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &861778307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861778305} + 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: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 0} + m_sharedMaterial: {fileID: 0} + 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: -99 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + 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: 0, 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 &861778308 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861778305} + m_CullTransparentMesh: 1 --- !u!1 &958859445 GameObject: m_ObjectHideFlags: 0 @@ -474,7 +608,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -493,6 +627,7 @@ RectTransform: m_Children: - {fileID: 645838741} - {fileID: 1294096253} + - {fileID: 861778306} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5811,14 +5946,14 @@ MonoBehaviour: m_Calls: [] m_text: Button m_isRightToLeft: 0 - m_fontAsset: {fileID: 0} - m_sharedMaterial: {fileID: 0} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 + rgba: 4281479730 m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -5831,7 +5966,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -5862,7 +5997,7 @@ MonoBehaviour: checkPaddingRequired: 0 m_isRichText: 1 m_parseCtrlCharacters: 1 - m_isOrthographic: 0 + m_isOrthographic: 1 m_isCullingEnabled: 0 m_horizontalMapping: 0 m_verticalMapping: 0 diff --git a/Demo2/Library/ArtifactDB b/Demo2/Library/ArtifactDB index f379b93..e52ee30 100644 Binary files a/Demo2/Library/ArtifactDB and b/Demo2/Library/ArtifactDB differ diff --git a/Demo2/Library/SceneVisibilityState.asset b/Demo2/Library/SceneVisibilityState.asset index 86de3ae..633086e 100644 Binary files a/Demo2/Library/SceneVisibilityState.asset and b/Demo2/Library/SceneVisibilityState.asset differ diff --git a/Demo2/Library/Search/transactions.db b/Demo2/Library/Search/transactions.db index 422ca19..eb82501 100644 Binary files a/Demo2/Library/Search/transactions.db and b/Demo2/Library/Search/transactions.db differ diff --git a/Demo2/Library/SourceAssetDB b/Demo2/Library/SourceAssetDB index 22f12cc..5593434 100644 Binary files a/Demo2/Library/SourceAssetDB and b/Demo2/Library/SourceAssetDB differ diff --git a/Demo2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json b/Demo2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json index b37706e..61200ef 100644 --- a/Demo2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json +++ b/Demo2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":778.23095703125,"y":296.5032958984375,"z":-212.33306884765626},"rotation":{"x":-0.014860762283205986,"y":0.9723845720291138,"z":-0.06457310169935227,"w":-0.22378234565258027},"size":39.61905288696289,"orthographic":false} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":489.5,"y":298.5,"z":0.0},"rotation":{"x":0.14035306870937348,"y":0.7600911855697632,"z":0.17491917312145234,"w":-0.6098936796188355},"size":3.245044708251953,"orthographic":false} \ No newline at end of file diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe0.log index 7db4fe3..1114881 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -110,3 +110,6 @@ Cmd: compileSnippet Cmd: compileSnippet insize=1981 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Sprite pass=Default ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Fragment platform=d3d11 reqs=1 mask=6 start=51 ok=1 outsize=478 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe1.log index 51634b4..ad7fbf4 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7143 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field Overlay pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=1594 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe2.log index dab9086..c43fb34 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=3090 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe3.log index bb71282..4ff0a6d 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7148 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=1594 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log index a177b32..ff5bd5f 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7899 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON FORCE_LINEAR UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=113 ok=1 outsize=1850 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe5.log index 060aaea..396b671 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe5.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7143 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field Overlay pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=3090 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe6.log index 05f0a39..dc51e83 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe6.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=7899 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON FORCE_LINEAR UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=113 ok=1 outsize=1866 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/UserSettings/Layouts/default-2022.dwlt b/Demo2/UserSettings/Layouts/default-2022.dwlt index 3d91e82..47c5a88 100644 --- a/Demo2/UserSettings/Layouts/default-2022.dwlt +++ b/Demo2/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 7.3333335 - y: 50 + x: 8 + y: 51 width: 1692 - height: 961.3334 + height: 961 m_ShowMode: 4 - m_Title: "\u573A\u666F" + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,11 +44,11 @@ MonoBehaviour: x: 0 y: 30 width: 1692 - height: 911.3333 + height: 911 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 99 + controlID: 90 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -67,7 +67,7 @@ MonoBehaviour: x: 1296 y: 0 width: 396 - height: 911.3333 + height: 911 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 314.66666 - height: 639.3333 + width: 315 + height: 639 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -117,7 +117,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 639.3333 + y: 639 width: 1296 height: 272 m_MinSize: {x: 231, y: 271} @@ -150,7 +150,7 @@ MonoBehaviour: x: 0 y: 0 width: 1692 - height: 961.3333 + height: 961 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -195,7 +195,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 941.3333 + y: 941 width: 1692 height: 20 m_MinSize: {x: 0, y: 0} @@ -220,11 +220,11 @@ MonoBehaviour: x: 0 y: 0 width: 1296 - height: 911.3333 + height: 911 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 39 + controlID: 40 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -245,11 +245,11 @@ MonoBehaviour: x: 0 y: 0 width: 1296 - height: 639.3333 + height: 639 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 40 + controlID: 41 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 314.66666 + x: 315 y: 0 - width: 981.3334 - height: 639.3333 + width: 981 + height: 639 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -327,13 +327,13 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: "\u9879\u76EE" - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.3333335 - y: 719.3334 + x: 8 + y: 720 width: 1295 height: 251 m_SerializedDataModeController: @@ -367,14 +367,14 @@ MonoBehaviour: m_LastFolders: - Assets m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\project\3TEST\unity3d\UnityDemo2\Demo2 + m_LastProjectPath: D:\wr\Unity\Project\UnityDemo2\Demo2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 82590000 - m_LastClickedID: 22914 - m_ExpandedIDs: 0000000082590000ffffff7f + m_SelectedIDs: 9a590000 + m_LastClickedID: 22938 + m_ExpandedIDs: 000000009a59000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -402,7 +402,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000082590000 + m_ExpandedIDs: 000000009a590000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -473,15 +473,15 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1303.3334 - y: 80 + x: 1304 + y: 81 width: 395 - height: 890.3333 + height: 890 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -520,15 +520,15 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u5C42\u7EA7" - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.3333335 - y: 80 - width: 313.66666 - height: 618.3333 + x: 8 + y: 81 + width: 314 + height: 618 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -542,9 +542,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8ef2ffff - m_LastClickedID: -3442 - m_ExpandedIDs: d8f8ffff60faffff + m_SelectedIDs: 96f7ffff + m_LastClickedID: -2154 + m_ExpandedIDs: 1afbffff1e590000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -583,15 +583,15 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u573A\u666F" - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 322 - y: 80 - width: 979.3334 - height: 618.3333 + x: 323 + y: 81 + width: 979 + height: 618 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -826,7 +826,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -937,9 +937,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 778.23096, y: 296.5033, z: -212.33307} + m_Target: {x: 489.5, y: 298.5, z: 0} speed: 2 - m_Value: {x: 778.23096, y: 296.5033, z: -212.33307} + m_Value: {x: 489.5, y: 298.5, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -977,7 +977,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -985,13 +985,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.014860762, y: 0.9723846, z: -0.0645731, w: -0.22378235} + m_Target: {x: 0.14035307, y: 0.7600912, z: 0.17491917, w: -0.6098937} speed: 2 - m_Value: {x: -0.015196413, y: 0.9722863, z: -0.06603158, w: -0.22375973} + m_Value: {x: 0.13592292, y: 0.7638658, z: 0.17096849, w: -0.60729223} m_Size: - m_Target: 39.619053 + m_Target: 3.2450447 speed: 2 - m_Value: 39.619053 + m_Value: 3.105306 m_Ortho: m_Target: 0 speed: 2 @@ -1031,8 +1031,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u6E38\u620F" - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -1071,10 +1071,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -343.6667 - m_HBaseRangeMax: 343.6667 - m_VBaseRangeMin: -197.66667 - m_VBaseRangeMax: 197.66667 + m_HBaseRangeMin: -515.5 + m_HBaseRangeMax: 515.5 + m_VBaseRangeMin: -296.5 + m_VBaseRangeMax: 296.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1108,7 +1108,7 @@ MonoBehaviour: height: 395.33334 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1546.5, y: 921} + m_LastWindowPixelSize: {x: 1031, y: 614} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1129,8 +1129,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: "\u63A7\u5236\u53F0" - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2