Merge branch 'master' into melania-dev

This commit is contained in:
KrolMel 2023-01-09 21:45:42 +01:00
commit 3d309a02b6
6 changed files with 171 additions and 0 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 85142fe83d11b204ea431b11614130e0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fb89fa2132b672b4cb37e3f7d153b8c6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,115 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5514110702475440540
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5514110702475440537}
- component: {fileID: 5514110702475440536}
- component: {fileID: 5514110702475440543}
- component: {fileID: 5514110702475440542}
- component: {fileID: 5514110702475440541}
m_Layer: 0
m_Name: Door
m_TagString: SceneTransition
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5514110702475440537
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5514110702475440540}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.55, y: -10.48, z: 0}
m_LocalScale: {x: 1.975, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &5514110702475440536
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5514110702475440540}
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_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!50 &5514110702475440543
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5514110702475440540}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &5514110702475440542
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5514110702475440540}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5514110702475440541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5514110702475440540}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3}
m_Name:
m_EditorClassIdentifier:
SaveController: {fileID: 5514110702475440540}
gateway:
id: 0
currentMapName:
coords: {x: 0, y: 0, z: 0}
nextMapName:
respawnCoords: {x: 0, y: 0, z: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 091334681d4a75c47981ce6090486fe2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9890013e3eb0ea54b90ab8d093688ac6, type: 3}
m_Name: Ground - Dungeon
m_EditorClassIdentifier:
Tiles:
- {fileID: 11400000, guid: bcef03bfe6d889f458c051fcda77d968, type: 2}
- {fileID: 11400000, guid: d42493bc02d957348b2fa86903567280, type: 2}
- {fileID: 11400000, guid: de0fda329382efd4282ae71a2102f4d3, type: 2}
- {fileID: 11400000, guid: 358aa35606523e7448ae0830831f6d72, type: 2}
- {fileID: 11400000, guid: deda5f47600755b4483b220e3c1ff87e, type: 2}
- {fileID: 11400000, guid: 7fd161cc7577108489aca90fb9db6ed1, type: 2}
- {fileID: 11400000, guid: 2e196d2a440526e4495cf2ae03a1da5c, type: 2}
- {fileID: 11400000, guid: 5d8974c1ff1a1ee4db297f3cc42015b3, type: 2}
- {fileID: 11400000, guid: ca1a2a4d015bc0e44b2f7ed4e8a19b0e, type: 2}
walkable: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 09b982311c12ce740906c7e5543621f1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: