diff --git a/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn b/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn index efdd6307a..7b6b1ceea 100644 --- a/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn +++ b/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn @@ -19,6 +19,7 @@ position: 0,-80 jg: 数据溢出:未知来源的记忆… #line:09952c6 jg: VERYFYING…bool seaExists = false; waiting for imput… #autonext #line:05a8257 <> +<> <> ???: …下来… #line:0c8c60b ???: 下来…下来。 #line:07bfa4b @@ -52,14 +53,16 @@ title: Test tags: demo position: 0,-80 --- -<> -<> -->想起海 #line:0d1a0e3 - <> - ->乌鸦展示真相 #line:07daab7 - <> - ->触碰真相 #line:0ae623b - <> +<> +<> +// <> +// <> +// ->想起海 #line:0d1a0e3 +// <> +// ->乌鸦展示真相 #line:07daab7 +// <> +// ->触碰真相 #line:0ae623b +// <> === @@ -418,45 +421,45 @@ title: 上升 position: 0,420 --- <> - <> - <> + <> + <> <> // 轻飘飘地... #line:0d10f22 - <> + <> <> - <> + <> <> - <> + <> me: 我这是… #line:0d10f22 ???: 喂! #line:02f25e7 头顶上什么地方有人在呼唤你。 #line:01b726a ???: 路——斯—— #line:0b51e73 - <> + <> 一条细长的线缠绕在你的脚上,伸向远处,一直到那个越飞越高的风筝。 #line:0b6dbc0 - <> + <> ???: 不要靠近那个地方—— #line:03b0aaa 你注意到了更高处的黑色矩形。看起来风筝正在把你带到那个地方去。 #line:0da7431 <> <> ->解开绳子 #line:0d2c8a9 <> - <> + <> 绳子牢牢地陷在你的皮肤里,难以下手。 #line:05c5ff8 - <> + <> 风筝已经飞进了黑色矩形里。腿上的拉力仍然没有消失。 #line:0859b3e <> 你摸到了一个结,那是绳子在腿上绕出的一个死扣。 #line:059e9b9 - <> + <> 那个黑色的矩形越来越近了。 #line:033f9ef <> ???: 路——斯—— #line:0c4045b me: 姐姐! #line:09da664 你尝试解开那个结,但是失败了。 #line:04986e6 - <> + <> 你好像已经能够闻到一种漆黑的气味。 #line:00d79bb <> 你徒劳地在绳子上摸索着。 #line:00c1857 - <> + <> <> <> <> @@ -468,11 +471,11 @@ position: 0,420 <> <> - <> + <> <> - <> + <> <> - <> + <> <> ???: …路斯! #line:02803ab me: …姐姐…… #line:02e9742 @@ -483,15 +486,15 @@ position: 0,420 ???: 现在我必须… #line:0ffc26b ???: 我会在海边等你,海边! #line:084121c <> - <> + <> <> - <> + <> <> - <> + <> <> - <> + <> me: 姐姐! #line:09a9225 - <> + <> <> <> 你从门里摔了出来。 #line:02e5ac7 @@ -622,10 +625,12 @@ position: 0,740 <> <> ->仔细听 #line:02bfe34 + <> 从门的背后隐约传出来某种声音。你竖起耳朵仔细听。 #line:04180f0 (海浪声) #line:0efa910 <> 你好像回忆起了什么。 #line:00934ab + <> <> <> <> @@ -653,8 +658,6 @@ title: end position: 0,940 --- ???: 她要提交答案了吗? #line:0af3672 -<> -<> 你吓了一跳,因为声音是从很近的地方传来的,就在你的正上方。 #line:05f60e0 一只黑色的鸟正站在门顶上,歪着脑袋,眼睛一眨不眨地看着你。 #line:0a6b416 me: 你是谁? #line:07e8aa5 @@ -663,7 +666,7 @@ me: 你是谁? #line:07e8aa5 <> me: 我想海是…是存在的。我在记忆里看到过。 #line:040048f ->不存在 #line:08b433a - <> + <>· me: 我想它实际上并不存在…或者已经不存在了。对么? #line:01dab0b ->不知道 #line:0374e64 <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 7477a56a9..7c03e3668 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5629,7 +5629,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runMode: 0 - firstTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} + firstTalkSo: {fileID: 11400000, guid: aaef579ad8bdda542b503b40ce6773a8, type: 2} testTalkSo: {fileID: 11400000, guid: a4dba2e2976607d45a28d4c8cade6b0a, type: 2} saveFileName: "20250901_204445_PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5" --- !u!1 &749156594 diff --git a/Assets/Scenes/梦境.unity b/Assets/Scenes/梦境.unity index a395be3c6..e152648d6 100644 --- a/Assets/Scenes/梦境.unity +++ b/Assets/Scenes/梦境.unity @@ -195,7 +195,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 844151739 m_SortingLayer: 1 - m_SortingOrder: 5 + m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 65581c14d5b5dad4e991ee88882656de, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -373,7 +373,7 @@ SpriteRenderer: m_SortingLayerID: 844151739 m_SortingLayer: 1 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 05cb55786a66c624593dca22c3dda14d, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -381,7 +381,7 @@ SpriteRenderer: m_Size: {x: 24.966095, y: 16.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &383939067 @@ -446,7 +446,7 @@ MonoBehaviour: doorShellTransform: {fileID: 0} terminalShapeReference: {fileID: 1847534534} seaCollapseScale: {x: 0.9, y: 0.84, z: 1} - doorSnapScale: {x: 0.95, y: 1.06, z: 1} + doorSnapScale: {x: 2.68, y: 1.06, z: 1} morphEase: 10 frameHidePhase: 2 doorSnapDuration: 0.2 @@ -757,15 +757,15 @@ SpriteRenderer: m_SortingLayerID: 844151739 m_SortingLayer: 1 m_SortingOrder: 4 - m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Sprite: {fileID: 21300000, guid: bbd4550937a8b8d4e9c81615bccc8a91, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 8.930233, y: 5.023256} + m_Size: {x: 17.860466, y: 10.046512} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &861686054 @@ -934,8 +934,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: useCullingMasks: 0 - terminalSize: {x: 6.4, y: 4.1} - morphStartSize: {x: 4, y: 7.6} + terminalSize: {x: 6, y: 3.8} + morphStartSize: {x: 3, y: 3.8} terminalFont: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} colAmberMain: {r: 0.81, g: 0.81, b: 0.81, a: 1} colAmberDim: {r: 0.36, g: 0.36, b: 0.36, a: 1} @@ -1005,7 +1005,7 @@ 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: -0.08, y: 0.3} + m_AnchoredPosition: {x: -0.08, y: 0.24} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1373573733 @@ -1557,7 +1557,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1847534533 Transform: m_ObjectHideFlags: 0 @@ -1665,7 +1665,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 844151739 m_SortingLayer: 1 - m_SortingOrder: 7 + m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 8e0b68f1e994fc24b80e5a480c61602b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 @@ -1686,8 +1686,8 @@ Transform: m_GameObject: {fileID: 1961593256904873106} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.07, y: 0.24, z: 0} - m_LocalScale: {x: 0.48998493, y: 0.54510826, z: 0.8065596} + m_LocalPosition: {x: -0.07, y: -0.03, z: 0} + m_LocalScale: {x: 0.7074555, y: 0.62522215, z: 0.8706811} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450371655} @@ -1701,8 +1701,8 @@ Transform: m_GameObject: {fileID: 5724422998448711206} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.28, z: 0} - m_LocalScale: {x: 3.6999986, y: 7.331499, z: 0.4458426} + m_LocalPosition: {x: -0.08, y: -0.04, z: 0} + m_LocalScale: {x: 4.7952704, y: 8.152062, z: 0.56408006} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450371655} @@ -1781,7 +1781,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 844151739 m_SortingLayer: 1 - m_SortingOrder: 10 + m_SortingOrder: 4 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0