Merge branch
This commit is contained in:
Maximilian Wagner
8082
Assets/Scenes/Level_Vanessa.unity
generated
8082
Assets/Scenes/Level_Vanessa.unity
generated
File diff suppressed because it is too large
Load Diff
241
Assets/Scenes/Prototype.unity
generated
241
Assets/Scenes/Prototype.unity
generated
@@ -6959,181 +6959,11 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1434189951
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1434189956}
|
||||
- component: {fileID: 1434189955}
|
||||
- component: {fileID: 1434189952}
|
||||
- component: {fileID: 1434189954}
|
||||
- component: {fileID: 1434189953}
|
||||
- component: {fileID: 1434189957}
|
||||
- component: {fileID: 1434189958}
|
||||
m_Layer: 0
|
||||
m_Name: le_fisch_draft
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1434189952
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f90e1f9169948b4499e0a5541c86d7bb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
maxSpeed: -2
|
||||
--- !u!50 &1434189953
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 4
|
||||
--- !u!70 &1434189954
|
||||
CapsuleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0.1, y: 0}
|
||||
m_Size: {x: 1.49, y: 1.76}
|
||||
m_Direction: 0
|
||||
--- !u!212 &1434189955
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 63423e7f6209b984398ff319d41fce89, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 2, y: 2}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!4 &1434189956
|
||||
--- !u!4 &1434189956 stripped
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_CorrespondingSourceObject: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
m_PrefabInstance: {fileID: 3157722294326665831}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 86.09533, y: -6.6714106, z: 0.11194041}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1317111512}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!68 &1434189957
|
||||
EdgeCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_EdgeRadius: 0
|
||||
m_Points:
|
||||
- {x: -0.67, y: 0}
|
||||
- {x: 0.87, y: 0}
|
||||
m_AdjacentStartPoint: {x: 0, y: 0}
|
||||
m_AdjacentEndPoint: {x: 0, y: 0}
|
||||
m_UseAdjacentStartPoint: 0
|
||||
m_UseAdjacentEndPoint: 0
|
||||
--- !u!114 &1434189958
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434189951}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
player: {fileID: 170098608}
|
||||
respawnPoint: {fileID: 1982712934}
|
||||
--- !u!1 &1501535132 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6161590568038202171, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3}
|
||||
@@ -41390,6 +41220,71 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dbd3b3a5517cb3e48b73ce0af4ad5f7b, type: 3}
|
||||
--- !u!1001 &3157722294326665831
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1317111512}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3157722293473387032, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: le_fisch_draft
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387233, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 170098608}
|
||||
- target: {fileID: 3157722293473387233, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: respawnPoint
|
||||
value:
|
||||
objectReference: {fileID: 1982712934}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 86.09533
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -6.6714106
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.11194041
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3157722293473387235, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6bb188494003a3c4ab4f0cecbc1f32d6, type: 3}
|
||||
--- !u!1001 &3743697183226462980
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user