diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 49b014b..b29d414 100644 Binary files a/Assets/StreamingAssets/Excel/NiuData.xlsx and b/Assets/StreamingAssets/Excel/NiuData.xlsx differ diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index 9e86a0a..dfa6180 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -5911,7 +5911,7 @@ "ProcessDescription": "对妊娠25天以上的牛可用B超检查。利用探头通过直肠轻轻地在子宫角滑动(使用B超探头检查时要特别注意,防止动作过重,检查过度,以免引起流产)", "SoundPath": "N105", "VideoPath": "", - "TimelineLength": 280, + "TimelineLength": 175, "CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0", "CameraNearTR": "", "QNextNum": 238, @@ -5936,7 +5936,7 @@ "ProcessDescription": "在荧光屏上便可观察到周围黑色中间有一个长1-2cm灰白色图像,即为胎儿。胎儿60日龄时为6-7cm长,90日龄时为14-17cm长。", "SoundPath": "N106", "VideoPath": "", - "TimelineLength": 115, + "TimelineLength": 100, "CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0", "CameraNearTR": "", "QNextNum": 239, diff --git a/Assets/TimeLine/YYZDTimeLineCtrl.playable b/Assets/TimeLine/YYZDTimeLineCtrl.playable index 0b0effc..9d79f66 100644 --- a/Assets/TimeLine/YYZDTimeLineCtrl.playable +++ b/Assets/TimeLine/YYZDTimeLineCtrl.playable @@ -569,6 +569,28 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-6184191805538591068 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset(Clone)(Clone) + m_EditorClassIdentifier: + m_Clip: {fileID: 644589263403131068, guid: 9be88cbea7d4faf48b51df10701c2ced, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} --- !u!114 &-5854866599769403492 MonoBehaviour: m_ObjectHideFlags: 1 @@ -706,10 +728,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 50.083333333333336 + m_Start: 48.333333333333336 m_ClipIn: 0 m_Asset: {fileID: -8110963697338682535} - m_Duration: 1.93333333333333 + m_Duration: 1.6666666666666643 m_TimeScale: 1 m_ParentTrack: {fileID: -4126499356004069609} m_EaseInDuration: 0 @@ -2944,7 +2966,58 @@ MonoBehaviour: m_Start: 45.416666666666664 m_ClipIn: 0 m_Asset: {fileID: 582913101377139349} - m_Duration: 4.625 + m_Duration: 2.9166666666666714 + m_TimeScale: 1 + m_ParentTrack: {fileID: 7448695141640849650} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 1.6666666666666643 + m_PreExtrapolationTime: 0 + m_DisplayName: 4 + - m_Version: 1 + m_Start: 50 + m_ClipIn: 2.6500000000000057 + m_Asset: {fileID: -6184191805538591068} + m_Duration: 2.0166666666666657 m_TimeScale: 1 m_ParentTrack: {fileID: 7448695141640849650} m_EaseInDuration: 0 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index a359b9b..b7edb57 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -123,6 +123,112 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &419268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 419269} + - component: {fileID: 419272} + - component: {fileID: 419271} + - component: {fileID: 419270} + m_Layer: 0 + m_Name: YYZDYinDao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &419269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419268} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.22562103, y: 0.49663797, z: 0.9528116} + m_LocalScale: {x: 1.0813636, y: 1.0813636, z: 1.0813636} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 599980927} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &419270 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419268} + 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: 7063374609376616071, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} +--- !u!23 &419271 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419268} + 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: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 5858675996899628329, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} + 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!33 &419272 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419268} + m_Mesh: {fileID: 7063374609376616071, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} --- !u!1 &16420053 GameObject: m_ObjectHideFlags: 0 @@ -1150,11 +1256,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 464004036039520780, guid: c7e6a121e57ddd0489e673d08199225e, type: 3} insertIndex: -1 - addedObject: {fileID: 359266034} + addedObject: {fileID: 313967181864349081} - targetCorrespondingSourceObject: {fileID: 464004036039520780, guid: c7e6a121e57ddd0489e673d08199225e, type: 3} insertIndex: -1 - addedObject: {fileID: 1896302221} + addedObject: {fileID: 1184602179} + - targetCorrespondingSourceObject: {fileID: 464004036039520780, guid: c7e6a121e57ddd0489e673d08199225e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025662240} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 6150021446898462249, guid: c7e6a121e57ddd0489e673d08199225e, type: 3} @@ -3091,111 +3201,6 @@ Transform: - {fileID: 1536089319} m_Father: {fileID: 1834696693} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &244653321 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 244653322} - - component: {fileID: 244653325} - - component: {fileID: 244653324} - - component: {fileID: 244653323} - m_Layer: 0 - m_Name: YYZDYinDao - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &244653322 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 244653321} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.274, y: 0.404, z: 0.776} - m_LocalScale: {x: 0.377985, y: 0.377985, z: 0.377985} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 599980927} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &244653323 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 244653321} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &244653324 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 244653321} - 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: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &244653325 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 244653321} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &250086717 GameObject: m_ObjectHideFlags: 0 @@ -4586,10 +4591,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2015130936} - - targetCorrespondingSourceObject: {fileID: 3997817710294349534, guid: e2da9a3a2ae31db439ba7b3d76c3783c, - type: 3} - insertIndex: -1 - addedObject: {fileID: 313967181864349081} - targetCorrespondingSourceObject: {fileID: 3997817710294349534, guid: e2da9a3a2ae31db439ba7b3d76c3783c, type: 3} insertIndex: -1 @@ -4870,111 +4871,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 349163084} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &359266033 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 359266034} - - component: {fileID: 359266037} - - component: {fileID: 359266036} - - component: {fileID: 359266035} - m_Layer: 0 - m_Name: RSJDzigongjing - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &359266034 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359266033} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.445, y: 13.434, z: -55.61} - m_LocalScale: {x: 0.31941, y: 0.31941, z: 0.31941} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 107011325} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &359266035 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359266033} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &359266036 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359266033} - 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: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &359266037 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359266033} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &359689440 GameObject: m_ObjectHideFlags: 0 @@ -7812,7 +7708,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5556936458030945584, guid: 83f0ef4f2142c074c91b13a3b8f6827c, type: 3} insertIndex: -1 - addedObject: {fileID: 244653322} + addedObject: {fileID: 419269} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2177224999130827029, guid: 83f0ef4f2142c074c91b13a3b8f6827c, type: 3} @@ -12402,7 +12298,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: d8a0f6f978955544082ec6b5019a22a6, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -12673,9 +12569,9 @@ PlayableDirector: - key: {fileID: 1301464831211663107, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} value: {fileID: 644742041} - key: {fileID: 3722974941660564465, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} - value: {fileID: 0} + value: {fileID: 1008241899} - key: {fileID: 240934812900543910, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} - value: {fileID: 0} + value: {fileID: 1752369249} - key: {fileID: 0} value: {fileID: 1764392503} - key: {fileID: 0} @@ -12779,9 +12675,9 @@ PlayableDirector: - key: {fileID: -2610436164943305520, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} value: {fileID: 4814776890344312793} - key: {fileID: 8593994300954333927, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} - value: {fileID: 0} + value: {fileID: 1008241899} - key: {fileID: -8639516125885400693, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} - value: {fileID: 0} + value: {fileID: 1752369249} - key: {fileID: -8023045793803171882, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} value: {fileID: 599980929} - key: {fileID: -6942726762340625221, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} @@ -12791,9 +12687,9 @@ PlayableDirector: - key: {fileID: -348201666913936155, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} value: {fileID: 7736194001022832407} - key: {fileID: 5503348677003431261, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} - value: {fileID: 359266033} + value: {fileID: 0} - key: {fileID: -4597807870022059700, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} - value: {fileID: 1896302220} + value: {fileID: 0} - key: {fileID: -2803756846926785644, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} value: {fileID: 1626746519} - key: {fileID: 6198469304868697162, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2} @@ -16206,6 +16102,112 @@ Transform: - {fileID: 923172713} m_Father: {fileID: 1195383334} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1184602178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1184602179} + - component: {fileID: 1184602182} + - component: {fileID: 1184602181} + - component: {fileID: 1184602180} + m_Layer: 0 + m_Name: RSJDzigongjing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1184602179 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184602178} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.345596, y: 13.490539, z: -56.925472} + m_LocalScale: {x: 1.0813636, y: 1.0813636, z: 1.0813636} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 107011325} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1184602180 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184602178} + 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: -7428365394362922968, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} +--- !u!23 &1184602181 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184602178} + 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: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 5858675996899628329, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} + 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!33 &1184602182 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184602178} + m_Mesh: {fileID: -7428365394362922968, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} --- !u!1 &1184892625 GameObject: m_ObjectHideFlags: 0 @@ -22349,111 +22351,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1874086925} m_PrefabAsset: {fileID: 0} ---- !u!1 &1896302220 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1896302221} - - component: {fileID: 1896302224} - - component: {fileID: 1896302223} - - component: {fileID: 1896302222} - m_Layer: 0 - m_Name: RSJDzigongjiao - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1896302221 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1896302220} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.45, y: 12.72, z: -57.51} - m_LocalScale: {x: 0.31941, y: 0.31941, z: 0.31941} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 107011325} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1896302222 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1896302220} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1896302223 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1896302220} - 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: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &1896302224 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1896302220} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1901057581 GameObject: m_ObjectHideFlags: 0 @@ -23237,6 +23134,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2019538366} m_CullTransparentMesh: 1 +--- !u!1 &2025662239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2025662240} + - component: {fileID: 2025662243} + - component: {fileID: 2025662242} + - component: {fileID: 2025662241} + m_Layer: 0 + m_Name: RSJDzigongjiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2025662240 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025662239} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.5685, y: 12.916014, z: -57.943104} + m_LocalScale: {x: 1.0813636, y: 1.0813636, z: 1.0813636} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 107011325} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &2025662241 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025662239} + 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: -7628297149760489497, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} +--- !u!23 &2025662242 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025662239} + 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: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 5858675996899628329, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} + 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!33 &2025662243 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025662239} + m_Mesh: {fileID: -7628297149760489497, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} --- !u!1 &2029554992 GameObject: m_ObjectHideFlags: 0 @@ -25267,8 +25270,8 @@ Transform: m_GameObject: {fileID: 1085578416991237923} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.5853972, y: 17.524075, z: -60.428593} - m_LocalScale: {x: 1.0813333, y: 1.0813334, z: 1.0813333} + m_LocalPosition: {x: 4.5853972, y: 17.524075, z: -60.428623} + m_LocalScale: {x: 1.0813332, y: 1.0813334, z: 1.0813332} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2207132923853157623} @@ -25276,7 +25279,7 @@ Transform: - {fileID: 5398419513685986299} - {fileID: 5956903538844690397} - {fileID: 1141456142466680747} - m_Father: {fileID: 309006744} + m_Father: {fileID: 107011325} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &329047082708079364 MeshRenderer: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e3da85f..571764a 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,10 +18,10 @@ EditorUserSettings: value: 5707515e06045e030e5b0d7615770f44104e1a7c797b75697d781b67e0e3636a flags: 0 RecentlyUsedSceneGuid-4: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 RecentlyUsedSceneGuid-5: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 vcSharedLogLevel: value: 0d5e400f0650