From 5fc2ff93249914ecd19e6d1ca0474013feb5443b Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Thu, 26 Mar 2026 20:54:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=B1=E6=95=88command(task?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3)=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Resources/Yarn/FP_Peipei1/Stage5_分析.yarn         | 3 ---
 Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn         | 2 --
 Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn        | 2 --
 Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn    | 1 -
 Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn       | 1 -
 Assets/Resources/Yarn/FP_Peipei2/Stage6_分析.yarn         | 1 -
 Assets/Resources/Yarn/FP_Peipei2/Stage7_术前谈话.yarn     | 1 -
 Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn     | 3 ---
 Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn       | 1 -
 Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn | 1 -
 Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn     | 2 --
 Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn     | 2 --
 Assets/Resources/Yarn/FP_Shitou2/Stage4_刻录.yarn         | 4 ----
 Assets/Resources/Yarn/Fiction_Prologue/Stage0_序章.yarn   | 2 --
 14 files changed, 26 deletions(-)

diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage5_分析.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage5_分析.yarn
index c33082286..bb50255e5 100644
--- a/Assets/Resources/Yarn/FP_Peipei1/Stage5_分析.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei1/Stage5_分析.yarn
@@ -61,12 +61,9 @@ pp: 我差点忘了。我没有小时候…也没有爸爸…… #line:05476c6
 pp: 我是一个机体。 #line:0db39dd 
 //这段感觉放到术前谈话更好
 <<play_sfx event:/Music/music_peipei_shock_1>>
-<<task_moveOut>>
 <<complete_task "line:02a3a37">>
-<<task_moveIn>>
 //【占位】:不过绘图机器人存储的颜色记忆也足够多了，也没什么新得值得记住得东西了
 <<fade_in 1>>
-<<task_moveOut>>
 <<hide_obj>>
 <<jump 结束分析>>
 ===
diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn
index 6b0df51e7..afcf1e8ec 100644
--- a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn
@@ -11,7 +11,6 @@ me: 还没结束…保险起见，我们进视觉复查一下吧。 #line:0f42b4
 <<fade_out 0.1>>
 <<clear_tasks>>
 Task: 检查视觉模块 #line:037c944 
-<<task_moveIn>>
 <<ModuleHightLight Eye true>>
 <<DropCable>>
 <<set $eyeChecked = false>>
@@ -61,7 +60,6 @@ me:这里应该已经彻底检查过了。 #line:0bf6303
         <<wait 0.8>>
         me: 好了，总之…<br>复查结果符合预期，<waitfor=0.3>可以结束测试了。 #line:09523f9 
         <<complete_task "line:037c944">>
-        <<task_moveOut>>
         <<set $isFinishedEyeCheck=true>>
         <<Set_MouseMovementLockState EyeManager false>>
         <<hide_dialog>>
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
index 18cbbdb2a..96005da20 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
@@ -8,12 +8,10 @@ position: 246,-866
 <<fade_out 0.1>>
 <<if $isPeipeiBE==true>>
     Task: 执行手术-色彩记忆初始化 #line:0701927 
-    <<task_moveIn>>
     me: 去记忆模块执行色彩初始化吧。 #line:0677ec5 
     <<ModuleHightLight Memory true>>
 <<else>>
     Task: 安装色觉晶圆 #line:0356120 
-    <<task_moveIn>>
     me: 先安装色彩晶圆吧。 #line:005bc47 
     ->安装色觉晶圆 #line:0437b10 
         <<fade_in 1>>
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn
index 82d24d2d9..950481685 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn
@@ -3,7 +3,6 @@ tags:
 colorID: 3
 position: 251,-1150
 ---
-<<task_moveOut>>
 <<fade_in 1>>
 <<switch_fix_system_to Clinic>>
 <<if $isPeipeiBE==true>>
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn
index a702b2075..265f6f823 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn
@@ -63,7 +63,6 @@ Linking: 正在获取深入检查权限… #line:037677f
 <<wait 1>>
 EyeModule: 检查到S+++级权限！欢迎访问，主脑！ #line:0b2693c 
 me: 哈！总算……让我看看这里边到底有啥东西吧。 #line:0c55bbb 
-<<task_moveOut>>
 <<switch_fix_system_to UF>>
 ===
 
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage6_分析.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage6_分析.yarn
index fc916a731..905730031 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage6_分析.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage6_分析.yarn
@@ -6,7 +6,6 @@ position: 43,-97
 <<switch_fix_system_to "BodyModule">>
 <<fade_out 1>>
 <<clear_tasks>>
-<<task_moveIn>>
 <<complete_task "line:0a431e3">>
 Task: 分析病理与治疗方案 #line:0e94a4a 
 ///可以先用思考专用黑幕，把showobj之外的部分都盖住，每次分析用showobj展示ppt，做一个思考阶段，把线索回顾一下
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage7_术前谈话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage7_术前谈话.yarn
index 5e6ac5332..f0a6bf4ba 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage7_术前谈话.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage7_术前谈话.yarn
@@ -114,7 +114,6 @@ me: 嗯…不行。<br>还是只有色彩记忆抹除。对不起。 #line:0bd04
 <<switch_character_state 默认流汗闭眼>>
 <<hide_dialog>>
 <<complete_task "line:0e94a4a">>
-<<task_moveOut>>
 
 <<hide_dialog>>
 <<wait 1.5>>
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
index f71178580..e425bc3c8 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
@@ -6,7 +6,6 @@ position: 428,-88
 <<declare $CheckTargetCount=0>>
 me:准备好了么？ #line:0eb665d 
 peipei: 我们来吧，医生。 #line:04a3898 
-<<task_moveIn>>
 Task: 尝试停止想象 #line:08f5fd5 
 <<set $UFCount = 0>>
 ===
@@ -206,13 +205,11 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目
         me: 喂……！佩佩！ #line:026d9fc 
         me: 我真是……操了… #line:0ccf5b2 
         <<complete_task "line:08f5fd5">>
-        <<task_moveOut>>
         <<hide_dialog>>
         <<SetHeat 2>>
         <<switch_fix_system_to BodyModule>>
         <<ShowHeatMap>>
         Task: 对佩佩进行降温 #line:0a5b7c2 
-        <<task_moveIn>>
     <<endif>>
 <<jump UF停止想象CheckEnd>>
 ===
diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn
index 99e4319d0..a89ff387d 100644
--- a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn
@@ -15,7 +15,6 @@ position: 43,-97
     <<complete_task "line:0a5b7c2">>
     <<complete_task "line:0365d74">>
     <<complete_task "line:0538e87">>
-    <<task_moveOut>>
     me: 可得小心点…别把这东西碰坏了。 #line:097ba5e 
     <<jump 结束UF拆除>>
 ===
diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn
index 909c39d52..20dd5db58 100644
--- a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn
@@ -22,7 +22,6 @@ position: 33,-552
 <<if $Memory1Fade_Peipei==true && $Memory2Fade_Peipei==true && $Memory3Fade_Peipei==true>>
     me: 已经完成了…… #line:0bb4d55 
     me: 好了……都结束了。 #line:007d937 
-    <<task_moveOut TaskManager>>
     me: …… #line:0233434 
     me: 不，好像还有一个。是最新的记忆…… #line:0ed4db5 
     ->检查下一个只读记忆 #line:02795d4 
diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn
index 99ee7feaf..93971eca3 100644
--- a/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn
@@ -41,7 +41,6 @@ title: 色觉校准开始
 position: 275,-222
 ---
 <<complete_task TaskManager "检查视觉模块">>
-<<task_moveOut TaskManager>>
 <<wait 1>>
 me: 我需要让机器检索到关于颜色的记忆……我需要让佩佩的记忆转动起来。 #line:0127bce 
 me: 我需要你。佩佩，醒醒！ #line:0bc5f81 
@@ -99,7 +98,6 @@ me: 我想我会怀念它的。但是…对不起，我想要治好我的病人
 <<stop_music "mem_liuying" "fade">>
 <<switch_fix_system_to "BodyModule">>
 <<complete_task TaskManager "唤醒佩佩">>
-<<task_moveIn TaskManager>>
 ->重新唤醒 #line:0d1f009 
 Linking: 正在唤醒机体… #line:0cfce14 
 <<wait 2>>
diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn
index 40e79397f..a178d781f 100644
--- a/Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn
@@ -40,7 +40,6 @@ me: 来吧。检查一下所有头部模块…<br>确认各模块的受损情况
 //【注：此为占位，石头头部无UF模块和色觉】
 
 Task: 检查所有头部模块 #line:00eca83 
-<<task_moveIn>>
 
 //<<MessageBoxSetNull>>
 //<<MessageBoxSetText 已检测到目标机体！诊疗仪已就绪。>>
@@ -67,7 +66,6 @@ position: 384,81
 
 <<if $emoChecked==true && $logicChecked==true && $memoryChecked==true && $eyeChecked==true && $speakerChecked==true && $memoryPlayed == true>>  
     <<complete_task "line:00eca83">>
-    <<task_moveOut>>
     me:都检查完了，看起来偏偏是记忆受到了损害。<br>万幸的是其它部分似乎都没事…… #line:0b13db0 
     <<jump toStage3>>
 <<endif>>
diff --git a/Assets/Resources/Yarn/FP_Shitou2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2/Stage4_刻录.yarn
index 79de857d3..f862e0e4d 100644
--- a/Assets/Resources/Yarn/FP_Shitou2/Stage4_刻录.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou2/Stage4_刻录.yarn
@@ -13,7 +13,6 @@ position: 378,-540
 <<fade_out 1>>
 
 Task: 进入变速箱 #line:01948a6 
-<<task_moveIn>>
 
 //<<MessageBoxSetNull>>
 //<<MessageBoxSetText 等待信号输入……>>
@@ -198,7 +197,6 @@ me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录
 Task: 刻录下石头的歌声 #line:084810e 
 shitou: …… #line:01ffc06 
 
-<<task_moveOut>>
 <<jump 刻录调速>>
 
 ===
@@ -451,9 +449,7 @@ shitou: 要唱了，医生！ #line:0ae56c9
 //<<hide_dialog>>
 //<<wait 1>>
 
-<<task_moveIn>>
 Task: 刻录下石头的歌声 #line:06e5faf 
-<<task_moveOut>>
 <<stop_music "shitou_music">>
 <<play_music "event:/Music/music_shitou_0">>
 歌曲结束了。 #line:013aad1 
diff --git a/Assets/Resources/Yarn/Fiction_Prologue/Stage0_序章.yarn b/Assets/Resources/Yarn/Fiction_Prologue/Stage0_序章.yarn
index ef7a39dc2..8388c97e3 100644
--- a/Assets/Resources/Yarn/Fiction_Prologue/Stage0_序章.yarn
+++ b/Assets/Resources/Yarn/Fiction_Prologue/Stage0_序章.yarn
@@ -56,7 +56,6 @@ position: 250,200
 【无影灯亮起，医生戴上手套，准备开始手术，期间背景的提示音仍不断播报着。】 #line:04639ce 
 ???: 它就在情绪模块…我能感觉到。<br>让它停下…求求你了，医生。 #line:02cb425 
 <<add_task TaskManager "检查情绪模块">>
-<<task_moveIn TaskManager>>
 <<ModuleHightLight Emo true>>
 <<hide_dialog>>
 <<wait 1>>
@@ -222,7 +221,6 @@ position: 906,-585
 <<complete_task TaskManager "检查情绪模块">>
 <<wait 0.1>>
 <<open_screen Emo>>
-<<task_moveOut TaskManager>>
 Linking: 正在建立连接… #line:0e7b127 
 <<wait 0.2>>
 ???: 啊！痛…好痛！ #line:0348ba1 

From bebee804d994b6a9534c514e9f8443524101bafa Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Thu, 26 Mar 2026 20:55:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(peipei):=20=E4=BD=A9=E4=BD=A9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 打孔带托盘不显示
2. 记忆特效消失
---
 Assets/Render/Renderer2Dtest.asset | 10 +++++-----
 Assets/Scenes/Persistence.unity    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset
index a05bf4fcd..d18bbcf52 100644
--- a/Assets/Render/Renderer2Dtest.asset
+++ b/Assets/Render/Renderer2Dtest.asset
@@ -512,7 +512,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
   m_Name: VolFx
   m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
   _event: 550
   _format:
     enabled: 1
@@ -724,7 +724,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
   m_Name: Memory
   m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
   _event: 550
   _format:
     enabled: 1
@@ -1607,7 +1607,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
   m_Name: VolFx
   m_EditorClassIdentifier: 
-  m_Active: 1
+  m_Active: 0
   _event: 550
   _format:
     enabled: 1
@@ -1750,7 +1750,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
   m_Name: Image
   m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
   _event: 550
   _format:
     enabled: 1
@@ -1792,7 +1792,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
   m_Name: UF
   m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
   _event: 550
   _format:
     enabled: 1
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index e45470c90..a8e26e7af 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -12186,7 +12186,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   runMode: 0
-  firstTalkSo: {fileID: 11400000, guid: 653fbfbb55fef7740a2360590e29d552, type: 2}
+  firstTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
   testTalkSo: {fileID: 11400000, guid: 8ce86974047bb404c9096e70a606355a, type: 2}
   saveFileName: "20250901_204445_PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5"
 --- !u!1 &749156594
@@ -54913,7 +54913,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4040749114382236603, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4947548532371034966, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3}
       propertyPath: m_Sprite
@@ -54933,7 +54933,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6036241349967455381, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7117798419024193216, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3}
       propertyPath: m_AnchorMax.x