From 2f81d7ffd5184dde7855c2e5f54a192eaa4ef4b2 Mon Sep 17 00:00:00 2001 From: ly <1431951621@qq.com> Date: Sat, 25 Nov 2023 15:14:07 +0800 Subject: [PATCH] ly --- Demo2/Library/EditorInstance.json | 6 - Demo2/Library/EditorUserBuildSettings.asset | Bin 7896 -> 7948 bytes Demo2/Library/SceneVisibilityState.asset | Bin 3732 -> 3820 bytes Demo2/Library/SourceAssetDB | Bin 4194304 -> 4194304 bytes .../8c/8cd7c613bf844de3b80696e27a479d5e.json | 2 +- ...hadercompiler-UnityShaderCompiler.exe0.log | 3 + ...hadercompiler-UnityShaderCompiler.exe1.log | 3 + ...hadercompiler-UnityShaderCompiler.exe2.log | 3 + ...hadercompiler-UnityShaderCompiler.exe3.log | 3 + ...hadercompiler-UnityShaderCompiler.exe4.log | 3 + Demo2/UserSettings/Layouts/default-2022.dwlt | 178 +++++++++--------- 11 files changed, 105 insertions(+), 96 deletions(-) delete mode 100644 Demo2/Library/EditorInstance.json diff --git a/Demo2/Library/EditorInstance.json b/Demo2/Library/EditorInstance.json deleted file mode 100644 index b7a07ff..0000000 --- a/Demo2/Library/EditorInstance.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "process_id" : 22564, - "version" : "2022.3.9f1c1", - "app_path" : "E:/Program Files/Unity/Hub/Editor/2022.3.9f1c1/Editor/Unity.exe", - "app_contents_path" : "E:/Program Files/Unity/Hub/Editor/2022.3.9f1c1/Editor/Data" -} \ No newline at end of file diff --git a/Demo2/Library/EditorUserBuildSettings.asset b/Demo2/Library/EditorUserBuildSettings.asset index 28d279b922c5b12a5e0615b89498ccc06b4543c8..797b016beeecb2b168b92d642e00895c95c8b31c 100644 GIT binary patch delta 82 zcmca%+haFDj!B+pqrwDPMw`tWWtkaG85tND*n!wFFQq6yGlc=f7Xsq+qQsP(RKL{J flw#+c)Wp2f0tN*+GsI0JV|{y#N3J diff --git a/Demo2/Library/SceneVisibilityState.asset b/Demo2/Library/SceneVisibilityState.asset index 2b2ca9a8cc2de8c3f83674fb16796fb5a7361dd5..016a361fcec9f4209b3ff2bd98525091d0d6f8e2 100644 GIT binary patch delta 37 rcmbOt`$l$xJmZ^<3KG0ba~LNx@<~m8z`KQ!aq>Z4@yRuO5+EJ`?XC>J delta 33 pcmaDOJ4JSaJmZv&3KG0bE{u~4d8HVcCp+>APp;rAnQX$h0|2Dt33&hj diff --git a/Demo2/Library/SourceAssetDB b/Demo2/Library/SourceAssetDB index 3fb7018b6bc229e1ea07d6f9d86da6a7b957f586..a4cb8f3fbbe9e1c2332f8ba78127597e0789a0aa 100644 GIT binary patch delta 870 zcmbu8%}*0S7{+II23X2=w?&150?UW6DjyY<7W|-mm~b$$-kO-|`yWV*iQL?Hcp}Ec zY7gUqL?py`oP>n&SZ^HlC?|~G#hVw<7Pc2O@!%wr%shFXcQWs9CJaL>tj^Lxa|=5h z^Dl0VC8wgzCvmu#FujZ8_q>;hy!|wi%DU)x#3JAIBmT^x|FI9B!?!kl5rii2h3}Y! z6_McOLNVlX<l)kWy7QH9Y7tAT*rIedQWf%ePJLLDeRAnOn^CVH$uT~y__FL% zcSk21TG-xfbYN8t<yqG1nI_kc;31Y$rF)m zGu62#M%DWs;n!OA&Qd%3!Yd~XgL*-IpnlK*=rm{$Gz1Dj zXFz8`=Rm`t5zr`T43q|)2aSU+fG&bAfhItiP0Gg7uEpBey0`9q^D17&`GZ9LF*0Vc zfaR(^{~L*|Dv3JPyi6_~LE+X=JWTqLoQY5f^<`hQch}118!c{@@_={Q;=GVd7;aXn>=pGxOxf(S?MyvppX}~@Kl^Au%=fTGDc|$)gz#l}K!$&Y z$Pi>QUCd?qOrv)z-S<8>r=ob2h_bG4O`~WOjEoU9WQ5c?T@yee9vJSBc*)nLt#yEiDt8hA{Em$VI* zk&M*WdzDpIGgDF1|93S)8XZ>z%kcVYGx2RR1Mb^pGf`zlU)f=%6u9Fr`DbOQkbI?w z!c}et{)ZcpXy9SFv8aU^8?;$2R&JK(yA)G4vLq(%s+K6dOMC6oWY6CHV$1v}8`{-M z^R|`Y9ac=Gs2BgR;sm5gYT7R{3)K>I-ZL0(V|$Ok$A(m{Su z0AzrIpb)4QbP#k1bQn|zst1KZM?gnG$3PL#aZnW005U<1pc9~zpe9f==oBahii27} zr$J{xXF;u?Hc&e#0Xhdtg3g0FK%Jm2P->adzJ&Cxr|ub^r`-NA(d2o?MRAk2dFHuT p-{kR{1@}{!7p# 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=SOFTPARTICLES_ON FOG_LINEAR FOG_EXP FOG_EXP2 INSTANCING_ON PROCEDURAL_INSTANCING_ON _NORMALMAP _FADING_ON _REQUIRE_UV2 EFFECT_BUMP 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=33 mask=6 start=146 ok=1 outsize=854 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log index 80d13b5..c0b3e2b 100644 --- a/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Demo2/Logs/shadercompiler-UnityShaderCompiler.exe4.log @@ -4,3 +4,6 @@ Cmd: initializeCompiler Cmd: compileSnippet insize=1583 file=Assets/DefaultResourcesExtra/Particles/Standard Unlit 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=_ALPHABLEND_ON dKW=_EMISSION SOFTPARTICLES_ON FOG_LINEAR FOG_EXP FOG_EXP2 INSTANCING_ON PROCEDURAL_INSTANCING_ON _ALPHATEST_ON _ALPHAPREMULTIPLY_ON _ALPHAMODULATE_ON _COLOROVERLAY_ON _COLORCOLOR_ON _COLORADDSUBDIFF_ON _NORMALMAP _FADING_ON _REQUIRE_UV2 EFFECT_BUMP 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=33 mask=6 start=146 ok=1 outsize=454 +Cmd: shutdown + +Quitting shader compiler process diff --git a/Demo2/UserSettings/Layouts/default-2022.dwlt b/Demo2/UserSettings/Layouts/default-2022.dwlt index 77aa09b..3d91e82 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: 22 - y: 62 - width: 1781 - height: 956 + x: 7.3333335 + y: 50 + width: 1692 + height: 961.3334 m_ShowMode: 4 - m_Title: Scene + m_Title: "\u573A\u666F" m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1781 - height: 906 + width: 1692 + height: 911.3333 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 89 + controlID: 99 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,12 +64,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1364 + x: 1296 y: 0 - width: 417 - height: 906 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 396 + height: 911.3333 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -92,10 +92,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 331 - height: 635 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 314.66666 + height: 639.3333 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 635 - width: 1364 - height: 271 + y: 639.3333 + width: 1296 + height: 272 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 13} @@ -149,8 +149,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1781 - height: 956 + width: 1692 + height: 961.3333 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -174,7 +174,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1781 + width: 1692 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -195,8 +195,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 936 - width: 1781 + y: 941.3333 + width: 1692 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -219,8 +219,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1364 - height: 906 + width: 1296 + height: 911.3333 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 @@ -244,8 +244,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1364 - height: 635 + width: 1296 + height: 639.3333 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 331 + x: 314.66666 y: 0 - width: 1033 - height: 635 + width: 981.3334 + height: 639.3333 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -327,15 +327,15 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 22 - y: 727 - width: 1363 - height: 250 + x: 7.3333335 + y: 719.3334 + width: 1295 + height: 251 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -367,14 +367,14 @@ MonoBehaviour: m_LastFolders: - Assets m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\wr\Unity\Project\UnityDemo2\Demo2 + m_LastProjectPath: D:\project\3TEST\unity3d\UnityDemo2\Demo2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 36590000 - m_LastClickedID: 22838 - m_ExpandedIDs: 000000003659000000ca9a3b + m_SelectedIDs: 82590000 + m_LastClickedID: 22914 + m_ExpandedIDs: 0000000082590000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -402,7 +402,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000036590000 + m_ExpandedIDs: 0000000082590000 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: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1386 - y: 92 - width: 416 - height: 885 + x: 1303.3334 + y: 80 + width: 395 + height: 890.3333 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: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 22 - y: 92 - width: 330 - height: 614 + x: 7.3333335 + y: 80 + width: 313.66666 + height: 618.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -542,9 +542,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 30fbffff + m_SelectedIDs: 8ef2ffff + m_LastClickedID: -3442 + m_ExpandedIDs: d8f8ffff60faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -560,7 +560,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -583,15 +583,15 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u573A\u666F" + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 353 - y: 92 - width: 1031 - height: 614 + x: 322 + y: 80 + width: 979.3334 + height: 618.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -606,7 +606,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -166, y: -26} + snapOffset: {x: -166, y: -26.666687} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -826,7 +826,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 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: -3.6126385, y: 1.9666634, z: 3.3763876} + m_Target: {x: 778.23096, y: 296.5033, z: -212.33307} speed: 2 - m_Value: {x: -3.6126385, y: 1.9666634, z: 3.3763876} + m_Value: {x: 778.23096, y: 296.5033, z: -212.33307} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -977,7 +977,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 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.08852599, y: 0.8491586, z: -0.15084772, w: -0.4983344} + m_Target: {x: -0.014860762, y: 0.9723846, z: -0.0645731, w: -0.22378235} speed: 2 - m_Value: {x: -0.08858798, y: 0.85116494, z: -0.15252152, w: -0.494376} + m_Value: {x: -0.015196413, y: 0.9722863, z: -0.06603158, w: -0.22375973} m_Size: - m_Target: 9.492101 + m_Target: 39.619053 speed: 2 - m_Value: 9.492101 + m_Value: 39.619053 m_Ortho: m_Target: 0 speed: 2 @@ -1009,7 +1009,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.014806402, y: -0.40413642, z: -0.0065497663, w: -0.91456664} + m_LastSceneViewRotation: {x: 0.000964686, y: 0.99874747, z: -0.045283835, w: 0.021277403} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -1031,8 +1031,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u6E38\u620F" + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -1071,10 +1071,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -515.5 - m_HBaseRangeMax: 515.5 - m_VBaseRangeMin: -296.5 - m_VBaseRangeMax: 296.5 + m_HBaseRangeMin: -343.6667 + m_HBaseRangeMax: 343.6667 + m_VBaseRangeMin: -197.66667 + m_VBaseRangeMax: 197.66667 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1094,7 +1094,7 @@ MonoBehaviour: y: 21 width: 1031 height: 593 - m_Scale: {x: 1, y: 1} + m_Scale: {x: 1.5, y: 1.5} m_Translation: {x: 515.5, y: 296.5} m_MarginLeft: 0 m_MarginRight: 0 @@ -1102,13 +1102,13 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -515.5 - y: -296.5 - width: 1031 - height: 593 + x: -343.66666 + y: -197.66667 + width: 687.3333 + height: 395.33334 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1031, y: 614} + m_LastWindowPixelSize: {x: 1546.5, y: 921} 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: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Text: "\u63A7\u5236\u53F0" + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2