Commit cc1168d8 authored by yzy's avatar yzy

Merge branch 'master' of git@gitlab.sd-zeus.com:yangzeyu/SCVerificationPipelineDT.git

parents 9db42302 63b738d6
Subproject commit 539468d6b3d502227d2db8f43f46b35e470f457e
Subproject commit 9eab1b3143ea0b4ebe02a2b41732eebb71694e20
This diff is collapsed.
This diff is collapsed.
......@@ -410,6 +410,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1004141955566152663}
- {fileID: 677898309018025866}
- {fileID: 7406346047259710576}
- {fileID: 2936072568499754857}
......@@ -3502,6 +3503,154 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5925170255049399280
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1004141955566152663}
- component: {fileID: 6078366768603468479}
- component: {fileID: 8021391936377975769}
- component: {fileID: 771347758692841648}
- component: {fileID: 4735196011338767227}
m_Layer: 0
m_Name: "\u5730\u9762 (1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
--- !u!4 &1004141955566152663
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5925170255049399280}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 18.8, y: 5.850887, z: 0.1}
m_LocalScale: {x: 5.38893, y: 2.9887, z: 3.48154}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9073857072825387431}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6078366768603468479
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5925170255049399280}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8021391936377975769
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5925170255049399280}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 3
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: dc7867b9a4d380c4f89673fa113458ff, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &771347758692841648
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5925170255049399280}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &4735196011338767227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5925170255049399280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 75f82f03739e4499282c234601d0b1ad, type: 3}
m_Name:
m_EditorClassIdentifier:
ignore: 0
scope: 0
layerMask:
serializedVersion: 2
m_Bits: 4294967295
nameFilter:
subMeshMask: 0
useMaterialSmoothness: 1
materialSmoothnessMapPropertyName: _MetallicGlossMap
materialSmoothnessIntensityPropertyName: _Smoothness
smoothness: 0.75
perSubMeshSmoothness: 0
subMeshSettings:
- smoothness: 0
useMaterialNormalMap: 1
materialNormalMapPropertyName: _BumpMap
overrideGlobalSettings: 1
sampleCount: 128
stepSize: 0
maxRayLength: 64
thickness: 0.2
binarySearchIterations: 8
refineThickness: 1
thicknessFine: 0.02
decay: 2
fresnel: 0.75
fuzzyness: 0
contactHardening: 0
jitter: 0.3
--- !u!1 &6159979640375844710
GameObject:
m_ObjectHideFlags: 0
......
......@@ -38,7 +38,7 @@ MonoBehaviour:
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u88C5\u9970/\u68AF\u5B50.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u88C5\u9970/\u68AF\u5B50/\u68AF\u5B50.001.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u5EFA\u7B51/\u6D41\u6C34\u7EBF.fbx"
modifiedAssetPaddingHash: aaf8cc2eecc124912542225a3454deb3739960eafcfbdf8b13bc0560fe150172fee2df8b3be07881ec1a45d524b1dc57eec3a693fe2f60f4ecc12491fe4945beecc12491fe4945beece62f8fecc12491ecc12491f98b2e89
modifiedAssetPaddingHash: d6a958ffaf80373e2542225a3454deb3739960eafcfbdf8b13bc0560fe150172fee2df8b3be07881ec1a45d524b1dc57eec3a693fe2f60f4ecc12491fe4945beecc12491fe4945beece62f8fecc12491ecc12491f98b2e89
modifiedMeshList: []
modifiedMeshPaddingList:
modifiedAssets:
......@@ -640,7 +640,26 @@ MonoBehaviour:
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u8BBE\u5907/\u5C71\u897F\u68C0\u5B9A\u91C7\u96C6\u7EBF/\u4FE1\u9053\u68C0\u6D4B\u5355\u5143.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u8BBE\u5907/\u5C71\u897F\u4E92\u611F\u7EBF/\u4E92\u611F\u7EBFfbx.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u8BBE\u5907/\u5C71\u897F\u4E92\u611F\u7EBF/\u673A\u68B0\u81C2\u652F\u67B6.fbx"
uvOverlapAssetList: 00000000ffffffff010100000101000001010000000000000000000001010000010100000101000001010000010100000101000001010000010100000101000000000000000000000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000
- "Assets/ZeusLibs/DTComponent/Demo/Models/S45\u88C5\u7BB1\u673A\u5668\u4EBA.fbx"
- "Assets/ZeusLibs/DTComponent/Demo/Models/\u6298\u5F2F\u4EA7\u54C1.fbx"
- Assets/Bakery/examples/content/logolight.FBX
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Stand--Idle.anim.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Locomotion--Walk_N_Land.anim.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Locomotion--Walk_N.anim.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Models/XRControllerLeft.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Jump--InAir.anim.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Locomotion--Run_N.anim.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Models/Armature.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Models/XRControllerRight.fbx
- "Assets/ZeusLibs/ZeusUIS/ArtAssets/Models/\u81EA\u52A8\u79FB\u52A8\u6807\u8BB0/Models/HalfCylinder2.fbx"
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Jump--Jump.anim.fbx
- Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/Mesh/UnityMaterialBall.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Models/Primitive_Wedge.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Character/Animations/Locomotion--Run_N_Land.anim.fbx
- Packages/com.unity.render-pipelines.core/Editor/Resources/DebugProbe.fbx
- Assets/ZeusLibs/ZeusUIS/ArtAssets/Models/Primitive_Torus.fbx
- "Assets/ZeusLibs/ZeusUtility/Prefabs/\u5916\u90E8\u52A0\u8F7D/LED\u706F\u724C-\u52A0\u8F7D\u5916\u90E8\u6587\u672C/Models/ZeusUtility-LED\u663E\u793A\u5C4F.fbx"
uvOverlapAssetList: 000000000000000001010000010100000101000000000000000000000101000001010000010100000101000001010000010100000101000001010000010100000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000
xatlasWarningShown: 0
foundCompatibleSetup: 1
gpuName: NVIDIA GeForce RTX 3060 Laptop GPU
......
......@@ -38,4 +38,4 @@ MonoBehaviour:
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u88C5\u9970/\u68AF\u5B50.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u88C5\u9970/\u68AF\u5B50/\u68AF\u5B50.001.fbx"
- "Assets/_\u7F8E\u672F\u8D44\u6E90/\u6A21\u578B/\u5EFA\u7B51/\u6D41\u6C34\u7EBF.fbx"
modifiedAssetPaddingHash: aaf8cc2eecc124912542225a3454deb3739960eafcfbdf8b13bc0560fe150172fee2df8b3be07881ec1a45d524b1dc57eec3a693fe2f60f4ecc12491fe4945beecc12491fe4945beece62f8fecc12491ecc12491f98b2e89
modifiedAssetPaddingHash: d6a958ffaf80373e2542225a3454deb3739960eafcfbdf8b13bc0560fe150172fee2df8b3be07881ec1a45d524b1dc57eec3a693fe2f60f4ecc12491fe4945beecc12491fe4945beece62f8fecc12491ecc12491f98b2e89
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment