diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 8d2b2a22c..c3578f5e0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -67,6 +67,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: de4a251a9de044a4eb51efd53cf2d9a2 + m_Address: OpenFixScene + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset index f63e7d8d9..214b82004 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -82,6 +82,11 @@ MonoBehaviour: m_ReadOnly: 1 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: da47117d0e2720c4a8dc0bac3acb3cac + m_Address: Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset + m_ReadOnly: 1 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: 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 15ed1b850..8d429c906 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 @@ -95,6 +95,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-zh-Hans FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 533b33b4a1f64604c99fc25138b1a50a + m_Address: Test_OP_zh-Hans + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-zh-Hans + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index c19288cae..dd8def0c9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -95,6 +95,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-en FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 58ce8964b8b71fd43989e4688bb56792 + m_Address: Test_OP_en + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-en + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Language/Dialog/Test_OP.meta b/Assets/Language/Dialog/Test_OP.meta new file mode 100644 index 000000000..2833d5093 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afd33a83dc8afd14c9f6dd61e1deb49b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset b/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset new file mode 100644 index 000000000..e74285010 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset @@ -0,0 +1,78 @@ +%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: Test_OP Shared Data + m_EditorClassIdentifier: + m_TableCollectionName: Test_OP + m_TableCollectionNameGuidString: da47117d0e2720c4a8dc0bac3acb3cac + m_Entries: + - m_Id: 18172173357056 + m_Key: line:01887d4 + m_Metadata: + m_Items: + - rid: 128120912349757456 + - m_Id: 18172173357057 + m_Key: line:0a48da2 + m_Metadata: + m_Items: + - rid: 128120912349757457 + - m_Id: 18172173357058 + m_Key: line:0ce9452 + m_Metadata: + m_Items: + - rid: 128120912349757458 + - m_Id: 18172173357059 + m_Key: line:09e6780 + m_Metadata: + m_Items: + - rid: 128120912349757459 + - m_Id: 18172173357060 + m_Key: line:0e76bc9 + m_Metadata: + m_Items: + - rid: 128120912349757460 + m_Metadata: + m_Items: [] + m_KeyGenerator: + rid: 128120912349757446 + references: + version: 2 + RefIds: + - rid: 128120912349757446 + type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} + data: + m_CustomEpoch: 1747199431587 + - rid: 128120912349757456 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u5F00\u5934" + tags: [] + - rid: 128120912349757457 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u5F00\u5934" + tags: [] + - rid: 128120912349757458 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u623F\u95F4\u5F00\u706F" + tags: [] + - rid: 128120912349757459 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u623F\u95F4\u5F00\u706F" + tags: [] + - rid: 128120912349757460 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u623F\u95F4\u5F00\u706F" + tags: [] diff --git a/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset.meta b/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset.meta new file mode 100644 index 000000000..2b28609c5 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP Shared Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da47117d0e2720c4a8dc0bac3acb3cac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_OP/Test_OP.asset b/Assets/Language/Dialog/Test_OP/Test_OP.asset new file mode 100644 index 000000000..a07d71107 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP.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: Test_OP + m_EditorClassIdentifier: + m_SharedTableData: {fileID: 11400000, guid: da47117d0e2720c4a8dc0bac3acb3cac, type: 2} + m_Tables: + - {fileID: 11400000, guid: 58ce8964b8b71fd43989e4688bb56792, type: 2} + - {fileID: 11400000, guid: 533b33b4a1f64604c99fc25138b1a50a, type: 2} + m_Extensions: [] + m_Group: String Table + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_OP/Test_OP.asset.meta b/Assets/Language/Dialog/Test_OP/Test_OP.asset.meta new file mode 100644 index 000000000..503bf4728 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00f09ce02efaea54792bcbe38bd5b4bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_OP/Test_OP_en.asset b/Assets/Language/Dialog/Test_OP/Test_OP_en.asset new file mode 100644 index 000000000..40dcd884f --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP_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: Test_OP_en + m_EditorClassIdentifier: + m_LocaleId: + m_Code: en + m_SharedData: {fileID: 11400000, guid: da47117d0e2720c4a8dc0bac3acb3cac, type: 2} + m_Metadata: + m_Items: [] + m_TableData: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_OP/Test_OP_en.asset.meta b/Assets/Language/Dialog/Test_OP/Test_OP_en.asset.meta new file mode 100644 index 000000000..e95a06725 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP_en.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58ce8964b8b71fd43989e4688bb56792 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset b/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset new file mode 100644 index 000000000..2e1ac160f --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset @@ -0,0 +1,43 @@ +%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: Test_OP_zh-Hans + m_EditorClassIdentifier: + m_LocaleId: + m_Code: zh-Hans + m_SharedData: {fileID: 11400000, guid: da47117d0e2720c4a8dc0bac3acb3cac, type: 2} + m_Metadata: + m_Items: [] + m_TableData: + - m_Id: 18172173357060 + m_Localized: "\u5207\u5272\u6307\u5B9A\u6A21\u5757" + m_Metadata: + m_Items: [] + - m_Id: 18172173357059 + m_Localized: "\u5207\u6362\u5230\u63D2\u7EBF\u90E8\u5206" + m_Metadata: + m_Items: [] + - m_Id: 18172173357058 + m_Localized: "\u623F\u95F4\u706F\u5DF2\u7ECF\u6253\u5F00" + m_Metadata: + m_Items: [] + - m_Id: 18172173357057 + m_Localized: "\u5BF9\u8BDD" + m_Metadata: + m_Items: [] + - m_Id: 18172173357056 + m_Localized: "\u663E\u793A\u5668\u8FD0\u884C" + m_Metadata: + m_Items: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset.meta b/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset.meta new file mode 100644 index 000000000..a8f830833 --- /dev/null +++ b/Assets/Language/Dialog/Test_OP/Test_OP_zh-Hans.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 533b33b4a1f64604c99fc25138b1a50a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/SceneSO/TestSO.asset b/Assets/Resources/SceneSO/TestSO.asset index c6d65dbf8..f0af55f8f 100644 --- a/Assets/Resources/SceneSO/TestSO.asset +++ b/Assets/Resources/SceneSO/TestSO.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: TestSO m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: fa27b0d9a05721b4d8c3253ca36b4d29, type: 3} - firstSceneName: ExpressFixScene + yarnProject: {fileID: 7545569452688597077, guid: 2ab1bf9ed11e94647a8d2c1bcb9fd5c2, type: 3} + firstSceneName: OpenFixScene isEndOfDay: 1 + nameToPlayer: diff --git a/Assets/Resources/Yarn/Test_OP.meta b/Assets/Resources/Yarn/Test_OP.meta new file mode 100644 index 000000000..f14e84a66 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50b0bd951bba468419983e368f02c51e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/Test_OP/Center.yarn b/Assets/Resources/Yarn/Test_OP/Center.yarn new file mode 100644 index 000000000..e2ee354c0 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/Center.yarn @@ -0,0 +1,24 @@ +title: Start +tags: +position: -150,-353 +--- +<> +=== + + +title: 数据初始化 +position: -152,-106 +--- +// 初始化变量 +<> + +<> +=== + +title: Center +position: -156,103 +--- +<> + <> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_OP/Center.yarn.meta b/Assets/Resources/Yarn/Test_OP/Center.yarn.meta new file mode 100644 index 000000000..8c7faea79 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/Center.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d61a7cd56ad3ecc49a4edfac34c25cb8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Test_OP/EventNode.yarn b/Assets/Resources/Yarn/Test_OP/EventNode.yarn new file mode 100644 index 000000000..48b6abc49 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/EventNode.yarn @@ -0,0 +1,40 @@ +title: LightOn +--- +<> +=== + +title: MemoryCutDown +--- +<> +=== + +title: EyeCutDown +--- +<> +=== + +title: EmoCutDown +--- +<> +=== + + +title: LogicCutDown +--- +<> +=== + +title: SpeakCutDown +--- +<> +=== + +title: LeftEyeCutDown +--- +<> +=== + +title: HeadCoverCutDown +--- +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_OP/EventNode.yarn.meta b/Assets/Resources/Yarn/Test_OP/EventNode.yarn.meta new file mode 100644 index 000000000..67ef830f6 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/EventNode.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f71ec1f748b6664fa54846ea55a9c66 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject b/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject new file mode 100644 index 000000000..617a484a3 --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject @@ -0,0 +1,14 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": { + "zh-CHS": {} + }, + "baseLanguage": "zh-Hans", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject.meta b/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject.meta new file mode 100644 index 000000000..ea587406b --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/Test_OP.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 2ab1bf9ed11e94647a8d2c1bcb9fd5c2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 1 + unityLocalisationStringTableCollection: {fileID: 11400000, guid: 00f09ce02efaea54792bcbe38bd5b4bc, type: 2} diff --git a/Assets/Resources/Yarn/Test_OP/开头.yarn b/Assets/Resources/Yarn/Test_OP/开头.yarn new file mode 100644 index 000000000..5daf7624b --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/开头.yarn @@ -0,0 +1,68 @@ +title: 开头 +tags: +position: -284,-211 +--- +<> +显示器运行 #line:01887d4 +对话 #line:0a48da2 +<> +<> +<> +=== + + +title: 房间开灯 +position: -155,-336 +--- +房间灯已经打开 #line:0ce9452 +切换到插线部分 #line:09e6780 +<> +<> +<> +切割指定模块 #line:0e76bc9 +<> +=== + +title: 记忆切除 +position: -330,48 +--- +<> +=== + +title: 视觉切除 +position: 151,131 +--- +<> +=== + +title: 感情切除 +position: -191,105 +--- +<> +=== + + +title: 逻辑切除 +position: 54,-106 +--- +<> +=== + +title: 表达切除 +position: 258,-18 +--- +<> +=== + +title: 左眼切除 +position: 71,-232 +--- +<> +=== + +title: 背板切除 +position: -13,201 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Test_OP/开头.yarn.meta b/Assets/Resources/Yarn/Test_OP/开头.yarn.meta new file mode 100644 index 000000000..2ec8d34dc --- /dev/null +++ b/Assets/Resources/Yarn/Test_OP/开头.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 826158ca0eac39b47814a47fa8ab2f25 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Scenes/OpenFixScene.unity b/Assets/Scenes/OpenFixScene.unity index 199045d9d..b17f571b7 100644 --- a/Assets/Scenes/OpenFixScene.unity +++ b/Assets/Scenes/OpenFixScene.unity @@ -291,7 +291,7 @@ GameObject: - component: {fileID: 66799945} - component: {fileID: 66799944} m_Layer: 0 - m_Name: OpRoot + m_Name: OpSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1928,7 +1928,7 @@ MonoBehaviour: m_EditorClassIdentifier: socketPos: {fileID: 0} data: - moduleName: Head Cover + moduleName: HeadCover clickRadius: 0.2 available: 0 --- !u!1 &369018062 @@ -10262,7 +10262,7 @@ MonoBehaviour: m_EditorClassIdentifier: socketPos: {fileID: 0} data: - moduleName: Left Eye + moduleName: LeftEye clickRadius: 0.2 available: 0 --- !u!4 &5427647268324916120 @@ -10976,18 +10976,6 @@ PrefabInstance: propertyPath: m_Name value: Editor Mode Func objectReference: {fileID: 0} - - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: field of view - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic size - value: 5 - objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -11028,10 +11016,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 8723d9e5e..81124b602 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -7692,7 +7692,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9884,7 +9884,7 @@ MonoBehaviour: - {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} runMode: 1 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 8ce86974047bb404c9096e70a606355a, type: 2} + testTalkSo: {fileID: 11400000, guid: bd44f6c25aa17a4408e172d16b903176, type: 2} saveFileName: --- !u!1 &719273460 GameObject: diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index 90f45a7db..20e7c5052 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -140,7 +140,7 @@ namespace AibisDream.FixSystem .Delay(0.5f) .DOTween(() => transform.DOMoveY(ConstRef.TweenEndY, (transform.position.y - ConstRef.TweenEndY) / ConstRef.FallSpeed).SetEase(Ease.InQuad)) - .Callback(() => DialogController.Instance?.StartDialogNode($"{data.moduleName}_cutdown")) + .Callback(() => DialogController.Instance?.StartDialogNode($"{data.moduleName}CutDown")) .Callback(() => EnumEventSystem.Global.Send(EventEnum.CutEnd)) .Start(this, () => Destroy(gameObject)); } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/CutLine.cs b/Assets/Scripts/FixSystemNew/BodyModule/CutLine.cs index 2b240b45b..6a13108e8 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/CutLine.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/CutLine.cs @@ -35,7 +35,7 @@ namespace AibisDream _lineRenderer = GetComponent(); _lineMaterial = _lineRenderer.materials[0]; } - + _lineRenderer.gameObject.SetActive(true); // 清除旧数据 @@ -296,7 +296,7 @@ namespace AibisDream gameObject.SetActive(false); } - // 获取当前所有记录的范围（0-1之间的值） + // 获取当前所有记录的范围（0-1之间的值） public List GetRecordedRanges() { return new List(_recordedRanges); diff --git a/Assets/Scripts/FixSystemNew/Open/LightRoom.cs b/Assets/Scripts/FixSystemNew/Open/LightRoom.cs index e40dba963..6f231bd9e 100644 --- a/Assets/Scripts/FixSystemNew/Open/LightRoom.cs +++ b/Assets/Scripts/FixSystemNew/Open/LightRoom.cs @@ -28,8 +28,13 @@ namespace AibisDream ActionKit.Sequence() .Delay(0.5f) .Callback(() => onA.DOFade(0, 1f)) - .Delay(1f, () => Debug.Log("变焦完成")) + .Delay(1f, ZoomEnd) .Start(this); } + + private void ZoomEnd() + { + DialogController.Instance.StartDialogNode("LightOn"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs index 8adf3d0e8..80e0f46c7 100644 --- a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs @@ -54,6 +54,7 @@ namespace AibisDream public void EnableClock() { + lightRoom.gameObject.SetActive(false); deepInClock.Enable(); }