fixed merge

This commit is contained in:
2020-02-01 01:47:44 -05:00
parent 6902571489
commit 3c794540ce
8 changed files with 200 additions and 8 deletions

View File

@@ -121,9 +121,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5f777aa09d2ced42baa1cc6bf9dbe54, type: 3}
m_Name:
m_EditorClassIdentifier:
secondsLeft: 1
secondsRight: 1
movementSpeed: 1
secondsGoingLeft: 1
secondsGoingRight: 1
movementSpeed: 5
playerCollider: {fileID: 0}
--- !u!50 &3827363133515929334
Rigidbody2D:
serializedVersion: 4