diff --git a/Assets/Resources/Yarn/PeipeiNewBottleFish/PeipeiNewBottleFish.yarn b/Assets/Resources/Yarn/PeipeiNewBottleFish/PeipeiNewBottleFish.yarn
index 1dfe73f93..602a105b4 100644
--- a/Assets/Resources/Yarn/PeipeiNewBottleFish/PeipeiNewBottleFish.yarn
+++ b/Assets/Resources/Yarn/PeipeiNewBottleFish/PeipeiNewBottleFish.yarn
@@ -1,22 +1,30 @@
 title: Start
 tags:
-position: 259,-1970
+color: red
+position: 163,-2288
+---
+//<<jump Dialogue_新闻>>    
+===
+title: Dialogue_新闻
+tags:
+position: 441,-2079
 ---
 新闻:balabalabala
 <<indoor>>
-<<jump 日常对话>>
+<<jump Dialogue_诊所对话>>
 ===
-title: 日常对话
+
+title: Dialogue_诊所对话
 tags:
-position: 259,-1669
+position: 440,-1768
 ---
 peipei:我生病了
 me:开始治疗吧
-<<jump 诊断初始化>>
+<<jump Function_诊断初始化>>
 ===
-title: 诊断初始化
+title: Function_诊断初始化
 tags:
-position: 254,-1295
+position: 171,-1120
 ---
 ///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值
 
@@ -36,8 +44,6 @@ position: 254,-1295
 <<declare $eyeTargetTriggerCount=0>>
 //方便的触发针对eyetarget的对话，如果不喜欢这种写法可以商量，然后分开写
 <<declare $currentEyeTarget="未定义">>
-
-
 //当前步骤的填入clueName
 <<declare $clueName="">>
 //当前要分析的是第几个slot
@@ -49,35 +55,36 @@ position: 254,-1295
 //上一步骤的matchCode
 <<declare $previousMatchCode="">>
 
+<<declare $isLineCut=false>>
+<<declare $isReturnTool=false>>
 
 
 <<fade_in 0.5>>
 <<load_scene 佩佩视觉模块>>
 <<OpenClueBoard ClueBoard>>
-<<Set_ViewVisualState ViewManager "ColorView" 1>>
+//<<Set_ViewVisualState ViewManager "ColorView" 1>>
 <<wait 0.5>>
 <<fade_out 0.5>>
  //<<jump 主维修界面>>
  <<jump 主维修界面 >>
-
 ===
 
-title: AddAllClueToFavorites
-position: -760,-1665
----
-<<generate_PunchTape ClueManager "海报" "EyeView" "liuying1-1" "红色" true>> 
-<<generate_PunchTape ClueManager "植物" "EyeView" "liuying1-2" "绿色" true>>
-<<generate_PunchTape ClueManager "天空" "EyeView" "liuying1-3" "蓝色" true>>
-<<generate_MemoryClue ClueManager "病房" "liuying1-3" "蓝色" true>>
-<<generate_MemoryClue ClueManager "草地绘画" "liuying1-2" "绿色" true>>
-<<generate_MemoryClue ClueManager "夕阳景色" "liuying1-1" "红色" true>>
-<<generate_UFClue ClueManager UFImage can_grass_error 绿色 true>> 
-===
+// title: AddAllClueToFavorites
+// position: -1373,-1674
+// ---
+// <<generate_PunchTape ClueManager "海报" "EyeView" "liuying1-1" "红色" true>> 
+// <<generate_PunchTape ClueManager "植物" "EyeView" "liuying1-2" "绿色" true>>
+// <<generate_PunchTape ClueManager "天空" "EyeView" "liuying1-3" "蓝色" true>>
+// <<generate_MemoryClue ClueManager "病房" "liuying1-3" "蓝色" true>>
+// <<generate_MemoryClue ClueManager "草地绘画" "liuying1-2" "绿色" true>>
+// <<generate_MemoryClue ClueManager "夕阳景色" "liuying1-1" "红色" true>>
+// <<generate_UFClue ClueManager UFImage can_grass_error 绿色 true>> 
+// ===
 title: 主维修界面
-position: 261,-771
+position: 170,-356
 ---
 <<start_transition ViewManager "MainView">>
-
+<<SetHeat Plug 1>>
 <<if visited("手术") && $isFinishedEyeCheck == -1 && $isFinishedUFCheck == -1>>
     <<jump 流程结束>>
 <<endif>>
@@ -89,16 +96,28 @@ position: 261,-771
 // 检查主目标是否完成并提供反馈 
 <<if $isFinishedEyeCheck == -1 && $isFinishedUFCheck == -1>>
     <<if $memoryCount == 3>>
-        me: 似乎该检查的都检查了，应该去看下诊疗单了
+    <<jump Dialogue_当检查完成时的主界面触发对话>>
+    //me: 似乎该检查的都检查了，应该去看下诊疗单了
     <<else>>
         // 此处可以替换为界面视觉效果，表示有外部错误
-        me: 现在记忆模块应该可以查看了，我们应该去记忆看看   
+        <<jump Dialogue_当记忆模块可以查看时的主界面触发对话>>
+        //me: 现在记忆模块应该可以查看了，我们应该去记忆看看   
     <<endif>>
 <<endif>>
 ===
+title: Dialogue_当检查完成时的主界面触发对话
+position: 532,-44
+---
+me: 似乎该检查的都检查了，应该去看下诊疗单了
+===
+title: Dialogue_当记忆模块可以查看时的主界面触发对话
+position: 534,-221
+---
+me: 似乎该检查的都检查了，应该去看下诊疗单了
+===
 title: ClueBoard
 tags:
-position: -236,-1318
+position: -904,-1310
 ---
 <<if $clueBoardStep == 0>>
     <<if $clueCategory == "UFView">>
@@ -149,59 +168,58 @@ position: -236,-1318
 ===
 title: 结论
 tags:
-position: -236,-1047
+position: -902,-953
 ---
 //现在关于切换场景的数据保存还没有完成，建议先不切场景
 peipei:佩佩需要手术
 peipei:我们去手术吧
-<<jump 手术>>
-===
-title: 手术
-tags:
-position: -235,-771
----
 <<wait_for_ClueBoard_close ClueBoard>>
-<<set_scissors_mode LineManager true>>
 <<set_line_cuttable LineManager MemoryEye true>>
-[command name=activate_socket_choice /]
-    -> MemoryEyeScissor
-        <<set_scissors_mode LineManager false>>
-        // <<complete_task TaskManager "执行记忆-视觉桥阻断术">>
-        ///<<shakeScreen ScreenEffect>>
-        ///<<hide_dialog>>
-        ///<<wait 2>>
-        ///<<fadeIn ScreenEffect 1 1>>
-        ///<<hide_dialog>>
-        peipei: 啊…眼睛……我的……
-        peipei: 好痛！
-        me: 怎么了？怪了，这不应该引起任何痛觉的…
-        peipei: ……
-        peipei: 呼……
-        peipei: 好像……好多了。
-        me: 还没结束…我们进视觉和UF模块复查一下吧。
-        <<set_EyeState EyeManager "CannotImagineColor">>
-        <<set $eyeTargetTriggerCount=0>>
-        <<set $isFinishedEyeCheck=1>>
-        <<set $isFinishedUFCheck=1>>
-        // <<add_task TaskManager "检查视觉模块" "修好佩佩的UF模块">>
-        // <<add_task TaskManager "检查UF模块" "修好佩佩的UF模块">>
-        <<jump 主维修界面>>
-    -> MemoryUFScissor
-        me: 我们要剪的不是这个吧
-
+<<ShowTool ToolManager Scissor>>
+//<<set_scissors_mode LineManager true>>
 
+// [command name=activate_socket_choice /]
+//<<jump 手术>>
+===
+title: CutLine
+tags:
+position: -903,-634
+---
+<<if $isLineCut==true>>
+    peipei: 啊…眼睛……我的……
+    peipei: 好痛！
+    me: 怎么了？怪了，这不应该引起任何痛觉的…
+    peipei: ……
+    peipei: 呼……
+    peipei: 好像……好多了。
+    me: 还没结束…我们进视觉和UF模块复查一下吧。
+    <<set_EyeState EyeManager "CannotImagineColor">>
+    <<set $eyeTargetTriggerCount=0>>
+    <<set $isFinishedEyeCheck=1>>
+    <<set $isFinishedUFCheck=1>> 
+// <<add_task TaskManager "检查视觉模块" "修好佩佩的UF模块">>
+// <<add_task TaskManager "检查UF模块" "修好佩佩的UF模块">>
+    <<jump 主维修界面>>
+<<else>>
+me: 要剪的不是这个吧
+<<endif>>
 ===
-
 title: 流程结束
 tags:
-position: 261,-400
+position: 163,266
+---
+<<jump Dialogue_流程结束时的对话>>
+===
+title: Dialogue_流程结束时的对话
+tags:
+position: 528,443
 ---
 me:看起来应该没什么问题了
 me:再见佩佩
 ===
 title: IntoEyeView
 tags:
-position: 1965,-2069
+position: 1960,-2075
 ---
 <<if $isFinishedEyeCheck==-1>>
 me:这里似乎没什么可看的了
@@ -257,7 +275,7 @@ me:啊，出现错误抖动了
 ===
 title: Eye_sky
 tags:
-position: 1722,-1730
+position: 1721,-1722
 ---
 <<set_EyeState EyeManager "CanImagineColor">>
 <<EyeEffect_FadeIn EyeManager>>
@@ -283,7 +301,7 @@ position: 2203,-1721
   <<jump EyeCheckEnd>>
 ===
 title: Eye_plant
-position: 1961,-1731
+position: 1960,-1724
 ---
 <<if visited("Eye_plant")==false>>
 <<set $eyeTargetTriggerCount = $eyeTargetTriggerCount + 1>>
@@ -296,7 +314,7 @@ position: 1961,-1731
 
 ===
 title: EyeCheckEnd
-position: 1959,-1242
+position: 1959,-1240
 ---
 <<if $isFinishedEyeCheck==-1>>
 me:这里似乎没什么新的线索了
@@ -365,7 +383,8 @@ me:似乎该看的都看了，我们退出记忆吧
 <<endif>>
 ===
 title: 天空
-position: 746,-1726
+group: Memory
+position: 781,-1641
 ---
 <<wait 1>>
 peipei_child: 医生！看，大象！
@@ -389,7 +408,8 @@ me:好了，这个记录下吧
 <<jump End_memoryPaly>>
 ===
 title: 海报
-position: 1003,-1727
+group: Memory
+position: 1007,-1642
 ---
 <<wait 1>>
 unknown: 好美啊。
@@ -409,7 +429,8 @@ me:好了，这个记录下吧
 ===
 
 title: 植物
-position: 1256,-1727
+group: Memory
+position: 1260,-1642
 ---
 <<wait 1>>
 peipei: 要是工作也能画画…要是能永远画画就好了。
@@ -429,17 +450,17 @@ me:好了，这个记录下吧
 <<jump End_memoryPaly>>
 ===
 title: EmoViewDialogue
-position: 83,-2424
+position: 97,-2566
 ---
 me:情绪平稳
 ===
 title: SpeakViewDialogue
-position: 405,-2419
+position: 453,-2567
 ---
 me:讲话清晰
 ===
 title: OnUFViewDeepIn
-position: -377,-1655
+position: -894,-1597
 ---
 <<if $isFinishedUFCheck==0>>
     <<set $isFinishedUFCheck=-1>>
@@ -460,3 +481,11 @@ position: -377,-1655
 <<endif>>
 <<jump 主维修界面>>
 ===
+title: OnEyeViewDeepIn
+position: -786,-1832
+---
+me:啊，果然这里是有问题的
+me:我们去看看
+===
+
+