yarn: 节点调整

Assets/Scenes/Persistence.unity

@@ -960,154 +960,6 @@ MonoBehaviour:
   centerOptions: {fileID: 1586904157}
   onelineOptions: {fileID: 23905304}
   defaultViewType: 1
---- !u!1 &398371924
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 398371925}
-  - component: {fileID: 398371928}
-  - component: {fileID: 398371927}
-  - component: {fileID: 398371926}
-  m_Layer: 5
-  m_Name: DemoTimer
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &398371925
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 398371924}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 923998313}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 875, y: -475}
-  m_SizeDelta: {x: 150.07, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &398371926
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 398371924}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a21f67dffcd841adb0f408b5cf075ea8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  totalTimeInSeconds: 1200
---- !u!114 &398371927
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 398371924}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 00:00:00
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &398371928
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 398371924}
-  m_CullTransparentMesh: 1
 --- !u!1 &415824291
 GameObject:
   m_ObjectHideFlags: 0
@@ -2572,7 +2424,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 961234236}
-  - {fileID: 398371925}
   - {fileID: 749156595}
   - {fileID: 2045712318}
   m_Father: {fileID: 2091451641}
@@ -2602,7 +2453,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a9d56c7fba994304580ad04b75767c25, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  demoTimer: {fileID: 398371926}
   loading: {fileID: 749156594}
   saveLoading: {fileID: 2045712317}
 --- !u!1 &933302598

Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn

@@ -226,10 +226,6 @@ hs: 我不知道我是感<waitfor=0.1>帽<waitfor=0.1>了…还是怎么…我
 me: …患者似乎无法停止说谐音梗。<br>来，和我到诊疗室来。 #line:0ff5f87 
 
 
-<<set $gameStage = 2>>
-<<jump Center>>
-<<hide_dialog>>
-<<wait 1>>
 <<set $gameStage = 2>>
 <<jump Center>>
 ===

Assets/Yarn/FP/FP_Huoshan1/Stage2.yarn

@@ -72,8 +72,8 @@ EmoModule: 已与情绪模块建立连接！ #line:0b19318
     <<if $gameStage==2 && $speakerChecked==true && $colorChecked==true>>
         // Stage2: 检查完表达和滤波器后，对比预测波形与真实情绪波形
         ->查询情绪波形 #line:00f857c 
-        <<switch_emotion_wave_config empty>>
-        <<show_emotion_wave 1>>
+            <<switch_emotion_wave_config empty>>
+            <<show_emotion_wave 1>>
             <<wait 0.8>>
             me: 得看看为什么你会生成这么多幽默情绪… #line:0fb004f 
             Analysing:正在查询... #line:0736427 
@@ -410,7 +410,6 @@ SaleModule: 已与销售语言拓展模块建立连接！ #line:0448f12
 ->结束  #line:0f8d528 
     <<hide_dialog>>
     //<<clear_screen>> 
-
 ===
 
 title: 结束Stage2
@@ -419,7 +418,6 @@ colorID: 2
 group: 插线检查
 position: 300,950
 ---
-// 此节点已废弃，流程改为在检查情绪节点中自动跳转
 <<complete_task "line:0c51688">>
 <<clear_tasks>>
 <<set $gameStage = 3>>

Assets/Yarn/FP/FP_Huoshan1/Stage5.yarn

@@ -21,7 +21,6 @@ tags: content
 colorID: 2
 position: 500,1575
 ---
-<<init_actor 火山 "clinic" "FrameAnimation">>
 me: … #line:0d92c92 
 me: 你不打算说也没关系。 #line:0860155 
 
@@ -70,7 +69,7 @@ me: 英理没提前和你说它们会来吗？ #line:06a5cae
 <<wait 0.3>>
 
 hs: 这就是好玩的部分啦。 #line:06a5caf
-<<change_actor_state "伸手石化表情" 火山>>
+<<change_actor_state "伸手 石化表情" 火山>>
 <<wait 0.3>>
 
 hs: 英理也遇到麻烦了，最坏的情况是撤职。 #line:06a5cb0

Assets/Yarn/FP/FP_Huoshan1/Stage8.yarn

@@ -1,4 +1,4 @@
-title: Stage8
+title: Stage8
 tags: start
 colorID: 2
 position: 500,3000
@@ -21,7 +21,6 @@ group: 结束
 colorID: 2
 position: 500,3150
 ---
-<<init_actor 火山 "clinic" "FrameAnimation">>
 <<change_actor_state "捂头表情idle" 火山>>
 <<wait 0.3>>
 hs: 都是因为我……都怪我……  #line:09eef1e 
@@ -57,7 +56,7 @@ me: 你把它用得很好。但是前提是你自己别垮了。 #line:0df8145
 hs: 我… #line:01bc7e1 
 hs: 我感觉头好痒。 #line:0ff7f43 
 me: 啊…那是因为，那个比特压缩器还开着。 #line:041a275 
-<<change_actor_state "扣头？" 火山>>
+<<change_actor_state "扣头 ？" 火山>>
 <<wait 0.3>>
 hs: 可是，为什么……我还是可以说丧气话啊？ #line:098bc8f 
 <<change_actor_state "扣头表情idle" 火山>>

Assets/Yarn/FP/FP_Prologue/Stage1_开灯.yarn

@@ -158,7 +158,7 @@ me: <speed=1><shake a=0.2>带我回家啊，姐姐。</shake>  #line:0d447f7
 
 
 title: 开场
-tags: content
+tags: content no_save
 colorID: 8
 position: 250,200
 ---

Assets/Yarn/FP/FP_Prologue/Stage2-5_切割.yarn

@@ -1,5 +1,5 @@
 title: Stage2
-tags:
+tags: start
 group: 入口
 position: 569,-3402
 ---
@@ -34,7 +34,7 @@ Task: 通电唤醒患者 #line:082c057
 
 
 title: 手术准备
-tags: 
+tags: content
 colorID: 8
 position: 566,-3135
 ---
@@ -54,7 +54,7 @@ Task: 插线找到异常模块 #line:002672d
 
 
 title: 第一次切除
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 1109,-2665
@@ -71,7 +71,7 @@ me: 只有这个工具了么… #line:0408052
 
 
 title: 第一次切除后
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 1108,-2261
@@ -116,7 +116,7 @@ me: 出现异常状况。现在重新通电。 #line:0bb059f
 
 
 title:电击后
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 788,-1825
@@ -229,7 +229,7 @@ position: 788,-1825
 
 
 title: 第一次检查
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 1101,-3126
@@ -373,7 +373,7 @@ me: 很抱歉。没有什么妈妈。 #line:0f77f2a
 
 
 title: 连接记忆切除
-tags:
+tags: content no_save
 colorID: 8
 group:插线检查
 description: 找记忆阶段插中记忆模块，触发切割
@@ -405,7 +405,7 @@ me: 我得再快些。 #line:048cfa4
 
 
 title: 未检测到信号
-tags:
+tags: content no_save
 colorID: 8
 group:插线检查
 description: 找记忆阶段误插已关机模块或表达模块
@@ -423,7 +423,7 @@ Error: 未检测到信号。 #line:0127f8a
 
 
 title: 检查异常模块
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 758,-2965
@@ -435,7 +435,7 @@ position: 758,-2965
 
 
 title: 切除异常模块
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 769,-2682
@@ -449,7 +449,7 @@ position: 769,-2682
 
 
 title: 异常模块切除后
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 774,-2287
@@ -463,7 +463,7 @@ position: 774,-2287
 
 
 title: 检查表达
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 542,-2965
@@ -479,7 +479,7 @@ SpeakerModule: 已与表达模块建立连接！ #line:0995165
 
 
 title: 检查逻辑
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 542,-2965
@@ -495,7 +495,7 @@ LogicModule: 已与逻辑模块建立连接！ #line:01e0a90
 
 
 title: 检查情绪
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 542,-2965
@@ -511,7 +511,7 @@ EmoModule: 已与情绪模块建立连接！ #line:0cb8026
 
 
 title: 正在建立连接
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 774,-2287
@@ -522,7 +522,7 @@ Linking: 正在建立连接… #line:095d856
 
 
 title: 隔离模式
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 774,-2287
@@ -537,7 +537,7 @@ Error: 检测到异常来自其他模块干扰 #line:084763e
 
 
 title: 等待通电
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 774,-2287
@@ -548,7 +548,7 @@ dn: 等待通电... #line:0f20b65
 
 
 title: 电流过载
-tags: 
+tags: content no_save
 colorID: 8
 group:插线检查
 position: 774,-2287

Assets/Yarn/FP/FP_Prologue/Stage6_螺旋.yarn

@@ -66,7 +66,7 @@ position: 906,-585
 
 
 title: end
-tags: end no_save
+tags: end
 group: 出口
 position: 248,443
 ---