diff --git a/Assets/FMOD Banks/Desktop/Ambience.bank b/Assets/FMOD Banks/Desktop/Ambience.bank index 3ad9fe8ec..b62195d66 100644 --- a/Assets/FMOD Banks/Desktop/Ambience.bank +++ b/Assets/FMOD Banks/Desktop/Ambience.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b2737a1d0f01f4678627300493b4d4d05aa52304c6b360236c1cfeb1abfcfd -size 26990880 +oid sha256:95e787c3f9265831cbdfa797e90da312f35d74a0eb0483022e83c440b26e4403 +size 27001856 diff --git a/Assets/FMOD Banks/Desktop/Environment.bank b/Assets/FMOD Banks/Desktop/Environment.bank index 21b43dba9..44fb1187e 100644 --- a/Assets/FMOD Banks/Desktop/Environment.bank +++ b/Assets/FMOD Banks/Desktop/Environment.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36b9c19e93cf7d22c494741f02d7b865379e046979ef32e405f963b95a4b82e -size 14712352 +oid sha256:1409837c19bdbecaa415936e2c266184f37b04764a79d1822dff618f335e86f0 +size 14744288 diff --git a/Assets/FMOD Banks/Desktop/Master.bank b/Assets/FMOD Banks/Desktop/Master.bank index ba74865cc..3e4035f27 100644 --- a/Assets/FMOD Banks/Desktop/Master.bank +++ b/Assets/FMOD Banks/Desktop/Master.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45ec47bb0df6b78736b83ae17c3df1f8296a7126525a0616fb2eb982d65a1758 -size 8656 +oid sha256:6c5b727e6726e60cc97a7be10ccf979205fedf415478e42b4f4ca64c5aa6a017 +size 8820 diff --git a/Assets/FMOD Banks/Desktop/Master.strings.bank b/Assets/FMOD Banks/Desktop/Master.strings.bank index 4699e5609..697dc1ff0 100644 --- a/Assets/FMOD Banks/Desktop/Master.strings.bank +++ b/Assets/FMOD Banks/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64f9a56795536fdc7d79e08f514741901039f5f262371b1dc658f480ccba54e2 -size 9560 +oid sha256:1bd9d4cd8ef6307d0ad1e09fb0db6e29f3e26268b114f65c72a44a6a14ac24ca +size 9598 diff --git a/Assets/FMOD Banks/Desktop/Music.bank b/Assets/FMOD Banks/Desktop/Music.bank index 02e812cd7..c7d0ec5e0 100644 --- a/Assets/FMOD Banks/Desktop/Music.bank +++ b/Assets/FMOD Banks/Desktop/Music.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:511a0194baa7e7b3b06dd7682cc6a5b4935fb430a9de93f58c897cde8924498a +oid sha256:e2f58818ea9c8bdd4f07f1385e5e84cf8a261de28130b789bf4280c73ed33fa1 size 89720960 diff --git a/Assets/FMOD Banks/Desktop/VO.bank b/Assets/FMOD Banks/Desktop/VO.bank index be809f89d..12342e1be 100644 --- a/Assets/FMOD Banks/Desktop/VO.bank +++ b/Assets/FMOD Banks/Desktop/VO.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f08ce4d76544e1067ec9f555a638dad67c5f2284a5bd7bd15d397641dc5c3e6 +oid sha256:2754585a08bdc5820b008c88dc0649ae4fcfc30d2102c3b8c8121eb7ed78c818 size 592128 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 4b36a34d2..12c32fba3 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -728,6 +728,7 @@ MonoBehaviour: _assetLocaleCode: zh-Hans _useFallback: 1 _fallbackLocaleCode: zh-Hans + _narrativeTextStyle: {fileID: 0} --- !u!1 &367483171 GameObject: m_ObjectHideFlags: 0 @@ -1545,7 +1546,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/ScriptableObjects/SceneSO/Demo/Day2_sleep.asset b/Assets/ScriptableObjects/SceneSO/Demo/Day2_sleep.asset index 9f0fa836f..13357f284 100644 --- a/Assets/ScriptableObjects/SceneSO/Demo/Day2_sleep.asset +++ b/Assets/ScriptableObjects/SceneSO/Demo/Day2_sleep.asset @@ -15,7 +15,7 @@ MonoBehaviour: exits: - exitName: default targetScene: {fileID: 11400000, guid: 362a7dfb573114247a33c0e290b698eb, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: 62f2a99a47fc652449b846035a739529, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: 0e7b7ff37c6b781438198162c0f0858d, type: 3} firstSceneName: "Scene/\u68A6\u5883" title: "\u7B2C\u4E8C\u4E2A\u68A6" titleKey: scene_day2_sleep diff --git a/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn b/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn index 978e87377..9f27990e7 100644 --- a/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn +++ b/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn @@ -653,7 +653,7 @@ zls?: …得知她去世的时候。你有什么感觉? <> -mem: 不记得。 +mem: 不记得了。 zls: 如果你真的想忘掉,现在就必须记起来。否则β-阻滞剂就无法生效。 <> @@ -725,9 +725,12 @@ mecd: 往前走——但是别忘了我——! #line:0b267e5 mecd: 别忘了回来的路——!别忘了——!我在海…… #line:020bf92 <> -<> +<> + +->睁开眼睛 #line:0734efc + +<> -你深吸一口气,猛地睁开了眼睛。 #line:0734efc 你的头顶是一片洁白,脚下是一片茂密的绿色。
头顶的洁白轻轻地晃动着,像摇篮一样。 #line:09b3498 ->解开脚踝的线 #line:0a940c9 <> @@ -780,7 +783,12 @@ tags: detour 你靠近检查。 #line:0e628fc <> me: 这是… #line:0ac3f59 -你好像想起了什么。 #line:0e4cb23 +似乎想起了什么东西…… #line:0e4cb23 + +<> + +mecd?: …喂...... + 沉闷的空气似乎动了起来。似乎有人在什么地方叫你。 #line:0d96a92 me: 谁…? #line:06e4139 <> @@ -837,7 +845,7 @@ tags: detour 你走近门边,透过毛玻璃想要看清另一边。 #line:06fa27b 是谁修了这扇门…又是为了关住什么东西? <> -mecd?: …喂——!… #line:0bfb27b +mecd?: …喂——!... #line:0bfb27b 你好像听到门的那边有什么在呼唤你。一个被你遗忘了很久很久的声音…… #line:029c773 你知道穿过这扇门你就无法再回来了。 #line:05ac743 <> @@ -860,7 +868,7 @@ tags: linear <> <> 那些你不应该看到的东西…到底是什么呢? -mecd?: …喂…… +mecd?: …喂... <> 它真的只是一场梦吗?…… #line:06faee0 <> @@ -1069,21 +1077,18 @@ me: 失去…控制?究竟是什么出错了……
我是怎么染上的… 乌鸦: 她最终会知道答案的。 #line:0e9213f 乌鸦: 在这之前,她不会被它们发现的。如果她想的话。 #line:073ad21 me: 它们到底是谁? #line:06bdc48 -乌鸦: 在这之前她还有最后一个问题可以问。 #line:0ac5cf3 +乌鸦: 不。没时间了。它必须要离开。
在这之前她还有最后一个问题可以问。 #line:0ac5cf3 me: … #line:05f1cdb me: 我… #line:04e1fb0 <> -> 为什么帮我 #line:08629e4 <> --> 这是什么病? #line:0d60cb4 +-> 这是什么病 #line:0d60cb4 <> --> 海真的存在吗? #line:0131505 +-> 海真的存在吗 #line:0131505 <> <> 乌鸦扑腾起翅膀,飞到了天上,很远很远的地方。 #line:0c892f8 -<> -<> -<> <> === @@ -1130,6 +1135,11 @@ me: 这听起来不太可信呢。 #line:078f00c title: 靠近黑暗 tags: linear --- +<> +<> +<> +<> + 乌鸦: 从这个过程苏醒会有些…不舒服。做好准备。 #line:0569379 me: 喂! #line:0748ea2 <> @@ -1156,9 +1166,11 @@ tags: linear ???: 我想我们必须要上报了。对吧? <> 英理: … -<> -<> +<> <> +<> +<> <> +<> <> === diff --git a/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn b/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn index f4fa036e3..0fd6b60b4 100644 --- a/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn +++ b/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn @@ -213,6 +213,7 @@ tags: function <> <> <> + <> <> <> <> @@ -221,13 +222,21 @@ tags: function <> <> <> -<=9>> + <> +<> <> <> <> + <> +<=10>> + <> + <> + <> + <> <> === + title: 风筝2回合推进_Set tags: function --- @@ -293,7 +302,7 @@ title: 上升_高空开始_Func tags: function --- <> -<> +<> <> <> <> @@ -309,6 +318,7 @@ tags: function title: 展示高空中景_Func tags: function --- +<> <> <> <> @@ -321,15 +331,28 @@ tags: function <> === -title: 上升_醒来_Set +title: 上升_醒来1_Set tags: function --- +<> +<> <> -<> -<> +<> +<> +<> +<> +<> +=== + +title: 上升_醒来2_Set +tags: function +--- +<> +<> <> -<> -<> +<> +<> +<> === title: 上升_解开_Func @@ -341,12 +364,14 @@ tags: function title: 展示枯树_Func tags: function --- +<> <> === title: 展示枯树风筝_Func tags: function --- +<> <> === @@ -415,6 +440,7 @@ tags: function <> <> <> +<> <> <> <> @@ -433,6 +459,7 @@ tags: function <> <> <> +<> <> <> <>