diff --git a/.history/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话_20250309192927.yarn b/.history/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话_20250309192927.yarn new file mode 100644 index 000000000..32bf69c43 --- /dev/null +++ b/.history/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话_20250309192927.yarn @@ -0,0 +1,107 @@ +title: 进入术前谈话 +tags: +colorID: 3 +position: 251,-1150 +--- + +<> +<> +<> +<> +<> +peipei: 所以…那些色彩其实是一种…病?
而我必须要把它…治好? +me: 是的…无论如何,只有当这些色彩消失,UF才能恢复正常。 +<> +<> +<> +<> +<> +<> +peipei: 也就是说,我就没办法…再想象那些颜色了? +me: 是的。 +<> +<> +<> +<> +<> +<> +<> +<> + +peipei: 只有彻底看不见颜色…我才能继续画画…… +peipei: …我还以为…吃点药或者换点冷却液就可以了。 +me: 别担心,这只是个小手术。 +<> +peipei: …… +peipei: 我才意识到…我已经好久没有画画了。 +me: 你们不是用UF来画画么? +peipei: 我是说画画,不是工作的画画…… + +<> +<> +<> +<> +<> +<> + +peipei: 医生,一个连太阳和树叶的颜色都分不清的机体,还能画画吗? +me: …对不起,画画不是我了解的领域。
我只能肯定的是,这个手术是让UF恢复正常工作的最好办法。 + +<> +<> +<> +<> +<> +<> + + +peipei: 你说得对,医生…… +peipei: 很抱歉失态了。 +<> +<> +me: 没关系…你可以想清楚了再做决定。在这之前,你随时可以…… +<> +peipei: 医生,我做。 +me: 决定了? +<> +<> +<> +<> +<> +<> + +peipei: 嗯。 +<> +<> +<> +peipei: 销售大赛对公司很重要,搞砸的话我就…… +<> +<> +<> +<> +peipei: 我想要继续画画。哪怕是用UF。 +<> +<> +me: 好,如果你同意…就请在手术单上签个字吧。 +<> +<> +<> +<> +<> +<> +<> +<> +<> +<> +me: 我们到治疗室来吧。 +<> +<> +=== + + +title: 结束术前谈话 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 9bebfac1e..d3df27388 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,15 +1053,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/SpriteGroup/佩佩最新.prefab b/Assets/Resources/SpriteGroup/佩佩最新.prefab index 398d45ab6..d627cb96f 100644 --- a/Assets/Resources/SpriteGroup/佩佩最新.prefab +++ b/Assets/Resources/SpriteGroup/佩佩最新.prefab @@ -143,7 +143,7 @@ Transform: m_GameObject: {fileID: 270670824853948101} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7023258, y: 0.47674417, z: 0} + m_LocalPosition: {x: -3.9802332, y: 0.47674417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -343,7 +343,7 @@ Transform: m_GameObject: {fileID: 903628299271071472} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.497675, y: 0.9697671, z: 0} + m_LocalPosition: {x: -3.7755823, y: 0.9697671, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -888,7 +888,7 @@ Transform: m_GameObject: {fileID: 2654324608659633263} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7023258, y: 0.47674417, z: 0} + m_LocalPosition: {x: -3.9802332, y: 0.47674417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -972,7 +972,7 @@ Transform: m_GameObject: {fileID: 2685491168148541651} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.414, y: -1.0069768, z: 0} + m_LocalPosition: {x: -3.415, y: -1.0069768, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1184,7 +1184,7 @@ Transform: m_GameObject: {fileID: 3731560189141743791} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7720928, y: 0.91162777, z: 0} + m_LocalPosition: {x: -4.05, y: 0.91162777, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1385,7 +1385,7 @@ Transform: m_GameObject: {fileID: 4608205336904579852} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.8348837, y: 1.0953488, z: 0} + m_LocalPosition: {x: -4.112791, y: 1.0953488, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1553,7 +1553,7 @@ Transform: m_GameObject: {fileID: 4853573204786867104} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.718605, y: 0.96046495, z: 0} + m_LocalPosition: {x: -3.9965124, y: 0.96046495, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1627,7 +1627,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3180292444082115115 Transform: m_ObjectHideFlags: 0 @@ -1711,7 +1711,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1768653872334917077 Transform: m_ObjectHideFlags: 0 @@ -1795,7 +1795,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8350166737951538443 Transform: m_ObjectHideFlags: 0 @@ -1805,7 +1805,7 @@ Transform: m_GameObject: {fileID: 6531299957704211549} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7720928, y: 0.644186, z: 0} + m_LocalPosition: {x: -4.05, y: 0.644186, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1879,7 +1879,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6943040293172856464 Transform: m_ObjectHideFlags: 0 @@ -1889,7 +1889,7 @@ Transform: m_GameObject: {fileID: 6709917434676327321} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.781396, y: 0.95348835, z: 0} + m_LocalPosition: {x: -4.0593033, y: 0.95348835, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1963,7 +1963,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &653750857460872601 Transform: m_ObjectHideFlags: 0 @@ -1973,7 +1973,7 @@ Transform: m_GameObject: {fileID: 6838688359436157542} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7465115, y: 0.965116, z: 0} + m_LocalPosition: {x: -4.024419, y: 0.965116, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2167,7 +2167,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5310136728925613857 Transform: m_ObjectHideFlags: 0 @@ -2251,7 +2251,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4009632713096831653 Transform: m_ObjectHideFlags: 0 @@ -2335,7 +2335,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &7133885259711726990 Transform: m_ObjectHideFlags: 0 @@ -2345,7 +2345,7 @@ Transform: m_GameObject: {fileID: 8260813992734842594} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7023258, y: 0.4720931, z: 0} + m_LocalPosition: {x: -3.9802332, y: 0.4720931, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn index 7f9f7bc29..f4661b566 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn @@ -22,27 +22,28 @@ position: 0,200 <> <> -<> -<> +//<> +//<> // <> -<> +//<> +//播报员: ……
…晴,未来几天内将有冷空气抵达,
户外工作的机体,请做好设备保温工作。 +//播报员: 再来关注一下第45届销售大赛的进展。 +//播报员: 今天下午,
奥古斯主管抵达了园区,开始指导筹备工作。 +//播报员: 他表示,作为高品质生活不可或缺的一部分,
扩展罐头的品类已经成为广大机体的一致需求…… -播报员: 销售大赛是园区一年一度的盛举,
旨在通过销售,促进幸福罐头公司员工进一步提高生产、销售效率,扩大产业规模。 -播报员: 我宣布,
幸福罐头产业园区第1011届销售大赛正式开幕! +//<> +//<> +//<> -<> -<> -<> +//播报员: 在销售部工作的火山,
正在为新一季度的销售工作而紧张地忙碌着…… +//me: 不知道每年都整这个罐头,到底有什么意义。
忙了。 +//yingli_novoice: …就是这里了,员工诊所。
他们一定能治好你的怪病。 +//me: 看来比我想得要更快些。 -播报员: 在销售部工作的火山,
正在为新一季度的销售工作而紧张地忙碌着…… -me: 又开始了,这个销售大赛…
很快我也有得忙了。 -yingli_novoice: …就是这里了,员工诊所。
他们一定能治好你的怪病。 -me: 看来比我想得要更快些。 - -<> -<> -<> -<> +//<> +//<> +//<> +//<> <> @@ -65,7 +66,7 @@ peipei_novoice: 我以前……#auto_next yingli_novoice: 我不在乎你之前做得有多好,那对我来说没有任何意义。 <> -<> +<> yingli_novoice: 我已经说过很多次了。为什么你就是听不懂?
这次任务不能完成,你就会被回收 。 yingli_novoice: 不用我和你说这意味着什么吧? @@ -85,63 +86,91 @@ peipei_novoice: 是的,组长。 <> <> -<> +<> me: 原来,美工部的机体也有被回收的风险啊。 + <> <> -<> -<> -<> +<> +<> +<> <> -<> -<> +<> +<> + peipei: 啊…你都听到了? +<> <> +<> peipei: 对不起…打扰到你了。 me: 没有的事,这是我的工作。
说说吧,你怎么了,身体哪里不舒服? peipei: 倒也没有哪里不舒服……只是最近工作表现很差。 + +<> +<> +<> peipei: 我也不知道为什么,总是没办法和UF沟通清楚… peipei: 这次也是一样,我也不知道为什么…
UF画出来的图根本不能用。 me: UF…是什么绘图工具吗?画笔吗? -<> + +<> <> +<> +<> +<> +<> +<> +<> + peipei: 啊对不起,医生…
是我没有说清楚。 peipei: 这是一个内置的绘图模块…
…你看,我的眼睛。 <> +<> +<> +<> +<> <> <> -me:啊…确实有一个不一样。
我在数据库找找…… - +me:啊,确实有一个不一样。
我在数据库查查…… +<> <> +<> <> - +<> me: (UnstableFusion,非稳态聚合模块,是幸福罐头公司技术部研发的图像生成AI。) me: (它广泛列装于公司美工机体中,受到美术部的大力欢迎,极大提高了公司的图像产能。) -me: 所以…就是这个UF模块画出来的图有问题。 +me: 这倒是没见过的模块。AI…装在机器人脑袋里?
搞不懂…为什么不把它们单独做成一个机器呢? +peipei: 他们说,这样才能让我们和AI更高效率地沟通。
我也不太懂…… +me: 沟通?像是…你和它对话,它就会把你想的图片打印出来? - -me: 既然是出图的问题,那就从出图查起吧。 - -me: 话说,我还不知道这个“UF”到底是怎么使用的。佩佩,可以现场用UF模块出一张图吗? - -<> - -peipei: 我只要在脑袋里和它对话…它就会指导我的手,把想要的图片绘制出来。 +<> +<> +<> +peipei: 它只是一个AI啦,不是打印机。
我要在脑袋里和它对话,
它就会操作我的手,把想要的图片绘制出来。 <> -<> +<> +<> <> peipei: 比如…
…医生,你想画一张什么呢? me: 那我们来模拟一下你工作中的需求吧,
比如,生成一张“罐头”的广告图? <> -<> +<> +<> +<> peipei: 是什么样的…罐头呢? + +<> +<> +<> +<> + peipei: 啊…对不起,医生。我忘了说清楚…
UF需要描述更多细节才能画出来。 <> @@ -156,26 +185,39 @@ me: 嗯…
假如这是一个鱼罐头……
海鱼,海鱼罐头。 me: 那么……画面是一条美人鱼从海面跳出来…手里捧着罐头,感觉怎样? <> -<> -<> -<> +<> +<> +<> +<> +<> +<> +<> +<> +<> peipei: 是什么样的海呢…… me: 什么样的海? <> -<> -<> <> -<> +<> +<> +<> +<> +<> <> -peipei: 抱歉…医生。因为我没有见过大海。我只想象过……
但是没关系!UF什么都见过,它会处理的。 +peipei: 抱歉…医生。因为我没有见过大海。我只想象过…… +peipei: 但是没关系!UF什么都见过,它会处理的。 <> <> -<> -<> +<> +<> +<> +<> +<> +<> peipei: 所以,大海应该有很密集的波浪吧!还有天空的倒影,在天际线和天空连接在一起……我能想象了。 me: 差不多。
……我也快忘了大海是啥样了。 @@ -186,13 +228,12 @@ peipei: 好的…
那么,UF…… <> <> -<> -<> <> <> <> peipei: 完成了…… +<> peipei: 医生…你能看得出来吗? me: 美人鱼…在哪? me: 啊…我看出来了。
…看起来像是颜色生成相关的什么东西出了问题。 @@ -201,11 +242,16 @@ me: 啊…我看出来了。
…看起来像是颜色生成相关的什么东 <> <> -<> +<> +<> +<> +<> +<> peipei: 应该不是这个模块的问题…他们说这个模块很高级,一般不会出问题。 me: 不好说,让我来检查看看吧。 <> +<> <> === diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn index ca52635c8..c1b42260c 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn @@ -166,8 +166,7 @@ position: 104,-2498 Error: 检查完成! <> Error: 检测到绘图过程中发生兼容性错误。 - me: 我就说嘛…肯定有问题。 - me: 来深入检查看看吧 + me: 我就说嘛…肯定有问题。
深入检查看看吧。 <> ->深入检查 <> @@ -228,14 +227,14 @@ position: 572,-2497 <> <> Analysing: #auto_next - <> + <> <> Error: 检查到2个错误: <> Error: 未检测到色彩信号! <> Error: 检测到未知来源的异常显像! - <> + <> <> <> <> @@ -248,7 +247,7 @@ position: 572,-2497 <> me: 无论如何…都应该到显像窗深入检查一下。 <> - <> + <> EyeModule: #auto_next // <> // <> @@ -323,12 +322,12 @@ MemModule: 已与记忆模块建立连接! <> Analysing: #auto_next <> - <> + <> <> - <> + <> MemModule: 检查完成!未发现错误。 <> - <> + <> me: 记忆模块一切正常。 <> ->结束 diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn index 2612a8f8b..76981951b 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn @@ -63,6 +63,8 @@ position: -871,-2773 <> me: 果然…这些都是色彩丰富的记忆。 <> + <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话.yarn index bbe942635..32bf69c43 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage6_中间对话.yarn @@ -5,58 +5,94 @@ position: 251,-1150 --- <> -<> +<> +<> +<> <> peipei: 所以…那些色彩其实是一种…病?
而我必须要把它…治好? me: 是的…无论如何,只有当这些色彩消失,UF才能恢复正常。 <> -<> +<> +<> +<> +<> +<> peipei: 也就是说,我就没办法…再想象那些颜色了? me: 是的。 <> <> +<> +<> +<> +<> +<> +<> + peipei: 只有彻底看不见颜色…我才能继续画画…… peipei: …我还以为…吃点药或者换点冷却液就可以了。 me: 别担心,这只是个小手术。 +<> peipei: …… peipei: 我才意识到…我已经好久没有画画了。 me: 你们不是用UF来画画么? peipei: 我是说画画,不是工作的画画…… -<> -<> - -//<<表情:佩佩很忧伤>> <> +<> +<> +<> +<> <> peipei: 医生,一个连太阳和树叶的颜色都分不清的机体,还能画画吗? me: …对不起,画画不是我了解的领域。
我只能肯定的是,这个手术是让UF恢复正常工作的最好办法。 + <> -<> +<> +<> +<> +<> +<> + + peipei: 你说得对,医生…… peipei: 很抱歉失态了。 <> <> me: 没关系…你可以想清楚了再做决定。在这之前,你随时可以…… +<> peipei: 医生,我做。 me: 决定了? <> <> +<> +<> +<> +<> + peipei: 嗯。 <> <> +<> peipei: 销售大赛对公司很重要,搞砸的话我就…… <> <> +<> +<> peipei: 我想要继续画画。哪怕是用UF。 <> <> me: 好,如果你同意…就请在手术单上签个字吧。 <> -<> <> -<> +<> +<> +<> +<> +<> +<> +<> +<> me: 我们到治疗室来吧。 <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage7_手术.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage7_手术.yarn index 54181414a..72b969ee8 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage7_手术.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage7_手术.yarn @@ -19,6 +19,7 @@ tags: group:手术相关 position: -273,-66 --- +<> <> peipei: 啊…眼睛……我的…… peipei: 好痛! diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn index 1c20715bd..0cb42acc3 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn @@ -16,6 +16,9 @@ me: 还没结束…保险起见,我们进视觉复查一下吧。 === + + + title: EyeCheckEnd_AfterSurgery tags: colorID: 3 @@ -36,8 +39,7 @@ me:这里应该已经彻底检查过了。 <> <> peipei: 没了吗?…
没了吗……? - me: 看起来没有…… - me: 我们再试一次吧。 + me: 看起来是的。
不过我们最好重复一次。 <> <> <> @@ -52,7 +54,7 @@ me:这里应该已经彻底检查过了。 peipei: 只怪我…我一直不愿意去想罢了。 <> <> - me: 好了,总之…复查结果符合预期。
可以结束测试了… + me: 好了,总之…
复查结果符合预期,可以结束测试了。 <> <> <> @@ -62,6 +64,10 @@ me:这里应该已经彻底检查过了。 <> <> === + + + + title: 复查_检查UF tags: 待编辑 colorID: 8 @@ -86,6 +92,10 @@ position: -45,-3043 <> <> === + + + + title: 复查_检查视觉 tags: 待编辑 colorID: 8 @@ -111,8 +121,7 @@ position: 435,-3043 <> <> <> - me: 嗯…没有色彩信号是正常的。 - me: 第一次遇到这种情况,还是深入检查亲眼确认下的好。 + me: “丢失和记忆模块的链接”,看起来是生效了。
不过,还是深入检查亲眼确认下的好。 <> <> <> @@ -197,6 +206,8 @@ position: 780,749 === + + title: 结束复查 position: 262,1501 --- diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn index 07ba7635e..83152948f 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn @@ -6,39 +6,58 @@ position: 251,-1150 <> <> <> +<> +<> <> -<> -<> -<> -<> -<> -<> -<> -<> +<> +<> +<> +<> +<> +<> <> +<> +<> +<> +<> +<> +<> +<> +<> +<> +<> +<> +<> + peipei: 当然没了…我在想什么呢。 +<> +<> me: 以防万一… me: 佩佩,把一开始我们描述的那张图再画一遍吧? -<> -peipei: 一开始的……美人鱼吗? -peipei: 让我试试…… -<> -<> <> +<> +<> +peipei: 一开始的……美人鱼吗? +peipei: 让我试试。 + +<> +<> +<> +<> <> <> <> +<> <> <> -<> -<> peipei: 太好了……它看起来……总算正常了!对吧? me: 嗯… <> +<> <> <> @@ -46,9 +65,11 @@ peipei: 谢谢你,医生。总算…
我总算可以完成工作了。 me: 眼睛怎么样,还有不舒服吗? <> +<> +<> <> -<> -<> +<> +<> peipei: 不舒服吗?倒也没有哪里不舒服……不过感觉有点奇怪。 @@ -59,14 +80,14 @@ peipei: 这就是不能想象的感觉吗? <> <> -<> +<> <> peipei: 其实还挺不错的……比我想象的好多了。 me: 那就好。 <> -<> +<> <> peipei: 我先走了,医生,再见。
现在还不是休息的时候。 diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn index 2b09a833b..0bd46be8b 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn @@ -90,7 +90,7 @@ peipei: …… me: 你怎么了?又感觉不舒服吗? <> -<> +<> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn index 2ef473343..cb34f8e4f 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn @@ -56,7 +56,7 @@ position: 33,-552 <> <> <> - <> + <> ->安装UF盖子 <> <> @@ -204,6 +204,7 @@ colorID: 8 position: 481,-570 --- ->校准颜色 +<> <> <> // <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn index 252252e82..a6bc21b34 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn @@ -19,6 +19,7 @@ position: 251,-1150 title: BE结束对话 position: 275,-222 --- +<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn index d7f6b657e..9dadb7112 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn @@ -4,66 +4,73 @@ colorID: 8 position: 272,-1156 --- <> +<> +<> +<> <> <> peipei: 我搞砸了…我搞砸了。 -<> -<> -<> -<> -<> + +<> +<> <> + me: 佩佩?怎么了? <> <> -peipei: 不太好,感觉这一天里……发生了很多事。 -peipei: 嘶……我的头好痛,而且UF…… +peipei: 感觉这一天里……发生了很多事。 +peipei: 嘶…我的头好痛,而且UF…… me: UF怎么了? peipei: 一开始它还很好,很正常地工作!很久没有这么正常过了。 peipei: 第二天早上一觉起来,它就又开始变得不正常了。 <> <> -<> +<> <> - -peipei: 啊……头痛……痛……又开始了…… +<> +<> +<> +peipei: 啊,头……好痛!又开始了… <> <> +<> peipei: 一开始还只是不太灵敏了,画的内容不太准确…… -peipei: 然后它就变得越来越怪了,一张比一张怪…… -peipei: 啊!……这头痛…怎么也停不下来…… +peipei: 然后它就变得越来越怪了,一张比一张怪。 +<> +peipei: …这头怎么…痛得停不下来… <> -<> -<> -<> +<> +<> +<> +<> <> peipei: 我是不是…修不好了?我是不是要死了? -peipei: 一切都太突然了……我的工作死线就要到了,我还不能死…… -me: 头痛?听起来很严重…快来检查一下。 +peipei: 一切都太突然了。我的工作死线就要到了,我还不能死…… +me: 头痛?听起来很严重…最好现在就检查一下。 +<> peipei: 不…医生!来不及了,先别管什么头痛了,你要先修好我的UF…… <> +<> <> -<> -<> +<> +<> peipei: …你看这个。 <> <> -<> -<> +<> <> -<> -<> <> <> -peipei: 还记得昨天你让我画的图吗? +<> +peipei: 嘶…还记得昨天你让我画的图吗? me: 鱼肉罐头…广告?可是为什么…这里面有个大象?罐头又… peipei: 根本没有罐头!对吧? @@ -71,21 +78,20 @@ peipei: 根本没有罐头!对吧? <> me: UF…又出新的问题了? +<> peipei: 何止是新的…你再看这个! <> <> <> peipei: 好痛…好痛……#auto_next -<> -<> +<> <> -<> -<> <> +<> <> - me: 这又是…
你怎么把自己画进去了? +<> peipei: 不是我把自己…不是我,是UF!
医生,你忘了吗? <> @@ -96,37 +102,42 @@ me: 可是UF…为什么会…把你画进广告里……#auto_next peipei: 再看这个!医生…… <> +<> <> peipei: 这真是…痛得快睁不开眼睛了…#auto_next -<> -<> +<> <> -<> -<> <> +<> +<> <> me: … -me: 这次看起来不只是“颜色错误”了……
我先收录下来。除了UF,还有一个更重要的事情… -me: …你刚才的痛又是怎么回事?眼睛吗? - -<> -<> +me: 这次看起来不只是“颜色错误”了……
我先收录下来。但是,除了UF… +me: …你刚才说的痛是哪里痛?眼睛吗? peipei: 别管什么痛了! +<> <> <> +<> +<> <> +<> +<> peipei: 医生…求求你,我不能没有UF……我必须修好它。 me: 好吧…无论如何,先到治疗室来吧。 <> -<> +<> <> === + + + title: 结束引入对话 position: 275,-222 --- diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn index 41a0d357c..43f290888 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn @@ -227,6 +227,8 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 <> <> <> + <> + <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn index 8ddf71069..45bddfec2 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn @@ -88,6 +88,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 <> <> //颜色不出现,一会又出现了 + <> <> <> me: 很好… diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn index 050cc7563..b7a008386 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn @@ -17,6 +17,10 @@ position: 43,-97 me: 可得小心点…别把这东西碰坏了。 <> === + + + + title: 结束UF拆除 position: 275,-222 --- diff --git a/Assets/Scenes/ClinicScene.unity b/Assets/Scenes/ClinicScene.unity index 4a91ffd54..5bbfe5b67 100644 --- a/Assets/Scenes/ClinicScene.unity +++ b/Assets/Scenes/ClinicScene.unity @@ -123,11 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!4 &411836820 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} - m_PrefabInstance: {fileID: 8718985815712778838} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1284968266 PrefabInstance: m_ObjectHideFlags: 0 @@ -136,6 +131,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1370369938018575987, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5664960779156270250, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: m_Name value: Clinic System @@ -185,7 +184,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} insertIndex: -1 - addedObject: {fileID: 411836820} + addedObject: {fileID: 8977731012300941513} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} --- !u!4 &1284968267 stripped @@ -193,7 +192,7 @@ Transform: m_CorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} m_PrefabInstance: {fileID: 1284968266} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8718985815712778838 +--- !u!1001 &8977731012300941512 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -205,10 +204,6 @@ PrefabInstance: propertyPath: m_Name value: "\u4F69\u4F69\u6700\u65B0(Clone)" objectReference: {fileID: 0} - - target: {fileID: 2685491168148541651, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -249,15 +244,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4873017592926150579, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} +--- !u!4 &8977731012300941513 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + m_PrefabInstance: {fileID: 8977731012300941512} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 7d29304e2..20956cb5e 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -4697,10 +4697,10 @@ MonoBehaviour: m_EditorClassIdentifier: ambEvent: Guid: - Data1: -1978560838 - Data2: 1285599156 - Data3: -1740780130 - Data4: -337441980 + Data1: 1700888787 + Data2: 1189708601 + Data3: 1610383794 + Data4: -1468709119 Path: event:/Amb/amb --- !u!1 &387510857 GameObject: @@ -9336,10 +9336,10 @@ MonoBehaviour: - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - saveFileName: "PeipeiDay2_UF\u68C0\u67E5" + saveFileName: "PeipeiDay2_\u5F00\u573A\u5BF9\u8BDD" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/Config/sprite_group.json b/Assets/StreamingAssets/Config/sprite_group.json index 85e452640..2f1e738c7 100644 --- a/Assets/StreamingAssets/Config/sprite_group.json +++ b/Assets/StreamingAssets/Config/sprite_group.json @@ -1 +1 @@ -{"佩佩最新":{"key":"佩佩最新","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"低头不爽":["侧低头不爽嘴型","侧低头抱手"],"默认":["佩佩默认姿势"],"none":[],"默认扬眉":["开心眉毛_1","佩佩默认姿势"],"默认扬眉闭眼":["开心眉毛_1","闭眼","佩佩默认姿势"]}}} \ No newline at end of file +{"佩佩最新":{"key":"佩佩最新","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"none":[],"默认":["佩佩默认姿势"],"默认扬眉":["开心眉毛_1","佩佩默认姿势"],"默认扬眉闭眼":["开心眉毛_1","闭眼","佩佩默认姿势"],"低头":["侧低头抱手"],"低头不爽":["侧低头不爽嘴型","侧低头抱手"],"默认扬眉I":["开心眉毛_1","嘴型A","佩佩默认姿势"],"默认扬眉闭嘴I":["开心眉毛_1","闭眼","嘴型A","佩佩默认姿势"],"默认扬眉微笑":["开心眉毛_1","嘴型D","佩佩默认姿势"],"默认扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","佩佩默认姿势"],"默认闭眼":["闭眼","佩佩默认姿势"],"默认扬眉E":["开心眉毛_1","嘴型C","佩佩默认姿势"],"画画扬眉微笑":["开心眉毛_1","嘴型D","画画姿势"],"画画扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","画画姿势"],"画画":["画画姿势"],"默认微笑":["嘴型D","佩佩默认姿势"],"画画微笑":["嘴型D","画画姿势"],"画画微笑闭眼":["闭眼","嘴型D","画画姿势"],"低头侧目":["测低头侧眼","侧低头抱手"],"低头闭眼":["侧低头闭眼","侧低头抱手"],"默认I":["嘴型A","佩佩默认姿势"],"默认A":["嘴型B","佩佩默认姿势"],"默认垂眼":["无神眼睛","佩佩默认姿势"],"默认垂眼I":["无神眼睛","嘴型A","佩佩默认姿势"],"默认微笑闭眼":["闭眼","嘴型D","佩佩默认姿势"],"默认扬眉垂眼":["开心眉毛_1","无神眼睛","佩佩默认姿势"],"默认扬眉垂眼微笑":["开心眉毛_1","无神眼睛","嘴型D","佩佩默认姿势"],"默认垂眼微笑":["无神眼睛","嘴型D","佩佩默认姿势"],"画画垂眼":["无神眼睛","画画姿势"],"画画闭眼":["闭眼","画画姿势"],"背手":["侧低头背手"],"背手侧眼":["测低头侧眼","侧低头背手"],"背手闭眼":["侧低头闭眼","侧低头背手"],"背手侧眼张嘴":["测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手闭眼微笑":["侧低头闭眼","侧低头侧眼蓝色眼睛","测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"背手侧眼微笑":["测低头侧眼","侧低头苦笑嘴型","侧低头背手"],"默认无神微笑":["无表情眼睛","嘴型D","佩佩默认姿势"],"画画扬眉":["开心眉毛_1","画画姿势"],"画画扬眉微笑闭眼":["开心眉毛_1","闭眼","嘴型D","画画姿势"],"默认闭眼A":["闭眼","嘴型B","佩佩默认姿势"],"默认闭眼I":["闭眼","嘴型A","佩佩默认姿势"],"默认无神A":["无表情眼睛","嘴型B","佩佩默认姿势"],"默认无神":["无表情眼睛","佩佩默认姿势"],"默认扬眉无神微笑":["开心眉毛_1","无表情眼睛","嘴型D","佩佩默认姿势"],"默认扬眉无神":["开心眉毛_1","无表情眼睛","佩佩默认姿势"],"低头黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"低头黑线流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头抱手"],"低头黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头抱手"],"头痛":["画画头疼"],"低头黑线张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头张嘴 ","侧低头抱手"],"低头黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头抱手"],"低头黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头抱手"],"默认皱眉无神流汗":["流汗","生气眉毛","无表情眼睛","佩佩默认姿势"],"画画皱眉流汗闭眼A":["流汗","生气眉毛","闭眼","嘴型B","画画姿势"],"画画皱眉流汗闭眼":["大汗淋漓流汗","生气眉毛","闭眼","画画姿势"],"画画皱眉大汗淋漓闭眼I":["大汗淋漓流汗","流汗","生气眉毛","闭眼","嘴型A","画画姿势"],"低头黑线闭眼":["侧低头阴郁排线阴影","侧低头闭眼","测低头侧眼","侧低头抱手"],"画画皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","画画姿势"],"默认皱眉流汗无神A":["流汗","生气眉毛","无表情眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓闭眼":["大汗淋漓流汗","流汗","生气眉毛","闭眼","画画姿势"],"默认皱眉大汗淋漓垂眼A":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","嘴型B","佩佩默认姿势"],"画画皱眉大汗淋漓垂眼":["大汗淋漓流汗","流汗","生气眉毛","无神眼睛","画画姿势"],"画画皱眉流汗垂眼":["大汗淋漓流汗","生气眉毛","无神眼睛","画画姿势"],"默认皱眉流汗闭眼":["流汗","生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉闭眼":["生气眉毛","闭眼","佩佩默认姿势"],"默认皱眉流汗难受I":["流汗","生气眉毛","难受眼睛","嘴型A","佩佩默认姿势"],"默认皱眉流汗难受":["流汗","生气眉毛","难受眼睛","佩佩默认姿势"],"默认皱眉流汗闭眼I":["流汗","生气眉毛","闭眼","嘴型A","佩佩默认姿势"],"背手黑线张嘴闭眼":["侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"],"背手黑线流泪":["侧低头流泪","侧低头阴郁排线阴影","侧低头背手"],"背手黑线侧目张嘴流泪":["侧低头流泪","侧低头阴郁排线阴影","测低头侧眼","侧低头张嘴 ","侧低头背手"],"背手黑线张嘴流泪闭眼":["侧低头流泪","侧低头阴郁排线阴影","侧低头闭眼","侧低头张嘴 ","侧低头背手"]}}} \ No newline at end of file diff --git a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank index 722c086d6..7d40816f0 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank and b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank differ diff --git a/Assets/StreamingAssets/FMOD/Desktop/Environment.bank b/Assets/StreamingAssets/FMOD/Desktop/Environment.bank index 221a8ea09..e8a9462b6 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Environment.bank and b/Assets/StreamingAssets/FMOD/Desktop/Environment.bank differ diff --git a/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank b/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank index a9457a1b1..368ce8881 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank and b/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank differ diff --git a/Assets/StreamingAssets/FMOD/Desktop/Music.bank b/Assets/StreamingAssets/FMOD/Desktop/Music.bank index a50866c23..2c3f95b8f 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Music.bank and b/Assets/StreamingAssets/FMOD/Desktop/Music.bank differ