Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fix

This commit is contained in:
BOT Alex 2024-02-04 11:56:48 +01:00
parent 9236097855
commit ff6fcee62e
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scenes/GameScene.unity
View File

@ -9334,11 +9334,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
<<<<<<< HEAD
- {fileID: 290886138581533559, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - {fileID: 290886138581533559, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
=======
- {fileID: 1690165032579755590, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
>>>>>>> bc988ab60ec64c0741074ee2dbaa85f27f64190f
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
insertIndex: -1 insertIndex: -1
@ -9385,16 +9381,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3c20bad5f6ef76d429d398dfba893d40, type: 3} m_Script: {fileID: 11500000, guid: 3c20bad5f6ef76d429d398dfba893d40, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
<<<<<<< HEAD
pauseMenuUI: {fileID: 0} pauseMenuUI: {fileID: 0}
--- !u!224 &4158834148864819270 stripped --- !u!224 &4158834148864819270 stripped
RectTransform: RectTransform:
m_CorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} m_CorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
m_PrefabInstance: {fileID: 4158834148864819266} m_PrefabInstance: {fileID: 4158834148864819266}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
=======
pauseMenuUI: {fileID: 1230350817}
>>>>>>> bc988ab60ec64c0741074ee2dbaa85f27f64190f
--- !u!1001 &4910321061857220295 --- !u!1001 &4910321061857220295
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0