diff --git a/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao1.mat b/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao1.mat index add3ae1..534353d 100644 --- a/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao1.mat +++ b/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao1.mat @@ -23,6 +23,7 @@ Material: m_Name: cao1 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: + - _METALLICSPECGLOSSMAP - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -66,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7a758ee56421e3b4fa030be65cf5c79b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -122,8 +123,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.9339623, g: 0.91193485, b: 0.91193485, a: 1} + - _Color: {r: 0.9339623, g: 0.91193485, b: 0.91193485, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao2.mat b/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao2.mat index d980e80..a91de98 100644 --- a/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao2.mat +++ b/Assets/ArtRes/Models/配景/杂草素材/Ground Foliage/Materials/cao2.mat @@ -23,6 +23,7 @@ Material: m_Name: cao2 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: + - _METALLICSPECGLOSSMAP - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -66,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6ec9c2173783ca344993658d9785ec2e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -122,8 +123,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.21359916, g: 0.6037736, b: 0.22865066, a: 1} - - _Color: {r: 0.21359909, g: 0.6037736, b: 0.22865063, a: 1} + - _BaseColor: {r: 0.45025802, g: 0.8207547, b: 0.42973477, a: 1} + - _Color: {r: 0.45025796, g: 0.8207547, b: 0.42973474, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 81f84e9..ae715f4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,26 +12,26 @@ EditorUserSettings: value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a flags: 0 RecentlyUsedSceneGuid-2: - value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e - flags: 0 - RecentlyUsedSceneGuid-3: - value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 - flags: 0 - RecentlyUsedSceneGuid-4: value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-3: value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-4: value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-5: value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-6: value: 51000c005c010c0f5b595b731372074444161e72787d2365797c1b64b6b4306f flags: 0 + RecentlyUsedSceneGuid-7: + value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e + flags: 0 + RecentlyUsedSceneGuid-8: + value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 + flags: 0 RecentlyUsedSceneGuid-9: value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 287fa74..5fecdb1 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Inspector + m_Title: Scene m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -40,9 +40,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 676 + y: 572 width: 961 - height: 132 + height: 192 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -66,9 +66,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 808 + y: 764 width: 961 - height: 131 + height: 175 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -101,7 +101,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 300} m_MaxSize: {x: 8096, y: 24288} vertical: 1 - controlID: 16 + controlID: 88 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -204,7 +204,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 300} m_MaxSize: {x: 32384, y: 24288} vertical: 0 - controlID: 15 + controlID: 54 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,7 +296,7 @@ MonoBehaviour: x: 0 y: 0 width: 961 - height: 676 + height: 572 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} @@ -391,9 +391,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 285 - y: 881 + y: 837 width: 959 - height: 110 + height: 154 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -431,9 +431,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e0720000 - m_LastClickedID: 29408 - m_ExpandedIDs: e2f8ffff26faffff34fbffffd8720000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 46f6ffff34fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -539,7 +539,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/HQB/Models + - Assets/HQB/Scene m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -554,7 +554,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 3c670200 m_LastClickedID: 157500 - m_ExpandedIDs: 00000000587300007e73000000780000027800000478000006780000087800000a7800000c7800000e78000010780000127800001478000016780000187800001a7800001c7800001e78000020780000227800002478000026780000287800002a7800002c7800002e78000030780000327800003478000036780000387800003a7800003c7800003e78000040780000427800004478000046780000487800004a7800004c7800004e780000 + m_ExpandedIDs: 00000000287400003274000098740000d4780000d6780000d8780000da780000dc780000de780000e0780000e2780000e4780000e6780000e8780000ea780000ec780000ee780000f0780000f2780000f4780000f6780000f8780000fa780000fc780000fe78000000790000027900000479000006790000087900000a7900000c7900000e79000010790000127900001479000016790000187900001a7900001c7900001e79000020790000227900002479000026790000287900002a7900002c7900002e79000030790000327900003479000036790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -579,10 +579,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 2168} + scrollPos: {x: 0, y: 1492} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000587300007e73000096730000c073000000780000027800000478000006780000087800000a7800000c7800000e78000010780000127800001478000016780000187800001a7800001c7800001e78000020780000227800002478000026780000287800002a7800002c7800002e78000030780000327800003478000036780000387800003a7800003c7800003e78000040780000427800004478000046780000487800004a7800004c7800004e780000427e0000c07e0000 + m_ExpandedIDs: ffffffff00000000287400003274000098740000d4780000d6780000d8780000da780000dc780000de780000e0780000e2780000e4780000e6780000e8780000ea780000ec780000ee780000f0780000f2780000f4780000f6780000f8780000fa780000fc780000fe78000000790000027900000479000006790000087900000a7900000c7900000e79000010790000127900001479000016790000187900001a7900001c7900001e79000020790000227900002479000026790000287900002a7900002c7900002e79000030790000327900003479000036790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -659,9 +659,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 285 - y: 749 + y: 645 width: 959 - height: 111 + height: 171 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -697,7 +697,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 1 + m_HSlider: 0 m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 @@ -710,22 +710,22 @@ MonoBehaviour: x: 0 y: 21 width: 959 - height: 90 - m_Scale: {x: 0.51446354, y: 0.51446354} - m_Translation: {x: 477.775, y: 45.000015} + height: 150 + m_Scale: {x: 0.4574923, y: 0.45749223} + m_Translation: {x: 479.5, y: 78.19816} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -928.6858 - y: -87.46979 - width: 1864.0776 - height: 174.93951 + x: -1048.1051 + y: -170.92784 + width: 2096.2102 + height: 327.87442 m_MinimalGUI: 1 - m_defaultScale: 0.083333336 - m_LastWindowPixelSize: {x: 959, y: 111} + m_defaultScale: 0.1388889 + m_LastWindowPixelSize: {x: 959, y: 171} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -754,7 +754,7 @@ MonoBehaviour: x: 285 y: 73 width: 959 - height: 655 + height: 551 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -990,9 +990,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.3238304, y: 2.9819524, z: -160.18616} + m_Target: {x: 27.93394, y: 3.90361, z: -137.38055} speed: 2 - m_Value: {x: 1.3238304, y: 2.9819524, z: -160.18616} + m_Value: {x: 27.93394, y: 3.90361, z: -137.38055} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1039,13 +1039,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.014887205, y: -0.9629622, z: 0.05436771, w: 0.26370695} + m_Target: {x: -0.22849435, y: -0.38294128, z: 0.098352484, w: -0.8896666} speed: 2 - m_Value: {x: 0.01449153, y: -0.96303546, z: 0.052922804, w: 0.263727} + m_Value: {x: -0.22834271, y: -0.38426888, z: 0.09869345, w: -0.88907623} m_Size: - m_Target: 13.190479 + m_Target: 0.9990049 speed: 2 - m_Value: 12.622468 + m_Value: 0.9990049 m_Ortho: m_Target: 0 speed: 2 @@ -1063,7 +1063,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: 0.024567742, y: 0.91240835, z: 0.055358306, w: -0.40480465} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: