diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.playable b/Assets/GameContent/Huoshan/Actor/火山彩带.playable index 8fa11e556..cb85f6cc1 100644 --- a/Assets/GameContent/Huoshan/Actor/火山彩带.playable +++ b/Assets/GameContent/Huoshan/Actor/火山彩带.playable @@ -30,6 +30,7 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 229814774481162458} + - {fileID: 316860149308452177} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -128,3 +129,148 @@ MonoBehaviour: m_DisplayName: "\u5F69\u5E26" m_Markers: m_Objects: [] +--- !u!114 &316860149308452177 +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: 133253f56854570409c222a87786b263, type: 3} + m_Name: FMOD Event 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_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 5021032119192316961} + m_Duration: 2.244999885559082 + m_TimeScale: 1 + m_ParentTrack: {fileID: 316860149308452177} + 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: FMODEventPlayable + m_Markers: + m_Objects: [] + template: + volume: 1 +--- !u!114 &5021032119192316961 +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: 987a467495df9d942b56b1b51381d095, type: 3} + m_Name: FMODEventPlayable + m_EditorClassIdentifier: + Template: + EventReference: + Guid: + Data1: 0 + Data2: 0 + Data3: 0 + Data4: 0 + Path: + StopType: 0 + Parameters: [] + ParameterLinks: [] + ParameterAutomation: + Slot00: 0 + Slot01: 0 + Slot02: 0 + Slot03: 0 + Slot04: 0 + Slot05: 0 + Slot06: 0 + Slot07: 0 + Slot08: 0 + Slot09: 0 + Slot10: 0 + Slot11: 0 + Slot12: 0 + Slot13: 0 + Slot14: 0 + Slot15: 0 + EventLength: 2.245 + eventName: + EventReference: + Guid: + Data1: 1501134276 + Data2: 1295893522 + Data3: -928928893 + Data4: 1141318870 + Path: event:/Music/music_volcano_joke + StopType: 0 + Parameters: [] diff --git a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn index 8355b849d..db8a8a809 100644 --- a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn +++ b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn @@ -113,7 +113,7 @@ me: 头？ #line:01bb9ad hs: 你那是末端传感器坏死导致的头憋大了。 #line:05929a0 <> <> -<> + <> <> <> @@ -170,7 +170,7 @@ hs:*帽子*，
到头了！ #line:0dfbd20 me: 啊不是等会什么… #auto_next #line:09fc837 -<> + <> // 火山开始加速表演，掩盖真实情绪 //<>