diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_PeipeiFix.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_PeipeiFix.asset
index 83f1ee634..0cd945a05 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Scene_PeipeiFix.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Scene_PeipeiFix.asset
@@ -37,6 +37,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 26105571c9644aa4194f2b981ee33a58
+    m_Address: "FrameAnimation/\u4F69\u4F69"
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
   m_SchemaSet:
diff --git a/Assets/GameContent/Scene_Peipei/Actor/PeipeiGraph.asset b/Assets/GameContent/Scene_Peipei/Actor/PeipeiGraph.asset
index fad561da9..7a03648f4 100644
--- a/Assets/GameContent/Scene_Peipei/Actor/PeipeiGraph.asset
+++ b/Assets/GameContent/Scene_Peipei/Actor/PeipeiGraph.asset
@@ -2260,7 +2260,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4c9e0458642034545b44454bbadcf059, type: 3}
   m_Name: PeipeiGraph
   m_EditorClassIdentifier: 
-  id: 
+  id: "\u4F69\u4F69"
   displayName: "\u4F69\u4F69\u89D2\u8272\u52A8\u753B"
   clips:
   - {fileID: -6395813161982734351}
@@ -2424,7 +2424,7 @@ MonoBehaviour:
     defaultNewClipEndBehavior: 0
     lastSourceHash: a787c4efdb41da2eb0d631b2306eb2541f9c9d71eeeaafc80fa4516506479a05
   settings:
-    defaultPlayableId: 
+    defaultPlayableId: default
     newManualClipDefaultEndBehavior: 0
   editorData:
     nodeEditorData: []
diff --git a/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn b/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn
index 39f6c4532..3c61709fd 100644
--- a/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn
+++ b/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn
@@ -1,5 +1,5 @@
 title: Start
-tags:
+tags: start
 group: 入口
 position: 250,-26
 ---
@@ -59,7 +59,7 @@ me: 今天又迟到了么。 #line:09a568c
 
 
 title: 地铁结尾
-tags: 
+tags: end
 colorID: 8
 position: 0,400
 ---
diff --git a/Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn b/Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn
index 3531dd555..9ddb9ea1e 100644
--- a/Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn
+++ b/Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn
@@ -1,5 +1,5 @@
 title: Start
-tags: 
+tags: start
 colorID: 8
 position: 205,-53
 ---
@@ -50,6 +50,13 @@ position: 205,-53
 // hs: 连被注意的价值也没有… #line:0b8e398 
 // hs: 直到最后英理被带走了，也没人告诉我该停下来。 #line:02dacb4 
 // hs: 我就像个垃圾一样被遗忘在那个房间里…… #line:0d73e06 
+===
+
+title: 对话
+tags: content
+colorID: 8
+position: 205,-53
+---
 
 火山摘下帽子，擦了擦，在手上悠悠地转了起来。 #line:08954c9 
 
diff --git a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
index 3255c9b8b..55ea74607 100644
--- a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
+++ b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
@@ -1,29 +1,34 @@
 title: Start
-tags: 
+tags: start
 colorID: 8
 position: 205,-53
 ---
 <<if $global_isPeipeiBE == true>>
+    <<detour BE_init>>
     <<jump BE>>
 <<else>>
+    <<detour HE_init_Func>>
     <<jump HE>>
 <<endif>>
 
 ===
 
-
-
-title: HE
-tags: 
-colorID: 8
-position: 205,-53
+title: HE_init_Func
+tags: function
 ---
-
 <<stop_music event:/Music/mus_peipei>>
 <<set_time_of_day "Evening">>
 <<fade_out 1>>
 <<wait 1>>
+===
 
+
+
+title: HE
+tags: content
+colorID: 8
+position: 205,-53
+---
 [character name="me" role="Aside" /]佩佩？ #line:094b927 
 [character name="me" role="Aside" /]跑到哪里去了……  #line:034968b 
 
@@ -114,13 +119,8 @@ peipei: 一会…一会见。 #line:01ff340
 <<jump 结束>>
 ===
 
-
-
-
-title: BE
-tags: 
-colorID: 8
-position: 205,-53
+title: BE_init_Func
+tags: function
 ---
 <<hide_dialog>>
 <<fade_in 1>>
@@ -130,6 +130,14 @@ position: 205,-53
 <<fade_in_actor "诊室外佩佩" 0.1>>
 <<fade_out 1>>
 <<wait 1>>
+===
+
+
+title: BE
+tags: content
+colorID: 8
+position: 205,-53
+---
 佩佩双手撑在栏杆上，呆呆地望着远方。 #line:09402c5 
 
 <<hide_dialog>>
@@ -219,7 +227,7 @@ peipei: 这是我们的职责。 #line:080c8a0
 
 
 title: 结束
-tags: 
+tags: content
 colorID: 8
 position: 205,-53
 ---
diff --git a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
index a9ce2049b..a4bf144c0 100644
--- a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
+++ b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
@@ -1,7 +1,7 @@
 title: Start
 color: blue
 cluster: Day2_Entry
-tags: demo
+tags: demo start
 position: 1,-422
 ---
 
diff --git a/Assets/Yarn/FP/FP_Peipei2/EventNode.yarn b/Assets/Yarn/FP/FP_Peipei2/EventNode.yarn
index ccafee0dd..aefd35276 100644
--- a/Assets/Yarn/FP/FP_Peipei2/EventNode.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/EventNode.yarn
@@ -1,5 +1,5 @@
-title: 系统发热
-tags: 待编辑
+title: 系统发热
+tags: event
 colorID: 8
 position: 240,-2640
 ---
@@ -7,7 +7,7 @@ position: 240,-2640
 ===
 
 title: 降温成功
-tags: 
+tags: event
 colorID: 6
 position: 1332,-1465
 ---
@@ -21,7 +21,7 @@ position: 1332,-1465
 ===
 
 title: 降温失败
-tags: 
+tags: event
 colorID: 6
 position: 1697,-1468
 ---
@@ -29,7 +29,7 @@ position: 1697,-1468
 ===
 
 title: EmoPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: -2,-3039
 ---
@@ -37,7 +37,7 @@ position: -2,-3039
 ===
 
 title: SpeakPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 240,-2640
 ---
@@ -46,7 +46,7 @@ position: 240,-2640
 ===
 
 title: LogicPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 480,-3040
 ---
@@ -54,7 +54,7 @@ position: 480,-3040
 ===
 
 title: ColorPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 240,-2840
 ---
@@ -62,7 +62,7 @@ position: 240,-2840
 ===
 
 title: MemoryPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 240,-3040
 --- 
@@ -78,7 +78,7 @@ position: 240,-3040
 ===
 
 title: UFPlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 0,-2840
 ---
@@ -90,7 +90,7 @@ position: 0,-2840
 ===
 
 title: EyePlugIn
-tags: 待编辑
+tags: event
 colorID: 8
 position: 480,-2840
 ---
@@ -101,7 +101,7 @@ position: 480,-2840
 ===
 
 title: IntoEyeView
-tags: 
+tags: event
 group:视觉检查
 colorID: 6
 position: 244,271
@@ -116,7 +116,7 @@ position: 244,271
 ===
 
 title: UFDeepIn
-tags:
+tags: event
 ---
 <<if $gameStage=="身体检查">>
     <<jump UF深入失败>>
@@ -128,21 +128,21 @@ tags:
 ===
 
 title: MemoryDeepIn
-tags:
+tags: event
 ---
 <<switch_fix_system_to Memory>>
 <<jump 记忆初始化深度>>
 ===
 
 title: EyeDeepIn
-tags:
+tags: event
 position: -9,21
 ---
 <<switch_fix_system_to Eye>>
 ===
 
 title: 重复看同一个目标
-tags:
+tags: event
 position: -9,21
 ---
 <<jump UF检查_目标重复>>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn
index db53d54a4..cda9777eb 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn
@@ -1,8 +1,18 @@
 title: 进入术前谈话2
-tags: 
+tags: start
 colorID: 3
 position: -545,-709
 ---
+<<fade_in 1>>
+
+//<<clear_tasks>>
+<<hide_actor 佩佩>>
+<<switch_fix_system_to Clinic>>
+// <<init_actor 佩佩>>
+<<change_actor_state 1BrowupUB>>
+// //TODO: <<switch_character_state 默认扬眉闭眼I>>
+// <<show_actor 佩佩>>
+<<fade_out 1>>
 <<jump 谈话>>
 ===
 
@@ -10,6 +20,7 @@ position: -545,-709
 
 
 title: 结束术前谈话2
+tags: end
 position: -268,422
 ---
 <<set $gameStage = "手术">>
@@ -24,16 +35,7 @@ tags:
 colorID: 1
 position: -544,-442
 ---
-<<fade_in 1>>
 
-//<<clear_tasks>>
-<<hide_actor 佩佩>>
-<<switch_fix_system_to Clinic>>
-// <<init_actor 佩佩>>
-//1BrowupUB
-// //TODO: <<switch_character_state 默认扬眉闭眼I>>
-// <<show_actor 佩佩>>
-<<fade_out 1>>
 me: 我不应该提出这个什么“停止想象的”…我早就知道这不会有好结果。 #line:0e06541 
 me: 想象力这种东西……看来不是那么容易被停止的。 #line:05e9941 
 <<hide_dialog>>
@@ -56,16 +58,7 @@ peipei: 我好像在飘一样。 #line:07066a9
 
 <<hide_dialog>>
 
-//TODO:注册为D2S10-1
-//TODO: <<switch_character_state 默认扬眉闭眼>>
-<<wait 1>>
-//TODO: <<switch_character_state 默认闭眼I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼无神I>>
-<<wait 1>>
-//TODO: <<switch_character_state 默认闭眼I>>
-
-//1BlueeyeU
+<<change_actor_state 1BlueeyeU>>
 //TODO: <<switch_character_state 默认蓝眼无神I>>
 //TODO：目前只是蓝眼不是无神
 
@@ -75,20 +68,9 @@ peipei: 发热？为什么？…… #line:053d4f8
 
 <<hide_dialog>>
 <<wait 0.5>>
-//TODO：目前只是蓝眼不是无神
-//TODO:注册为D2S10-2
-//TODO: <<switch_character_state 默认闭眼I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼无神I>>
-<<wait 1.5>>
-//TODO: <<switch_character_state 默认蓝眼A>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼流汗A>>
-<<wait 2.5>>
 
 //TODO：目前只是蓝眼不是无神
-//1SweatBlueblankeyeSmile
-//TODO: <<switch_character_state 默认蓝眼流汗无神微笑>>
+<<change_actor_state 1SweatBlueblankeyeSmile>>
 
 <<wait 0.7>>
 peipei: 我失败了，是吗？ #line:0a04301 
@@ -102,25 +84,22 @@ peipei: 也就是…没有想象力，是么？ #line:0897069
 <<hide_dialog>>
 <<wait 1>>
 me: 嗯。也就是…把色彩从你的记忆里抹掉。 #line:061f820 
-//1B
+<<change_actor_state 1B>>
 //TODO: <<switch_character_state 默认闭眼>>
 peipei: …… #line:0404bf2 
 peipei: 有那么一刻，我以为我真的要离开这里了。 #line:01e065e 
-//1SmileB
+<<change_actor_state 1SmileB>>
 //TODO: <<switch_character_state 默认闭眼微笑>>
 peipei: 哈哈…… #line:0e1fa9a 
 
 <<hide_dialog>>
-//1BlueblankeyeSmile
-//TODO: <<switch_character_state 默认蓝眼无神微笑>>
+<<change_actor_state 1BlueblankeyeSmile>>
 <<wait 2.3>>
-//1BrowupUB
-//TODO: <<switch_character_state 默认扬眉闭眼A>>
+<<change_actor_state 1BrowupUB>>
 <<wait 0.2>>
 
 peipei: 呼…… #line:041679f 
-//2BrowupAB
-//TODO: <<switch_character_state 低头扬眉张嘴闭眼>>
+<<change_actor_state 2BrowupAB>>//TODO: <<switch_character_state 低头扬眉张嘴闭眼>>
 peipei: …… #line:05c6b2a 
 <<hide_dialog>>
 <<wait 1>>
@@ -128,7 +107,7 @@ me: 你怎么了？又感觉不舒服吗？ #line:02ac2a8
 
 <<hide_dialog>>
 <<wait 1>>
-//2SmileB
+<<change_actor_state 2SmileB>>
 //TODO: <<switch_character_state 低头微笑闭眼>>
 <<wait 0.5>>
 
@@ -142,21 +121,13 @@ peipei: 这已经有多久了？ #line:080cf8d
 
 <<hide_dialog>>
 <<wait 1>>
-//2BlueeyeSmile
+<<change_actor_state 2BlueeyeSmile>>
 //TODO: <<switch_character_state 低头蓝眼微笑>>
 <<wait 1.5>>
 
 peipei: 我竟然一直…没有感觉到吗？还是说…<br>已经太久了，我忘记了不痛是什么感觉了？ #line:0a408e5 
 
-//TODO:注册为D2S10-3
-<<hide_dialog>>
-//TODO: <<switch_character_state 低头闭眼微笑>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头蓝眼微笑>>
-<<wait 0.8>>
-//TODO: <<switch_character_state 低头蓝眼>>
-
-//2Bluesideeye
+<<change_actor_state 2Bluesideeye>>
 //TODO: <<switch_character_state 低头蓝眼侧目>>
 <<wait 1>>
 
@@ -164,7 +135,7 @@ peipei: 医生，我是不是…你遇到过最没用的机体？<br>我是不
 <<hide_dialog>>
 <<wait 0.5>>
 me: 我无权评价…佩佩。我只是个医生，是一个按照指令工作的机体。 #line:003d290 
-//2B
+<<change_actor_state 2B>>
 //TODO: <<switch_character_state 低头闭眼>>
 me: 但是…这不是你的错。 #line:0c1d15f 
 me: 有一些东西出问题了，UF没办法正常工作。这不是你做错了什么，所有机体都会生病。 #line:00c2e54 
@@ -177,28 +148,22 @@ me: 只要你是我的病人，我就要把你治好。这是公司给我的指
 <<hide_dialog>>
 <<wait 1>>
 //TODO：目前只是蓝眼不是无神
-//TODO:注册为D2S10-4
-//TODO: <<switch_character_state 默认微笑闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼无神微笑>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼微笑>>
 
-//1BlueeyeSmile
+<<change_actor_state 1BlueeyeSmile>>
 //TODO: <<switch_character_state 默认微笑闭眼>>
 <<wait 0.9>>
 
 peipei: 医生…… #line:0444567 
 peipei: 我有一个请求。 #line:0d75f0d 
 me: 什么？ #line:0606193 
-//1SmileB
-//TODO: <<switch_character_state 默认微笑闭眼>>
+<<change_actor_state 1SmileB>>
+
 peipei: 你说过，UF里面有我的色彩晶圆，对吧？ #line:02e1a86 
 peipei: 既然已经拆除了UF… #line:0f19759 
 
 <<hide_dialog>>
 <<wait 0.5>>
-//1BlueeyeSmile
+<<change_actor_state 1BlueeyeSmile>>
 //TODO: <<switch_character_state 默认蓝眼微笑>>
 
 peipei: 就请再帮我把我的晶圆装到它原本应该在的地方吧。 #line:06d0be4 
@@ -211,37 +176,37 @@ peipei: 别担心…这只是暂时的，我最后会回来做色彩抹除的。
 me: 也就是说…你想重新装上一段时间色觉晶圆，<br>然后在附近转转，然后回来重新拿下来，<br>抹除记忆色彩，装上UF。对吧？ #line:0672b14 
 me: 你没有打算装上之后就跑掉，然后找个地方躲起来，以为自己真的能逃避公司的惩罚，对吧？ #line:052ed7b 
 <<hide_dialog>>
-//1UB
+<<change_actor_state 1UB>>
 //TODO: <<switch_character_state 默认闭眼I>>
 <<wait 1>>
 peipei: 我只是想重新看看这个世界……就…只是看看。 #line:0bcf0e2 
 peipei: 现在几点了？我能赶上夕阳吗？ #line:06fa4b4 
 <<hide_dialog>>
 <<wait 1>>
-//1BlueeyeSmile
+<<change_actor_state 1BlueeyeSmile>>
 //TODO: <<switch_character_state 默认蓝眼微笑>>
 me: …… #line:0b10ec4 
 peipei: 我不会走远的…… #line:0a9d7a7 
 
 <<hide_dialog>>
 <<wait 1>>
-//1BlueblankeyeSmile
+<<change_actor_state 1BlueblankeyeSmile>>
 //TODO: <<switch_character_state 默认蓝眼无神微笑>>
 <<wait 1.2>>
 
-//1BlueblankeyeE
+<<change_actor_state 1BlueblankeyeE>>
 //TODO: <<switch_character_state 默认蓝眼无神A>>
 
 peipei: 幸福市太小了…你知道我们走不掉。 #line:0c94e8d 
 
-//1BlueblankeyeSmile
+<<change_actor_state 1BlueblankeyeSmile>>
 //TODO: <<switch_character_state 默认蓝眼无神微笑>>
 
 ->CenterOption:建议直接进行色彩抹除 #line:0a4fbc1 
     me: 你不会想这么做的。 #line:0b0c56d 
     me: 况且…你刚刚发生了排异反应，这已经足够让我头疼了…… #line:0a6ed8e 
     me: 我不知道这会不会诱发什么更复杂的问题。 #line:083fa16 
-    //1Blueblankeye
+    <<change_actor_state 1Blueblankeye>>
     //TODO: <<switch_character_state 默认蓝眼无神>>
     me: 你是我的病人，我不能把我的病人置于任何危险之中。 #line:033d698 
     peipei: 对不起…医生。 #line:0851d68 
@@ -249,13 +214,8 @@ peipei: 幸福市太小了…你知道我们走不掉。 #line:0c94e8d
 
     //TODO:注册为D2S10-5
     //TODO：只有蓝色没有无神
-    //TODO: <<switch_character_state 默认闭眼>>
-    <<wait 0.1>>
-    //TODO: <<switch_character_state 默认蓝眼无神>>
-    <<wait 0.7>>
-    //TODO: <<switch_character_state 默认蓝眼无神I>>
 
-    //1B
+    <<change_actor_state 1B>>
     //TODO: <<switch_character_state 默认闭眼>>
     <<wait 0.2>>
     peipei: 但我还是… #line:090f58a 
@@ -275,10 +235,10 @@ position: -265,-201
 ---
 peipei: 医生…… #line:0afcc12 
 <<if $peipeiCry==false>>
-    //1BlueeyeE
+    <<change_actor_state 1BlueeyeE>>
     //TODO: <<switch_character_state 默认蓝眼E>>
 <<else>>
-    //1BlueeyeWeep
+    <<change_actor_state 1BlueeyeWeep>>
     <<wait 1.8>>
 <<endif>>
 peipei: 如果你离开这里…你会去哪里？ #line:097852e 
@@ -288,10 +248,10 @@ me: 我不知道。 #line:06684f6
 me: 我好像…无处可去。 #line:07cdea4 
 <<hide_dialog>>
 <<if $peipeiCry==false>>
-    //1BlueeyeSmile
+    <<change_actor_state 1BlueeyeSmile>>
     //TODO: <<switch_character_state 默认蓝眼微笑>>
 <<else>>
-    //1BlueeyeWeepSmile
+    <<change_actor_state 1BlueeyeWeepSmile>>
     //TODO: <<switch_character_state 默认蓝眼流泪微笑>>
 <<endif>>
 <<wait 0.5>>
@@ -301,10 +261,10 @@ peipei: 我的家在很远很远的南方……<br>但是那个地方已经早
 peipei: 我所拥有的…也就只有那些记忆罢了。<br>我能去的只有幸福市…只有这个罐头厂。 #line:0bda4cb 
 peipei: 所以，我不可能离开的。医生。 #line:0b3e014 
 <<if $peipeiCry==false>>
-    //1B
+    <<change_actor_state 1B>>
     //TODO: <<switch_character_state 默认闭眼>>
 <<else>>
-    //1WeepB
+    <<change_actor_state 1WeepB>>
     //TODO: <<switch_character_state 默认流泪闭眼>>
 <<endif>>
 peipei: 求求你了，帮我把晶圆装上去吧。 #line:04fd046 
@@ -314,30 +274,26 @@ me: 如果我的患者要变成那个样子了…我想它应该也至少享有
 me: 再说了，这是你自己的选择…… #line:058d556 
 <<hide_dialog>>
 <<wait 1>>
-<<if $peipeiCry==false>>
-    //TODO:注册为D2S10-6
-    //TODO: <<switch_character_state 默认闭眼>>
-    <<wait 0.1>>
-    //TODO: <<switch_character_state 默认微笑闭眼>>
-    <<wait 0.1>>
-    //TODO: <<switch_character_state 默认蓝眼无神微笑>>
-    //TODO: <<switch_character_state 默认流泪闭眼>>
+// <<if $peipeiCry==false>>
+//     //TODO:注册为D2S10-6
+//     //TODO: <<switch_character_state 默认闭眼>>
+//     <<wait 0.1>>
+//     //TODO: <<switch_character_state 默认微笑闭眼>>
+//     <<wait 0.1>>
+//     //TODO: <<switch_character_state 默认蓝眼无神微笑>>
+//     //TODO: <<switch_character_state 默认流泪闭眼>>
 
-<<endif>>
-//TODO:注册为D2S10-7
-//TODO: <<switch_character_state 默认微笑流泪闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼流泪无神微笑>>
+// <<endif>>
 
 
-//1BlueeyeWeepSmile
+<<change_actor_state 1BlueeyeWeepSmile>>
 //TODO: <<switch_character_state 默认蓝眼流泪无神E>>
 
 peipei: 太好了！谢谢你！ #line:037c7c1 
 peipei: 谢谢你，谢谢你……医生！ #line:0cf6f92 
 me: …… #line:0813d06 
 me: 我们去治疗室吧。 #line:0d7c713 
-//1WeepSmileB
+<<change_actor_state 1WeepSmileB>>
 //TODO: <<switch_character_state 默认蓝眼流泪无神微笑>>
 <<set $global_isPeipeiBE=false>>
 // <<switch_fix_system_to BodyModule>>
@@ -361,10 +317,10 @@ position: -739,-206
     me: 对不起，这风险太大了…<br>不符合最优化操作指令。 #line:0daba58 
     <<hide_dialog>>
     <<wait 1>>
-    //2B
+    <<change_actor_state 2B>>
     //TODO: <<switch_character_state 低头闭眼>>
     <<wait 2>>
-    //2WeepB
+    <<change_actor_state 2WeepB>>
     //TODO: <<switch_character_state 低头流泪闭眼>>
     <<set $peipeiCry=true>>
     <<wait 1>>
@@ -373,7 +329,7 @@ position: -739,-206
     peipei: 我不要那样… #line:01ae3d1 
     <<hide_dialog>>
     <<wait 1>>
-    //2BlueeyeWeepA
+    <<change_actor_state 2BlueeyeWeepA>>
     //TODO: <<switch_character_state 低头蓝眼流泪张嘴>>
     <<wait 1>>
     peipei: 我不要忘掉那些色彩…… #line:088343e 
@@ -412,7 +368,7 @@ position: -733,301
 me: 佩佩，你是我的患者…<br>我必须要对我的患者负责任。 #line:06abc3e 
 <<hide_dialog>>
 <<wait 2>>
-//2WeepAB
+<<change_actor_state 2WeepAB>>
 //TODO: <<switch_character_state 低头流泪张嘴闭眼>>
 <<wait 1>>
 me: 而且…你知道你逃不掉的，对吧？ #line:02a0526 
@@ -429,23 +385,15 @@ me: 那很危险，我不能将你置于危险之中。 #line:085eee8
 peipei:……… #line:08c24ef 
 <<hide_dialog>>
 <<wait 2>>
-//TODO:注册为D2S10-8
-//TODO: <<switch_character_state 低头蓝眼流泪>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头流泪闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头蓝眼流泪>>
-<<wait 1>>
-//TODO: <<switch_character_state 低头蓝眼侧目流泪>>
 
-//2BluesideeyeWeepA
+<<change_actor_state 2BluesideeyeWeepA>>
 //TODO: <<switch_character_state 低头蓝眼侧目流泪张嘴>>
 peipei: 我会记得我曾经有过那些彩色的记忆吗？ #line:06061a8 
 me: 你只会记得你曾经有一些记忆… #line:0e756f6 
 me: 但不再记得它们是什么了。 #line:0fce558 
 me: 就像梦一样。 #line:0571d47 
 peipei: 就像梦一样… #line:0949ad0 
-//1WeepB
+<<change_actor_state 1WeepB>>
 //TODO: <<switch_character_state 低头流泪闭眼>>
 peipei: 医生…… #line:0db0142 
 peipei: 请把它们清除得干净一些。                  #line:04d55a7 
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage11_手术.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage11_手术.yarn
index bf5ee85b3..4be8982bc 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage11_手术.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage11_手术.yarn
@@ -1,5 +1,5 @@
 title: 进入手术
-tags: 
+tags: start
 colorID: 3
 position: 246,-866
 ---
@@ -33,7 +33,7 @@ position: 246,-866
 ===
 
 title: 记忆初始化深度
-tags: 
+tags: content no_save
 colorID: 1
 position: 33,-552
 ---
@@ -104,7 +104,7 @@ position: 33,-552
 ===
 
 title: 进行色彩回复后插入视觉
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 395,-3195
@@ -131,7 +131,7 @@ EyeModule: 已与视觉模块建立连接！ #line:0f3996e
 ===
 
 title: 色彩校准测试
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 395,-3195
@@ -144,7 +144,7 @@ position: 395,-3195
 ===
 
 title: 选择记忆清除后插记忆模块的对话
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 395,-3195
@@ -178,7 +178,7 @@ me: …… #line:0218d93
 ===
 
 title: 选择给色彩晶圆后插记忆模块的对话
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 395,-3195
@@ -200,7 +200,7 @@ MemModule: 未检测到可查看的记忆卡带。 #line:00d2cb0
 ===
 
 title: RecoverColor
-tags: 
+tags: content no_save
 colorID: 8
 position: 481,-570
 ---
@@ -240,6 +240,7 @@ me: 好了，佩佩。 #line:06dd1eb
 ===
 
 title: 结束手术
+tags: end
 position: 275,-222
 ---
 <<set $gameStage = "结束对话">>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn
index ff9916647..79f824602 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn
@@ -20,16 +20,16 @@ position: 275,-222
 ---
 <<set_music_param music peipeiEmo 0>>
 // <<init_actor 佩佩>>
-//1Blankeye
+<<change_actor_state 1Blankeye>>
 //TODO: <<switch_character_state 默认闭眼>>
 // <<show_actor 佩佩>>
 <<fade_out 1>>
 <<wait 1>>
-//1Blankeye
+<<change_actor_state 1Blankeye>>
 //TODO: <<switch_character_state 默认无神>>
 <<wait 1>>
 
-//1BlankeyeSmile
+<<change_actor_state 1BlankeyeSmile>>
 //TODO: <<switch_character_state 默认无神微笑>>
 peipei: …我这是怎么了？<br>明明早就已经看不见了。 #line:08da87a 
 <<hide_dialog>>
@@ -37,17 +37,17 @@ peipei: …我这是怎么了？<br>明明早就已经看不见了。 #line:08da
 peipei: 怎么还这么优柔寡断的。 #line:0e9a491 
 <<hide_dialog>>
 <<wait 1>>
-//1BrowupSmileB
+<<change_actor_state 1BrowupSmileB>>
 //TODO: <<switch_character_state 默认扬眉微笑闭眼>>
 <<wait 1.5>>
 
-//1BrowupBlankeyeE
+<<change_actor_state 1BrowupBlankeyeE>>
 //TODO: <<switch_character_state 默认扬眉无神E>>
 peipei: 像一场梦一样。 #line:0961262 
 <<hide_dialog>>
 <<wait 1>>
 me: 眼睛还会痛吗？ #line:0657e0f 
-//1BrowupBlankeyeSmile
+<<change_actor_state 1BrowupBlankeyeSmile>>
 //TODO: <<switch_character_state 默认扬眉无神微笑>>
 peipei: 不痛了。脑袋还有点晕，但我想应该是正常的，对吧？ #line:0b2e3d4 
 me: 记忆经过这么大程度的修改…<br>是的，感觉晕眩是正常的。很快就会恢复。 #line:0093ff3 
@@ -61,7 +61,7 @@ me: 你还能…感受到那个念头吗？<br>那个…念头。 #line:0baf4ab
 //TODO: <<switch_character_state 默认无神微笑>>
 
 
-//1PBlankeyeSmile
+<<change_actor_state 1PBlankeyeSmile>>
 //TODO: <<switch_character_state 画画无神微笑>>
 
 peipei:来吧，医生，我们测一下。<br>罐头广告？美人鱼…？ #line:0be0ca8 
@@ -70,7 +70,7 @@ pp: 我真蠢啊。 #line:0fd82b8
 
 <<hide_dialog>>
 <<wait 1>>
-//1PB
+<<change_actor_state 1PB>>
 //TODO: <<switch_character_state 画画闭眼>>
 <<wait 3>>
 <<show_obj 美人鱼正确>>
@@ -82,13 +82,13 @@ me: 正确…算是吧。 #line:03c7a69
 peipei: 很好。 #line:058a645 
 <<wait 1>>
 <<hide_obj>>
-//1BrowupB
+<<change_actor_state 1BrowupB>>
 //TODO: <<switch_character_state 默认扬眉无神闭眼>>
 peipei: 好…还有很多事情等着我去做。 #line:013285e 
 
 <<hide_dialog>>
 <<wait 2>>
-//1BlankeyeSmile
+<<change_actor_state 1BlankeyeSmile>>
 //TODO: <<switch_character_state 默认扬眉无神微笑>>
 <<wait 1>>
 
@@ -115,19 +115,13 @@ position: 275,-222
 ---
 <<hide_dialog>>
 // <<init_character "佩佩最新">>
-//1B
+<<change_actor_state 1B>>
 // //TODO: <<switch_character_state 默认闭眼>>
 // <<show_character>>
 <<fade_out 1>>
 <<wait 1>>
-//TODO:注册为D2S12-H1
-//TODO: <<switch_character_state 默认蓝眼无神>>
-<<wait 1.4>>
-//TODO: <<switch_character_state 默认蓝眼无神I>>
-<<wait 0.6>>
-//TODO: <<switch_character_state 默认闭眼I>>
 
-//1BrowupBlueeyeI
+<<change_actor_state 1BrowupBlueeyeI>>
 //TODO: <<switch_character_state 默认蓝眼扬眉I>>
 <<wait 1>>
 peipei: 好美。 #line:00b9359 
@@ -135,12 +129,8 @@ me: 是吧。<br>…好好看看吧。 #line:09f8ed2
 
 <<hide_dialog>>
 <<wait 1>>
-//TODO:注册为D2S12-H2
-//TODO: <<switch_character_state 默认扬眉闭眼I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认蓝眼扬眉I>>
 
-//1BrowupBlueeye
+<<change_actor_state 1BrowupBlueeye>>
 //TODO: <<switch_character_state 默认蓝眼扬眉>>
 <<wait 1>>
 
@@ -149,10 +139,10 @@ me: 我的？我的眼睛？…有…什么好看的… #line:05e5e20
 
 <<hide_dialog>>
 <<wait 1>>
-//1B
+<<change_actor_state 1B>>
 //TODO: <<switch_character_state 默认闭眼>>
 <<wait 0.1>>
-//1BlueblankeyeSmile
+<<change_actor_state 1BlueblankeyeSmile>>
 //TODO: <<switch_character_state 默认蓝眼无神微笑>>
 <<wait 1>>
 
@@ -166,7 +156,7 @@ me: 好了…别看我的眼睛了。<br>你不是说要赶上夕阳么？ #line
 
 <<hide_dialog>>
 <<wait 0.5>>
-//1BlueeyeE
+<<change_actor_state 1BlueeyeE>>
 //TODO: <<switch_character_state 默认蓝眼E>>
 <<wait 0.5>>
 
@@ -199,6 +189,7 @@ me: 一下子就跑掉了… #line:0abfb5c
 
 
 title: 结束结束对话
+tags: end
 position: 275,-222
 ---
 <<hide_dialog>>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage1_佩佩开场对话.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage1_佩佩开场对话.yarn
index 148a001fd..7a6927fa5 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage1_佩佩开场对话.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage1_佩佩开场对话.yarn
@@ -1,19 +1,22 @@
-title: 进入佩佩开场对话
-tags: 
+title: 进入佩佩开场
+tags: start
 colorID: 8
 position: 272,-1156
 ---
-
-
-// <<init_actor 佩佩>>
-// <<jump 色彩校准测试>>
 <<time_flows_on day day>> 
-<<init_actor 佩佩>>
-<<change_actor_state 2Pouting>>
-//TODO: <<switch_character_state 背手黑线张嘴闭眼>>
-//2HBlacklineCloseeyeAB
+<<init_actor 佩佩 "clinic" "FrameAnimation">>
+<<change_actor_state 2HBlacklineCloseeyeAB>>
 <<fade_out 1>>
-// <<indoor_new 1>>
+<<jump 进入佩佩开场对话>>
+===
+
+
+
+title: 进入佩佩开场对话
+tags: content
+colorID: 8
+position: 272,-1156
+---
 peipei: 医生… #line:05b09aa 
 me: …佩佩？ #line:0429100 
 peipei: 我搞砸了…我搞砸了。 #line:0f06882 
@@ -38,86 +41,35 @@ peipei: 第二天早上一觉起来，它就又开始变得不正常了。 #line
 
 <<hide_dialog>>
 <<wait 1>>
-//TODO:注册为D2S1-1
-//TODO: <<switch_character_state 低头闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉流汗难受>>
-<<wait 1>>
-//1FrownSweatBlankeye
+<<change_actor_state 1FrownSweatBlankeye>>
 peipei: 啊…#auto_next #line:0b982b2 
-//TODO:注册为D2S1-2
-//TODO: <<switch_character_state 默认皱眉流泪流汗闭眼I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉流泪流汗难受>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉流泪流汗难受I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉流泪流汗闭眼I>>
-<<wait 0.2>>
 peipei: 头……好痛！又开始了… #line:058cdc3 
 <<hide_dialog>>
-//TODO: <<switch_character_state 默认皱眉流泪流汗闭眼I>>
-//1FrownWeepIB
+<<change_actor_state 1FrownWeepIB>>
 peipei: 一开始还只是不太灵敏了，画的内容不太准确…… #line:07bdc09 
 peipei: 然后它就变得越来越怪了，一张比一张怪。 #line:0a1eed1 
-//TODO: <<switch_character_state 低头黑线流泪张嘴闭眼>>
-//2BlacklineWeepAB
+<<change_actor_state 2BlacklineWeepAB>>
 peipei: …这头怎么…痛得停不下来… #line:05019b2 
 
 <<hide_dialog>>
-<<wait 1.2>>
-//TODO:注册为D2S1-3
-//TODO: <<switch_character_state 背手黑线流泪>>
-<<wait 1>>
-//TODO: <<switch_character_state 背手黑线侧目张嘴流泪>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 背手黑线闭眼张嘴流泪>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 背手黑线侧目张嘴流泪>>
-<<wait 0.8>>
-//TODO: <<switch_character_state 背手黑线闭眼张嘴流泪>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 背手黑线侧目张嘴流泪>>
-peipei: 我是不是…修不好了？我是不是要死了？ #line:0da1c4f 
-//TODO: <<switch_character_state 背手黑线闭眼张嘴流泪>>
-<<wait 0.1>>
-//2BlacklineSideeyeWeepA
-//TODO: <<switch_character_state 背手黑线侧目张嘴流泪>>
+<<change_actor_state 2BlacklineSideeyeWeepA>>
 peipei: 一切都太突然了。我的工作死线就要到了，我还不能死…… #line:0ea6e88 
 me: 头痛？听起来很严重…最好现在就检查一下。 #line:08ce8c3 
-//TODO: <<switch_character_state 背手黑线张嘴流泪闭眼>>
-//2BlacklineWeepAB
+<<change_actor_state 2BlacklineWeepAB>>
 peipei: 不…医生！来不及了，先别管什么头痛了，你要先修好我的UF…… #line:0f7937b 
 
 <<hide_dialog>>
-<<wait 1>>
-//TODO:注册为D2S1-4
-//TODO: <<switch_character_state 低头黑线流泪闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认皱眉流泪流汗闭眼>>
-<<wait 0.5>>
-//TODO: <<switch_character_state 默认流泪流汗难受>>
-<<wait 1>>
-//TODO: <<switch_character_state 画画流泪流汗难受>>
-<<wait 0.2>>
-//1PLowbrowWeepBlankeyeI
-//TODO: <<switch_character_state 画画流泪流汗难受I>>
-
+<<change_actor_state 1PLowbrowWeepBlankeyeI>>
 peipei: …你看这个。 #line:03b43d0 
 
 <<hide_dialog>>
-//1PLowbrowWeepBlankeye
-//TODO: <<switch_character_state 画画流泪流汗难受>>
+<<change_actor_state 1PLowbrowWeepBlankeye>>
 <<wait 1>>
-//1PLowbrowWeepBlankeyeB
-//TODO: <<switch_character_state 画画流泪流汗闭眼>>
+<<change_actor_state 1PLowbrowWeepBlankeyeB>>
 <<wait 2>>
 <<show_obj "佩佩day2UF之一">>
 <<wait 1>>
-//3
-//TODO: <<switch_character_state 头痛>>
+<<change_actor_state "3">>
 me: 这是… #line:09198f9 
 peipei: 嘶…还记得昨天你让我画的图吗？ #line:06f0869 
 me: 这还是那个罐头广告的广告么…<br>可是这个大象是…？<br>罐头又… #line:0215b98 
@@ -127,29 +79,23 @@ peipei: 根本没有罐头！对吧？ #line:0d6e6d2
 <<wait 1>>
 
 me: UF…又出新的问题了？ #line:073069b 
-//1WeepBlankeye
-//TODO: <<switch_character_state 默认流泪流汗难受>>
+<<change_actor_state 1WeepBlankeye>>
 peipei: 何止是新的…你再看这个！ #line:05a7164 
 
 <<hide_dialog>>
 <<hide_obj>>
-//1PWeepBlankeye
-//TODO: <<switch_character_state 画画流泪流汗难受>>
+<<change_actor_state 1PWeepBlankeye>>
 <<wait 1>>
-//1PFrownWeepB
-//TODO: <<switch_character_state 画画皱眉流泪流汗闭眼>>
+<<change_actor_state 1PFrownWeepB>>
 peipei: 好痛…好痛……#auto_next #line:0322994 
 
-//1PWeepB
-//TODO: <<switch_character_state 画画流泪流汗闭眼>>
+<<change_actor_state 1PWeepB>>
 <<wait 2>>
 <<show_obj "佩佩day2UF之二">>
-//3
-//TODO: <<switch_character_state 头痛>>
+<<change_actor_state "3">>
 <<wait 1>>
 me: 这又是…<br>你自己么？ #line:004d2d3 
-//1WeepBlankeye
-//TODO: <<switch_character_state 默认流泪流汗难受A>>
+<<change_actor_state 1WeepBlankeye>>
 peipei: 不是我把自己…不是我，是UF！<br>医生，你忘了吗？ #line:058e910 
 
 <<hide_dialog>>
@@ -157,25 +103,20 @@ peipei: 不是我把自己…不是我，是UF！<br>医生，你忘了吗？ #l
 
 me: 我明白，你别着急。 #line:0d417da 
 me: 我需要弄清楚UF为什么会把你…#auto_next #line:020ef5d 
-//1PWeepBlankeye
-//TODO: <<switch_character_state 画画流泪流汗难受>>
+<<change_actor_state 1PWeepBlankeye>>
 peipei: 再看这个！医生…… #line:02b32bb 
 
 <<hide_dialog>>
-//1PFrownWeepB
-//TODO: <<switch_character_state 画画皱眉流泪流汗闭眼>>
+<<change_actor_state 1PFrownWeepB>>
 <<wait 0.1>>
-//1PFrownWeepHalfeye
-//TODO: <<switch_character_state 画画皱眉流泪流汗垂眼>>
+<<change_actor_state 1PFrownWeepHalfeye>>
 <<wait 1>>
 peipei: 这真是…痛得快睁不开眼睛了…#auto_next #line:0db3ac6 
-//1PFrownWeepIB
-//TODO: <<switch_character_state 画画皱眉流泪大汗淋漓闭眼I>>
+<<change_actor_state 1PFrownWeepIB>>
 <<wait 2>>
 <<show_obj "佩佩day2UF之三">>
 <<hide_dialog>>
-//3Weep
-//TODO: <<switch_character_state 头痛>>
+<<change_actor_state "3Weep">>
 <<wait 1>>
 
 me: … #line:09e7196 
@@ -183,33 +124,16 @@ me: 这次看起来不只是“颜色错误”了……<br>我先收录下来。
 me: …你刚才说的痛是哪里痛？眼睛吗？ #line:0b37714 
 peipei: 别管什么痛了！ #line:051d56c 
 
-//2BlacklineSideeyeWeepA
-//TODO: <<switch_character_state 低头黑线侧目张嘴流泪>>
+<<change_actor_state 2BlacklineSideeyeWeepA>>
 <<hide_obj>>
 <<hide_dialog>>
-<<wait 1.7>>
-
-//TODO:注册为D2S1-5
-//TODO: <<switch_character_state 低头黑线张嘴流泪>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头黑线张嘴流泪闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头黑线张嘴流泪>>
-<<wait 1.3>>
-//TODO: <<switch_character_state 低头黑线侧目张嘴流泪>>
-<<wait 0.2>>
-//TODO: <<switch_character_state 低头黑线张嘴流泪闭眼>>
-<<wait 0.1>>
-//2BlacklineSideeyeWeepA
-//TODO: <<switch_character_state 低头黑线侧目张嘴流泪>>
-<<wait 1.3>>
+<<change_actor_state 2BlacklineSideeyeWeepA>>
 
 peipei: 医生…求求你，我不能没有UF……我必须修好它。 #line:061a35f 
 me: 好吧…无论如何，先到治疗室来吧。 #line:0d21450 
 
 <<hide_dialog>>
-//2BlacklineWeepAB
-//TODO: <<switch_character_state 低头黑线张嘴流泪闭眼>>
+<<change_actor_state 2BlacklineWeepAB>>
 
 <<jump 结束引入对话>>
 ===
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage2_第一次发热.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage2_第一次发热.yarn
index e40b43a9b..124e902b5 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage2_第一次发热.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage2_第一次发热.yarn
@@ -1,5 +1,5 @@
 title: 进入第一次发热
-tags: 
+tags: start
 colorID: 3
 position: 322,-1030
 ---
@@ -12,11 +12,11 @@ position: 322,-1030
 Task: 检查UF模块 #line:06d0c20 
 <<fade_out 1>>
 <<show_task_panel>>
-
 ===
   
 
 title: 结束第一次发热
+tags: end
 position: 304,-368
 ---
 <<set $gameStage = "身体检查">>
@@ -24,7 +24,7 @@ position: 304,-368
 ===
 
 title: 系统发热对话
-tags: 
+tags: content
 colorID: 8
 position: -32,-873
 ---
@@ -52,7 +52,7 @@ Error: 当前温度：83.3℃，请恢复至工作温度…… #line:0f2f946
 ===
 
 title: 第一次降温
-tags: 
+tags: content
 colorID: 8
 position: -29,-688
 ---
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage3_身体检查.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage3_身体检查.yarn
index f43a89661..bff081d36 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage3_身体检查.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage3_身体检查.yarn
@@ -1,5 +1,5 @@
 title: 进入身体检查
-tags: 
+tags: start
 colorID: 8
 position: -445,-3182
 ---
@@ -8,6 +8,7 @@ me: 发热的源头就是这个UF模块…<br>很有可能就是它出问题了
 ===
 
 title: 身体检查状态
+tags: content no_save
 position: -464,-2375
 ---
 //退出状态条件
@@ -17,6 +18,7 @@ position: -464,-2375
 ===
 
 title: 结束身体检查
+tags: end
 position: -492,-2056
 ---
 <<set $gameStage = "UF拆壳">>
@@ -37,7 +39,7 @@ position: -492,-2056
 // ===
 
 title: 检查情绪
-tags: 待编辑
+tags: content
 colorID: 8
 group:插线检查
 position: -87,-3394
@@ -77,7 +79,7 @@ EmoModule: 已与情绪模块建立连接！ #line:043977a
 ===
 
 title: 检查语言
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 154,-3032
@@ -116,7 +118,7 @@ SpeakerModule: 已与表达模块建立连接！ #line:08e4ff7
 ===
 
 title: 检查逻辑
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 388,-3398
@@ -161,7 +163,7 @@ LogicModule: 已与逻辑处理模块建立连接！ #line:0c7c186
 ===
 
 title: 检查色觉
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 155,-3195
@@ -195,7 +197,7 @@ ChipModule: 已与附加模块建立连接！ #line:0e44178
 ===
 
 title: 检查记忆
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 155,-3395
@@ -232,7 +234,7 @@ MemModule: 未检测到可查看的记忆卡带。 #line:0cba6c7
 ===
 
 title: 检查UF_不可检查
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: -79,-3186
@@ -270,7 +272,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ #line:039f0cf
 ===
 
 title: 检查视觉
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 395,-3195
@@ -314,6 +316,7 @@ EyeModule: 已与视觉模块建立连接！ #line:0a489b0
 ===
 
 title: 第二次发热前对话
+tags: content no_save
 position: 129,-2381
 ---
 <<jump 第二次发热>>
@@ -332,12 +335,14 @@ position: 129,-2381
 // <<hide_dialog>>
 ===
 title: 屏幕结束
+tags: content no_save
 position: -76,-2841
 ---
 <<clear_screen>>
 ===
 
 title: 第二次发热
+tags: content
 position: 135,-2155
 ---
 // <<wait 0.1>>
@@ -358,7 +363,7 @@ me: 再坚持一下…佩佩。 #line:01a4f28
 ===
 
 title: 第二次降温
-tags: 
+tags: content
 colorID: 8
 position: 114,-2653
 ---
@@ -371,7 +376,7 @@ me: 发热的症状正在逐渐加重…下次可能不会这么容易了。 #li
 ===
 
 title: UF深入失败
-tags: 
+tags: content no_save
 colorID: 8
 position: -478,-2694
 ---
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage4_UF拆壳.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage4_UF拆壳.yarn
index c95bab73c..577e06fa7 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage4_UF拆壳.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage4_UF拆壳.yarn
@@ -1,5 +1,5 @@
 title: 进入UF拆壳
-tags:
+tags: content
 position: 43,-97
 ---
 <<hide_dialog>>
@@ -41,7 +41,9 @@ Task: 拆开UF #line:0ef5998
         <<return_init_camera>>
         <<jump 结束UF拆壳>>
 ===
+
 title: 结束UF拆壳
+tags: end
 position: 275,-222
 ---
 <<set $gameStage = "UF检查">>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn
index 25a68113c..2132e5b4f 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn
@@ -1,5 +1,5 @@
 title: 进入UF检查
-tags:
+tags: start
 position: 43,-97
 ---
 <<declare $UFCount = 0>>
@@ -14,6 +14,7 @@ me: 好…现在应该可以通过插线访问UF了。 #line:0509a25
 ===
 
 title: 结束UF检查
+tags: end
 position: 275,-222
 ---
 <<set $gameStage = "分析">>
@@ -21,7 +22,7 @@ position: 275,-222
 ===
 
 title: 检查UF_拆除安保
-tags: 待编辑
+tags: content no_save
 colorID: 8
 group:插线检查
 position: -85,-3195
@@ -46,6 +47,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ #line:0873625
 ===
 
 title: 第一次进入UF检查
+tags: content no_save
 position: 275,-222
 ---
 <<clear_screen>>
@@ -58,6 +60,7 @@ me: 哈！总算……让我看看这里边到底有啥东西吧。 #line:0c55bb
 ===
 
 title: UF检查_目标重复
+tags: content no_save
 position: 275,-222
 ---
 me: 刚才已经试过这个了…这次选一个不同的目标吧。 #line:0196667 
@@ -65,7 +68,7 @@ me: 刚才已经试过这个了…这次选一个不同的目标吧。 #line:019
 ===
 
 title: UFCheck
-tags:  
+tags: content no_save
 colorID: 3
 group:视觉检查
 position: -2052,-2351
@@ -275,7 +278,7 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目
 ===
 
 title: UFCheckEnd
-tags:  
+tags: content no_save
 colorID: 3
 group:视觉检查
 position: -2052,-2351
@@ -284,7 +287,7 @@ position: -2052,-2351
 ===
 
 title: 退出UF
-tags:  
+tags: content no_save
 colorID: 3
 group:视觉检查
 position: -2052,-2351
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn
index 8aa04fed1..3c1b2d3b1 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn
@@ -103,6 +103,7 @@ peipei: ……<br>为什么…<br>…… #line:0372b04
 
 
 title: 结束分析
+tags: end
 position: 261,-223
 ---
 <<set $gameStage = "术前谈话">>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage7_术前谈话.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage7_术前谈话.yarn
index 958d1afa3..8f579a36d 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage7_术前谈话.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage7_术前谈话.yarn
@@ -1,5 +1,5 @@
 title: 进入术前谈话
-tags: 
+tags: start
 colorID: 3
 position: 251,-1150
 ---
@@ -7,23 +7,18 @@ position: 251,-1150
 <<switch_fix_system_to Clinic>>
 // <<init_actor 佩佩>>
 // <<show_actor 佩佩>>
-//1SweatI
-//TODO:注册为D2S7-1
-//TODO: <<switch_character_state 默认大汗淋漓I>>
+<<change_actor_state 1SweatI>>
 <<fade_out 1>>
-//TODO: <<switch_character_state 默认大汗淋漓闭眼I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认大汗淋漓I>>
-<<wait 0.1>>
-<<hide_dialog>>
-//TODO: <<switch_character_state 默认大汗淋漓>>
-<<wait 1>>
-//TODO: <<switch_character_state 默认大汗淋漓闭眼I>>
-<<wait 0.1>>
-//1SweatI
-//TODO: <<switch_character_state 默认大汗淋漓I>>
-<<wait 0.8>>
+<<change_actor_state 1SweatI>>
 //似乎这里应该有两个情绪点：一个是得知问题所在，一个是得知该怎么办——以及底下还有一个停止想象（停止想象也许可以缩短一些？）——跑跑看会不会长了
+<<jump 术前谈话_1>>
+===
+
+
+title: 术前谈话_1
+tags: content
+position: 251,-1150
+---
 peipei: 医生…<br>为什么你总是提出这么残忍的方案？ #line:0844ca3 
 <<hide_dialog>>
 <<wait 1>>
@@ -34,19 +29,16 @@ me: 只有这样，才能中止UF的排异反应，<br>结束发热和头痛，
 
 <<hide_dialog>>
 <<wait 1>>
-//2BlacklineSweat
-//TODO: <<switch_character_state 低头黑线>>
+<<change_actor_state 2BlacklineSweat>>
 <<wait 1>>
 
 peipei: 排异反应…？ #line:04c5399 
 me: 你身上的一些模块是来自于你自己的，而一些模块是被塞进来的，比如你的UF。 #line:059a020 
 me: 成因很复杂，我们还不知道是为什么。 #line:0bc5eb3 
 me: 总之…出于某些原因，你身体里的“原型”可能不太喜欢这些新来的模块。 #line:0f69a12 
-//2BlacklineSweatB
-//TODO: <<switch_character_state 低头闭眼>>
+<<change_actor_state 2BlacklineSweatB>>
 <<wait 0.1>>
-//2SweatSideeyeA
-//TODO: <<switch_character_state 低头侧目张嘴>>
+<<change_actor_state 2SweatSideeyeA>>
 peipei: 又是原型？ #line:088c92a 
 me: 是的…原型。 #line:087f051 
 <<wait 1>>
@@ -62,68 +54,42 @@ me: 这也就是为什么…你始终有那个念头。想要去“看见”的
 
 <<hide_dialog>>
 <<wait 1>>
-//TODO:注册为D2S7-2
-//TODO: <<switch_character_state 默认流汗无神>>
-<<wait 0.5>>
-//TODO: <<switch_character_state 默认流汗闭眼I>>
-<<wait 0.1>>
-//1SweatI
-//TODO: <<switch_character_state 默认流汗I>>
-<<wait 0.5>>
+<<change_actor_state 1SweatI>>
 
 peipei: 所以…这个“原型”…<br>我脑袋里听到的那个声音…也就是…<br>…我。 #line:02bd758 
 <<hide_dialog>>
 <<wait 1>>
-//1Sweat
-//TODO: <<switch_character_state 默认流汗>>
+<<change_actor_state 1Sweat>>
 peipei: 那么是不是…只要我能…只要这个“原型”能看见色彩…… #line:0d553cf 
 me: …也就不会有到处乱跑的想象力了…… #line:07c095f 
 
 <<hide_dialog>>
-<<wait 0.5>>
-//TODO:注册为D2S7-3
-//TODO: <<switch_character_state 默认流汗闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认流汗>>
-<<wait 0.5>>
-//TODO: <<switch_character_state 默认流汗微笑>>
-<<wait 0.1>>
-//1SweatLaugh
-//TODO: <<switch_character_state 默认流汗E>>
+<<change_actor_state 1SweatLaugh>>
 <<wait 1>>
 peipei: 对吧？ #line:0c3ffa2 
 peipei: 医生？对吧…？ #line:06e238e 
 
 <<hide_dialog>>
-//1SweatSmile
-//TODO: <<switch_character_state 默认流汗微笑>>
+<<change_actor_state 1SweatSmile>>
 <<wait 2.5>>
 
 me: 可是…你只有一个色彩晶圆。要么给你自己的眼睛用…要么给UF用。 #line:068dd1e 
-//1SweatR
+<<change_actor_state 1SweatR>>
 <<wait 0.3>>
 peipei: 难道…就没有办法弄到额外的色彩晶圆吗？ #line:085a1b8 
 me: 对不起，色彩晶圆是无法量产的……每个机体都只有一个。 #line:0362191 
 <<hide_dialog>>
 <<wait 1>>
-//TODO:注册为D2S7-4
-//TODO: <<switch_character_state 默认流汗I>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 默认流汗A>>
-
-
-//1SweatI
-//TODO: <<switch_character_state 默认流汗I>>
+<<change_actor_state 1SweatI>>
 <<wait 1>>
 me: 嗯…不行。<br>还是只有色彩记忆抹除。对不起。 #line:0bd043d 
-//1SweatB
-//TODO: <<switch_character_state 默认流汗闭眼>>
+<<change_actor_state 1SweatB>>
 <<hide_dialog>>
 <<complete_task "line:0e94a4a">>
 
 <<hide_dialog>>
 <<wait 1>>
-//1SweatBlankeye
+<<change_actor_state 1SweatBlankeye>>
 <<wait 0.5>>
 peipei: 我还以为…只要我能把想象的画面给UF，它就能把我想象的也画出来……又快又好。 #line:0d06cd0 
 me: 你理解错了。它不能理解你的想象力……也不允许理解你的想象力。 #line:00a8d00 
@@ -140,39 +106,17 @@ me: 它只把你当作异类。…尽管它在你的身体里面。 #line:0ceadc
 //也许试试不要这段↑
 
 <<hide_dialog>>
-//TODO:注册为D2S7-5
-<<wait 1.2>>
-//TODO: <<switch_character_state 低头黑线闭眼>>
-<<wait 0.2>>
-//TODO: <<switch_character_state 低头黑线>>
-<<wait 1>>
-//TODO: <<switch_character_state 低头黑线微笑>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头黑线微笑闭眼>>
 
-//2BlacklineSmile
-//TODO: <<switch_character_state 低头黑线微笑>>
-<<wait 0.5>>
+<<change_actor_state 2BlacklineSmile>>
 
 peipei: 医生……你知道被回收的机体最后都去哪儿了吗？ #line:0302afd 
-//TODO:注册为D2S7-6
-//TODO: <<switch_character_state 低头黑线微笑闭眼>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头黑线微笑>>
-<<wait 0.1>>
-//TODO: <<switch_character_state 低头黑线微笑闭眼>>
-
-//2BlacklineSmile
-//TODO: <<switch_character_state 低头黑线微笑>>
+<<change_actor_state 2BlacklineSmile>>
 me: 老实说，我不知道。它们…最后都没有回来。我不想去想这个问题。 #line:08e0979 
 peipei: 我开始想，或许这样的生活…也并不值得再继续下去了。 #line:099ac43 
-//2BlacklineSmile
-//TODO: <<switch_character_state 低头黑线微笑闭眼>>
-<<wait 0.5>>
+<<change_actor_state 2BlacklineSmile>>
 peipei: 也许不再回来也挺好的，我想我根本就不适合在这儿。 #line:0e0d945 
 me: 你应该知道这是什么意思。 #line:027d596 
-//2BlacklineSmileB
-//TODO: <<switch_character_state 低头黑线微笑闭眼>>
+<<change_actor_state 2BlacklineSmileB>>
 peipei: 我知道这是什么意思。 #line:01692d8 
 me: …… #line:08403a0 
 
@@ -181,8 +125,7 @@ me: …… #line:08403a0
 
 me: 你刚刚说的…让我在想，也许还有另一种办法…… #line:0856470 
 me: 停止想象。让那个“声音”不要再想象画面，你的UF也应该能恢复正常。 #line:0ce8234 
-//2SideeyeA
-//TODO: <<switch_character_state 低头侧目张嘴>>
+<<change_actor_state 2SideeyeA>>
 peipei: 停止…想象？我不明白。怎么做到？ #line:03d760c 
 me: 你是怎么把那些颜色和图像…调用出来的呢？ #line:04df8f5 
 peipei: 调用出来？我不明白…… #line:0e314d4 
@@ -191,8 +134,7 @@ me: 好吧…*想象*。我不知道你具体是怎么做到的，但是就像
 
 <<hide_dialog>>
 <<wait 1>>
-//1SweatBlankeyeI
-//TODO: <<switch_character_state 默认流汗无神I>>
+<<change_actor_state 1SweatBlankeyeI>>
 <<wait 1>>
 
 peipei: 该怎么做才能停止想象？我不明白。 #line:0e54d35 
@@ -216,8 +158,7 @@ me: 很好，现在闭上眼睛。 #line:041c698
 <<hide_dialog>>
 
 <<wait 1>>
-//1SweatB
-//TODO: <<switch_character_state 默认流汗闭眼>>
+<<change_actor_state 1SweatB>>
 <<wait 1>>
 
 peipei: 好。 #line:03343b5 
@@ -243,23 +184,19 @@ peipei: 好。 #line:03343b5
     me: 是的，那也是你的想象。你什么也看不到。 #line:00b9521 
 me: 有一个方法来清空你的思绪。 #line:08387b1 
 me: 如果你无法控制你的大脑活动，试着说“停止”。 #line:09498de 
-//1SweatIB
-//TODO: <<switch_character_state 默认流汗闭眼I>>
+<<change_actor_state 1SweatIB>>
 peipei: 就……说出来吗？ #line:0500219 
 me: 是的。一旦你意识到这不是你想要去想的东西，就对自己喊“停止”，然后你就会停下来。 #line:0270a9e 
 peipei: 让我试试…… #line:0f94543 
-//1SweatB
-//TODO: <<switch_character_state 默认流汗闭眼>>
+<<change_actor_state 1SweatB>>
 ->让佩佩保持一段时间 #line:04ed557 
 peipei: …… #line:02d2685 
-//1SweatIB
-//TODO: <<switch_character_state 默认流汗闭眼I>>
+<<change_actor_state 1SweatIB>>
 peipei: 停止。 #line:04844f3 
 me: 很好，就保持这样。 #line:08558b6 
 peipei: …… #line:022428a 
 peipei: 停止。很好…… #line:024d62f 
-//1SweatB
-//TODO: <<switch_character_state 默认流汗闭眼>>
+<<change_actor_state 1SweatB>>
 peipei:…… #line:0a4af03 
 me: …… #line:00c325c 
 me: 好了。现在感觉如何？ #line:0afd11f 
@@ -270,6 +207,7 @@ me: 那我们试试吧。 #line:02363a5
   
 
 title: 结束术前谈话
+tags: end
 position: 275,-222
 ---
 <<set $gameStage = "停止想象">>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn
index 2c79781a8..3f552ca66 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn
@@ -1,11 +1,18 @@
 title: 进入停止想象
-tags:
+tags: start
 position: 428,-88
 ---
 <<fade_in 1>>
 <<switch_fix_system_to BodyModule>>
 <<declare $CheckTargetCount=0>>
 <<fade_out 1>>
+<<jump 停止想象_1>>
+===
+
+title: 停止想象_1
+tags: content
+position: 428,-88
+---
 me:准备好了么？ #line:0eb665d 
 peipei: 我们来吧，医生。 #line:04a3898 
 Task: 尝试停止想象 #line:08f5fd5 
@@ -13,6 +20,7 @@ Task: 尝试停止想象 #line:08f5fd5
 ===
 
 title: 结束停止想象
+tags: end
 position: 259,432
 ---
 <<set $gameStage = "UF拆除">>
@@ -20,6 +28,7 @@ position: 259,432
 ===
 
 title: 停止想象Check
+tags: content no_save
 position: 71,-93
 ---
 
@@ -349,7 +358,7 @@ ULM自训练进程: 检测到进程接管请求！正在识别手动选择的目
 // ===
 
 title: UF停止想象CheckEnd
-tags:  
+tags: content no_save
 colorID: 3
 group:视觉检查
 position: -2052,-2351
@@ -358,6 +367,7 @@ position: -2052,-2351
 ===
 
 title: 降温失败的对话
+tags: content no_save
 position: 255,114
 ---
 me: 降不下来…为什么降不下来？ #line:0153613 
diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn
index a89ff387d..eb215833d 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn
@@ -1,6 +1,6 @@
 
 title: 进入UF拆除
-tags:
+tags: start
 position: 43,-97
 ---
 <<wait 0.5>>
@@ -23,6 +23,7 @@ position: 43,-97
 
 
 title: 结束UF拆除
+tags: end
 position: 275,-222
 ---
 <<set $gameStage = "术前谈话2">>
diff --git a/Assets/Yarn/FP/FP_Peipei2/Start.yarn b/Assets/Yarn/FP/FP_Peipei2/Start.yarn
index 982dbb6f4..bb51b7423 100644
--- a/Assets/Yarn/FP/FP_Peipei2/Start.yarn
+++ b/Assets/Yarn/FP/FP_Peipei2/Start.yarn
@@ -1,14 +1,15 @@
-title: Start
-tags: 
+title: Start
+tags: start
 colorID: 8
 position: 253,-2041
 ---
 
-<<jump 数据初始化>>
+<<detour 数据初始化>>
+<<jump Center>>
 ===
 
 title: 数据初始化
-tags: 
+tags: init
 colorID: 4
 position: 248,-1739
 ---
@@ -87,23 +88,17 @@ position: 248,-1739
 <<declare $memoryChecked=false>>
 <<declare $UfChecked=false>>
 <<declare $eyeChecked=false>>
-
-<<jump Center>>
-
-
-///一些状态初始化
-
-<<Temp_RemoveChip>>
 ===
 
 title: Center
+tags: center
 description: 脚本跳转中心，GameStage在此处处理，理论上不在其他地方读取GameStage
 position: 205,446
 colorID: 1
 ---
 // 每次进入维修界面就自动保存
 <<if $gameStage =="开场对话">>
-    <<jump 进入佩佩开场对话>>
+    <<jump 进入佩佩开场>>
 <<endif>>
 <<if $gameStage == "第一次发热">>
     <<jump 进入第一次发热>>