diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index 747be08..adc4d3d 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -1726,7 +1726,6 @@ MonoBehaviour: projectile: {fileID: 5836429411335034028, guid: 67bd739b3855bf4449e02e4b83c1d984, type: 3} projSpeed: 8 timeBetween: 4 - enemyHealth: 100 damageTaken: 10 doors: - {fileID: 1787950110} @@ -1827,6 +1826,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1913,6 +1913,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 100 + m_RefResolutionY: 100 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 8d3256a..4a223dc 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -3027,6 +3027,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -3093,7 +3094,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563510750} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -25.3, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -3113,6 +3114,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &568026480 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity index df27452..a5e30ad 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity @@ -8425,6 +8425,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -8491,7 +8492,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563510750} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: 2.7, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -8511,6 +8512,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity index 9ce3aba..9790548 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity @@ -214,151 +214,83 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 73552635} m_ColliderPaths: - - - X: 140000100 - Y: -50000041 - - X: 140000100 - Y: -30000100 - - X: 160000041 - Y: -30000100 - - X: 160000100 - Y: -30000041 - - X: 160000100 - Y: 29999900 - - X: 190000041 - Y: 29999900 - - X: 190000100 - Y: 29999959 - - X: 190000100 - Y: 40000041 - - X: 190000041 - Y: 40000100 - - X: 180000100 - Y: 40000100 - - X: 180000100 - Y: 59999900 - - X: 190000041 - Y: 59999900 - - X: 190000100 - Y: 59999959 - - X: 190000100 - Y: 70000041 - - X: 190000041 - Y: 70000100 - - X: 149999959 - Y: 70000100 - - X: 149999900 - Y: 70000041 - - X: 149999900 - Y: 59999959 - - X: 149999959 - Y: 59999900 - - X: 169999900 - Y: 59999900 - - X: 169999900 - Y: 40000100 - - X: 129999959 - Y: 40000100 - - X: 129999900 - Y: 40000041 - - X: 129999900 - Y: 29999959 - - X: 129999959 - Y: 29999900 - - X: 139999900 - Y: 29999900 - - X: 139999900 - Y: -29999900 - - X: 109999959 - Y: -29999900 - - X: 109999900 - Y: -29999959 - - X: 109999900 - Y: -50000041 - - X: 109999959 - Y: -50000100 - - X: 140000041 - Y: -50000100 - - - X: -239999900 - Y: -10000041 - - X: -239999900 - Y: -100 - - X: -229999959 - Y: -100 - - X: -229999900 - Y: -41 - - X: -229999900 - Y: 20000041 - - X: -229999959 - Y: 20000100 - - X: -260000041 - Y: 20000100 - - X: -260000100 - Y: 20000041 - - X: -260000100 - Y: -10000041 - - X: -260000041 - Y: -10000100 - - X: -239999959 - Y: -10000100 - - - X: 10000100 - Y: -90000041 - - X: 10000100 - Y: -80000100 - - X: 50000041 - Y: -80000100 - - X: 50000100 - Y: -80000041 - - X: 50000100 - Y: -70000100 - - X: 60000041 - Y: -70000100 - - X: 60000100 - Y: -70000041 - - X: 60000100 - Y: -50000100 - - X: 90000041 - Y: -50000100 - - X: 90000100 - Y: -50000041 - - X: 90000100 - Y: -29999959 - - X: 90000041 - Y: -29999900 - - X: 49999959 - Y: -29999900 - - X: 49999900 - Y: -29999959 - - X: 49999900 - Y: -49999900 - - X: 39999959 - Y: -49999900 - - X: 39999900 - Y: -49999959 - - X: 39999900 - Y: -69999900 - - X: -41 - Y: -69999900 - - X: -100 - Y: -69999959 - - X: -100 - Y: -79999900 - - X: -59999900 - Y: -79999900 - - X: -59999900 - Y: -19999959 - - X: -59999959 - Y: -19999900 - - X: -80000041 - Y: -19999900 - - X: -80000100 - Y: -19999959 - - X: -80000100 - Y: -79999900 - - X: -130000041 - Y: -79999900 - - X: -130000100 - Y: -79999959 - - X: -130000100 + - - X: 160000000 + Y: 30000000 + - X: 190000000 + Y: 30000000 + - X: 190000000 + Y: 40000000 + - X: 180000000 + Y: 40000000 + - X: 180000000 + Y: 60000000 + - X: 190000000 + Y: 60000000 + - X: 190000000 + Y: 70000000 + - X: 150000000 + Y: 70000000 + - X: 150000000 + Y: 60000000 + - X: 170000000 + Y: 60000000 + - X: 170000000 + Y: 40000000 + - X: 130000000 + Y: 40000000 + - X: 130000000 + Y: 30000000 + - X: 140000000 + Y: 30000000 + - X: 140000000 + Y: -30000000 + - X: 160000000 + Y: -30000000 + - - X: -240000000 + Y: 0 + - X: -230000000 + Y: 0 + - X: -230000000 + Y: 20000000 + - X: -260000000 + Y: 20000000 + - X: -260000000 + Y: -10000000 + - X: -240000000 + Y: -10000000 + - - X: 10000000 + Y: -80000000 + - X: 50000000 + Y: -80000000 + - X: 50000000 + Y: -70000000 + - X: 60000000 + Y: -70000000 + - X: 60000000 + Y: -50000000 + - X: 90000000 + Y: -50000000 + - X: 90000000 + Y: -30000000 + - X: 50000000 + Y: -30000000 + - X: 50000000 + Y: -50000000 + - X: 40000000 + Y: -50000000 + - X: 40000000 + Y: -70000000 + - X: 0 + Y: -70000000 + - X: 0 + Y: -80000000 + - X: -60000000 + Y: -80000000 + - X: -60000000 + Y: -20000000 + - X: -80000000 + Y: -20000000 + - X: -80000000 Y: -80000000 - X: -170000000 Y: -80000000 @@ -371,25 +303,9 @@ CompositeCollider2D: - X: -190000000 Y: -60000000 - X: -190000000 - Y: -40000100 - - X: -190000041 - Y: -40000100 - - X: -190000100 - Y: -40000041 - - X: -190000100 - Y: -29999959 - - X: -190000041 - Y: -29999900 - - X: -260000041 - Y: -29999900 - - X: -260000100 - Y: -29999959 - - X: -260000100 - Y: -40000041 - - X: -260000041 - Y: -40000100 + Y: -30000000 - X: -260000000 - Y: -40000100 + Y: -30000000 - X: -260000000 Y: -70000000 - X: -220000000 @@ -400,72 +316,74 @@ CompositeCollider2D: Y: -80000000 - X: -200000000 Y: -90000000 - - X: -130000100 + - X: 10000000 Y: -90000000 - - X: -130000100 - Y: -90000041 - - X: -130000041 - Y: -90000100 - - X: 10000041 - Y: -90000100 + - - X: 140000000 + Y: -30000000 + - X: 110000000 + Y: -30000000 + - X: 110000000 + Y: -50000000 + - X: 140000000 + Y: -50000000 m_CompositePaths: m_Paths: - - - {x: 13.99999, y: -2.999981} - - {x: 16.00001, y: -2.9999747} - - {x: 16.00004, y: 2.99999} - - {x: 19.00001, y: 3.0000253} - - {x: 18.999975, y: 4.00001} - - {x: 18.00001, y: 4.000039} - - {x: 18.00004, y: 5.99999} - - {x: 19.00001, y: 6.0000253} - - {x: 18.999975, y: 7.0000095} - - {x: 14.99999, y: 6.9999743} - - {x: 15.000026, y: 5.99999} - - {x: 16.99999, y: 5.999961} - - {x: 16.99996, y: 4.00001} - - {x: 12.99999, y: 3.9999747} - - {x: 13.000026, y: 2.99999} - - {x: 13.99999, y: 2.9999607} - - - {x: -24.000027, y: -1.00001} - - {x: -23.99996, y: -0.00001} - - {x: -22.99999, y: 0.0000252} - - {x: -23.000027, y: 2.00001} - - {x: -26.00001, y: 1.9999748} - - {x: -25.999975, y: -1.00001} - - - {x: 0.9999748, y: -9.00001} - - {x: 1.0000395, y: -8.00001} - - {x: 5.00001, y: -7.9999747} - - {x: 5.000039, y: -7.0000095} - - {x: 6.00001, y: -6.9999743} - - {x: 6.000039, y: -5.00001} - - {x: 9.00001, y: -4.9999747} - - {x: 8.999974, y: -2.99999} - - {x: 4.99999, y: -3.0000253} - - {x: 4.999961, y: -4.99999} - - {x: 3.99999, y: -5.0000253} - - {x: 3.999961, y: -6.9999905} - - {x: -0.00001, y: -7.0000257} - - {x: -0.0000394, y: -7.9999905} - - {x: -5.99999, y: -7.999961} - - {x: -6.0000253, y: -1.99999} - - {x: -8.00001, y: -2.0000253} - - {x: -8.000039, y: -7.9999905} + - - {x: 15.999971, y: -3} + - {x: 16.000029, y: 3} + - {x: 19, y: 3.0000293} + - {x: 18.999971, y: 4} + - {x: 18, y: 4.0000296} + - {x: 18.000029, y: 6} + - {x: 19, y: 6.000029} + - {x: 18.999971, y: 7} + - {x: 15, y: 6.9999704} + - {x: 15.000029, y: 6} + - {x: 17, y: 5.9999704} + - {x: 16.999971, y: 4} + - {x: 13, y: 3.999971} + - {x: 13.00003, y: 3} + - {x: 14, y: 2.9999707} + - {x: 14.000029, y: -3} + - - {x: -24.000029, y: -1} + - {x: -23.999971, y: 0} + - {x: -23, y: 0.000029300001} + - {x: -23.000029, y: 2} + - {x: -26, y: 1.9999708} + - {x: -25.999971, y: -1} + - - {x: 0.99997073, y: -9} + - {x: 1.0000294, y: -8} + - {x: 5, y: -7.9999704} + - {x: 5.0000296, y: -7} + - {x: 6, y: -6.9999704} + - {x: 6.0000296, y: -5} + - {x: 9, y: -4.999971} + - {x: 8.99997, y: -3} + - {x: 5, y: -3.0000293} + - {x: 4.9999704, y: -5} + - {x: 4, y: -5.000029} + - {x: 3.9999704, y: -7} + - {x: 0, y: -7.0000296} + - {x: -0.0000294, y: -8} + - {x: -6, y: -7.9999704} + - {x: -6.000029, y: -2} + - {x: -8, y: -2.0000293} + - {x: -8.00003, y: -8} - {x: -17, y: -7.9999704} - {x: -17.000029, y: -7} - {x: -18, y: -6.9999704} - {x: -18.000029, y: -6} - {x: -19, y: -5.9999704} - - {x: -19.000034, y: -2.99999} - - {x: -26.00001, y: -3.0000253} + - {x: -19.000029, y: -3} + - {x: -26, y: -3.0000293} - {x: -25.999971, y: -7} - {x: -22, y: -7.0000296} - {x: -21.999971, y: -8} - {x: -20, y: -8.00003} - {x: -19.999971, y: -9} - - - {x: 13.999974, y: -5.00001} - - {x: 13.999981, y: -2.99999} - - {x: 10.99999, y: -3.0000253} - - {x: 11.000026, y: -5.00001} + - - {x: 13.999971, y: -5} + - {x: 13.999971, y: -3} + - {x: 11, y: -3.0000293} + - {x: 11.00003, y: -5} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &73552638 @@ -1871,6 +1789,8 @@ GameObject: - component: {fileID: 378298696} - component: {fileID: 378298695} - component: {fileID: 378298697} + - component: {fileID: 378298699} + - component: {fileID: 378298698} m_Layer: 0 m_Name: Lava m_TagString: EnemyPlatform @@ -2794,10 +2714,103 @@ TilemapCollider2D: m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_UsedByComposite: 1 m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 +--- !u!66 &378298698 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378298693} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 378298697} + m_ColliderPaths: + - - X: 0 + Y: -70000000 + - X: 40000000 + Y: -70000000 + - X: 40000000 + Y: -50000000 + - X: 50000000 + Y: -50000000 + - X: 50000000 + Y: -40000000 + - X: -60000000 + Y: -40000000 + - X: -60000000 + Y: -80000000 + - X: 0 + Y: -80000000 + - - X: -80000000 + Y: -40000000 + - X: -190000000 + Y: -40000000 + - X: -190000000 + Y: -60000000 + - X: -180000000 + Y: -60000000 + - X: -180000000 + Y: -70000000 + - X: -170000000 + Y: -70000000 + - X: -170000000 + Y: -80000000 + - X: -80000000 + Y: -80000000 + m_CompositePaths: + m_Paths: + - - {x: -0.000029300001, y: -8} + - {x: 0.0000294, y: -7} + - {x: 4, y: -6.9999704} + - {x: 4.0000296, y: -5} + - {x: 5, y: -4.999971} + - {x: 4.999971, y: -4} + - {x: -6, y: -4.000029} + - {x: -5.999971, y: -8} + - - {x: -8.00003, y: -8} + - {x: -8.00003, y: -4} + - {x: -19, y: -4.000029} + - {x: -18.999971, y: -6} + - {x: -18, y: -6.0000296} + - {x: -17.999971, y: -7} + - {x: -17, y: -7.0000296} + - {x: -16.999971, y: -8} + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 +--- !u!50 &378298699 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378298693} + m_BodyType: 2 + 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: 0 --- !u!1 &392279113 GameObject: m_ObjectHideFlags: 0 @@ -3004,6 +3017,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -3070,7 +3084,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563510750} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -16.5, y: -1.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -3090,6 +3104,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 36b0373..f57f340 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -1914,6 +1914,7 @@ GameObject: - component: {fileID: 516074242} - component: {fileID: 516074241} - component: {fileID: 516074244} + - component: {fileID: 516074245} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2000,6 +2001,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.25 easing: 0.01 +--- !u!114 &516074245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516074240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &1101410975 GameObject: m_ObjectHideFlags: 0 @@ -3455,90 +3476,62 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 1506634821} m_ColliderPaths: + - - X: 130000000 + Y: 60000000 + - X: 20000000 + Y: 60000000 + - X: 20000000 + Y: 50000000 + - X: 30000000 + Y: 50000000 + - X: 30000000 + Y: 30000000 + - X: 40000000 + Y: 30000000 + - X: 40000000 + Y: 10000000 + - X: 130000000 + Y: 10000000 - - X: -100000000 - Y: 9999900 - - X: -19999959 - Y: 9999900 - - X: -19999900 - Y: 9999959 - - X: -19999900 - Y: 29999900 - - X: -9999959 - Y: 29999900 - - X: -9999900 - Y: 29999959 - - X: -9999900 - Y: 49999900 - - X: 41 - Y: 49999900 - - X: 100 - Y: 49999959 - - X: 100 - Y: 60000041 - - X: 41 - Y: 60000100 - - X: -110000041 - Y: 60000100 - - X: -110000100 - Y: 60000041 - - X: -110000100 - Y: 9999959 - - X: -110000041 - Y: 9999900 + Y: 10000000 + - X: -20000000 + Y: 10000000 + - X: -20000000 + Y: 30000000 + - X: -10000000 + Y: 30000000 + - X: -10000000 + Y: 50000000 + - X: 0 + Y: 50000000 + - X: 0 + Y: 60000000 - X: -110000000 - Y: 9999900 + Y: 60000000 - X: -110000000 Y: -30000000 - X: -100000000 Y: -30000000 - - - X: 130000100 - Y: 9999959 - - X: 130000100 - Y: 60000041 - - X: 130000041 - Y: 60000100 - - X: 19999959 - Y: 60000100 - - X: 19999900 - Y: 60000041 - - X: 19999900 - Y: 49999959 - - X: 19999959 - Y: 49999900 - - X: 29999900 - Y: 49999900 - - X: 29999900 - Y: 29999959 - - X: 29999959 - Y: 29999900 - - X: 39999900 - Y: 29999900 - - X: 39999900 - Y: 9999959 - - X: 39999959 - Y: 9999900 - - X: 130000041 - Y: 9999900 m_CompositePaths: m_Paths: + - - {x: 12.99997, y: 1} + - {x: 12.99997, y: 6} + - {x: 2, y: 5.999971} + - {x: 2.0000293, y: 5} + - {x: 3, y: 4.9999704} + - {x: 3.0000293, y: 3} + - {x: 4, y: 2.9999707} + - {x: 4.000029, y: 1} - - {x: -10.00003, y: -3} - - {x: -9.99997, y: 0.99999} - - {x: -1.99999, y: 1.0000252} - - {x: -1.9999607, y: 2.99999} - - {x: -0.99999, y: 3.0000253} - - {x: -0.9999606, y: 4.99999} - - {x: 0.00001, y: 5.0000253} - - {x: -0.0000252, y: 6.00001} - - {x: -11.00001, y: 5.9999747} + - {x: -9.99997, y: 1} + - {x: -2, y: 1.0000293} + - {x: -1.9999707, y: 3} + - {x: -1, y: 3.0000293} + - {x: -0.9999706, y: 5} + - {x: 0, y: 5.000029} + - {x: -0.000029300001, y: 6} + - {x: -11, y: 5.999971} - {x: -10.99997, y: -3} - - - {x: 12.999974, y: 0.99999} - - {x: 12.999974, y: 6.00001} - - {x: 1.99999, y: 5.9999747} - - {x: 2.0000253, y: 4.99999} - - {x: 2.99999, y: 4.999961} - - {x: 3.0000253, y: 2.99999} - - {x: 3.99999, y: 2.9999607} - - {x: 4.0000253, y: 0.99999} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1506634824 @@ -4548,31 +4541,17 @@ CompositeCollider2D: - m_Collider: {fileID: 1607880950} m_ColliderPaths: - - X: 130000000 - Y: 9999900 + Y: 10000000 - X: 110000000 - Y: 9999900 + Y: 10000000 - X: 110000000 Y: -10000000 - X: 130000000 Y: -10000000 - - X: 130000000 Y: -30000000 - - X: -99999900 - Y: -30000000 - - X: -99999900 - Y: -29999959 - - X: -99999959 - Y: -29999900 - - X: -110000041 - Y: -29999900 - - X: -110000100 - Y: -29999959 - - X: -110000100 - Y: -40000041 - - X: -110000041 - Y: -40000100 - X: -110000000 - Y: -40000100 + Y: -30000000 - X: -110000000 Y: -60000000 - X: 130000000 @@ -4580,12 +4559,12 @@ CompositeCollider2D: m_CompositePaths: m_Paths: - - {x: 12.99997, y: -1} - - {x: 12.99997, y: 0.99999} - - {x: 11, y: 0.9999607} + - {x: 12.99997, y: 1} + - {x: 11, y: 0.99997073} - {x: 11.00003, y: -1} - - {x: 12.99997, y: -6} - {x: 12.99997, y: -3} - - {x: -11.00001, y: -3.0000253} + - {x: -11, y: -3.0000293} - {x: -10.99997, y: -6} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity index 77dadbe..8af4e6d 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -1587,6 +1587,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1653,7 +1654,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563510750} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.67, z: -10} + m_LocalPosition: {x: 0, y: -2, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1673,6 +1674,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index be54a01..70875ae 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 429622409} - component: {fileID: 429622408} - component: {fileID: 429622411} + - component: {fileID: 429622412} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -201,7 +202,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429622407} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.5, y: 0, z: -10} + m_LocalPosition: {x: -2.5, y: -9.4, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -221,6 +222,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &429622412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 429622407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &908243558 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity index 6c29942..2ad6920 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogBoss.unity @@ -701,6 +701,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -787,6 +788,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.35 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &612235266 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity b/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity index 1e93ae3..f0fcbb1 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/DogLevelSpawn.unity @@ -1538,6 +1538,7 @@ GameObject: - component: {fileID: 563510753} - component: {fileID: 563510752} - component: {fileID: 563510751} + - component: {fileID: 563510754} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1610,6 +1611,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &563510754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &612235266 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index cbc2672..5d516c1 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -2150,6 +2150,7 @@ GameObject: - component: {fileID: 1681575692} - component: {fileID: 1681575691} - component: {fileID: 1681575690} + - component: {fileID: 1681575693} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2222,6 +2223,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1681575693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1681575689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 100 + m_RefResolutionX: 960 + m_RefResolutionY: 680 + m_UpscaleRT: 0 + m_PixelSnapping: 1 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1001 &1831256036 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 457e5a4..bd18db7 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -9755,6 +9755,7 @@ GameObject: - component: {fileID: 563510752} - component: {fileID: 563510751} - component: {fileID: 563510754} + - component: {fileID: 563510755} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -9841,6 +9842,26 @@ MonoBehaviour: m_EditorClassIdentifier: boundaryPercent: 0.25 easing: 0.01 +--- !u!114 &563510755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563510750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AssetsPPU: 8 + m_RefResolutionX: 120 + m_RefResolutionY: 50 + m_UpscaleRT: 0 + m_PixelSnapping: 0 + m_CropFrameX: 0 + m_CropFrameY: 0 + m_StretchFill: 0 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 4950cec..7739a5a 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 vcSharedLogLevel: value: 0d5e400f0650