huangjiayu
/
ShanxiKnowledgeBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

融合

This commit is contained in:
YangHua 2024-06-05 21:45:52 +08:00
parent 9047f71e24 23b557366d
commit ef8e556eb0
26 changed files with 25235 additions and 704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1.prefab vendored
View File

@ -363,7 +363,7 @@ MonoBehaviour:
m_Name: Tree Data
m_EditorClassIdentifier:
_uniqueID: 759
materialHash: 8e0f4f1a34694c9be92b03f82f8402ec-687407104
materialHash: 6085df664d9056bfd1bb46ce59172708-687407104
root:
_uniqueID: 1
seed: 1234

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/diffuse.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 334 KiB

2
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/normal_specular.png.meta vendored
View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/shadow.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 86 KiB

6
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/shadow.png.meta vendored
View File

@ -6,8 +6,8 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
maxTextureSize: 64
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/translucency_gloss.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

2
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle1_Textures/translucency_gloss.png.meta vendored
View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0

36
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/GrassBundle2.prefab vendored
View File

@ -29,6 +29,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -61,6 +62,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -93,14 +95,15 @@ MeshRenderer:
m_AdditionalVertexStreams: {fileID: 0}
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Optimized Bark Material
m_Shader: {fileID: 10604, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -122,6 +125,7 @@ Material:
m_Texture: {fileID: 2800000, guid: 8467257acdc5b4bc09679ffb276b4481, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.3
- _SquashAmount: 1
@ -134,14 +138,15 @@ Material:
m_BuildTextureStacks: []
--- !u!21 &2100002
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Optimized Leaf Material
m_Shader: {fileID: 10605, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -167,6 +172,7 @@ Material:
m_Texture: {fileID: 2800000, guid: 8467257acdc5b4bc09679ffb276b4481, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.582078
- _ShadowOffsetScale: 5.17
@ -357,7 +363,7 @@ MonoBehaviour:
m_Name: Tree Data
m_EditorClassIdentifier:
_uniqueID: 783
materialHash: 3b3e2747ab36b5772a91cd8fc8c52b74-687407104
materialHash: fb7b5ac171f8810092f9feb87d496151-687407104
root:
_uniqueID: 1
seed: 1234
@ -459,17 +465,17 @@ MonoBehaviour:
rootSpread: 1.5123144
groundOffset: 0
rootMatrix:
e00: 0.94799054
e01: -0
e02: 0.31829843
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: -0.31829843
e20: 0
e21: 0
e22: 0.94799054
e22: 1
e23: 0
e30: 0
e31: 0
@ -1265,17 +1271,17 @@ MonoBehaviour:
pitch: -0
rotation: {x: 0, y: 0, z: 0, w: 1}
matrix:
e00: 0.94799054
e01: -0
e02: 0.31829843
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: -0.31829843
e20: 0
e21: 0
e22: 0.94799054
e22: 1
e23: 0
e30: 0
e31: 0

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/diffuse.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/normal_specular.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

2
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/normal_specular.png.meta vendored
View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/shadow.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 130 KiB

6
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/shadow.png.meta vendored
View File

@ -6,8 +6,8 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
maxTextureSize: 128
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

BIN
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/translucency_gloss.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 94 KiB

2
SXElectricalInspection/Assets/GameAssets/Art/8.23/3rdParty/Wild Scenery Kit/Prefabs (Ready to use)/Plants and Foliage/Tree1_Textures/translucency_gloss.png.meta vendored
View File

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0

11
SXElectricalInspection/Assets/GameAssets/Art/8.23/GameAssets/Models/工器具间0708.fbm/人物/Materials/95598.mat
View File

@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 95598
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_ValidKeywords:
- _ALPHABLEND_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -56,6 +58,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -65,12 +68,12 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:

8
SXElectricalInspection/Assets/GameAssets/Art/8.23/GameAssets/Models/工器具间0708.fbm/人物/Materials/Mat3d66-1583582-3-3790.mat
View File

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Mat3d66-1583582-3-3790
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +56,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -73,6 +75,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.85959065, g: 0.6768209, b: 0, a: 1}
- _Color: {r: 0.85882354, g: 0.39371982, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

11
SXElectricalInspection/Assets/GameAssets/Art/8.23/GameAssets/Models/工器具间0708.fbm/人物/Materials/guowangbiao.mat
View File

@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: guowangbiao
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_ValidKeywords:
- _ALPHABLEND_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -56,6 +58,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -65,12 +68,12 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:

20
SXElectricalInspection/Assets/GameAssets/Art/Art_工具间/GameAssets/Mdoels/Tools/纺织手套/st.FBX.meta
View File

@ -1,19 +1,30 @@
fileFormatVersion: 2
guid: bdf34a9a1f27ab9488ecd87eac9a586f
ModelImporter:
serializedVersion: 20200
serializedVersion: 21300
internalIDToNameTable: []
externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Material #0
second: {fileID: 2100000, guid: df7b831b84544c1439e809d3c5228251, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Material #1
second: {fileID: 2100000, guid: 491fd59a0cf829747aadf2dcba7684c3, type: 2}
materials:
materialImportMode: 1
materialName: 2
materialSearch: 1
materialLocation: 0
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
@ -43,6 +54,7 @@ ModelImporter:
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
@ -54,6 +66,7 @@ ModelImporter:
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
@ -96,6 +109,7 @@ ModelImporter:
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:

2
SXElectricalInspection/Assets/GameAssets/Models/工具相关/工具/Material/Material #25.mat → SXElectricalInspection/Assets/GameAssets/Models/工具相关/工具/Material/钢丝钳.mat
View File

@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Material #25
m_Name: "\u94A2\u4E1D\u94B3"
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION

0
SXElectricalInspection/Assets/GameAssets/Models/工具相关/工具/Material/Material #25.mat.meta → SXElectricalInspection/Assets/GameAssets/Models/工具相关/工具/Material/钢丝钳.mat.meta
View File

4
SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/低压公配变.asset
View File

@ -203,7 +203,7 @@ MonoBehaviour:
value: 1
temperature:
overrideState: 1
value: -5
value: -2
tint:
overrideState: 0
value: 0
@ -220,7 +220,7 @@ MonoBehaviour:
overrideState: 0
value: 0
postExposure:
overrideState: 1
overrideState: 0
value: 0.6
contrast:
overrideState: 1

19424
SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/室外型低压公配变.unity
View File

File diff suppressed because it is too large Load Diff

6395
SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity
View File

File diff suppressed because it is too large Load Diff

2
SXElectricalInspection/ProjectSettings/ProjectSettings.asset
View File

@ -724,7 +724,7 @@ PlayerSettings:
PS4: UNITY_POST_PROCESSING_STACK_V2
PS5: UNITY_POST_PROCESSING_STACK_V2
Stadia: UNITY_POST_PROCESSING_STACK_V2
Standalone: UNITY_POST_PROCESSING_STACK_V2;AMPLIFY_SHADER_EDITOR;AQUAS_PRESENT
Standalone: UNITY_POST_PROCESSING_STACK_V2;AMPLIFY_SHADER_EDITOR;AQUAS_PRESENT;VUPLEX_STANDALONE
WebGL: UNITY_POST_PROCESSING_STACK_V2
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2

4
SXElectricalInspection/ProjectSettings/QualitySettings.asset
View File

@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 0
m_CurrentQuality: 5
m_QualitySettings:
- serializedVersion: 2
name: Very Low
@ -231,7 +231,7 @@ QualitySettings:
PSP2: 2
Server: 0
Stadia: 5
Standalone: 0
Standalone: 5
WebGL: 3
Windows Store Apps: 0
XboxOne: 5