diff --git a/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity b/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity old mode 100755 new mode 100644 index 19be7a0..1b0de26 --- a/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity +++ b/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -259,10 +259,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -358,10 +355,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -1130,7 +1124,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 81.2, y: 64.1, z: -12.4} + m_LocalPosition: {x: 77.5, y: 55.2, z: -5.9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1261,12 +1255,6 @@ Transform: m_Father: {fileID: 671439045} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!4 &868386701 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - m_PrefabInstance: {fileID: 1809549197} - m_PrefabAsset: {fileID: 0} --- !u!1 &884498019 GameObject: m_ObjectHideFlags: 0 @@ -1300,80 +1288,6 @@ Transform: m_Father: {fileID: 782729761} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1061293905 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 868386701} - m_Modifications: - - target: {fileID: 2836004473841745626, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: 95a44e56d04c7d248ba723eda9611c51, type: 2} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2836004475591695743, guid: f432554f564e69242897607d34218939, - type: 3} - propertyPath: m_Name - value: DragonFucker - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f432554f564e69242897607d34218939, type: 3} --- !u!1 &1116745543 GameObject: m_ObjectHideFlags: 0 @@ -1405,10 +1319,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -1840,7 +1751,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345085340} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 21.51, y: -5.782543, z: -10.46} + m_LocalPosition: {x: 47.446796, y: -5.782543, z: -25.400002} m_LocalScale: {x: 1.4367, y: 1.4367, z: 1.4367} m_Children: [] m_Father: {fileID: 2060099472} @@ -1858,10 +1769,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -1957,10 +1865,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -2182,10 +2087,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -2236,105 +2138,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663305221} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1809549197 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -4942972567661207728, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalPosition.x - value: 42.23 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalPosition.z - value: -15.91 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763699, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: playerStance - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: playerCrouchStance.CameraHeight - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 4528203470625763703, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.417 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 99bb17a23a489624baeaf337f91a4f84, type: 3} --- !u!1 &1858987083 GameObject: m_ObjectHideFlags: 0 @@ -2459,9 +2262,9 @@ MonoBehaviour: - {fileID: 140697606} spawnPointsForAttackersTeam: - {fileID: 2004854094} - AIPrefab: {fileID: 2988578997639256874, guid: b016874eb34cc084aa4359f0bbec50e1, + AIPrefab: {fileID: 6171680323948707524, guid: b016874eb34cc084aa4359f0bbec50e1, type: 3} - PlayerPrefab: {fileID: 5245491127989480125, guid: 99bb17a23a489624baeaf337f91a4f84, + PlayerPrefab: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3} --- !u!114 &1858987091 MonoBehaviour: @@ -2728,10 +2531,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD navType: 1 -======= ->>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467 PointId: 0 DeathAttr: 0 EnemiesSeen: [] @@ -2820,7 +2620,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060099471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 27.79, y: 7.782543, z: -15} + m_LocalPosition: {x: 19.553204, y: 7.782543, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1345085341}