Commit 563cd657 authored by Jonas's avatar Jonas

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/_Game/Prefabs/PlayerManagerPrefabs/Player1Manager.prefab
#	Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Body.prefab
#	Assets/_Game/Scenes/CharacterCustomization.unity
#	Assets/_Game/Scenes/MainLevelSwitched.unity
#	Assets/_Game/Scripts/GameManager/GameHandler.cs
#	Assets/_Game/Scripts/UI/CharacterCustomization.cs
#	Assets/_Game/Scripts/UI/ShowCountdown.cs
parents 2fff6796 77c428eb
......@@ -10,11 +10,11 @@ GameObject:
m_Component:
- component: {fileID: 4412139409271564331}
- component: {fileID: 4412139409271564330}
- component: {fileID: 4412139409271564309}
- component: {fileID: 7027236318075671688}
- component: {fileID: 4412139409271564309}
m_Layer: 0
m_Name: Player1Manager
m_TagString: Untagged
m_Name: PlayerManager
m_TagString: ControllHandler1
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -64,7 +64,7 @@ MonoBehaviour:
m_DefaultActionMap: 480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &4412139409271564309
--- !u!114 &7027236318075671688
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -73,20 +73,21 @@ MonoBehaviour:
m_GameObject: {fileID: 4412139409271564308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b7ddf446ce92e44db1b540ae5f55155, type: 3}
m_Script: {fileID: 11500000, guid: 865a6f4af420e454086e6906b464c7b7, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: {fileID: 0}
mutation: {fileID: 0}
--- !u!114 &7027236318075671688
--- !u!114 &4412139409271564309
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4412139409271564308}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 865a6f4af420e454086e6906b464c7b7, type: 3}
m_Script: {fileID: 11500000, guid: 5b7ddf446ce92e44db1b540ae5f55155, type: 3}
m_Name:
m_EditorClassIdentifier:
tag: HeadPlayer
movement: {fileID: 0}
mutation: {fileID: 0}
......@@ -93,6 +93,7 @@ GameObject:
- component: {fileID: 3713909334391863638}
- component: {fileID: 5454309568428411407}
- component: {fileID: 1957649875713174593}
- component: {fileID: 7438479100682827079}
m_Layer: 8
m_Name: Body
m_TagString: BodyPlayer
......@@ -169,7 +170,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2301140017794985292}
serializedVersion: 2
m_Mass: 1e+9
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
......@@ -221,3 +222,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c5dcddde29f5d3747912be55aba7420a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7438479100682827079
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2301140017794985292}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6219fa0ffdc9db34cb51427902f06c90, type: 3}
m_Name:
m_EditorClassIdentifier:
mutation1: {fileID: 11400000, guid: 3a533c310414823458ca2a6ea6c6ddce, type: 2}
mutation2: {fileID: 11400000, guid: 674a68f9f71d2b640914ad1f3be2cbc0, type: 2}
......@@ -131,8 +131,9 @@ GameObject:
- component: {fileID: 160772135}
- component: {fileID: 160772137}
- component: {fileID: 160772136}
- component: {fileID: 160772138}
m_Layer: 5
m_Name: Text (TMP)
m_Name: DelayTimerTextField
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -155,7 +156,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 600, y: 350}
m_SizeDelta: {x: 683.9, y: 109.29999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &160772136
MonoBehaviour:
......@@ -177,17 +178,17 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 5
m_text: Get Ready
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278913979
m_fontColor: {r: 0.735849, g: 0.045122836, b: 0.045122836, a: 1}
rgba: 4278222320
m_fontColor: {r: 0.9433962, g: 0.49156815, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
......@@ -205,13 +206,13 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 300
m_fontSizeBase: 300
m_fontSize: 100
m_fontSizeBase: 100
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_fontStyle: 17
m_textAlignment: 258
m_characterSpacing: 0
m_wordSpacing: 0
......@@ -222,7 +223,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
......@@ -246,10 +247,10 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 160772136}
characterCount: 1
characterCount: 9
spriteCount: 0
spaceCount: 0
wordCount: 1
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
......@@ -277,6 +278,21 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 160772134}
m_CullTransparentMesh: 0
--- !u!114 &160772138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 160772134}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2a46c9de6bb9b94a918138671cc1332, type: 3}
m_Name:
m_EditorClassIdentifier:
delayTimer: {fileID: 11400000, guid: 2a8e93333552cee40bb1655c20f581d8, type: 2}
delayTextField: {fileID: 160772136}
scale: 2
--- !u!1 &216406850
GameObject:
m_ObjectHideFlags: 0
......@@ -369,210 +385,13 @@ RectTransform:
m_Children:
- {fileID: 160772135}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1003040377
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1003040380}
- component: {fileID: 1003040379}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!20 &1003040379
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1003040377}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1003040380
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1003040377}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1231639504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1231639506}
- component: {fileID: 1231639505}
m_Layer: 0
m_Name: DelayScripts
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1231639505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1231639504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2a46c9de6bb9b94a918138671cc1332, type: 3}
m_Name:
m_EditorClassIdentifier:
delayTextField: {fileID: 160772136}
--- !u!4 &1231639506
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1231639504}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 420.66663, y: 174.83424, z: -129.625}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1685987113
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1685987114}
- component: {fileID: 1685987116}
- component: {fileID: 1685987115}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1685987114
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1685987113}
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: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 605.5, y: 261.5}
m_SizeDelta: {x: 615.7, y: 346.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1685987115
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1685987113}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.16841131, g: 0.745283, b: 0.116011046, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 300
m_FontStyle: 3
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 5
--- !u!222 &1685987116
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1685987113}
m_CullTransparentMesh: 0
--- !u!1 &1933017517
GameObject:
m_ObjectHideFlags: 0
......@@ -637,5 +456,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
This diff is collapsed.
......@@ -120,12 +120,136 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!4 &150093077 stripped
--- !u!4 &150093077
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 5204299803420509725, guid: 276ed99a0fe19ff48b6ad175cbbec559,
type: 3}
m_PrefabInstance: {fileID: 6856644574209275985}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1706954638}
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: 260863597}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &260863596
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 6856644574209275985}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 260863597}
m_Layer: 0
m_Name: Player2Manager (Missing Prefab)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &260863597
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 6856644574209275985}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 260863596}
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:
- {fileID: 150093077}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &725000195
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4412139409271564308, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_Name
value: Player2Manager
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564308, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_TagString
value: ControllHandler2
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564331, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412139409271564309, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: movement
value:
objectReference: {fileID: 944714734}
- target: {fileID: 4412139409271564309, guid: 63e8800253376df44a1d2ea9ad6b520a,
type: 3}
propertyPath: tag
value: BodyPlayer
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63e8800253376df44a1d2ea9ad6b520a, type: 3}
--- !u!1 &848338633
GameObject:
m_ObjectHideFlags: 0
......@@ -269,7 +393,7 @@ PrefabInstance:
- target: {fileID: 6549029302140537430, guid: 9b5e35e1fe41f15419dad967083bafa8,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6549029302140537430, guid: 9b5e35e1fe41f15419dad967083bafa8,
type: 3}
......@@ -350,7 +474,7 @@ PrefabInstance:
- target: {fileID: 2301140017794985288, guid: ea05ca32432105d468969c2ccef55e1a,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 2301140017794985288, guid: ea05ca32432105d468969c2ccef55e1a,
type: 3}
......@@ -381,6 +505,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 64ce53df6ad8d004b9a944bc4741ba8e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1706954638
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 6856644574209275985}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 150093077}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1718606470
GameObject:
m_ObjectHideFlags: 0
......@@ -410,7 +550,7 @@ Transform:
m_Children:
- {fileID: 848338634}
m_Father: {fileID: 0}