1
Fork 0

Update... something?

This commit is contained in:
Steffo 2019-04-28 00:30:04 +02:00
parent c422045fcf
commit 08830afea9

View file

@ -46,13 +46,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
hpMax: 0 hpMax: 0
hp: 0 hp: 0
<<<<<<< Updated upstream
sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3}
visionRange: 4 visionRange: 4
=======
sprite: {fileID: 21300000, guid: 0121970e693ee0a4d987bd5fe694ad67, type: 3}
visionRange: 2.5
>>>>>>> Stashed changes
--- !u!212 &1351652798109185028 --- !u!212 &1351652798109185028
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0