diff options
author | Carson Katri <carson.katri@gmail.com> | 2021-06-12 16:57:05 -0400 |
---|---|---|
committer | Carson Katri <carson.katri@gmail.com> | 2021-06-12 16:57:05 -0400 |
commit | 2da4072647dbf8577f8a5e2391551fbbfceef231 (patch) | |
tree | 636de5585864d64832d362117d40c93de97e5bb9 /Assets/Prefabs | |
parent | 939170f625e5928d5ca86a57796aaa23f25a4fa7 (diff) | |
parent | d6d5014337ab72a6eb8c2f93fae107c71d267649 (diff) | |
download | gmtk-gamejam-2da4072647dbf8577f8a5e2391551fbbfceef231.tar.gz gmtk-gamejam-2da4072647dbf8577f8a5e2391551fbbfceef231.tar.zst gmtk-gamejam-2da4072647dbf8577f8a5e2391551fbbfceef231.zip |
Resolve conflicts
Diffstat (limited to 'Assets/Prefabs')
-rw-r--r-- | Assets/Prefabs/Hoop.prefab | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/Assets/Prefabs/Hoop.prefab b/Assets/Prefabs/Hoop.prefab index 691d0b2..7dfd3b9 100644 --- a/Assets/Prefabs/Hoop.prefab +++ b/Assets/Prefabs/Hoop.prefab @@ -14,6 +14,9 @@ GameObject: - component: {fileID: 2106494524751008832} - component: {fileID: 2106494524751008834} - component: {fileID: 2106494524751008835} + - component: {fileID: 1029364543094105199} + - component: {fileID: 2639737386686648195} + - component: {fileID: 1022133350338841181} m_Layer: 0 m_Name: Hoop m_TagString: Untagged @@ -183,3 +186,69 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.040855214, y: 0.030604668} m_EdgeRadius: 0 +--- !u!61 &1029364543094105199 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106494524751008836} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0056511946, y: 0.005704716} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.32, y: 0.32} + newSize: {x: 0.32, y: 0.32} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.14921531, y: 0.050745383} + m_EdgeRadius: 0 +--- !u!61 &2639737386686648195 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106494524751008836} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.005651191, y: -0.104769394} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.32, y: 0.32} + newSize: {x: 0.32, y: 0.32} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.14921531, y: 0.030544288} + m_EdgeRadius: 0 +--- !u!114 &1022133350338841181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106494524751008836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40e5d6a883d14c7fb60913ec2fc3009c, type: 3} + m_Name: + m_EditorClassIdentifier: + Rim: {fileID: 2639737386686648195} + Net: {fileID: 1029364543094105199} |