From 73cc1b6cb40862adef8422d657611d73e9fd7ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=87?= <2453663605@qq.com> Date: Wed, 10 Jul 2024 10:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Textures/Materials/Atlas-1.mat | 2 +- .../Textures/Materials/Trees-01.mat | 2 +- .../Model/电线杆/Mat/Material #2522.mat | 2 +- .../Assets/Model/电线杆/Mat/ND_配电箱围栏.mat | 4 +- .../Model/电线杆/Mat/ND_配电箱围栏底座.mat | 2 +- .../Assets/Model/电线杆/Mat/color.mat | 4 +- .../Assets/Model/电线杆/Mat/dianxiang.mat | 2 +- .../Assets/Model/电线杆/Mat/yinjinshu.mat | 11 +- .../Assets/Model/电线杆/Mat/电线杆.mat | 4 +- .../Assets/Model/电线杆/Prefab/电柜.prefab | 4 + .../Model/电线杆/Prefab/配电区域.prefab | 74 +++++- .../Assets/Model/设备/Mat/三相电表 2.mat | 89 ++++++++ .../Assets/Model/设备/Mat/三相电表 2.mat.meta | 8 + .../Assets/Scenes/现场 _Test.unity | 214 +++++++++++++++++- .../现场Scenes/现场_Profiles/现场.asset | 12 +- .../ProjectSettings/QualitySettings.asset | 2 +- 16 files changed, 407 insertions(+), 29 deletions(-) create mode 100644 SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat create mode 100644 SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat.meta diff --git a/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Atlas-1.mat b/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Atlas-1.mat index 8a702cef..92d95ed0 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Atlas-1.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Atlas-1.mat @@ -90,7 +90,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} + - _Color: {r: 0.8113207, g: 0.8113207, b: 0.7529412, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.38679248, g: 0.38679248, b: 0.38679248, a: 0} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Trees-01.mat b/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Trees-01.mat index e275ffaa..ba5c6357 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Trees-01.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/Fantastic City Generator/Textures/Materials/Trees-01.mat @@ -80,6 +80,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8207547, g: 0.8207547, b: 0.8207547, a: 1} + - _Color: {r: 0.81960785, g: 0.81960785, b: 0.81960785, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/Material #2522.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/Material #2522.mat index 90d88267..a1ecc52f 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/Material #2522.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/Material #2522.mat @@ -53,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ea710971f9aeefc4d8c5760c0b233ffe, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏.mat index c21b1db8..efd4386b 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏.mat @@ -71,7 +71,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -83,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏底座.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏底座.mat index c4ff5961..de8a3890 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏底座.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/ND_配电箱围栏底座.mat @@ -53,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: df1f339b7a8796944970d6e4e9f4d331, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/color.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/color.mat index 3b5dbf2d..2bc45820 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/color.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/color.mat @@ -53,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b7da4d38fa4070448b8843642901b389, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -71,7 +71,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.6 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/dianxiang.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/dianxiang.mat index be58057b..c7ec029a 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/dianxiang.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/dianxiang.mat @@ -72,7 +72,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/yinjinshu.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/yinjinshu.mat index 0dec7517..76d5e244 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/yinjinshu.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/yinjinshu.mat @@ -13,9 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DETAIL_MULX2 - - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -30,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: d0b17546253caaf43b770b1fb40e3e29, type: 3} + m_Texture: {fileID: 2800000, guid: b7da4d38fa4070448b8843642901b389, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -54,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fead1508d7b51404598bf9cb50137d7e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -72,7 +71,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.6 - _GlossyReflections: 1 - _Metallic: 1 - _Mode: 0 @@ -84,6 +83,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/电线杆.mat b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/电线杆.mat index e8b6037c..7fe1935e 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/电线杆.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/电线杆.mat @@ -53,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b7da4d38fa4070448b8843642901b389, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -71,7 +71,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.2 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/电柜.prefab b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/电柜.prefab index 0406da16..d12ae61b 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/电柜.prefab +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/电柜.prefab @@ -48,6 +48,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -4240419013182574420, guid: 85dcbd15c4bf30949aadb6c753cebd79, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 34f035f1ae632f347b68f34dbcc67994, type: 2} - target: {fileID: 919132149155446097, guid: 85dcbd15c4bf30949aadb6c753cebd79, type: 3} propertyPath: m_Name value: "\u7535\u67DC" diff --git a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/配电区域.prefab b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/配电区域.prefab index dad435f5..2f534b17 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/配电区域.prefab +++ b/SXElectricityInformationAcquisition/Assets/Model/电线杆/Prefab/配电区域.prefab @@ -1,5 +1,70 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &93901354921372746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9110869545448619091} + - component: {fileID: 7932507099026356953} + m_Layer: 0 + m_Name: Reflection Probe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9110869545448619091 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93901354921372746} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} + m_LocalPosition: {x: -0.126, y: 2.043, z: -0.229} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8322912254063910965} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!215 &7932507099026356953 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93901354921372746} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 1 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 128 + m_UpdateFrequency: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxOffset: {x: 0, y: 0, z: 0} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 100 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 1 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} --- !u!1 &3708782976203021668 GameObject: m_ObjectHideFlags: 0 @@ -310,6 +375,7 @@ Transform: - {fileID: 7885052562152851712} - {fileID: 73790700294135962} - {fileID: 450023607792506237} + - {fileID: 9110869545448619091} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &7224413821687438680 @@ -983,7 +1049,7 @@ Transform: m_GameObject: {fileID: 8989132117155332241} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: -0.067, y: 2.241, z: -0.85} + m_LocalPosition: {x: -0.102, y: 2.374, z: -0.685} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1002,7 +1068,7 @@ Light: m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.9 - m_Range: 3.12 + m_Range: 3 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -5573,6 +5639,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} + - target: {fileID: 6714067838338008932, guid: a47634dceb9b5874c8a5d0d065f1ccdf, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6928575194308002785, guid: a47634dceb9b5874c8a5d0d065f1ccdf, type: 3} propertyPath: m_LocalPosition.x value: 0.0746 diff --git a/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat b/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat new file mode 100644 index 00000000..75e6160b --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u4E09\u76F8\u7535\u8868 2" + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _METALLICGLOSSMAP + m_InvalidKeywords: + - _SPECGLOSSMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f561f7473d3ce6141b7697e2ff2469c0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: f9db763a3d9c92241ae576c850f46ea8, type: 3} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: f7e55c01408651244a9acc01cd1d9949, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat.meta b/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat.meta new file mode 100644 index 00000000..6f4094e8 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Model/设备/Mat/三相电表 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34f035f1ae632f347b68f34dbcc67994 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity index b8f9cfc8..673f3e83 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity @@ -3751,6 +3751,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4551507190943069657, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} m_PrefabInstance: {fileID: 601364440} m_PrefabAsset: {fileID: 0} +--- !u!4 &187667555 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + m_PrefabInstance: {fileID: 1751701194} + m_PrefabAsset: {fileID: 0} --- !u!1 &198856100 GameObject: m_ObjectHideFlags: 0 @@ -11192,11 +11197,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.7072302 objectReference: {fileID: 0} - target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.7069834 objectReference: {fileID: 0} - target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_LocalRotation.y @@ -11208,7 +11213,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: -89.98 objectReference: {fileID: 0} - target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -18416,6 +18421,55 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000350259} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1000682731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1000682733} + - component: {fileID: 1000682732} + m_Layer: 3 + m_Name: PostVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1000682732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000682731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 5035210edc719c74f8770291d49e713e, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 +--- !u!4 &1000682733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000682731} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 307.63492, y: 2.3356245, z: 160.4964} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1001312279 GameObject: m_ObjectHideFlags: 0 @@ -33172,6 +33226,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1746751618} m_CullTransparentMesh: 1 +--- !u!1001 &1751701194 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1438674221} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_Name + value: BusinessWomanB + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_Avatar + value: + objectReference: {fileID: 9000000, guid: a8cdfa287b44f004fa55c0c3049de77b, type: 3} + - target: {fileID: 5866666021909216657, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: ebe9dce224f392344ae511bfe201b453, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d581b302e4a7514ba2e9ba4d27f32c2, type: 3} --- !u!1 &1755457971 stripped GameObject: m_CorrespondingSourceObject: {fileID: 965816488757340388, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} @@ -34522,13 +34641,40 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -4798874528583315279, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3715013532437581614, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2855767553258790046, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1767070837432701097, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 122910976867492708, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_Name value: Man_stand objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} + insertIndex: 0 + addedObject: {fileID: 187667555} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} insertIndex: -1 addedObject: {fileID: 314679705} @@ -231885,6 +232031,7 @@ GameObject: - component: {fileID: 6121626523118833246} - component: {fileID: 6121626523118833248} - component: {fileID: 6121626523118833249} + - component: {fileID: 6121626523118833250} m_Layer: 0 m_Name: PlayerCamera m_TagString: MainCamera @@ -231976,6 +232123,66 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac993d98ca1c3d47b28cf2a9d81d94f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6121626523118833250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6121626523118833245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 6121626523118833240} + volumeLayer: + serializedVersion: 2 + m_Bits: 8 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] --- !u!1 &6121626523198945500 GameObject: m_ObjectHideFlags: 0 @@ -232761,3 +232968,4 @@ SceneRoots: - {fileID: 1863232719} - {fileID: 1426078485} - {fileID: 764007851} + - {fileID: 1000682733} diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset index 839b4dfe..83535c39 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1cb7e9e120078f43bce4f0b1be547a7, type: 3} m_Name: AmbientOcclusion m_EditorClassIdentifier: - active: 1 + active: 0 enabled: overrideState: 1 value: 1 @@ -21,7 +21,7 @@ MonoBehaviour: value: 1 intensity: overrideState: 1 - value: 1 + value: 0 color: overrideState: 0 value: {r: 0, g: 0, b: 0, a: 1} @@ -80,7 +80,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 + active: 0 enabled: overrideState: 1 value: 1 @@ -140,7 +140,7 @@ MonoBehaviour: defaultState: 1 tonemapper: overrideState: 1 - value: 2 + value: 1 toneCurveToeStrength: overrideState: 0 value: 0 @@ -180,12 +180,12 @@ MonoBehaviour: value: 0 saturation: overrideState: 1 - value: 10 + value: 15 brightness: overrideState: 0 value: 0 postExposure: - overrideState: 0 + overrideState: 1 value: 0.5 contrast: overrideState: 1 diff --git a/SXElectricityInformationAcquisition/ProjectSettings/QualitySettings.asset b/SXElectricityInformationAcquisition/ProjectSettings/QualitySettings.asset index 8dcaee35..35c34396 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/QualitySettings.asset +++ b/SXElectricityInformationAcquisition/ProjectSettings/QualitySettings.asset @@ -258,7 +258,7 @@ QualitySettings: shadowResolution: 2 shadowProjection: 1 shadowCascades: 4 - shadowDistance: 50 + shadowDistance: 150 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}