diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat index 1674159..9cdfb91 100644 --- a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat +++ b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128567792.mat @@ -127,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.42352942, g: 0.7019608, b: 0.6784314, a: 0.25} - - _Color: {r: 0.42352942, g: 0.7019608, b: 0.6784314, a: 0.25} + - _Color: {r: 0.4235294, g: 0.7019608, b: 0.6784314, a: 0.25} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat b/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat index 2211dff..42b5a51 100644 --- a/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat +++ b/Assets/Art/Models/LouDi/SM_hengwenzaiwutai/Materials/M_zaiwutai Line.mat @@ -118,7 +118,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.8113208, g: 0.21813813, b: 0.22139741, a: 1} - - _Color: {r: 0.8113208, g: 0.21813813, b: 0.22139741, a: 1} + - _Color: {r: 0.8113207, g: 0.21813807, b: 0.22139737, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/TimeLine/PTYZTimeLineCtrl.playable b/Assets/TimeLine/PTYZTimeLineCtrl.playable index 3b8d1a5..8c88c8e 100644 --- a/Assets/TimeLine/PTYZTimeLineCtrl.playable +++ b/Assets/TimeLine/PTYZTimeLineCtrl.playable @@ -538,6 +538,47 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &-7865052177985815263 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 1.3166174, y: -2.363628, z: 2.0450358} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 90, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -2458770296529745924} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 --- !u!114 &-7672866409642211304 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2553,6 +2594,126 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset(Clone)(Clone) m_EditorClassIdentifier: +--- !u!74 &-2458770296529745924 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (12) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 84.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 86.71667 + value: 60 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._displayFrame + path: MESH + classID: 23 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3623540706 + attribute: 2284710970 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 86.71667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 84.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 86.71667 + value: 60 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._displayFrame + path: MESH + classID: 23 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] --- !u!114 &-2302039057418458316 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2888,6 +3049,8 @@ MonoBehaviour: - {fileID: -973651026654013499} - {fileID: -8936700325060488812} - {fileID: -6249027646514711009} + - {fileID: 3505522705820902043} + - {fileID: -7865052177985815263} - {fileID: 463012593989899595} - {fileID: 6829907324428191069} - {fileID: -5327545306820594903} @@ -7425,6 +7588,99 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &3505522705820902043 +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: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (6) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 84.5 + m_ClipIn: 0 + m_Asset: {fileID: 5282596095344202499} + m_Duration: 16.600000000000023 + m_TimeScale: 1 + m_ParentTrack: {fileID: 3505522705820902043} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + 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: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &3685049905944216102 MonoBehaviour: m_ObjectHideFlags: 1 @@ -7698,6 +7954,18 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &5282596095344202499 +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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset(Clone)(Clone) + m_EditorClassIdentifier: --- !u!114 &6009677748403712918 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index ea269a5..08d9215 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -20236,7 +20236,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -20904,6 +20904,10 @@ PlayableDirector: value: {fileID: 1937030614} - key: {fileID: -6918725316685158774, guid: 7bff6f14e388dd74dad4e09245b4dc6f, type: 2} value: {fileID: 1161181685} + - key: {fileID: 3505522705820902043, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} + value: {fileID: 988015050} + - key: {fileID: -7865052177985815263, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} + value: {fileID: 988015051} m_ExposedReferences: m_References: - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863} @@ -22932,52 +22936,52 @@ PrefabInstance: - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalScale.x - value: 0.11000001 + value: 0.086665705 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalScale.y - value: 0.11000001 + value: 0.086665705 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalScale.z - value: 0.11000001 + value: 0.086665705 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalPosition.x - value: 1.3166174 + value: 1.2166 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalPosition.y - value: -2.363628 + value: -2.3603 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalPosition.z - value: 2.0450358 + value: 2.0223 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: -0.72176474 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.005523608 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: -0.69209623 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.0052965563 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} @@ -22987,7 +22991,7 @@ PrefabInstance: - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 359.6247 objectReference: {fileID: 0} - target: {fileID: 8437299668661599233, guid: ef9c3e8bd94a3b948829a2a21ae64a2e, type: 3} diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 0dea145..d8d1a48 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 30788 + controlID: 31101 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 30789 + controlID: 31102 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -689,7 +689,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.18568838, y: 0.22617772, z: -0.04396774, w: 0.95521253} speed: 2 - m_Value: {x: -0.18568839, y: -0.22617774, z: 0.043967742, w: -0.95521253} + m_Value: {x: 0.18568832, y: 0.22617765, z: -0.043967724, w: 0.9552122} m_Size: m_Target: 0.067235656 speed: 2 @@ -810,8 +810,8 @@ MonoBehaviour: y: 491 width: 1066 height: 448 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -881,8 +881,8 @@ MonoBehaviour: y: 0 width: 328 height: 939 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -926,8 +926,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a42becff - m_LastClickedID: -1299548 + m_SelectedIDs: 0ac50200 + m_LastClickedID: 0 m_ExpandedIDs: 102fecff760dedffb616edffc27dedff4072eeffc2efeeff2262efff2677f0ff1e78f0ff027cf0ff34baf0ffa2baf0ffccbbf0ff2cbcf0ff30bcf0ffa4bef0ffc0f1f0ffc0f2f0ffce1ff1fff820f1ff0a73f1ff3e78f1ffb4e0f1ff8639f2ffce54f2ff1468f3ffacc9f3ff7edcf3ff06f2f3ff7cf5f3ff984cf4ff5e51f4fff2b4f4ff7aedf4ff8eedf4ffd61ef5ffca8ef5ff9c00f7ff8666f7ff54e4f7ff98fff7ffd076f8ffa4def8ff2c50f9ff70bcf9ff7c32faff8c37faffde4afaff4ea0faff620dfbffe61dfbfff422fbff5288fbff5688fbff6689fbffb68cfbffba8cfbffca8dfbffdee8fbffdc6afcff44d1fcff9240fdff5845fdff2ebbfdff362afeff5c33feff38b8fefffae1fefffee1feff320dffff6896ffff6c96ffff2efbfffff4ffffffc47c0000307d0000de7e0000cc850000cccc01009ed001008ad401008cd4010094d70100b0ec010082f001006ef4010078f7010066f901008afd010022fe0100ec290200d0320200f43602008c3702007839020014440200f84c02001c510200b4510200a0530200e8930200ba970200b09e0200d0c90200b0cc020092d50200b0d9020046da02007ae402005ae702003cf002005af40200f0f40200280203000a0b0300280f0300be0f0300d61c0300b8250300e6260300d62903006c2a0300ea360300cc3f0300ea43030080440300947e0300b47e03006ab9030018bb03008cbe03000ec20300fac3030018c80300aec80300e6720400f07204005a73040008750400067c0400468d0400ba8d0400688f04006696040050c204005ac20400c4c2040072c4040070cb0400e4cd040098d004007ad1040010d20400b8dc0400c2dc04002cdd0400dade040048df0400d8e50400b061050022620500d06305003e640500cc6a0500ea7b05005c7c05000a7e050006850500feb0050070b105001eb305001aba0500c2cb0500e2cd05002e1d0600482306002c24060058290600040c07009e100700fa14070018190700a2390700c23907001a410700a8420700 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1023,7 +1023,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/StreamingAssets/Excel m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1066,8 +1067,8 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a42becff - m_LastClickedID: 0 + m_SelectedIDs: 0ac50200 + m_LastClickedID: 181514 m_ExpandedIDs: ffffffff00000000829400002a970000689700000afe00000cfe00000efe000010fe000012fe000016fe000018fe00001afe00001cfe00001efe000020fe000022fe000024fe000026fe000028fe00002afe00002cfe00002efe000030fe000032fe000034fe000036fe000038fe00003afe00003cfe00003efe000042fe000044fe000046fe000048fe00004afe00004cfe00004efe000052fe000054fe00008002010088020100da030200000402000204020004c50200 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1093,8 +1094,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: a42becff - m_LastClickedInstanceID: -1299548 + m_SelectedInstanceIDs: 0ac50200 + m_LastClickedInstanceID: 181514 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1143,8 +1144,8 @@ MonoBehaviour: y: 0 width: 321 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14}