Merge branch 'melania-dev'

This commit is contained in:
KrolMel 2023-01-05 20:05:27 +01:00
commit c5f009b82a
5 changed files with 132061 additions and 1 deletions

View File

@ -11339,6 +11339,7 @@ GameObject:
- component: {fileID: 407612202}
- component: {fileID: 407612204}
- component: {fileID: 407612203}
- component: {fileID: 407612205}
m_Layer: 0
m_Name: Walls
m_TagString: Untagged
@ -14102,6 +14103,22 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!19719996 &407612205
TilemapCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 407612201}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!1 &425810218
GameObject:
m_ObjectHideFlags: 0
@ -55285,7 +55302,6 @@ MonoBehaviour:
- {fileID: 4095674802650808536, guid: d4ed7b1b2a2b74b49966bd3fb39806ff, type: 3}
- {fileID: 2071044935318948575, guid: 4424631257fae904ca20d56e45a8fce1, type: 3}
- {fileID: 768066516210684488, guid: 37d53369a108ca64b8ec49414fe5b33f, type: 3}
- {fileID: 2368039485218444103, guid: ef9907b84e7629a4ea317ffe22da98dd, type: 3}
respownPoints:
- {fileID: 2083033195}
- {fileID: 1004268553}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a4346d5149b2f1a4f8c7821efbb5e4a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 69001702ffc3307468ca42491ced18b5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: