RochesterX/Crash-Course
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'main' of https://github.com/RochesterX/Sophomore-Project

Browse Source
This commit is contained in:
RochesterX
2025-03-31 18:43:03 -04:00
parent 42797bfa55 6cb8eb33c9
commit 434ed1839f
1 changed files with 73 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
Assets/Scenes/ObstanceWIP.unity
View File

@@ -2195,16 +2195,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 8, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 9, y: -1, z: 0} - first: {x: 9, y: -1, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
@@ -2215,27 +2205,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 12, y: -1, z: 0} - first: {x: 10, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 13, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 8, y: 0, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2255,17 +2225,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 12, y: 0, z: 0} - first: {x: 10, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 13, y: 0, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2415,6 +2375,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 32, y: 6, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 33, y: 6, z: 0} - first: {x: 33, y: 6, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
@@ -2425,7 +2395,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 34, y: 6, z: 0} - first: {x: 35, y: 8, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2435,7 +2405,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 35, y: 6, z: 0} - first: {x: 36, y: 8, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2445,7 +2415,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 37, y: 8, z: 0} - first: {x: 30, y: 10, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2455,27 +2425,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 38, y: 8, z: 0} - first: {x: 31, y: 10, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 34, y: 10, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 35, y: 10, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 1 m_TileIndex: 1
@@ -2555,6 +2505,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 26, y: 11, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 27, y: 11, z: 0} - first: {x: 27, y: 11, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
@@ -2565,36 +2525,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 m_AllTileFlags: 1073741825
- first: {x: 28, y: 11, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 31, y: 11, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 32, y: 11, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 7, y: 13, z: 0} - first: {x: 7, y: 13, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
@@ -2659,15 +2589,15 @@ Tilemap:
m_TileAssetArray: m_TileAssetArray:
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
- m_RefCount: 186 - m_RefCount: 179
m_Data: {fileID: 11400000, guid: eba517dbe553d4e9eb4a38e332a4cfd9, type: 2} m_Data: {fileID: 11400000, guid: eba517dbe553d4e9eb4a38e332a4cfd9, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 0 - m_RefCount: 0
m_Data: {fileID: 0} m_Data: {fileID: 0}
- m_RefCount: 186 - m_RefCount: 179
m_Data: {fileID: 7482667652216324306, guid: 586cb85cfa61a4214a970f850bffc743, type: 3} m_Data: {fileID: 7482667652216324306, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 186 - m_RefCount: 179
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
@@ -2686,7 +2616,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 186 - m_RefCount: 179
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: [] m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
@@ -2780,21 +2710,13 @@ CompositeCollider2D:
Y: 130000000 Y: 130000000
- X: 130000000 - X: 130000000
Y: 130000000 Y: 130000000
- - X: 330000000 - - X: 280000000
Y: 120000000 Y: 120000000
- X: 310000000 - X: 260000000
Y: 120000000 Y: 120000000
- X: 310000000 - X: 260000000
Y: 110000000 Y: 110000000
- X: 330000000 - X: 280000000
Y: 110000000
- - X: 290000000
Y: 120000000
- X: 270000000
Y: 120000000
- X: 270000000
Y: 110000000
- X: 290000000
Y: 110000000 Y: 110000000
- - X: -80000000 - - X: -80000000
Y: 120000000 Y: 120000000
@@ -2804,29 +2726,29 @@ CompositeCollider2D:
Y: 110000000 Y: 110000000
- X: -80000000 - X: -80000000
Y: 110000000 Y: 110000000
- - X: 360000000 - - X: 320000000
Y: 110000000 Y: 110000000
- X: 340000000 - X: 300000000
Y: 110000000 Y: 110000000
- X: 340000000 - X: 300000000
Y: 100000000 Y: 100000000
- X: 360000000 - X: 320000000
Y: 100000000 Y: 100000000
- - X: 390000000 - - X: 370000000
Y: 90000000 Y: 90000000
- X: 370000000 - X: 350000000
Y: 90000000 Y: 90000000
- X: 350000000
Y: 80000000
- X: 370000000 - X: 370000000
Y: 80000000 Y: 80000000
- X: 390000000 - - X: 340000000
Y: 80000000
- - X: 360000000
Y: 70000000 Y: 70000000
- X: 330000000 - X: 320000000
Y: 70000000 Y: 70000000
- X: 330000000 - X: 320000000
Y: 60000000 Y: 60000000
- X: 360000000 - X: 340000000
Y: 60000000 Y: 60000000
- - X: -50000000 - - X: -50000000
Y: 70000000 Y: 70000000
@@ -2876,21 +2798,13 @@ CompositeCollider2D:
Y: 20000000 Y: 20000000
- X: -70000000 - X: -70000000
Y: 20000000 Y: 20000000
- - X: 100000000 - - X: 110000000
Y: 10000000 Y: 10000000
- X: 80000000 - X: 90000000
Y: 10000000 Y: 10000000
- X: 80000000 - X: 90000000
Y: -10000000 Y: -10000000
- X: 100000000 - X: 110000000
Y: -10000000
- - X: 140000000
Y: 10000000
- X: 120000000
Y: 10000000
- X: 120000000
Y: -10000000
- X: 140000000
Y: -10000000 Y: -10000000
- - X: -30000000 - - X: -30000000
Y: 0 Y: 0
@@ -2938,30 +2852,26 @@ CompositeCollider2D:
- {x: 12.99997, y: 14} - {x: 12.99997, y: 14}
- {x: 7, y: 13.999971} - {x: 7, y: 13.999971}
- {x: 7.0000296, y: 13} - {x: 7.0000296, y: 13}
- - {x: 32.999973, y: 11} - - {x: 27.999971, y: 11}
- {x: 32.999973, y: 12} - {x: 27.999971, y: 12}
- {x: 31, y: 11.99997} - {x: 26, y: 11.99997}
- {x: 31.000029, y: 11} - {x: 26.000029, y: 11}
- - {x: 28.999971, y: 11}
- {x: 28.999971, y: 12}
- {x: 27, y: 11.99997}
- {x: 27.000029, y: 11}
- - {x: -8.00003, y: 11} - - {x: -8.00003, y: 11}
- {x: -8.00003, y: 12} - {x: -8.00003, y: 12}
- {x: -15, y: 11.99997} - {x: -15, y: 11.99997}
- {x: -14.999971, y: 11} - {x: -14.999971, y: 11}
- - {x: 35.999973, y: 10} - - {x: 31.999971, y: 10}
- {x: 35.999973, y: 11} - {x: 31.999971, y: 11}
- {x: 34, y: 10.99997} - {x: 30, y: 10.99997}
- {x: 34.00003, y: 10} - {x: 30.000029, y: 10}
- - {x: 38.999973, y: 8} - - {x: 36.999973, y: 8}
- {x: 38.999973, y: 9} - {x: 36.999973, y: 9}
- {x: 37, y: 8.99997} - {x: 35, y: 8.99997}
- {x: 37.00003, y: 8} - {x: 35.00003, y: 8}
- - {x: 35.999973, y: 6} - - {x: 33.999973, y: 6}
- {x: 35.999973, y: 7} - {x: 33.999973, y: 7}
- {x: 33, y: 6.9999704} - {x: 32, y: 6.9999704}
- {x: 33.00003, y: 6} - {x: 32.00003, y: 6}
- - {x: -5.000029, y: 6} - - {x: -5.000029, y: 6}
- {x: -5.000029, y: 7} - {x: -5.000029, y: 7}
- {x: -7, y: 6.9999704} - {x: -7, y: 6.9999704}
@@ -2986,14 +2896,10 @@ CompositeCollider2D:
- {x: -7.0000296, y: 3} - {x: -7.0000296, y: 3}
- {x: -9, y: 2.999971} - {x: -9, y: 2.999971}
- {x: -8.99997, y: 2} - {x: -8.99997, y: 2}
- - {x: 13.999971, y: -1} - - {x: 10.99997, y: -1}
- {x: 13.999971, y: 1} - {x: 10.99997, y: 1}
- {x: 12, y: 0.99997073} - {x: 9, y: 0.99997073}
- {x: 12.00003, y: -1} - {x: 9.00003, y: -1}
- - {x: 9.99997, y: -1}
- {x: 9.99997, y: 1}
- {x: 8, y: 0.99997073}
- {x: 8.00003, y: -1}
- - {x: -3.0000293, y: -1} - - {x: -3.0000293, y: -1}
- {x: -3.0000293, y: 0} - {x: -3.0000293, y: 0}
- {x: -6, y: -0.000029300001} - {x: -6, y: -0.000029300001}
@@ -3296,7 +3202,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3} - target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 27.396545 value: 24.67
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3} - target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -3554,7 +3460,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3} - target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 21.166546 value: 18.87
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3} - target: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -3710,7 +3616,7 @@ Transform:
m_GameObject: {fileID: 2051604018} m_GameObject: {fileID: 2051604018}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.593454, y: -6.7237453, z: -15.765688} m_LocalPosition: {x: -3.65, y: -6.7237453, z: -15.765688}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: