From db874d547e77231a40bacf158c6f4eae06e42512 Mon Sep 17 00:00:00 2001 From: shengtao Date: Fri, 6 Sep 2024 13:35:04 +0800 Subject: [PATCH] 1 --- .../Settings/UniversalRP-HighQuality.asset | 2 +- Assets/GameAssets/Materials/chuanghuboli.mat | 55 +++++++++++++++++- .../Models/Materials/办公室-BGS_sign.mat | 6 +- .../Models/Materials/办公室-BGS_wood2.mat | 2 +- .../Models/Materials/办公室-BGS_ysj.mat | 4 +- .../Models/Materials/办公室-guizi001.mat | 4 +- Assets/GameAssets/Models/办公室.fbx.meta | 6 +- .../Models/工器具间/Mat/boli001a.mat | 54 +++++++++++++++-- .../Materials/Mat3d66-4603994-15-3854.mat | 29 ++++++++-- .../工器具间/Materials/gongjujian02.mat | 54 +++++++++++++++-- .../Models/工器具间/Materials/jiazi01.mat | 56 ++++++++++++++++-- .../Models/工器具间/Materials/jiazi02.mat | 56 ++++++++++++++++-- .../Models/工器具间/Materials/jiazi03.mat | 57 ++++++++++++++++-- .../Models/工器具间/Materials/qiang01.mat | 56 ++++++++++++++++-- .../Models/工器具间/Materials/qiang02.mat | 58 ++++++++++++++++--- .../Models/工器具间/工器具间.fbx.meta | 4 +- 16 files changed, 440 insertions(+), 63 deletions(-) diff --git a/Assets/Default/Settings/UniversalRP-HighQuality.asset b/Assets/Default/Settings/UniversalRP-HighQuality.asset index 3f994fc..c70a75b 100644 --- a/Assets/Default/Settings/UniversalRP-HighQuality.asset +++ b/Assets/Default/Settings/UniversalRP-HighQuality.asset @@ -43,7 +43,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 2048 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 0 - m_ShadowDistance: 50 + m_ShadowDistance: 500 m_ShadowCascadeCount: 2 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} diff --git a/Assets/GameAssets/Materials/chuanghuboli.mat b/Assets/GameAssets/Materials/chuanghuboli.mat index 2a5f276..7538168 100644 --- a/Assets/GameAssets/Materials/chuanghuboli.mat +++ b/Assets/GameAssets/Materials/chuanghuboli.mat @@ -8,9 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: chuanghuboli - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -18,10 +19,15 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -58,12 +64,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -71,12 +100,32 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 0.71428573} + - _BaseColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0.71428573} + - _Color: {r: 1, g: 1, b: 1, 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: [] +--- !u!114 &5822413716064095867 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/GameAssets/Models/Materials/办公室-BGS_sign.mat b/Assets/GameAssets/Models/Materials/办公室-BGS_sign.mat index 30501cd..8fcb4e4 100644 --- a/Assets/GameAssets/Models/Materials/办公室-BGS_sign.mat +++ b/Assets/GameAssets/Models/Materials/办公室-BGS_sign.mat @@ -96,7 +96,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -111,8 +111,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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/GameAssets/Models/Materials/办公室-BGS_wood2.mat b/Assets/GameAssets/Models/Materials/办公室-BGS_wood2.mat index 32a027c..ced33ac 100644 --- a/Assets/GameAssets/Models/Materials/办公室-BGS_wood2.mat +++ b/Assets/GameAssets/Models/Materials/办公室-BGS_wood2.mat @@ -106,7 +106,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.962 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/GameAssets/Models/Materials/办公室-BGS_ysj.mat b/Assets/GameAssets/Models/Materials/办公室-BGS_ysj.mat index cbfc9f5..b59ddf1 100644 --- a/Assets/GameAssets/Models/Materials/办公室-BGS_ysj.mat +++ b/Assets/GameAssets/Models/Materials/办公室-BGS_ysj.mat @@ -107,13 +107,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0.281 + - _Metallic: 0.115 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.297 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/GameAssets/Models/Materials/办公室-guizi001.mat b/Assets/GameAssets/Models/Materials/办公室-guizi001.mat index d756bb6..ea71cf2 100644 --- a/Assets/GameAssets/Models/Materials/办公室-guizi001.mat +++ b/Assets/GameAssets/Models/Materials/办公室-guizi001.mat @@ -93,13 +93,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Metallic: 0.527 + - _Metallic: 0.316 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.395 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/GameAssets/Models/办公室.fbx.meta b/Assets/GameAssets/Models/办公室.fbx.meta index aaeb1fc..c4ca244 100644 --- a/Assets/GameAssets/Models/办公室.fbx.meta +++ b/Assets/GameAssets/Models/办公室.fbx.meta @@ -47,7 +47,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 1 @@ -60,10 +60,10 @@ ModelImporter: meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 + secondaryUVAreaDistortion: 15 secondaryUVHardAngle: 88 secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 + secondaryUVMinLightmapResolution: 50 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 diff --git a/Assets/GameAssets/Models/工器具间/Mat/boli001a.mat b/Assets/GameAssets/Models/工器具间/Mat/boli001a.mat index 7adff2c..9e2d2d4 100644 --- a/Assets/GameAssets/Models/工器具间/Mat/boli001a.mat +++ b/Assets/GameAssets/Models/工器具间/Mat/boli001a.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7106392764487766476 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,12 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: boli001a - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _EMISSION + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -21,11 +33,15 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] - m_LockedProperties: + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -66,12 +82,31 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossyReflections: 1 @@ -79,12 +114,19 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5254902} + - _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5254902} + - _Color: {r: 1, g: 1, b: 1, 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/GameAssets/Models/工器具间/Materials/Mat3d66-4603994-15-3854.mat b/Assets/GameAssets/Models/工器具间/Materials/Mat3d66-4603994-15-3854.mat index d89960f..52a7c24 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/Mat3d66-4603994-15-3854.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/Mat3d66-4603994-15-3854.mat @@ -21,14 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Mat3d66-4603994-15-3854 - m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -41,10 +42,26 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -69,6 +86,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -149,7 +170,7 @@ Material: m_Colors: - _BASE_COLOR: {r: 0.78431386, g: 0.78431386, b: 0.78431386, a: 1} - _BaseColor: {r: 0.8984324, g: 0.8984324, b: 0.8984324, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.8984324, g: 0.8984324, b: 0.8984324, a: 1} - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _REFLECTIONS_COLOR: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/GameAssets/Models/工器具间/Materials/gongjujian02.mat b/Assets/GameAssets/Models/工器具间/Materials/gongjujian02.mat index 4838426..c77dc50 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/gongjujian02.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/gongjujian02.mat @@ -8,15 +8,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: gongjujian02 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: - - _EMISSION - m_LightmapFlags: 2 + m_InvalidKeywords: [] + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -29,14 +29,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: e6e72fcb8ff3ca541be754a1ee7a483a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e6e72fcb8ff3ca541be754a1ee7a483a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +89,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/GameAssets/Models/工器具间/Materials/jiazi01.mat b/Assets/GameAssets/Models/工器具间/Materials/jiazi01.mat index ac3c274..787dfb1 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/jiazi01.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/jiazi01.mat @@ -8,15 +8,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: jiazi01 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: - - _EMISSION - m_LightmapFlags: 2 + m_InvalidKeywords: [] + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -29,14 +29,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +89,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -107,7 +151,7 @@ Material: m_Colors: - _BASE_COLOR: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} - _BaseColor: {r: 0.5538889, g: 0.54990315, b: 0.5459098, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.55388886, g: 0.54990315, b: 0.5459098, a: 1} - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _REFLECTIONS_COLOR: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/GameAssets/Models/工器具间/Materials/jiazi02.mat b/Assets/GameAssets/Models/工器具间/Materials/jiazi02.mat index cd9567e..c7a8745 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/jiazi02.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/jiazi02.mat @@ -8,15 +8,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: jiazi02 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: - - _EMISSION - m_LightmapFlags: 2 + m_InvalidKeywords: [] + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -29,14 +29,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +89,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -107,7 +151,7 @@ Material: m_Colors: - _BASE_COLOR: {r: 0.41047904, g: 0.41509432, b: 0.40922034, a: 1} - _BaseColor: {r: 0.12479412, g: 0.28440613, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.12479409, g: 0.2844061, b: 0, a: 1} - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/GameAssets/Models/工器具间/Materials/jiazi03.mat b/Assets/GameAssets/Models/工器具间/Materials/jiazi03.mat index ba92394..75b7513 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/jiazi03.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/jiazi03.mat @@ -8,15 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: jiazi03 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -29,14 +30,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +90,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -107,9 +152,9 @@ Material: m_Colors: - _BASE_COLOR: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/工器具间/Materials/qiang01.mat b/Assets/GameAssets/Models/工器具间/Materials/qiang01.mat index 3face6b..5760d42 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/qiang01.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/qiang01.mat @@ -21,15 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: qiang01 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: - - _EMISSION - m_LightmapFlags: 2 + m_InvalidKeywords: [] + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -42,14 +42,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,6 +102,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -120,7 +164,7 @@ Material: m_Colors: - _BASE_COLOR: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/GameAssets/Models/工器具间/Materials/qiang02.mat b/Assets/GameAssets/Models/工器具间/Materials/qiang02.mat index 3a19a6e..1f5bd8f 100644 --- a/Assets/GameAssets/Models/工器具间/Materials/qiang02.mat +++ b/Assets/GameAssets/Models/工器具间/Materials/qiang02.mat @@ -8,15 +8,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: qiang02 - m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] - m_InvalidKeywords: - - _EMISSION - m_LightmapFlags: 2 + m_InvalidKeywords: [] + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -29,14 +29,54 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EMISSION_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _METALNESS_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _REFLECTIONS_COLOR_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +89,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TRANSPARENCY_MAP: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -106,8 +150,8 @@ Material: - _ZWrite: 1 m_Colors: - _BASE_COLOR: {r: 0.79622644, g: 0.79622644, b: 0.79622644, a: 1} - - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.36477977, g: 0.36477977, b: 0.36477977, a: 1} + - _Color: {r: 0.36477974, g: 0.36477974, b: 0.36477974, a: 1} - _EMISSION_COLOR: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/GameAssets/Models/工器具间/工器具间.fbx.meta b/Assets/GameAssets/Models/工器具间/工器具间.fbx.meta index 5b3346f..d0bfdd7 100644 --- a/Assets/GameAssets/Models/工器具间/工器具间.fbx.meta +++ b/Assets/GameAssets/Models/工器具间/工器具间.fbx.meta @@ -170,10 +170,10 @@ ModelImporter: meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 + secondaryUVAreaDistortion: 15 secondaryUVHardAngle: 88 secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 + secondaryUVMinLightmapResolution: 20 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1