From 65d6052fa5f6f08469aa3129d8bee6ac7ff2ec92 Mon Sep 17 00:00:00 2001 From: Ovid Date: Tue, 21 Jan 2025 00:53:31 +0800 Subject: [PATCH] resolve_conflict --- Assets/Scenes/Persistence.unity | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index b0edb4a5f..57ca19fc2 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8104,8 +8104,13 @@ MonoBehaviour: - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} - {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} + - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} + - {fileID: 11400000, guid: 68a9c1b8c5230454bb9498fd2ab5714b, type: 2} + - {fileID: 11400000, guid: ada4bdc2db5594e4f860c90b3a4b9da8, type: 2} + - {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} + - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} runMode: 2 - firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} + firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" --- !u!4 &719228339