tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve_conflict

Browse Source
This commit is contained in:
Ovid
2025-01-21 00:53:31 +08:00
parent f688ae0afd
commit 65d6052fa5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Persistence.unity
+6 -1
View File
@@ -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