From cd56e05d32b8560517c81dbe8cf14c8bf9068482 Mon Sep 17 00:00:00 2001 From: Ovid Date: Sun, 15 Mar 2026 00:30:19 +0800 Subject: [PATCH] add linetags --- Assets/Language/Dialog/FP_Day2_begin.meta | 8 ++++++ .../FP_Day2_begin Shared Data.asset | 28 +++++++++++++++++++ .../FP_Day2_begin Shared Data.asset.meta | 8 ++++++ .../Dialog/FP_Day2_begin/FP_Day2_begin.asset | 23 +++++++++++++++ .../FP_Day2_begin/FP_Day2_begin.asset.meta | 8 ++++++ .../FP_Day2_begin/FP_Day2_begin_en.asset | 23 +++++++++++++++ .../FP_Day2_begin/FP_Day2_begin_en.asset.meta | 8 ++++++ .../FP_Day2_begin/FP_Day2_begin_zh-Hans.asset | 23 +++++++++++++++ .../FP_Day2_begin_zh-Hans.asset.meta | 8 ++++++ .../Yarn/FP_Day1_begin/Day1_begin.yarn | 4 ++- .../Resources/Yarn/FP_Day1_mid/Day1_mid.yarn | 8 +++--- .../Yarn/FP_Day1_night/Day1_night.yarn | 2 +- .../Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn | 2 +- .../Yarn/FP_Day2_begin/FP_Day2_begin.yarn | 23 ++++++++------- .../FP_Day2_begin.yarnproject.meta | 4 +-- .../Yarn/FP_Day2_night/Day2_night.yarn | 6 ++-- 16 files changed, 164 insertions(+), 22 deletions(-) create mode 100644 Assets/Language/Dialog/FP_Day2_begin.meta create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset.meta create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset.meta create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset.meta create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset create mode 100644 Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset.meta diff --git a/Assets/Language/Dialog/FP_Day2_begin.meta b/Assets/Language/Dialog/FP_Day2_begin.meta new file mode 100644 index 000000000..55bf44bf1 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38be62049578a6a47ba7543164bb5fd5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset new file mode 100644 index 000000000..f66c35be2 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} + m_Name: FP_Day2_begin Shared Data + m_EditorClassIdentifier: + m_TableCollectionName: FP_Day2_begin + m_TableCollectionNameGuidString: 00000000000000000000000000000000 + m_Entries: [] + m_Metadata: + m_Items: [] + m_KeyGenerator: + rid: 9218883063513088000 + references: + version: 2 + RefIds: + - rid: 9218883063513088000 + type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} + data: + m_CustomEpoch: 1773505700823 diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset.meta b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset.meta new file mode 100644 index 000000000..9a04794b8 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin Shared Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afa9b26bd11b9d847bbb9714b8049a4b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset new file mode 100644 index 000000000..c4c805b50 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3} + m_Name: FP_Day2_begin + m_EditorClassIdentifier: + m_SharedTableData: {fileID: 11400000, guid: afa9b26bd11b9d847bbb9714b8049a4b, type: 2} + m_Tables: + - {fileID: 11400000, guid: a6b685d3b3e17c64da7ca72add7b3540, type: 2} + - {fileID: 11400000, guid: d9f05be3049f65b4c82800b1bde3b7c2, type: 2} + m_Extensions: [] + m_Group: String Table + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset.meta b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset.meta new file mode 100644 index 000000000..f07f9f77f --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf96eb9b621fe1649904d47130dc098a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset new file mode 100644 index 000000000..96031724d --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: FP_Day2_begin_en + m_EditorClassIdentifier: + m_LocaleId: + m_Code: en + m_SharedData: {fileID: 11400000, guid: afa9b26bd11b9d847bbb9714b8049a4b, type: 2} + m_Metadata: + m_Items: [] + m_TableData: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset.meta b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset.meta new file mode 100644 index 000000000..bf3526407 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_en.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6b685d3b3e17c64da7ca72add7b3540 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset new file mode 100644 index 000000000..8050b2c33 --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: FP_Day2_begin_zh-Hans + m_EditorClassIdentifier: + m_LocaleId: + m_Code: zh-Hans + m_SharedData: {fileID: 11400000, guid: afa9b26bd11b9d847bbb9714b8049a4b, type: 2} + m_Metadata: + m_Items: [] + m_TableData: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset.meta b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset.meta new file mode 100644 index 000000000..10bbb483c --- /dev/null +++ b/Assets/Language/Dialog/FP_Day2_begin/FP_Day2_begin_zh-Hans.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9f05be3049f65b4c82800b1bde3b7c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn index 0f638a474..19dcf170a 100644 --- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn @@ -15,6 +15,8 @@ position: 0,-80 <> <> +<> + <> // 等待状态机加载 <> @@ -23,7 +25,7 @@ position: 0,-80 -title: 地铁ver +title: 地铁ver5 tags: colorID: 8 position: 0,80 diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index ac52b76b4..c5a68dafb 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -231,12 +231,12 @@ peipei: 再见了,叶子。 #line:0694ade <> //<> //TODO:风吹树叶的动画 -一阵风吹过,树叶洋洋洒洒地落下。 +一阵风吹过,树叶洋洋洒洒地落下。 #line:0cc5390 <> -你的头又疼了一下。 +你的头又疼了一下。 #line:0c1713d <> -me: …… -me: 是时候再去一次了么…… +me: …… #line:03a974b +me: 是时候再去一次了么…… #line:0da4b7c //TODO:把所有“你”改成"医生" // <> diff --git a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn index bfa2e35da..16dc201a1 100644 --- a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn +++ b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn @@ -392,7 +392,7 @@ ql: 是嘛。 #line:0ec76a5 【你一饮而尽。】 #line:0910557 -【海浪声】 +【海浪声】 #line:0657cd3 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn index ebd347649..f2606f6d9 100644 --- a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn +++ b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn @@ -6,7 +6,7 @@ position: 250,-2611 <> <> jj: 坏掉的东西,修好就好了。 #line:06f029d -【海浪声消散】 +【海浪声消散】 #line:0b148e8 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarn b/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarn index fb35d018f..2367bf886 100644 --- a/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarn @@ -3,6 +3,9 @@ tags: group: 入口 position: 250,-26 --- + +<> + //<> <> <> @@ -10,8 +13,8 @@ position: 250,-26 <> <> -me: …… -me: 这家伙今天又迟到了么。 +me: …… #line:056f867 +me: 这家伙今天又迟到了么。 #line:09a568c <> <> @@ -27,15 +30,15 @@ position: 0,240 <2>> <> <> -【新闻1:寒潮天气预报】/br【新闻2:英理发表讲话】/br【新闻3:关于回收】 -->天气<> - 【略】 +【新闻1:寒潮天气预报】/br【新闻2:英理发表讲话】/br【新闻3:关于回收】 #line:0c43852 +->天气<> #line:0828f05 + 【略】 #line:0b85d4d <> -->英理<> - 【略】 +->英理<> #line:0a12ab2 + 【略】 #line:06cd19d <> -->回收<> - 【略】 +->回收<> #line:088ff43 + 【略】 #line:0e5efde <> ->结束<0>> #line:0b04710 <> @@ -51,7 +54,7 @@ tags: colorID: 8 position: 0,400 --- -me: … +me: … #line:00a0b81 <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarnproject.meta b/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarnproject.meta index 03f240834..9c289f20c 100644 --- a/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarnproject.meta +++ b/Assets/Resources/Yarn/FP_Day2_begin/FP_Day2_begin.yarnproject.meta @@ -9,5 +9,5 @@ ScriptedImporter: assetBundleVariant: script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} useAddressableAssets: 0 - UseUnityLocalisationSystem: 1 - unityLocalisationStringTableCollection: {fileID: 11400000, guid: 95dbf118f95f0234a93e3d0b0ee1cc25, type: 2} + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {fileID: 11400000, guid: cf96eb9b621fe1649904d47130dc098a, type: 2} diff --git a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn index c73b67472..42a15f810 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn @@ -76,11 +76,11 @@ peipei: 一会…一会见。 #line:01ff340 你目视她离开,吸完最后一口烟,长舒一口气。 #line:0cac326 <> <> -一阵风吹过,树叶洋洋洒洒地落下。 +一阵风吹过,树叶洋洋洒洒地落下。 #line:0d81ceb <> -你的头又疼了一下。 +你的头又疼了一下。 #line:086a27b <> -me: …怎么又来了…不…… +me: …怎么又来了…不…… #line:0dc1a12 <> <> ===