diff --git a/Assets/GameAssets/Models/工具/Materials/SafetyHelmet_SGCOC (1)_mat.mat b/Assets/GameAssets/Models/工具/Materials/SafetyHelmet_SGCOC (1)_mat.mat index d1f254d..09b5127 100644 --- a/Assets/GameAssets/Models/工具/Materials/SafetyHelmet_SGCOC (1)_mat.mat +++ b/Assets/GameAssets/Models/工具/Materials/SafetyHelmet_SGCOC (1)_mat.mat @@ -92,7 +92,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.375 + - _Glossiness: 0.3 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -112,7 +112,7 @@ Material: - _UseRoughnessMap: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.3915094, g: 0.41609478, b: 1, a: 1} + - _Color: {r: 0.14978641, g: 0.4000953, b: 0.9622642, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _UvOffset: {r: 0, g: 0, b: 0, a: 0} - _UvTiling: {r: 1, g: 1, b: 0, a: 0} diff --git a/Assets/GameAssets/Models/工具/Materials/glass1.mat b/Assets/GameAssets/Models/工具/Materials/glass1.mat index b8f9fa8..2873b3e 100644 --- a/Assets/GameAssets/Models/工具/Materials/glass1.mat +++ b/Assets/GameAssets/Models/工具/Materials/glass1.mat @@ -8,16 +8,14 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: glass1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -58,6 +56,22 @@ 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: - _BumpScale: 1 @@ -71,12 +85,35 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 0 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseRoughnessMap: 0 - _ZWrite: 0 m_Colors: - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 0.8995868} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &7388376288977267361 +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/sanxiang_sanxiang_BaseColor.mat b/Assets/GameAssets/Models/工具/Materials/sanxiang_sanxiang_BaseColor.mat index d36a9a3..f3f89ac 100644 --- a/Assets/GameAssets/Models/工具/Materials/sanxiang_sanxiang_BaseColor.mat +++ b/Assets/GameAssets/Models/工具/Materials/sanxiang_sanxiang_BaseColor.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: sanxiang_sanxiang_BaseColor - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -21,7 +21,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 924620be2cda78043be96ff159280195, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0c48aaad9ba858c4da7f8af3638d6494, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -57,6 +57,18 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 1811bedce09d98b4bbca4644630d735b, type: 3} + 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} @@ -73,12 +85,35 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 1 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseRoughnessMap: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &1857568779482729912 +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/玻璃.mat b/Assets/GameAssets/Models/工具/Materials/玻璃.mat index 000f5bb..40a17b8 100644 --- a/Assets/GameAssets/Models/工具/Materials/玻璃.mat +++ b/Assets/GameAssets/Models/工具/Materials/玻璃.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4260095223282799355 +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,16 +21,14 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u73BB\u7483" - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -58,8 +69,25 @@ 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: + - Boolean_8A2B8817: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -70,13 +98,26 @@ Material: - _Metallic: 0 - _Mode: 3 - _OcclusionStrength: 1 + - _Opacity: 0.6 + - _OpacityThreshold: 0 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 0 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseOpacityMap: 0 + - _UseRoughnessMap: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 0.8995868} + - _Color: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 0.8995868} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/工具/Materials/螺丝_BaseColor.mat b/Assets/GameAssets/Models/工具/Materials/螺丝_BaseColor.mat index 2e5cb24..49354b3 100644 --- a/Assets/GameAssets/Models/工具/Materials/螺丝_BaseColor.mat +++ b/Assets/GameAssets/Models/工具/Materials/螺丝_BaseColor.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6986498882574440306 +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,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u87BA\u4E1D_BaseColor" - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -56,6 +69,22 @@ 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: - _BumpScale: 1 @@ -69,12 +98,22 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseAoMap: 0 + - _UseColorMap: 0 + - _UseEmissiveMap: 0 + - _UseMetallicMap: 0 + - _UseNormalMap: 0 + - _UseRoughnessMap: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat b/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat index 120ffd4..b5ab871 100644 --- a/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat +++ b/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat @@ -21,14 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u9A8C\u7535\u7B14_D" - m_Shader: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -38,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 70b56a0185b574b4e992cc51e3cfa6b7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -168,13 +169,17 @@ Material: - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 @@ -191,7 +196,9 @@ Material: - _Parallax: 0.02 - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 - _SampleGI: 0 + - _Smoothness: 0.5 - _Smoothness0: 0.5 - _Smoothness1: 0.5 - _Smoothness2: 0.5 @@ -208,14 +215,16 @@ Material: - _UseNormalMap: 0 - _UseRoughnessMap: 0 - _WindQuality: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _UvOffset: {r: 0, g: 0, b: 0, a: 0} - _UvTiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/工具/三相四线电表.fbx.meta b/Assets/GameAssets/Models/工具/三相四线电表.fbx.meta index 7deb0f6..f4a664b 100644 --- a/Assets/GameAssets/Models/工具/三相四线电表.fbx.meta +++ b/Assets/GameAssets/Models/工具/三相四线电表.fbx.meta @@ -8,7 +8,7 @@ ModelImporter: materialImportMode: 2 materialName: 0 materialSearch: 1 - materialLocation: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 diff --git a/Assets/GameAssets/Models/手机.fbx b/Assets/GameAssets/Models/手机.fbx index 18dd67e..bbb4bbf 100644 Binary files a/Assets/GameAssets/Models/手机.fbx and b/Assets/GameAssets/Models/手机.fbx differ diff --git a/Assets/GameAssets/Models/手机.fbx.meta b/Assets/GameAssets/Models/手机.fbx.meta index 9a7b9de..453f9c3 100644 --- a/Assets/GameAssets/Models/手机.fbx.meta +++ b/Assets/GameAssets/Models/手机.fbx.meta @@ -8,7 +8,7 @@ ModelImporter: materialImportMode: 2 materialName: 0 materialSearch: 1 - materialLocation: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -67,6 +67,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 diff --git a/Assets/GameAssets/Models/材质/BGS_signs.png b/Assets/GameAssets/Models/材质/BGS_signs.png index 30351ea..deb85cc 100644 Binary files a/Assets/GameAssets/Models/材质/BGS_signs.png and b/Assets/GameAssets/Models/材质/BGS_signs.png differ diff --git a/Assets/GameAssets/Models/材质/BGS_signs.png.meta b/Assets/GameAssets/Models/材质/BGS_signs.png.meta index e853a01..941389d 100644 --- a/Assets/GameAssets/Models/材质/BGS_signs.png.meta +++ b/Assets/GameAssets/Models/材质/BGS_signs.png.meta @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 2 mipBias: 0 wrapU: 0 wrapV: 0 @@ -67,7 +67,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -79,7 +79,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -90,8 +90,44 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1