diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index 08880c0ee..d71c20747 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -11,7 +11,7 @@ position: 205,-53 <> // 你走出诊室,靠在巷子的墙上。 // 巷子正中央站着一个人,佩佩。 - 你走出诊室,诊室外的护栏边站着一个熟悉的人影。 +你走出诊室,诊室外的护栏边站着一个熟悉的人影。 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn index 4f78dbbad..07ba7635e 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage9_结束对话.yarn @@ -6,6 +6,7 @@ position: 251,-1150 <> <> <> +<> <> <> <> @@ -18,7 +19,7 @@ position: 251,-1150 peipei: 当然没了…我在想什么呢。 -<> + me: 以防万一… me: 佩佩,把一开始我们描述的那张图再画一遍吧? <> diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 3f4f2a8f2..1784d582b 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -5291,7 +5291,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} + insertIndex: 9 + addedObject: {fileID: 392279140} m_AddedComponents: [] m_SourcePrefab: {fileID: 4843985084834002234, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} --- !u!1 &105721800 stripped @@ -5299,6 +5302,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1262858780890837252, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} m_PrefabInstance: {fileID: 105721799} m_PrefabAsset: {fileID: 0} +--- !u!4 &105721801 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} + m_PrefabInstance: {fileID: 105721799} + m_PrefabAsset: {fileID: 0} --- !u!1 &105721802 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8679430258694198479, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} @@ -5373,7 +5381,7 @@ MonoBehaviour: - {fileID: 105721803} midnightObjects: - {fileID: 105721802} - - {fileID: 105721804} + - {fileID: 392279139} - {fileID: 105721800} snowEffect: {fileID: 1604901053} --- !u!4 &115529396 @@ -10577,6 +10585,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: delayTime: 300 +--- !u!1 &392279139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392279140} + - component: {fileID: 392279141} + m_Layer: 0 + m_Name: nightzhongjing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &392279140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392279139} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5.023256, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 105721801} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &392279141 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392279139} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1905855335 + m_SortingLayer: 2 + m_SortingOrder: 0 + m_Sprite: {fileID: -2596357460847674292, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 10.046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 732a825cb..db30ec17f 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8256,8 +8256,8 @@ MonoBehaviour: - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} - saveFileName: "PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5" + testTalkSo: {fileID: 11400000, guid: 68a9c1b8c5230454bb9498fd2ab5714b, type: 2} + saveFileName: "PeipeiDay1_\u7ED3\u675F\u5BF9\u8BDD" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0