diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab index d22a89b9f..70629cc25 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab @@ -170,6 +170,7 @@ GameObject: - component: {fileID: 2722517140198208553} - component: {fileID: 1938273992031414911} - component: {fileID: 4886813629240367925} + - component: {fileID: 769321914652070386} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -307,6 +308,46 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!114 &769321914652070386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5746768212615024148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:994c69bf4b2403043bc9562f2d24ee56 + m_TableEntryReference: + m_KeyId: 158091825673920512 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1938273992031414911} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1001 &63624482169889023 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal b/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal new file mode 100644 index 000000000..490dcceb9 --- /dev/null +++ b/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: TVOnSignal + m_EditorClassIdentifier: diff --git a/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal.meta b/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal.meta new file mode 100644 index 000000000..6c4f1187d --- /dev/null +++ b/Assets/GameContent/Feature_MainUI/Timeline/TVOnSignal.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f725e5af8de7f944b3402514a4be355 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Feature_MainUI/Timeline/按任意键开始.playable b/Assets/GameContent/Feature_MainUI/Timeline/按任意键开始.playable index 2901ebe62..fdd6c3cf0 100644 --- a/Assets/GameContent/Feature_MainUI/Timeline/按任意键开始.playable +++ b/Assets/GameContent/Feature_MainUI/Timeline/按任意键开始.playable @@ -1,5 +1,29 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7724491264856616267 +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: b46e36075dd1c124a8422c228e75e1fb, type: 3} + m_Name: Signal Track + 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: + - {fileID: 3548559168146922769} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15,6 +39,7 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 3995914538100974027} + - {fileID: -7724491264856616267} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -67,6 +92,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.30310845, y: 0.2758778, z: 0.28949317} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3.1666667 + value: {x: 1.4, y: 1.4, z: 1.4} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -133,6 +167,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.23604615 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: -127 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -182,7 +225,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.6666667 + m_StopTime: 3.1666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -259,6 +302,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.23604615 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: -127 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -298,6 +350,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.30310845 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 1.4 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -337,6 +398,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.2758778 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 1.4 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -367,6 +437,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.28949317 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 1.4 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -379,6 +458,22 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!114 &3548559168146922769 +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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 1.0833333333333333 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 0f725e5af8de7f944b3402514a4be355, type: 2} --- !u!114 &3995914538100974027 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index c95c00734..7d066e5e0 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -2710,6 +2710,8 @@ PlayableDirector: m_SceneBindings: - key: {fileID: 3995914538100974027, guid: 47c2d2113ca46fa4b9040642d9b467ab, type: 2} value: {fileID: 933302602} + - key: {fileID: -7724491264856616267, guid: 47c2d2113ca46fa4b9040642d9b467ab, type: 2} + value: {fileID: 1133910975} m_ExposedReferences: m_References: [] --- !u!1 &876298594 @@ -3935,6 +3937,7 @@ GameObject: - component: {fileID: 1133910973} - component: {fileID: 1133910972} - component: {fileID: 1133910974} + - component: {fileID: 1133910975} m_Layer: 5 m_Name: "\u5012\u5F71" m_TagString: Untagged @@ -3958,8 +3961,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 69.8} - m_SizeDelta: {x: 400, y: 510} + m_AnchoredPosition: {x: 0, y: 60.3} + m_SizeDelta: {x: 800, y: 640} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1133910972 MonoBehaviour: @@ -3981,7 +3984,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1742218470230028808, guid: e6b37dcb143583d43963b1bc8692bed6, type: 3} + m_Sprite: {fileID: 3590298006132234197, guid: 73def603ca61b39438ad172fd1536786, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4020,6 +4023,36 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1133910975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133910970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 0f725e5af8de7f944b3402514a4be355, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1133910974} + m_TargetAssemblyTypeName: UnityEngine.Animator, UnityEngine + m_MethodName: SetTrigger + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: TV_On + m_BoolArgument: 0 + m_CallState: 1 --- !u!1 &1163912583 GameObject: m_ObjectHideFlags: 0