nothke/quality-control
1
0
Fork 0
mirror of https://github.com/nothke/quality-control.git synced 2025-08-29 23:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nothke/quality-control

Browse Source 
# Conflicts:
#	Assets/Scripts/SlidingCrane.cs
This commit is contained in:
Daniel Tyomin
2024-08-19 23:52:39 +02:00
parent f5b35c6516 71f05400e4
commit 3414a62624
10 changed files with 1289 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/Scenes/Main.unity
View File

@@ -9890,6 +9890,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8393158071281731187, guid: d594a9afcbadc3646be0b679de9ca105, type: 3}
m_PrefabInstance: {fileID: 528109184}
m_PrefabAsset: {fileID: 0}
--- !u!114 &532119488 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 586259664102464044, guid: dbb480e8a73da05448bd6efa47d448b0, type: 3}
m_PrefabInstance: {fileID: 2017149079}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84817382e549d8b4797caa3a4891df6b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &536646929
PrefabInstance:
m_ObjectHideFlags: 0
@@ -13166,6 +13177,7 @@ GameObject:
- component: {fileID: 687919026}
- component: {fileID: 687919025}
- component: {fileID: 687919024}
- component: {fileID: 687919030}
m_Layer: 0
m_Name: Interaction
m_TagString: Untagged
@@ -13307,6 +13319,21 @@ MonoBehaviour:
throwKey: 102
examineKey: 101
placeKey: 116
--- !u!114 &687919030
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 687919022}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bb13478e4c42bd7489db482354f8b915, type: 3}
m_Name:
m_EditorClassIdentifier:
hands: {fileID: 687919027}
items:
- {fileID: 532119488}
--- !u!1001 &719329539
PrefabInstance:
m_ObjectHideFlags: 0
@@ -24778,7 +24805,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Objectives: []
CurrentStage: 0
CurrentStage: 4
--- !u!4 &1503113266
Transform:
m_ObjectHideFlags: 0