From be7a05a65012b8cc6c301b7562f7315823b8a177 Mon Sep 17 00:00:00 2001 From: yzx Date: Tue, 4 Jun 2024 09:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E8=B4=A8=E7=90=83=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Model/Man/Mat/头.mat | 2 +- .../Assets/Model/Man/Mat/头发.mat | 2 +- .../Assets/Model/Man/Mat/安全帽.mat | 2 +- .../Assets/Model/Man/Mat/无安全帽.mat | 22 +++--- .../Assets/Model/Man/Mat/无手套.mat | 11 ++- .../Assets/Model/Man/Mat/棉纱手套.mat | 2 +- .../Assets/Model/Man/Mat/眼睛.mat | 2 +- .../Assets/Model/Man/Mat/衣服.mat | 2 +- .../Assets/Model/Man/Mat/身体.mat | 2 +- .../Model/工器具间/MirrorTex.renderTexture | 4 +- .../Assets/Scenes/工具间Scenes/工具间.unity | 70 +++++++++++++++++-- 11 files changed, 92 insertions(+), 29 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头.mat index 56de033b..19c05355 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u5934" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头发.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头发.mat index 60c9a804..472f8075 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头发.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/头发.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u5934\u53D1" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/安全帽.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/安全帽.mat index c6953493..a3f36579 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/安全帽.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/安全帽.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u5B89\u5168\u5E3D" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无安全帽.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无安全帽.mat index 65ab7258..94e9b51c 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无安全帽.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无安全帽.mat @@ -8,17 +8,19 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u65E0\u5B89\u5168\u5E3D" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHABLEND_ON - _EMISSION m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -45,7 +47,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0c7963899115f53439e3e4fffda96f4a, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -53,7 +55,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: 47648d49215492b4cb7c8d7ec10223ba, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -69,20 +71,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _Color: {r: 0.9339623, g: 0.8233233, b: 0.2775454, a: 1} + - _Color: {r: 0.9339623, g: 0.8233233, b: 0.27754533, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无手套.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无手套.mat index df894f26..c1d2cfd3 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无手套.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/无手套.mat @@ -8,12 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u65E0\u624B\u5957" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 @@ -26,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 2800000, guid: 3f676946e8d198b439bad97cc4cbd5b3, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -46,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 21e93999bd727a14e92e0d76a4996e75, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -72,7 +71,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.42 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -84,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.9150943, g: 0.72932994, b: 0.3927999, a: 1} + - _Color: {r: 0.8396226, g: 0.7123932, b: 0.6455589, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/棉纱手套.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/棉纱手套.mat index 4049e8c1..d46f9ab0 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/棉纱手套.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/棉纱手套.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u68C9\u7EB1\u624B\u5957" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/眼睛.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/眼睛.mat index 488bc273..5c92237b 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/眼睛.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/眼睛.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u773C\u775B" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/衣服.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/衣服.mat index 73fda725..7c87c613 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/衣服.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/衣服.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u8863\u670D" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/身体.mat b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/身体.mat index 04fb1cda..999c5976 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/身体.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Man/Mat/身体.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: "\u8EAB\u4F53" - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: diff --git a/SXElectricityInformationAcquisition/Assets/Model/工器具间/MirrorTex.renderTexture b/SXElectricityInformationAcquisition/Assets/Model/工器具间/MirrorTex.renderTexture index b1ea7d63..a6f419b6 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/工器具间/MirrorTex.renderTexture +++ b/SXElectricityInformationAcquisition/Assets/Model/工器具间/MirrorTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 2048 - m_Height: 2048 + m_Width: 1080 + m_Height: 1020 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity index 917d2cb3..271c6eed 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity @@ -417,6 +417,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 409230221} m_Mesh: {fileID: 9042771077998628582, guid: 156cca832bad49447b16a92685b1fa5b, type: 3} +--- !u!1001 &450266584 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalPosition.x + value: 2.03 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalPosition.z + value: -1.18 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalRotation.w + value: 0.78094316 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalRotation.y + value: 0.62460214 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 77.306 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_Name + value: Man_stand + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe4c1814d44af964c94c33808b704426, type: 3} --- !u!1 &496101574 GameObject: m_ObjectHideFlags: 0 @@ -1737,13 +1798,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551399063} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} + m_LocalRotation: {x: 0.019918656, y: -0.68560207, z: 0.02113292, w: 0.72739714} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1747632740} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 3.322, y: -86.606, z: 0.197} --- !u!20 &1551399066 Camera: m_ObjectHideFlags: 0 @@ -2131,8 +2192,8 @@ Transform: m_GameObject: {fileID: 2108215482} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.62, y: 0.73, z: -2.95} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.14, y: 0.73, z: -2.95} + m_LocalScale: {x: 0.3636, y: 0.3636, z: 0.3636} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -2396,3 +2457,4 @@ SceneRoots: - {fileID: 2108215486} - {fileID: 8696923547104612602} - {fileID: 505215069} + - {fileID: 450266584}