sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	Assets/Scripts/TileBehaviour.cs
This commit is contained in:
j-weissen 2022-06-03 08:20:17 +02:00
commit 0ffbb31b39
17 changed files with 1009 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/BaseTile.prefab
View file

@ -76,7 +76,7 @@ SpriteRenderer:
m_SortingLayerID: -2016319409
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Sprite: {fileID: 21300000, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0