diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset index 2e56c7d08..879e753dd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -79,7 +79,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: ea388b59e37ddc14da4d8e3e9ead4133 - m_Address: Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset + m_Address: Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset m_ReadOnly: 1 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -202,7 +202,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 73c880a15817b7f408ad0596f07a3626 - m_Address: Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.asset + m_Address: Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.assetasset m_ReadOnly: 1 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset index 2ed80a85f..fcdac5386 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Chinese (Simplified) (zh-Hans).asset @@ -84,7 +84,7 @@ MonoBehaviour: - Locale-zh-Hans FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 523b3962bff363849a36683b375adc06 - m_Address: Test_Huoshan_zh-Hans + m_Address: FP_Huoshan1_zh-Hans m_ReadOnly: 1 m_SerializedLabels: - Locale-zh-Hans diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index 1c4bdc52a..6e4b7a4bd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -84,7 +84,7 @@ MonoBehaviour: - Locale-en FlaggedDuringContentUpdateRestriction: 0 - m_GUID: fb0b8f197b5a607468eeb9326737d547 - m_Address: Test_Huoshan_en + m_Address: FP_Huoshan1_en m_ReadOnly: 1 m_SerializedLabels: - Locale-en diff --git a/Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.asset b/Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.asset index 4f178886f..48ee1ad82 100644 --- a/Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.asset +++ b/Assets/Language/Dialog/FP_Day1_sleep/FP_Day1_sleep Shared Data.asset @@ -2015,6 +2015,10 @@ MonoBehaviour: m_Metadata: m_Items: - rid: 2040577493605549694 + - m_Id: 13958178151600128 + m_Key: New Entry + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Language/Dialog/Test_Huoshan.meta b/Assets/Language/Dialog/FP_Huoshan1.meta similarity index 100% rename from Assets/Language/Dialog/Test_Huoshan.meta rename to Assets/Language/Dialog/FP_Huoshan1.meta diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset similarity index 99% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset index 6f219e5c7..fdefa9390 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset +++ b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} - m_Name: Test_Huoshan Shared Data + m_Name: FP_Huoshan1 Shared Data m_EditorClassIdentifier: m_TableCollectionName: Test_Huoshan m_TableCollectionNameGuidString: ea388b59e37ddc14da4d8e3e9ead4133 diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset.meta b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset.meta similarity index 100% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset.meta rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1 Shared Data.asset.meta diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1.asset similarity index 96% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1.asset index 3745ccdc5..ff3b27a97 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset +++ b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3} - m_Name: Test_Huoshan + m_Name: FP_Huoshan1 m_EditorClassIdentifier: m_SharedTableData: {fileID: 11400000, guid: ea388b59e37ddc14da4d8e3e9ead4133, type: 2} m_Tables: diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset.meta b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1.asset.meta similarity index 100% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan.asset.meta rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1.asset.meta diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_en.asset similarity index 95% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_en.asset index 7226b2b4b..40cb070d7 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset +++ b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_en.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} - m_Name: Test_Huoshan_en + m_Name: FP_Huoshan1_en m_EditorClassIdentifier: m_LocaleId: m_Code: en diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset.meta b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_en.asset.meta similarity index 100% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_en.asset.meta rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_en.asset.meta diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_zh-Hans.asset similarity index 99% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_zh-Hans.asset index 00eb13624..d1e6bcd44 100644 --- a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset +++ b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_zh-Hans.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} - m_Name: Test_Huoshan_zh-Hans + m_Name: FP_Huoshan1_zh-Hans m_EditorClassIdentifier: m_LocaleId: m_Code: zh-Hans diff --git a/Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset.meta b/Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_zh-Hans.asset.meta similarity index 100% rename from Assets/Language/Dialog/Test_Huoshan/Test_Huoshan_zh-Hans.asset.meta rename to Assets/Language/Dialog/FP_Huoshan1/FP_Huoshan1_zh-Hans.asset.meta diff --git a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject index 617a484a3..52e28fbc3 100644 --- a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject +++ b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject @@ -1,14 +1,12 @@ { "projectFileVersion": 2, "sourceFiles": [ - "*.yarn" + "**/*.yarn" ], "excludeFiles": [ "**/*~/*" ], - "localisation": { - "zh-CHS": {} - }, - "baseLanguage": "zh-Hans", + "localisation": {}, + "baseLanguage": "zh-CHS", "compilerOptions": {} } \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject.meta b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject.meta index 40e58e86c..0bb4109e2 100644 --- a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject.meta +++ b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarnproject.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: beb6e77de3427b04dae210b2c9ca29a1 +guid: 759b6e8a16f70084e8fe77eded076218 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn index 1c2fa4575..7cd75fce8 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn @@ -3,18 +3,18 @@ tags: colorID: 8 position: 205,-53 --- -<> +<> <> - <> + <> <> - <> + <> <> === -title: ver2 +title: HE tags: colorID: 8 position: 205,-53 @@ -112,38 +112,13 @@ peipei: 一会…一会见。 #line:01ff340 <> <> 佩佩跌跌撞撞地向前夕阳的方向走着,离开了巷子。 #line:05dcfae -你目视她离开,吸完最后一口烟,长舒一口气。 #line:0cac326 -<> -<> -<> -<> -<> -<> -<> -<> -<> -me: 排异反应…么… #line:0db5584 -<> -// <> -// <> -<> -<> -<> -<> -// 一阵风吹过,树叶洋洋洒洒地落下。 #line:095df55 -<> -你的头又疼了一下。 #line:086a27b -<> -<> -<> -<> -<> -<> -<> - +<> === -title: BE外出 + + + +title: BE tags: colorID: 8 position: 205,-53 @@ -237,15 +212,55 @@ peipei: 这是我们的职责。 #line:080c8a0 <> <> <> -你目视它离开,吸完最后一口烟,长舒一口气。 #line:0dc3000 -<> -<> -->CenterOption: 回到岗位 #line:0ba7be1 - <> +<> === +title: 结束 +tags: +colorID: 8 +position: 205,-53 +--- +/////TODO:这里没做差分 +你目视她离开,吸完最后一口烟,长舒一口气。 #line:0cac326 + +<> +<> +<> +<> +<> +<> +<> +<> +<> + +me: 排异反应…么… #line:0db5584 + +<> +// <> +// <> +<> +<> +<> +<> +// 一阵风吹过,树叶洋洋洒洒地落下。 #line:095df55 +<> + <> +<> + <> +<> +你的头又疼了一下。 #line:086a27b + +<> +<> +<> +<> +<> +<> +<> + +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject b/Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject similarity index 58% rename from Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject rename to Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject index 617a484a3..52e28fbc3 100644 --- a/Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject +++ b/Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject @@ -1,14 +1,12 @@ { "projectFileVersion": 2, "sourceFiles": [ - "*.yarn" + "**/*.yarn" ], "excludeFiles": [ "**/*~/*" ], - "localisation": { - "zh-CHS": {} - }, - "baseLanguage": "zh-Hans", + "localisation": {}, + "baseLanguage": "zh-CHS", "compilerOptions": {} } \ No newline at end of file diff --git a/Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject.meta b/Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject.meta similarity index 91% rename from Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject.meta rename to Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject.meta index 35b3fece2..657da1fba 100644 --- a/Assets/Resources/Yarn/FP_Huoshan1/Test_Huoshan.yarnproject.meta +++ b/Assets/Resources/Yarn/FP_Huoshan1/FP_Huoshan1.yarnproject.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc075ea1c729cec4484634a00ebb03a4 +guid: f7d7db96cdd264f4dbb3341df5deeccc ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ScriptableObjects/SceneSO/Day1_sleep.asset b/Assets/ScriptableObjects/SceneSO/Day1_sleep.asset index 81317ba8f..237637ca1 100644 --- a/Assets/ScriptableObjects/SceneSO/Day1_sleep.asset +++ b/Assets/ScriptableObjects/SceneSO/Day1_sleep.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Day1_sleep m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 172e1298764e87a4b9ed51264b908ba9, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: beb6e77de3427b04dae210b2c9ca29a1, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: 759b6e8a16f70084e8fe77eded076218, type: 3} firstSceneName: "Scene/\u68A6\u5883" title: "\u542F\u793A" description: "\u627E\u5230\u5929\u6587\u53F0\u7684\u5165\u53E3" diff --git a/Assets/ScriptableObjects/SceneSO/Day2_FIRST_HS1.asset b/Assets/ScriptableObjects/SceneSO/Day2_FIRST_HS1.asset index e1c740e10..51bd6242f 100644 --- a/Assets/ScriptableObjects/SceneSO/Day2_FIRST_HS1.asset +++ b/Assets/ScriptableObjects/SceneSO/Day2_FIRST_HS1.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Day2_FIRST_HS1 m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: dc075ea1c729cec4484634a00ebb03a4, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: f7d7db96cdd264f4dbb3341df5deeccc, type: 3} firstSceneName: Scene/HuoShanFixScene title: "\u706B\u5C71" description: "\u6211\u7684\u7535\u89C6\u5934\u670B\u53CB"