Merge branch 'main' into Enemy-boat-pastie-steal

This commit is contained in:
Philip W 2021-11-01 17:19:29 +00:00
commit e96f723ea2
3 changed files with 2 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Art/Sprites/canon base.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

View File

@ -2485,8 +2485,8 @@ Canvas:
m_GameObject: {fileID: 1891200085}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_RenderMode: 1
m_Camera: {fileID: 1780207599}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1