From de1ac68f992db1a34bbea3d050599a4c80646680 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 20 Feb 2025 13:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A7=8D=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pewriter Sound - Package.unitypackage.meta | 7 - .../PlayMaker - Integration.unitypackage.meta | 7 - ... Scripting - Integration.unitypackage.meta | 7 - Assets/Render/Renderer2Dtest.asset | 22 +- .../Prefabs/Fix/Body Module System.prefab | 10 +- Assets/Resources/Yarn/FP_Peipei1/EVENT.yarn | 1 - .../Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn | 46 +- .../Resources/Yarn/FP_Peipei2/EventNode.yarn | 38 +- .../Yarn/FP_Peipei2/Stage11_手术.yarn | 6 +- .../Yarn/FP_Peipei2/Stage3_身体检查.yarn | 91 ++- .../Yarn/FP_Peipei2/Stage4_UF拆壳.yarn | 1 - .../Yarn/FP_Peipei2/Stage5_UF检查.yarn | 35 +- .../Yarn/FP_Peipei2/Stage8_停止想象.yarn | 24 +- Assets/Resources/Yarn/FP_Peipei2/Start.yarn | 10 + .../Yarn/FP_Shitou2_2/Stage4_刻录.yarn | 1 + .../Yarn/FP_Shitou2_head/Stage2_头部检查.yarn | 10 +- Assets/Scenes/PeipeiFixScene.unity | 12 - Assets/Scenes/Persistence.unity | 4 +- Assets/Scenes/ShitouHeadiFixScene.unity | 602 ++++++++++-------- .../FixSystemNew/BodyModule/BodyModule.cs | 2 +- .../Scripts/FixSystemNew/FixStateMachine.cs | 14 +- 21 files changed, 505 insertions(+), 445 deletions(-) delete mode 100644 Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta delete mode 100644 Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta delete mode 100644 Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta diff --git a/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta deleted file mode 100644 index 4801b3793..000000000 --- a/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 560a88da2bbc70140bed167f0ba7fe37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta deleted file mode 100644 index 77d64a86c..000000000 --- a/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fb01be13d6e88ca488dda82150319bfc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta deleted file mode 100644 index 05e590027..000000000 --- a/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 117dcc671050f5247bd8743b91ecaab7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index d3df27388..9bebfac1e 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,19 +1053,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 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 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Prefabs/Fix/Body Module System.prefab b/Assets/Resources/Prefabs/Fix/Body Module System.prefab index c37a5d890..bf1eee95a 100644 --- a/Assets/Resources/Prefabs/Fix/Body Module System.prefab +++ b/Assets/Resources/Prefabs/Fix/Body Module System.prefab @@ -89,7 +89,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1535758981242426442 Transform: m_ObjectHideFlags: 0 @@ -513,7 +513,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2195061089379433005} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1792,7 +1792,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1369475798980233471 Transform: m_ObjectHideFlags: 0 @@ -1802,8 +1802,8 @@ Transform: m_GameObject: {fileID: 8134912130971034244} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.1, y: -3.31, z: 0} - m_LocalScale: {x: 0.74917835, y: 3.2780066, z: 0.482227} + m_LocalPosition: {x: -0.27, y: -4.69, z: 0} + m_LocalScale: {x: 0.74917835, y: 2.9092307, z: 0.482227} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3167604532051452043} diff --git a/Assets/Resources/Yarn/FP_Peipei1/EVENT.yarn b/Assets/Resources/Yarn/FP_Peipei1/EVENT.yarn index 7b1afd537..0e0105dd7 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/EVENT.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/EVENT.yarn @@ -139,7 +139,6 @@ title: MemoryDeepIn tags: --- <> - <> <> <> === diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn index 6dc32c5eb..dddc93918 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn @@ -170,7 +170,16 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接! <> <> <> - <> + ->深入检查 + <> + // <> + // <> + <> + ->结束 + <> + <> + <> + <> <> UfModule: 检查完成!未检测到错误。 me: 搞定…报错已经消失了。 @@ -230,9 +239,19 @@ EyeModule: 已与视觉模块建立连接! <> <> EyeModule: #auto_next - <> - <> + // <> + // <> EyeModule: 已授权深入检查。 + ->深入检查 + <> + <> + <> + <> + ->结束 + <> + <> + <> + <> ->结束 <> <> @@ -252,13 +271,26 @@ position: 195,-3243 <> Linking: 正在建立连接… <> -MemModule: 已与视觉模块建立连接! +MemModule: 已与记忆模块建立连接! +<> + <> + <> +<> <> <> MemModule: 检测到可读取的记忆卡带! //这里有理解误区:玩家会以为记忆就存储在卡带里;需要处理 <> - <> + ->深入检查 + <> + <> + <> + <> + ->结束 + <> + <> + <> + <> <> MemModule: 已授权深入检查以读取卡带。 <> @@ -278,10 +310,6 @@ MemModule: 已与视觉模块建立连接! <> <> <> -<> - <> - <> -<> <> === diff --git a/Assets/Resources/Yarn/FP_Peipei2/EventNode.yarn b/Assets/Resources/Yarn/FP_Peipei2/EventNode.yarn index fb449de8d..e14043834 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/EventNode.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/EventNode.yarn @@ -42,11 +42,6 @@ tags: 待编辑 colorID: 8 position: -2,-3039 --- -<> - <> -<> - <> -<> <> === @@ -58,11 +53,6 @@ tags: 待编辑 colorID: 8 position: 240,-2640 --- -<> - <> -<> - <> -<> <> === @@ -75,11 +65,6 @@ tags: 待编辑 colorID: 8 position: 480,-3040 --- -<> - <> -<> - <> -<> <> === @@ -91,11 +76,6 @@ tags: 待编辑 colorID: 8 position: 240,-2840 --- -<> - <> -<> - <> -<> <> === @@ -107,11 +87,7 @@ tags: 待编辑 colorID: 8 position: 240,-3040 --- -<> - <> -<> - <> -<> +<> <> <> <> @@ -125,11 +101,6 @@ tags: 待编辑 colorID: 8 position: 0,-2840 --- -<> - <> -<> - <> -<> <> === @@ -141,11 +112,7 @@ tags: 待编辑 colorID: 8 position: 480,-2840 --- -<> - <> -<> - <> -<> +<> <> <> <> @@ -191,7 +158,6 @@ tags: title: MemoryDeepIn tags: --- -<> <> <> === diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn index ee73548f3..c65887a6e 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn @@ -114,7 +114,8 @@ position: 395,-3195 ->检查 <> <> -<> +->色彩初始化 + <> === @@ -146,7 +147,8 @@ position: 395,-3195 me: ……我明白了。 me: 一定是那些让佩佩对色彩留下印象深刻的记忆。像钉子一样被钉在了那里,不希望被忘记…… me: 佩佩,该放手了。不然你就永远也无法醒来了。 - <> + ->记忆初始化 + <> === diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn index c23e4a1d3..64e9545ff 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn @@ -4,9 +4,8 @@ colorID: 8 position: -443,-3575 --- <> -<> me: 发热的源头就是这个UF模块…
很有可能就是它出问题了。 -<> +<> === @@ -70,7 +69,7 @@ position: 43,-97 title: PlugFinished position: 151,-2688 --- -<> +<> <> <> <> @@ -115,10 +114,12 @@ EmoModule: 已与情绪模块建立连接! <> me: 情绪受到发热的影响…但整体没什么问题。 <> + <> + <> + <> ->结束 <> <> -<> === @@ -160,10 +161,12 @@ SpeakerModule: 已与表达模块建立连接! me: 不过问题不在这里。 <> <> + <> + <> + <> ->结束 <> <> -<> === @@ -207,10 +210,12 @@ LogicModule: 已与逻辑处理模块建立连接! me: 不过问题不在这里。 <> <> + <> + <> + <> ->结束 <> <> -<> === @@ -244,9 +249,11 @@ ChipModule: 已与附加模块建立连接! <> <> ->结束 + <> + <> + <> <> <> -<> === @@ -285,9 +292,11 @@ MemModule: 未检测到可查看的记忆卡带。 me: 不过记忆模块本身看起来没有出什么问题。 <> ->结束 +<> + <> +<> <> <> -<> === @@ -325,11 +334,21 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接! me: 又回来了…希望这次能成功深入。 <> <> - <> + ->深入 + <> + <> + ->结束 + <> + <> + <> + <> + <> ->结束 - <> - <> -<> + <> + <> + <> +<> +<> === @@ -371,9 +390,11 @@ EyeModule: 已与视觉模块建立连接! me: 没有新的问题……至少没有会影响UF的问题。 <> ->结束 + <> + <> + <> <> <> -<> === @@ -382,20 +403,21 @@ EyeModule: 已与视觉模块建立连接! title: 第二次发热前对话 position: 151,-2461 --- -me: 该查的都查了…
除了发热造成的影响,哪里有什么“未知来源干扰”…? -<> -<> -peipei: 医生…我是不是治不好了……?我是不是…有问题? -me: 当然…你的*身体里*有一些问题,这是你在这里的原因。 -me: 但这不是你的错,我会找到并解决这些问题的。 -<> -<> -me: 既然没有更多线索,那么我想问题还是在UF这里… -me: 我想我应该再检查一下UF,看看有没有办法绕开这些该死的权限要求…… -<> -<> -<> -<> +<> +// me: 该查的都查了…
除了发热造成的影响,哪里有什么“未知来源干扰”…? +// <> +// <> +// peipei: 医生…我是不是治不好了……?我是不是…有问题? +// me: 当然…你的*身体里*有一些问题,这是你在这里的原因。 +// me: 但这不是你的错,我会找到并解决这些问题的。 +// <> +// <> +// me: 既然没有更多线索,那么我想问题还是在UF这里… +// me: 我想我应该再检查一下UF,看看有没有办法绕开这些该死的权限要求…… +// <> +// <> +// <> +// <> === @@ -404,11 +426,12 @@ me: 我想我应该再检查一下UF,看看有没有办法绕开这些该死 title: 第二次发热 position: 151,-2461 --- -<> -<> -<> -Linking: 正在建立连接… -<> +// <> +// <> +// <> +// Linking: 正在建立连接… +// <> +<> <> Error: 机体过热!无法建立连接。 Error: 当前温度:89.8℃,请恢复至工作温度…… @@ -416,6 +439,8 @@ me: 又过热了!这也太快了… peipei: 医生…我好困…… me: 再坚持一下…佩佩。 <> +<> +<> <> <> === @@ -429,7 +454,6 @@ colorID: 8 position: -837,-2797 --- <> -<> me: 发热的症状正在逐渐加重…下次可能不会这么容易了。 <> <> @@ -490,6 +514,7 @@ Linking: 正在获取深入检查权限… me: ……啧。 me: 先尽快排查其他模块吧。 <> + <> <> === diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage4_UF拆壳.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage4_UF拆壳.yarn index d8a4a8d14..141cb0d1d 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage4_UF拆壳.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage4_UF拆壳.yarn @@ -2,7 +2,6 @@ tags: position: 43,-97 --- -<> me: 管不了那么多了。
佩佩,如果发热还止不住…… me: 我不能…我不能允许再有机体死在我的诊室了。 peipei: 对不起…医生… diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn index d45e34654..cb6f8303e 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn @@ -2,7 +2,7 @@ tags: position: 43,-97 --- -<> +<> <> <> <> @@ -96,7 +96,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 peipei: 这个是…那张护肤机油的海报吗?
我几乎认不出了… <> -<> +<> //me: 【占位】UF在把看到的画面变成数据...上传网络? //me: 【占位】这就是UF创造力的来源么 peipei: 不是这个颜色…不是这个颜色…… @@ -105,7 +105,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 peipei: 啊,痛!又开始了…… <> <> - <> + <> 【*{$targetDescription}*相关的记忆浮现】 me: 这是怎么回事…佩佩?
这好像是…我们上次看过的记忆画面。 @@ -143,7 +143,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 <> <> -<> +<> <> <> <> @@ -167,7 +167,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 <> <> <> - <> + <> peipei: 话说……
这是在用UF生成的图像…联网喂给其他的UF吗? me: 我只是个医生,我的数据库里没有和这个相关的信息…… peipei: 怪不得它可以做得这么快……我自己用画笔画的时候,要好几天才能出一张图… @@ -209,7 +209,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 <> <> <> -<> +<> <> <> @@ -234,7 +234,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 <> <> peipei: 我可以的…我可以的…… - <> + <> <> <> 【*{$targetDescription}*相关的记忆浮现】 @@ -286,6 +286,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 //me: 【占位】我大概明白了佩佩...我们先退出UF的深入模式吧 <> <> + <> <> <> <> @@ -311,8 +312,8 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 // <> // <> // ULM自训练进程: 已池化图像卷积数据!正在上传神经网络数据集…… -// <> -// <> +// <> +// <> // me: 这是…什么? // me: 佩佩…你能看见吗? // peipei: 这就是…这就是我的…… @@ -347,7 +348,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 // me: 看起来我接管了这个自训练进程的目标选择…那么我们让它再做几次试试吧。
再坚持一下,佩佩。 // <> // peipei: 好的…医生。我会没事的…… -// <> +// <> // <> // ULM自训练进程: 神经网络分析完毕!正在进行"天空"相关的生成训练…… // <> @@ -381,7 +382,7 @@ ULM自训练进程: 目标标记,{$targetDescription},正在进行第130624 // peipei: 不。医生,我是说我为自己感到好累。 // peipei: 我们再来一次吧。 // me: …好。 -// <> +// <> // peipei: 我可以的…我可以的…… // <> // ULM自训练进程: 神经网络分析完毕!正在进行"天空"相关的生成训练…… @@ -545,7 +546,7 @@ position: -2052,-2351 -// <> +// <> // ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目标…… // <> // <> @@ -563,8 +564,8 @@ position: -2052,-2351 // <> // ULM自训练进程: 神经网络分析完毕!正在进行"脸"相关的生成训练…… // <> -// <> -// <> +// <> +// <> // <> // <> // me: 没有出现问题…似乎…… @@ -584,7 +585,7 @@ position: -2052,-2351 // <> // <> // peipei: 我们来吧。 -// <> +// <> // //颜色不出现,一会又出现了 // <> // <> @@ -611,7 +612,7 @@ position: -2052,-2351 // me: 佩佩… // peipei: 不,医生,我想再试试。 // <> -// <> +// <> // ULM自训练进程: 警告!检测到兼容性错误:发现未授权的数据传入! // peipei: 啧…… // <> @@ -634,7 +635,7 @@ position: -2052,-2351 // peipei: 医生,我们继续吧。 // me: …… // <> -// <> +// <> // <> // <> // peipei: 不!停止! diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn index bd1d45956..9961d3a3f 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn @@ -6,7 +6,7 @@ position: 428,-88 <> me:准备好了么? peipei: 我们来吧,医生。 -<> +<> === @@ -39,8 +39,8 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 ULM自训练进程: 未识别到对应记忆,无法训练!尝试其他目标。 <> <> - <> - <> + <> + <> <> <> //<> @@ -84,7 +84,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 //peipei: 准备好了,我们继续测试 <> <> - <> + <> //颜色不出现,一会又出现了 <> <> @@ -119,7 +119,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 peipei: 不,医生,我想再试试。 <> <> - <> + <> peipei: 啧… <> <> @@ -147,7 +147,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 me: …… <> <> - <> + <> <> <> peipei: 没错…… @@ -292,7 +292,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 // title: 停止想象Check_暂时废弃 // position: 71,-93 // --- -// <> +// <> // ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目标…… // <> // <> @@ -310,8 +310,8 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 // <> // ULM自训练进程: 神经网络分析完毕!正在进行"脸"相关的生成训练…… // <> -// <> -// <> +// <> +// <> // <> // <> // me: 没有出现问题…似乎…… @@ -331,7 +331,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 // <> // <> // peipei: 我们来吧。 -// <> +// <> // //颜色不出现,一会又出现了 // <> // <> @@ -358,7 +358,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 // me: 佩佩… // peipei: 不,医生,我想再试试。 // <> -// <> +// <> // ULM自训练进程: 警告!检测到兼容性错误:发现未授权的数据传入! // peipei: 啧…… // <> @@ -381,7 +381,7 @@ ULM自训练进程: 检测到进程接管请求!正在识别手动选择的目 // peipei: 医生,我们继续吧。 // me: …… // <> -// <> +// <> // <> // <> // peipei: 不!停止! diff --git a/Assets/Resources/Yarn/FP_Peipei2/Start.yarn b/Assets/Resources/Yarn/FP_Peipei2/Start.yarn index 70e54cd84..a97643fe0 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Start.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Start.yarn @@ -75,6 +75,16 @@ position: 248,-1739 <> <> <> + + +<> +<> +<> +<> +<> +<> +<> +<> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn index 6a1b8c9d4..2a0637bfb 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -447,6 +447,7 @@ shitou: 要唱了,医生! <> 歌曲结束了 +<> <> me: 呼…我从来没有尝试过这个……但总之,能用了。 diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn index d99d3fa1f..f65b00d9b 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -284,8 +284,16 @@ MemModule: 未检测到可查看的记忆卡带。 <> me: 碰撞导致石头的视觉有重影,但过段时间就会恢复。 <> - <> MemModule: 已授权深入检查。 + ->深入检查 + <> + <> + ->结束 + <> + <> + <> + <> + ->结束 <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 7a780a398..1f6df895b 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -37213,18 +37213,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.03 objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalScale.y - value: 2.9092307 - objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.x - value: -0.27 - objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.y - value: -4.69 - objectReference: {fileID: 0} - target: {fileID: 1489219589270410967, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingOrder value: 9 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 1ecbad51b..492bf940a 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8256,8 +8256,8 @@ MonoBehaviour: - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: bd44f6c25aa17a4408e172d16b903176, type: 2} - saveFileName: "PeipeiDay1_UF\u68C0\u67E5" + testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} + saveFileName: "PeipeiDay2_\u672F\u524D\u8C08\u8BDD2" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ShitouHeadiFixScene.unity b/Assets/Scenes/ShitouHeadiFixScene.unity index 8806c8b8f..9d894522e 100644 --- a/Assets/Scenes/ShitouHeadiFixScene.unity +++ b/Assets/Scenes/ShitouHeadiFixScene.unity @@ -3459,6 +3459,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1036194065} wrongColorSpriteRenderer: {fileID: 1211051073} imageSpriteRender: {fileID: 163241097} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &171926895 SpriteRenderer: m_ObjectHideFlags: 0 @@ -6192,6 +6193,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1181555071} wrongColorSpriteRenderer: {fileID: 55672861} imageSpriteRender: {fileID: 818458647} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &247366037 SpriteRenderer: m_ObjectHideFlags: 0 @@ -12252,6 +12254,10 @@ MonoBehaviour: - {fileID: 190481521} - {fileID: 9804159} heatmapGameobject: {fileID: 1652512854} + imageToMove: {fileID: 0} + imageToRotate: {fileID: 0} + inPos: {x: 0, y: 0, z: 0} + outPos: {x: 0, y: 0, z: 0} --- !u!1001 &649595758 PrefabInstance: m_ObjectHideFlags: 0 @@ -16414,6 +16420,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966176895} m_CullTransparentMesh: 1 +--- !u!1001 &978503918 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalPosition.x + value: -30.3 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2336169013361707238, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3950570453712645596, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + propertyPath: m_Name + value: Screen System + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4603709260742992854, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 6547948142324226539, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3} --- !u!1 &983645281 GameObject: m_ObjectHideFlags: 0 @@ -18809,249 +18878,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!21 &1168428755 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AllIn1SpriteShader/AllIn1SpriteShader - m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _ColorRampTex: - m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorRampTexGradient: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorSwapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeBurnTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _GlowTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineDistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OverlayTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ShineMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 1 - - _AlphaCutoffValue: 0.25 - - _AlphaOutlineBlend: 1 - - _AlphaOutlineGlow: 5 - - _AlphaOutlineMinAlpha: 0 - - _AlphaOutlinePower: 1 - - _AlphaRoundThreshold: 0.5 - - _BillboardY: 0 - - _BlurHD: 0 - - _BlurIntensity: 10 - - _Brightness: 0 - - _ChromAberrAlpha: 0.4 - - _ChromAberrAmount: 1 - - _ClipUvDown: 0 - - _ClipUvLeft: 0 - - _ClipUvRight: 0 - - _ClipUvUp: 0 - - _ColorChangeLuminosity: 0 - - _ColorChangeTolerance: 0.25 - - _ColorChangeTolerance2: 0.25 - - _ColorChangeTolerance3: 0.25 - - _ColorRampBlend: 1 - - _ColorRampLuminosity: 0 - - _ColorRampOutline: 0 - - _ColorSwapBlend: 1 - - _ColorSwapBlueLuminosity: 0.5 - - _ColorSwapGreenLuminosity: 0.5 - - _ColorSwapRedLuminosity: 0.5 - - _Contrast: 1 - - _CullingOption: 0 - - _DistortAmount: 0.5 - - _DistortTexXSpeed: 5 - - _DistortTexYSpeed: 5 - - _EditorDrawers: 6 - - _FadeAmount: -0.1 - - _FadeBurnGlow: 2 - - _FadeBurnTransition: 0.075 - - _FadeBurnWidth: 0.025 - - _FishEyeUvAmount: 0.35 - - _FlickerAlpha: 0 - - _FlickerFreq: 0.2 - - _FlickerPercent: 0.05 - - _GhostBlend: 1 - - _GhostColorBoost: 1 - - _GhostTransparency: 0 - - _GlitchAmount: 3 - - _GlitchSize: 1 - - _Glow: 10 - - _GlowGlobal: 1 - - _GradBlend: 1 - - _GradBoostX: 1.2 - - _GradBoostY: 1.2 - - _GradIsRadial: 0 - - _GrassManualAnim: 1 - - _GrassManualToggle: 0 - - _GrassRadialBend: 0.1 - - _GrassSpeed: 2 - - _GrassWind: 20 - - _GreyscaleBlend: 1 - - _GreyscaleLuminosity: 0 - - _GreyscaleOutline: 0 - - _HandDrawnAmount: 10 - - _HandDrawnSpeed: 5 - - _HitEffectBlend: 1 - - _HitEffectGlow: 5 - - _HologramBlend: 1 - - _HologramMaxAlpha: 0.75 - - _HologramMinAlpha: 0.1 - - _HologramStripesAmount: 0.1 - - _HologramStripesSpeed: 4.5 - - _HologramUnmodAmount: 0 - - _HsvBright: 1 - - _HsvSaturation: 1 - - _HsvShift: 180 - - _InnerOutlineAlpha: 1 - - _InnerOutlineGlow: 4 - - _InnerOutlineThickness: 1 - - _MaxXUV: 1 - - _MaxYUV: 1 - - _MinXUV: 0 - - _MinYUV: 0 - - _MotionBlurAngle: 0.1 - - _MotionBlurDist: 1.25 - - _MyDstMode: 10 - - _MySrcMode: 5 - - _NegativeAmount: 1 - - _OffsetUvX: 0 - - _OffsetUvY: 0 - - _OnlyInnerOutline: 0 - - _OnlyOutline: 0 - - _OutlineAlpha: 1 - - _OutlineDistortAmount: 0.5 - - _OutlineDistortTexXSpeed: 5 - - _OutlineDistortTexYSpeed: 5 - - _OutlineGlow: 1.5 - - _OutlinePixelWidth: 1 - - _OutlineTexXSpeed: 10 - - _OutlineTexYSpeed: 0 - - _OutlineWidth: 0.004 - - _OverlayBlend: 1 - - _OverlayGlow: 1 - - _OverlayTextureScrollXSpeed: 0.25 - - _OverlayTextureScrollYSpeed: 0.25 - - _PinchUvAmount: 0.35 - - _PixelateSize: 32 - - _PosterizeGamma: 0.75 - - _PosterizeNumColors: 8 - - _PosterizeOutline: 0 - - _RadialClip: 45 - - _RadialClip2: 0 - - _RadialStartAngle: 90 - - _RandomSeed: 0 - - _RectSize: 1 - - _RotateUvAmount: 0 - - _RoundWaveSpeed: 2 - - _RoundWaveStrength: 0.7 - - _ShadowAlpha: 0.5 - - _ShadowX: 0.1 - - _ShadowY: -0.05 - - _ShakeUvSpeed: 2.5 - - _ShakeUvX: 1.5 - - _ShakeUvY: 1 - - _ShineGlow: 1 - - _ShineLocation: 0.5 - - _ShineRotate: 0 - - _ShineWidth: 0.1 - - _TextureScrollXSpeed: 1 - - _TextureScrollYSpeed: 0 - - _TwistUvAmount: 1 - - _TwistUvPosX: 0.5 - - _TwistUvPosY: 0.5 - - _TwistUvRadius: 0.75 - - _WarpScale: 0.5 - - _WarpSpeed: 8 - - _WarpStrength: 0.025 - - _WaveAmount: 7 - - _WaveSpeed: 10 - - _WaveStrength: 7.5 - - _WaveX: 0 - - _WaveY: 0.5 - - _ZTestMode: 4 - - _ZWrite: 0 - - _ZoomUvAmount: 0.5 - m_Colors: - - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} - - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} - - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} - - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} - - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} - - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} - - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - - _ShineColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1170503230 GameObject: m_ObjectHideFlags: 0 @@ -22007,6 +21833,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 983645283} wrongColorSpriteRenderer: {fileID: 533663232} imageSpriteRender: {fileID: 0} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1271136870 SpriteRenderer: m_ObjectHideFlags: 0 @@ -23486,6 +23313,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 795246566} wrongColorSpriteRenderer: {fileID: 2074510898} imageSpriteRender: {fileID: 299472613} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1437519564 SpriteRenderer: m_ObjectHideFlags: 0 @@ -24301,6 +24129,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1593142682} wrongColorSpriteRenderer: {fileID: 1635219591} imageSpriteRender: {fileID: 0} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1468799207 SpriteRenderer: m_ObjectHideFlags: 0 @@ -26069,6 +25898,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 905842942} wrongColorSpriteRenderer: {fileID: 101672554} imageSpriteRender: {fileID: 1875449745} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1589824318 SpriteRenderer: m_ObjectHideFlags: 0 @@ -36962,6 +36792,249 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 4843985084834002234, guid: fd04c28739017964789d58d573f9fabb, type: 3} +--- !u!21 &2137792651 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AllIn1SpriteShader/AllIn1SpriteShader + m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 1 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _BillboardY: 0 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 0 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _CullingOption: 0 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _EditorDrawers: 6 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FishEyeUvAmount: 0.35 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchSize: 1 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.1 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _InnerOutlineAlpha: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineThickness: 1 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _PinchUvAmount: 0.35 + - _PixelateSize: 32 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RandomSeed: 0 + - _RectSize: 1 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _ShadowAlpha: 0.5 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineRotate: 0 + - _ShineWidth: 0.1 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _ZTestMode: 4 + - _ZWrite: 0 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} + - _ShineColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &2147012102 GameObject: m_ObjectHideFlags: 0 @@ -37045,6 +37118,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 250470736151292147, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 736273937742518963, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalScale.x value: 0.74917835 @@ -37101,30 +37178,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.03 objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalScale.y - value: 2.9092307 - objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.x - value: -0.2 - objectReference: {fileID: 0} - - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.y - value: -3.127 - objectReference: {fileID: 0} - target: {fileID: 1489219589270410967, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: 1535758981242426442, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.x - value: -0.907 - objectReference: {fileID: 0} - - target: {fileID: 1535758981242426442, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.y - value: -0.013 - objectReference: {fileID: 0} - target: {fileID: 1953141088643421057, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_Color.b value: 0 @@ -37137,14 +37194,6 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} - - target: {fileID: 2117906688623379083, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.x - value: 5.09 - objectReference: {fileID: 0} - - target: {fileID: 2117906688623379083, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} - propertyPath: m_LocalPosition.y - value: -0.89 - objectReference: {fileID: 0} - target: {fileID: 2411966172391820548, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_IsActive value: 1 @@ -37181,6 +37230,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0.028 objectReference: {fileID: 0} + - target: {fileID: 3416573656669102897, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3683723466005475074, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingOrder value: 6 @@ -37369,10 +37422,14 @@ PrefabInstance: propertyPath: m_SortingOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8134912130971034244, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8209014069305634267, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1168428755} + objectReference: {fileID: 2137792651} - target: {fileID: 8290537350450133684, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalScale.x value: 1.265 @@ -37638,6 +37695,7 @@ SceneRoots: - {fileID: 320706165} - {fileID: 7026926953013077400} - {fileID: 6045551082333026152} + - {fileID: 978503918} - {fileID: 9210352354887959608} - {fileID: 1428720231} - {fileID: 2123497731} diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index e598e0745..f7d72bc51 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -68,7 +68,7 @@ namespace AibisDream.FixSystem if (DialogController.Instance) // 然后触发Yarn节点 - DialogController.Instance.StartDialogNode(_bodyModuleSystem.inHotErr ? "系统过热" : data.PlugInNodeName); + DialogController.Instance.StartDialogNode(_bodyModuleSystem.inHotErr ? "系统发热" : data.PlugInNodeName); } public void PlugOut() diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index dcb1264ea..de5151bb5 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -23,12 +23,12 @@ namespace AibisDream.FixSystem yield return _curState?.Exit(); // 检查当前状态和下一个状态 - if (_curState.GetState == FixState.Clinic && nextState == FixState.BodyModule) - { - // 仅在从 Clinic 到 BodyModule 时执行这两行 - yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); - yield return TimelineManager.Instance.PlayTimeline("ToBodyModule"); - } + // if (_curState.GetState == FixState.Clinic && nextState == FixState.BodyModule) + // { + // // 仅在从 Clinic 到 BodyModule 时执行这两行 + // yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); + // yield return TimelineManager.Instance.PlayTimeline("ToBodyModule"); + // } GameLoopManager.Instance?.UpdateFixState(nextState, _curArgs); _curState = CreateState(nextState, _curArgs); @@ -96,7 +96,7 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { // 切换相机 - yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); + // yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic); }