Commit e8e5f499 authored by Christopher Benes's avatar Christopher Benes
Browse files

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

parents 93f6567e 16147cea
......@@ -680,74 +680,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: weight
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: targetPos
value:
objectReference: {fileID: 1156108369}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: smoothTime
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: targetPos
value:
objectReference: {fileID: 1156108369}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: smoothTime
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: speed
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: patrolRange
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: moveTime
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8582909611794385439, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: chillTime
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_SortingLayerID
value: -614652393
objectReference: {fileID: 0}
- target: {fileID: 212219553255752332, guid: 6cd7f8e10f89642fd88661db0d3f3827,
type: 3}
propertyPath: m_SortingLayer
value: 4
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114692363085912100, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
- {fileID: 5987062824809259808, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cd7f8e10f89642fd88661db0d3f3827, type: 3}
--- !u!1 &719626315
GameObject:
......
......@@ -489,6 +489,35 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 674588446}
m_PrefabAsset: {fileID: 0}
--- !u!114 &435083158
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435083157}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3c0ce2eb523274b6fa61fccbf0227d85, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MaxLife: 3
LostLife:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1878028688071232123}
m_MethodName: HealthUpdate
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &435083164
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1552,6 +1581,11 @@ PrefabInstance:
propertyPath: m_GroundedOffset.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362284, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_SleepingMode
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
--- !u!1 &719626315
......@@ -1749,7 +1783,7 @@ SpriteShapeRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -2475,6 +2509,125 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &975171201
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2362585431789937785, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Name
value: PauseMenu
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3}
--- !u!1 &1025537126
GameObject:
m_ObjectHideFlags: 0
......@@ -2884,7 +3037,7 @@ SpriteShapeRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -3025,72 +3178,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ff4cf871f5edaa40b0530c80a9ff9df, type: 3}
--- !u!1 &1230622042
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1230622045}
- component: {fileID: 1230622044}
- component: {fileID: 1230622043}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1230622043
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230622042}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1230622044
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230622042}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 2897530309677776406}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1230622045
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230622042}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1325718403
GameObject:
m_ObjectHideFlags: 0
......@@ -5041,7 +5128,7 @@ SpriteShapeRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -5510,12 +5597,18 @@ EdgeCollider2D:
- {x: 38.2959, y: 5.64964}
- {x: 37.92376, y: 5.65967}
- {x: 37.54831, y: 5.67009}
--- !u!1 &2897530309677776406 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2897530309677776406, guid: 50a0ddec8ac259c46a58a6b5324a759d,
--- !u!114 &1878028688071232123 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1878028688071232123, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
m_PrefabInstance: {fileID: 6822927934576439631}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 533ddb9e0598722409208acad56bd8f4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6822927934576439631
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -5526,7 +5619,7 @@ PrefabInstance:
- target: {fileID: 7766137271154010154, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_Name
value: Levelauswahl
value: HUD
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
......@@ -5566,7 +5659,7 @@ PrefabInstance:
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_RootOrder
value: 19
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
......
fileFormatVersion: 2
guid: 2197bcbadbe4aa64c837bb2172290ab1
guid: 18a7fe86ba414cc44ac3ed98d0798651
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment