diff --git a/Assets/_Game/Scenes/MainLevel.unity b/Assets/_Game/Scenes/MainLevel.unity index 9787437931559cf1c48a4ea6b742ec0ad4e601ca..17c1896655572d36306b611e146331608e968045 100644 --- a/Assets/_Game/Scenes/MainLevel.unity +++ b/Assets/_Game/Scenes/MainLevel.unity @@ -1029,7 +1029,7 @@ Camera: field of view: 60 orthographic: 1 orthographic size: 13 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 8192 @@ -2283,7 +2283,7 @@ Transform: m_LocalScale: {x: 4.749867, y: 10.27617, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &117491776 GameObject: @@ -5655,7 +5655,7 @@ Transform: - {fileID: 1605852278} - {fileID: 1741470320} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &268156081 PrefabInstance: @@ -5971,7 +5971,7 @@ Transform: - {fileID: 1461548199} - {fileID: 733089692} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &320155738 GameObject: @@ -6291,30 +6291,183 @@ EdgeCollider2D: - {x: -105.67981, y: 10.40229} - {x: -105.68532, y: 10.59892} - {x: -105.6854, y: 10.60119} - - {x: -105.69397, y: 10.80991} - - {x: -105.89176, y: 11.00397} - - {x: -106.61968, y: 11.02002} - - {x: -106.61968, y: 11.02001} - - {x: -108.28457, y: 11.05732} - - {x: -110.87338, y: 11.11581} - - {x: -114.23412, y: 11.19238} - - {x: -118.21489, y: 11.28389} - - {x: -122.66394, y: 11.38723} - - {x: -122.66394, y: 11.38722} - - {x: -127.4291, y: 11.49926} - - {x: -132.35878, y: 11.61687} - - {x: -137.3012, y: 11.73695} - - {x: -137.3012, y: 11.73694} - - {x: -142.10387, y: 11.85634} - - {x: -142.10387, y: 11.85635} - - {x: -146.61569, y: 11.97198} - - {x: -150.6844, y: 12.08068} - - {x: -154.15707, y: 12.17932} - - {x: -156.88322, y: 12.26482} - - {x: -158.70615, y: 12.33385} - - {x: -159.25737, y: 12.36917} + - {x: -105.69393, y: 10.80882} + - {x: -105.88913, y: 11.00242} + - {x: -106.2138, y: 11.01306} + - {x: -106.74314, y: 11.0304} + - {x: -106.74319, y: 11.0304} + - {x: -107.56665, y: 11.05715} + - {x: -107.56672, y: 11.05715} + - {x: -108.63634, y: 11.09145} + - {x: -108.63642, y: 11.09145} + - {x: -109.9043, y: 11.13153} + - {x: -109.9044, y: 11.13153} + - {x: -111.32259, y: 11.17555} + - {x: -111.32271, y: 11.17556} + - {x: -112.8433, y: 11.2217} + - {x: -112.84344, y: 11.22171} + - {x: -114.41847, y: 11.26818} + - {x: -114.41866, y: 11.26819} + - {x: -116.00025, y: 11.31316} + - {x: -116.00049, y: 11.31317} + - {x: -117.54071, y: 11.35485} + - {x: -117.54103, y: 11.35485} + - {x: -118.992, y: 11.3914} + - {x: -118.99246, y: 11.39142} + - {x: -120.30633, y: 11.42103} + - {x: -120.30703, y: 11.42104} + - {x: -121.43603, y: 11.44192} + - {x: -121.43725, y: 11.44194} + - {x: -122.33406, y: 11.45226} + - {x: -122.33667, y: 11.45227} + - {x: -122.93393, y: 11.45024} + - {x: -122.93406, y: 11.48401} + - {x: -122.93429, y: 11.60366} + - {x: -122.9343, y: 11.60517} + - {x: -122.93564, y: 11.73215} + - {x: -122.9357, y: 11.73532} + - {x: -122.93943, y: 11.86545} + - {x: -122.93965, y: 11.87059} + - {x: -122.9472, y: 12.00051} + - {x: -122.94781, y: 12.00813} + - {x: -122.96076, y: 12.13489} + - {x: -122.96228, y: 12.14614} + - {x: -122.98269, y: 12.2675} + - {x: -122.98634, y: 12.28422} + - {x: -123.01745, y: 12.39913} + - {x: -123.02654, y: 12.42468} + - {x: -123.07502, y: 12.53346} + - {x: -123.09818, y: 12.57154} + - {x: -123.17769, y: 12.67116} + - {x: -123.23159, y: 12.71629} + - {x: -123.35042, y: 12.78072} + - {x: -123.42305, y: 12.80174} + - {x: -123.52069, y: 12.80824} + - {x: -123.52788, y: 12.80857} + - {x: -123.66373, y: 12.81201} + - {x: -123.66555, y: 12.81205} + - {x: -123.86238, y: 12.81499} + - {x: -123.8632, y: 12.815} + - {x: -124.11266, y: 12.81755} + - {x: -124.11313, y: 12.81756} + - {x: -124.4048, y: 12.81976} + - {x: -124.40511, y: 12.81976} + - {x: -124.72826, y: 12.82163} + - {x: -124.72847, y: 12.82164} + - {x: -125.07229, y: 12.82321} + - {x: -125.07245, y: 12.82321} + - {x: -125.42613, y: 12.8245} + - {x: -125.42625, y: 12.8245} + - {x: -125.77896, y: 12.82555} + - {x: -125.77905, y: 12.82555} + - {x: -126.11994, y: 12.82638} + - {x: -126.12002, y: 12.82638} + - {x: -126.43821, y: 12.82701} + - {x: -126.43828, y: 12.82701} + - {x: -126.72299, y: 12.82746} + - {x: -126.72304, y: 12.82746} + - {x: -126.92843, y: 12.82772} + - {x: -126.92254, y: 12.90061} + - {x: -126.92248, y: 12.90144} + - {x: -126.90991, y: 13.06685} + - {x: -126.90984, y: 13.06784} + - {x: -126.89737, y: 13.24519} + - {x: -126.89729, y: 13.24642} + - {x: -126.88567, y: 13.43018} + - {x: -126.88558, y: 13.43172} + - {x: -126.87553, y: 13.6164} + - {x: -126.87543, y: 13.61842} + - {x: -126.86772, y: 13.79862} + - {x: -126.86763, y: 13.80133} + - {x: -126.86298, y: 13.97179} + - {x: -126.86291, y: 13.97568} + - {x: -126.86213, y: 14.13151} + - {x: -126.8622, y: 14.13753} + - {x: -126.86623, y: 14.27473} + - {x: -126.86685, y: 14.28514} + - {x: -126.87736, y: 14.40297} + - {x: -126.88077, y: 14.42511} + - {x: -126.90612, y: 14.54016} + - {x: -126.93629, y: 14.6068} + - {x: -127.01871, y: 14.71903} + - {x: -127.12983, y: 14.78958} + - {x: -127.28555, y: 14.82016} + - {x: -127.30106, y: 14.82249} + - {x: -127.45332, y: 14.83843} + - {x: -127.45937, y: 14.83896} + - {x: -127.65498, y: 14.8526} + - {x: -127.65821, y: 14.8528} + - {x: -127.89282, y: 14.86481} + - {x: -127.8948, y: 14.8649} + - {x: -128.16103, y: 14.87551} + - {x: -128.16238, y: 14.87556} + - {x: -128.45216, y: 14.88485} + - {x: -128.45312, y: 14.88487} + - {x: -128.75816, y: 14.89296} + - {x: -128.75893, y: 14.89298} + - {x: -129.07085, y: 14.89991} + - {x: -129.07143, y: 14.89992} + - {x: -129.38182, y: 14.90579} + - {x: -129.38228, y: 14.9058} + - {x: -129.6827, y: 14.9107} + - {x: -129.68306, y: 14.9107} + - {x: -129.96501, y: 14.91469} + - {x: -129.96533, y: 14.91469} + - {x: -130.22034, y: 14.91783} + - {x: -130.2206, y: 14.91784} + - {x: -130.44022, y: 14.92023} + - {x: -130.44041, y: 14.92023} + - {x: -130.61617, y: 14.92194} + - {x: -130.61632, y: 14.92195} + - {x: -130.73958, y: 14.92304} + - {x: -130.84932, y: 14.92402} + - {x: -130.94078, y: 14.89971} + - {x: -131.08925, y: 14.81302} + - {x: -131.15958, y: 14.73745} + - {x: -131.24219, y: 14.56929} + - {x: -131.2548, y: 14.53491} + - {x: -131.30289, y: 14.34468} + - {x: -131.30626, y: 14.32798} + - {x: -131.34052, y: 14.10156} + - {x: -131.34169, y: 14.09198} + - {x: -131.3665, y: 13.83167} + - {x: -131.36697, y: 13.82554} + - {x: -131.3842, y: 13.53847} + - {x: -131.3844, y: 13.53423} + - {x: -131.3953, y: 13.22904} + - {x: -131.39537, y: 13.22598} + - {x: -131.40108, y: 12.91191} + - {x: -131.40111, y: 12.90963} + - {x: -131.40273, y: 12.59615} + - {x: -131.40273, y: 12.59441} + - {x: -131.40126, y: 12.29113} + - {x: -131.40125, y: 12.28983} + - {x: -131.3978, y: 12.00648} + - {x: -131.39777, y: 12.00556} + - {x: -131.39336, y: 11.7519} + - {x: -131.39334, y: 11.75139} + - {x: -131.38994, y: 11.58403} + - {x: -131.43394, y: 11.5839} + - {x: -132.37943, y: 11.59926} + - {x: -133.8016, y: 11.62924} + - {x: -135.61674, y: 11.67164} + - {x: -137.74825, y: 11.7244} + - {x: -140.11552, y: 11.78536} + - {x: -140.11552, y: 11.78537} + - {x: -142.6412, y: 11.85247} + - {x: -145.24571, y: 11.92357} + - {x: -147.85066, y: 11.99658} + - {x: -150.37706, y: 12.06937} + - {x: -150.37706, y: 12.06938} + - {x: -152.74716, y: 12.13988} + - {x: -152.74716, y: 12.13987} + - {x: -154.88116, y: 12.20593} + - {x: -156.70006, y: 12.26545} + - {x: -158.12708, y: 12.31636} + - {x: -159.07689, y: 12.35629} + - {x: -159.2572, y: 12.36844} - {x: -159.2695, y: 12.42441} - - {x: -159.30402, y: 12.62738} + - {x: -159.30399, y: 12.62717} - {x: -159.3395, y: 12.87544} - {x: -159.3748, y: 13.15399} - {x: -159.40977, y: 13.45379} @@ -6733,26 +6886,26 @@ EdgeCollider2D: - {x: -56.54583, y: -5.47112} - {x: -53.45804, y: -5.53332} - {x: -53.45628, y: -5.53334} - - {x: -52.27173, y: -5.54528} - - {x: -52.25714, y: -5.54481} - - {x: -51.4638, y: -5.48655} - - {x: -49.63707, y: -5.37147} - - {x: -46.91866, y: -5.20774} - - {x: -43.45905, y: -5.00422} - - {x: -43.45905, y: -5.00421} - - {x: -39.4099, y: -4.76978} - - {x: -34.92024, y: -4.51316} - - {x: -30.14129, y: -4.24321} - - {x: -30.14129, y: -4.24322} - - {x: -25.22229, y: -3.96871} - - {x: -20.31447, y: -3.69849} - - {x: -15.56686, y: -3.44129} - - {x: -11.13115, y: -3.206} - - {x: -7.15565, y: -3.00131} - - {x: -3.79336, y: -2.83618} - - {x: -1.1924, y: -2.7193} - - {x: 0.48877, y: -2.65975} - - {x: 1.00262, y: -2.66461} + - {x: -52.27218, y: -5.54527} + - {x: -52.25848, y: -5.54487} + - {x: -51.54171, y: -5.49591} + - {x: -49.77219, y: -5.38772} + - {x: -47.09232, y: -5.2287} + - {x: -47.09232, y: -5.22869} + - {x: -43.65693, y: -5.02805} + - {x: -43.65693, y: -5.02806} + - {x: -39.61715, y: -4.79479} + - {x: -35.12597, y: -4.53797} + - {x: -30.33542, y: -4.26665} + - {x: -25.39776, y: -3.98987} + - {x: -20.46554, y: -3.71671} + - {x: -15.69016, y: -3.45616} + - {x: -11.22527, y: -3.21736} + - {x: -7.22122, y: -3.00924} + - {x: -3.83331, y: -2.84101} + - {x: -1.21131, y: -2.72161} + - {x: 0.48377, y: -2.66036} + - {x: 1.00279, y: -2.66473} - {x: 1.15215, y: -2.76792} - {x: 1.15816, y: -2.77189} - {x: 1.66186, y: -3.09009} @@ -7109,9 +7262,9 @@ MonoBehaviour: spriteIndex: 0 corner: 0 - position: {x: -52.2755, y: -5.195221, z: 0} - leftTangent: {x: 1.1614571, y: 0.14007568, z: 0} + leftTangent: {x: 0.6932907, y: 0.083610535, z: -0} rightTangent: {x: -0.6932907, y: -0.083610535, z: 0} - mode: 2 + mode: 1 height: 1 bevelCutoff: 0 bevelSize: 0 @@ -7254,7 +7407,61 @@ MonoBehaviour: corner: 0 - position: {x: -159.50194, y: 12.034134, z: 0} leftTangent: {x: -0.1973114, y: 0.038154602, z: 0} - rightTangent: {x: 1.0788727, y: -0.20863342, z: 0} + rightTangent: {x: 0.55755615, y: -0.1078186, z: 0} + mode: 2 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -131.03674, y: 11.235107, z: 0} + leftTangent: {x: -0.5200043, y: -0.054618835, z: 0} + rightTangent: {x: 0.0211792, y: 0.0022277832, z: 0} + mode: 2 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -130.80515, y: 14.573616, z: 0} + leftTangent: {x: -0.3683014, y: 0.0039901733, z: 0} + rightTangent: {x: 0.15567017, y: -0.0016860962, z: 0} + mode: 2 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -127.261856, y: 14.458824, z: 0} + leftTangent: {x: -0.2752533, y: 0.09174347, z: 0} + rightTangent: {x: 0.13563538, y: -0.045211792, z: 0} + mode: 2 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -127.309906, y: 12.478088, z: 0} + leftTangent: {x: 0, y: 0, z: 0} + rightTangent: {x: 0, y: 0, z: 0} + mode: 0 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -123.484024, y: 12.455025, z: 0} + leftTangent: {x: -0.08104706, y: 0.021202087, z: 0} + rightTangent: {x: 0.32344818, y: -0.084609985, z: 0} + mode: 2 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: -123.23532, y: 11.083916, z: 0} + leftTangent: {x: -0.12590027, y: -0.028945923, z: 0} + rightTangent: {x: 0.5560913, y: 0.1278534, z: 0} mode: 2 height: 1 bevelCutoff: 0 @@ -7262,7 +7469,7 @@ MonoBehaviour: spriteIndex: 0 corner: 0 - position: {x: -106.03799, y: 10.657112, z: 0} - leftTangent: {x: -0.0050735474, y: -0.001083374, z: 0} + leftTangent: {x: -0.0015563965, y: -0.00033569336, z: 0} rightTangent: {x: 0.009269714, y: 0.0019836426, z: 0} mode: 2 height: 1 @@ -7439,8 +7646,8 @@ SpriteShapeRenderer: - {fileID: 0} - {fileID: 0} m_LocalAABB: - m_Center: {x: -138.52856, y: 2.5233293, z: -0.015000001} - m_Extent: {x: 186.14456, y: 15.9679985, z: 0.015000001} + m_Center: {x: -138.52856, y: 2.5233293, z: -0.0175} + m_Extent: {x: 186.14456, y: 15.9679985, z: 0.0175} --- !u!1001 &323319217 PrefabInstance: m_ObjectHideFlags: 0 @@ -10420,6 +10627,186 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3} +--- !u!1 &474182050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 474182051} + - component: {fileID: 474182054} + - component: {fileID: 474182053} + - component: {fileID: 474182052} + m_Layer: 9 + m_Name: New SpriteShapeController (41) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &474182051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474182050} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -28.53, y: -1.9199982, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1826291048} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &474182052 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474182050} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: -10.05947, y: 0.73277} + - {x: -7.1517, y: 0.79494} + - {x: -7.14494, y: 0.79534} + - {x: -5.32016, y: 0.97233} + - {x: -5.31665, y: 0.97274} + - {x: -3.4255, y: 1.23151} + - {x: -3.42478, y: 1.23161} + - {x: -1.66556, y: 1.48698} + - {x: -0.23663, y: 1.65417} + - {x: 1.20094, y: 1.73452} + - {x: 2.80465, y: 1.7872} + - {x: 4.10916, y: 1.81597} + - {x: 4.82695, y: 1.82759} + - {x: 4.82112, y: 2.18754} + - {x: 4.10249, y: 2.17591} + - {x: 4.10197, y: 2.1759} + - {x: 2.79589, y: 2.1471} + - {x: 2.79492, y: 2.14707} + - {x: 1.18588, y: 2.09422} + - {x: 1.18381, y: 2.09413} + - {x: -0.26489, y: 2.01316} + - {x: -0.27033, y: 2.01269} + - {x: -1.71102, y: 1.84412} + - {x: -1.71348, y: 1.84379} + - {x: -3.4749, y: 1.58811} + - {x: -5.36021, y: 1.33014} + - {x: -7.16957, y: 1.15465} + - {x: -10.06423, y: 1.09275} + - {x: -14.21452, y: 1.09562} + - {x: -17.93525, y: 1.12529} + - {x: -19.72917, y: 1.1457} + - {x: -19.73327, y: 0.78572} + - {x: -17.93919, y: 0.76531} + - {x: -17.93889, y: 0.76531} + - {x: -14.21582, y: 0.73562} + - {x: -14.21516, y: 0.73562} + - {x: -10.06145, y: 0.73275} + - {x: -10.05947, y: 0.73277} +--- !u!114 &474182053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474182050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90539df1cd5704abcb25fec9f3f5f84b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Spline: + m_IsOpenEnded: 1 + m_ControlPoints: + - position: {x: 1.5553207, y: 0.3562088, z: 0} + leftTangent: {x: -0.27543926, y: 0.011722565, z: 0} + rightTangent: {x: 0.27543926, y: -0.011722565, z: 0} + mode: 1 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: 2.6024132, y: 0.26784515, z: 0} + leftTangent: {x: -0.45373535, y: -0.0054855347, z: 0} + rightTangent: {x: 0.45373535, y: 0.0054855347, z: 0} + mode: 1 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + m_SpriteShape: {fileID: 11400000, guid: 47f91cca3221eda42bcfda1b0ac45675, type: 2} + m_SplineDetail: 16 + m_AdaptiveUV: 1 + m_UpdateCollider: 0 + m_ColliderDetail: 4 + m_ColliderOffset: 0.18 + m_ColliderCornerType: 0 +--- !u!1971053207 &474182054 +SpriteShapeRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474182050} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -480944179 + m_SortingLayer: 2 + m_SortingOrder: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_MaskInteraction: 0 + m_ShapeTexture: {fileID: 0} + m_Sprites: + - {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_LocalAABB: + m_Center: {x: 2.0295293, y: 0.31382167, z: -0.0005} + m_Extent: {x: 0.5729997, y: 0.47160912, z: 0.0005} --- !u!1 &476151164 GameObject: m_ObjectHideFlags: 0 @@ -12985,7 +13372,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &630855746 PrefabInstance: @@ -13772,7 +14159,7 @@ Transform: - {fileID: 1764593450} - {fileID: 2049111205} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &653535437 stripped Transform: @@ -15624,7 +16011,7 @@ Camera: field of view: 66 orthographic: 1 orthographic size: 8 - m_Depth: -1 + m_Depth: 2 m_CullingMask: serializedVersion: 2 m_Bits: 57143 @@ -15647,13 +16034,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 731052799} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -22.399998, y: 84.399994, z: -10} + m_LocalPosition: {x: -0.14, y: -0.07, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 842246475} - {fileID: 56322121} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Father: {fileID: 1949298891} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &731052803 MonoBehaviour: @@ -15669,7 +16056,7 @@ MonoBehaviour: m_EditorClassIdentifier: target: {fileID: 1949298891} smoothSpeed: 0.5 - lookAt: 0 + lookAt: 1 maxDistance: 5 --- !u!1 &733089691 GameObject: @@ -16108,7 +16495,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3} propertyPath: m_LocalPosition.x - value: -76.7 + value: -82.12 objectReference: {fileID: 0} - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3} propertyPath: m_LocalPosition.y @@ -16203,7 +16590,7 @@ Transform: - {fileID: 981825758} - {fileID: 1494754517} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &774815773 PrefabInstance: @@ -16767,7 +17154,7 @@ PrefabInstance: - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4, type: 3} @@ -16942,7 +17329,7 @@ Camera: m_GameObject: {fileID: 842246474} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 3 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} @@ -16960,7 +17347,7 @@ Camera: field of view: 60 orthographic: 1 orthographic size: 10 - m_Depth: -1 + m_Depth: 1 m_CullingMask: serializedVersion: 2 m_Bits: 131072 @@ -19305,7 +19692,7 @@ Transform: - {fileID: 2004137732} - {fileID: 1548538385} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1004855331 PrefabInstance: @@ -23078,6 +23465,186 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1220512237} m_PrefabAsset: {fileID: 0} +--- !u!1 &1222763048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1222763049} + - component: {fileID: 1222763052} + - component: {fileID: 1222763051} + - component: {fileID: 1222763050} + m_Layer: 9 + m_Name: New SpriteShapeController (39) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1222763049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222763048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -24.85, y: -1.92, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1826291048} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &1222763050 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222763048} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: -10.05947, y: 0.73277} + - {x: -7.1517, y: 0.79494} + - {x: -7.14494, y: 0.79534} + - {x: -5.32016, y: 0.97233} + - {x: -5.31665, y: 0.97274} + - {x: -3.4255, y: 1.23151} + - {x: -3.42478, y: 1.23161} + - {x: -1.66556, y: 1.48698} + - {x: -0.23663, y: 1.65417} + - {x: 1.20094, y: 1.73452} + - {x: 2.80465, y: 1.7872} + - {x: 4.10916, y: 1.81597} + - {x: 4.82695, y: 1.82759} + - {x: 4.82112, y: 2.18754} + - {x: 4.10249, y: 2.17591} + - {x: 4.10197, y: 2.1759} + - {x: 2.79589, y: 2.1471} + - {x: 2.79492, y: 2.14707} + - {x: 1.18588, y: 2.09422} + - {x: 1.18381, y: 2.09413} + - {x: -0.26489, y: 2.01316} + - {x: -0.27033, y: 2.01269} + - {x: -1.71102, y: 1.84412} + - {x: -1.71348, y: 1.84379} + - {x: -3.4749, y: 1.58811} + - {x: -5.36021, y: 1.33014} + - {x: -7.16957, y: 1.15465} + - {x: -10.06423, y: 1.09275} + - {x: -14.21452, y: 1.09562} + - {x: -17.93525, y: 1.12529} + - {x: -19.72917, y: 1.1457} + - {x: -19.73327, y: 0.78572} + - {x: -17.93919, y: 0.76531} + - {x: -17.93889, y: 0.76531} + - {x: -14.21582, y: 0.73562} + - {x: -14.21516, y: 0.73562} + - {x: -10.06145, y: 0.73275} + - {x: -10.05947, y: 0.73277} +--- !u!114 &1222763051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222763048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90539df1cd5704abcb25fec9f3f5f84b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Spline: + m_IsOpenEnded: 1 + m_ControlPoints: + - position: {x: 1.5382652, y: 0.21979189, z: 0} + leftTangent: {x: -0.27543926, y: 0.011722565, z: 0} + rightTangent: {x: 0.27543926, y: -0.011722565, z: 0} + mode: 1 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + - position: {x: 2.5341797, y: 0.19964015, z: 0} + leftTangent: {x: -0.45373535, y: -0.0054855347, z: 0} + rightTangent: {x: 0.45373535, y: 0.0054855347, z: 0} + mode: 1 + height: 1 + bevelCutoff: 0 + bevelSize: 0 + spriteIndex: 0 + corner: 0 + m_SpriteShape: {fileID: 11400000, guid: 47f91cca3221eda42bcfda1b0ac45675, type: 2} + m_SplineDetail: 16 + m_AdaptiveUV: 1 + m_UpdateCollider: 0 + m_ColliderDetail: 4 + m_ColliderOffset: 0.18 + m_ColliderCornerType: 0 +--- !u!1971053207 &1222763052 +SpriteShapeRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222763048} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -480944179 + m_SortingLayer: 2 + m_SortingOrder: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_MaskInteraction: 0 + m_ShapeTexture: {fileID: 0} + m_Sprites: + - {fileID: 21300000, guid: 13ab9aadcc474c54fa0e5e1357839339, type: 3} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_LocalAABB: + m_Center: {x: 1.9920366, y: 0.21050926, z: -0.0005} + m_Extent: {x: 0.5462149, y: 0.43771183, z: 0.0005} --- !u!1001 &1228088908 PrefabInstance: m_ObjectHideFlags: 0 @@ -25121,7 +25688,7 @@ Transform: m_LocalScale: {x: 0.682, y: 0.756, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1343683348 BoxCollider2D: @@ -26437,7 +27004,7 @@ PrefabInstance: - target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3} @@ -27046,7 +27613,7 @@ PrefabInstance: - target: {fileID: 411923848164041270, guid: 733da531ef87f6242be09aeffa86d7c6, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 411923848164041270, guid: 733da531ef87f6242be09aeffa86d7c6, type: 3} @@ -31898,7 +32465,7 @@ Transform: - {fileID: 774815774} - {fileID: 1004855332} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1605852278 stripped Transform: @@ -34392,6 +34959,25 @@ Transform: m_Father: {fileID: 2027679588} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1716686427 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1634356314439590, guid: 6cd7f8e10f89642fd88661db0d3f3827, + type: 3} + m_PrefabInstance: {fileID: 2004137731} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1716686428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716686427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59d5594d570702d4d818016a9f0350e9, type: 3} + m_Name: + m_EditorClassIdentifier: + mission: 0 --- !u!1 &1720009768 GameObject: m_ObjectHideFlags: 0 @@ -35310,12 +35896,12 @@ PrefabInstance: - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332, type: 3} propertyPath: m_LocalPosition.x - value: -21.6 + value: -74.3 objectReference: {fileID: 0} - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332, type: 3} propertyPath: m_LocalPosition.y - value: 84.2 + value: 53 objectReference: {fileID: 0} - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332, type: 3} @@ -35345,7 +35931,7 @@ PrefabInstance: - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332, type: 3} @@ -36102,7 +36688,7 @@ PrefabInstance: - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3} @@ -36969,7 +37555,7 @@ Transform: - {fileID: 716558692} - {fileID: 1305028038} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1826291047 GameObject: @@ -37010,6 +37596,8 @@ Transform: - {fileID: 1517373935} - {fileID: 1566272199} - {fileID: 1447929494} + - {fileID: 1222763049} + - {fileID: 474182051} m_Father: {fileID: 648558924} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39884,7 +40472,7 @@ PrefabInstance: - target: {fileID: 3962879857309384162, guid: 5ab2931e604d74039ab392b8189d5cbc, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3962879857309384162, guid: 5ab2931e604d74039ab392b8189d5cbc, type: 3} @@ -39926,6 +40514,11 @@ PrefabInstance: propertyPath: m_SortingOrder value: -1 objectReference: {fileID: 0} + - target: {fileID: 3962879857309384167, guid: 5ab2931e604d74039ab392b8189d5cbc, + type: 3} + propertyPath: m_Damage + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ab2931e604d74039ab392b8189d5cbc, type: 3} --- !u!1 &1968747630 @@ -40601,7 +41194,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3} propertyPath: m_LocalPosition.x - value: -123 + value: -126.58 objectReference: {fileID: 0} - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3} propertyPath: m_LocalPosition.y @@ -44897,7 +45490,7 @@ Transform: m_Children: - {fileID: 1475881766} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2146625978 stripped MonoBehaviour: diff --git a/Assets/_Game/Scripts/UI/EndScreen.cs b/Assets/_Game/Scripts/UI/EndScreen.cs index 383464b76ad4e8c753f9509f57e492d5bae1b521..2b3e9e14d581a8dc63cc44b707dbc3b5b55022c8 100644 --- a/Assets/_Game/Scripts/UI/EndScreen.cs +++ b/Assets/_Game/Scripts/UI/EndScreen.cs @@ -1,6 +1,7 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; +using EndMissionScript; public class EndScreen : MonoBehaviour { @@ -8,7 +9,10 @@ public class EndScreen : MonoBehaviour public GameObject credits; private void OnTriggerEnter2D(Collider2D other) - { - credits.SetActive(true); + { + if (EndMission.em.mission && other.tag.Equals("Player")) + { + credits.SetActive(true); + } } }