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

Merge branch 'main' into Dylan

Browse Source
This commit is contained in:
djkellerman
2025-01-27 17:32:07 -05:00
parent 164df0339c 285a5fb538
commit 5a379ec239
6 changed files with 121 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Prefabs/Tile Palette.prefab
View File

@@ -42,7 +42,7 @@ Tilemap:
m_GameObject: {fileID: 1266732574638700412}
m_Enabled: 1
m_Tiles:
- first: {x: -3, y: 0, z: 0}
- first: {x: -1, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 0
@@ -84,8 +84,8 @@ Tilemap:
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -3, y: 0, z: 0}
m_Size: {x: 3, y: 1, z: 1}
m_Origin: {x: -1, y: 0, z: 0}
m_Size: {x: 1, y: 1, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@@ -115,7 +115,7 @@ TilemapRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_DynamicOccludee: 0
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
@@ -202,7 +202,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!114 &8030602722995540191
--- !u!114 &767334651253208596
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

56
Assets/Scenes/Platformer.unity
View File

@@ -11982,14 +11982,6 @@ CompositeCollider2D:
Y: -30000000
- X: -100000000
Y: -30000000
- - X: -60000000
Y: -20000000
- X: -80000000
Y: -20000000
- X: -80000000
Y: -70000000
- X: -60000000
Y: -70000000
- - X: 120000000
Y: -20000000
- X: 100000000
@@ -11998,18 +11990,14 @@ CompositeCollider2D:
Y: -40000000
- X: 120000000
Y: -40000000
- - X: -160000000
Y: -60000000
- X: -170000000
Y: -60000000
- X: -170000000
Y: -30000000
- X: -190000000
Y: -30000000
- X: -190000000
Y: -90000000
- X: -160000000
Y: -90000000
- - X: -60000000
Y: -20000000
- X: -80000000
Y: -20000000
- X: -80000000
Y: -70000000
- X: -60000000
Y: -70000000
- - X: 260000000
Y: -90000000
- X: 270000000
@@ -12026,14 +12014,18 @@ CompositeCollider2D:
Y: -150000000
- X: 260000000
Y: -150000000
- - X: -210000000
Y: -50000000
- X: -250000000
Y: -50000000
- X: -250000000
Y: -70000000
- X: -210000000
Y: -70000000
- - X: -160000000
Y: -60000000
- X: -170000000
Y: -60000000
- X: -170000000
Y: -30000000
- X: -190000000
Y: -30000000
- X: -190000000
Y: -90000000
- X: -160000000
Y: -90000000
- - X: 150000000
Y: -50000000
- X: 130000000
@@ -12042,6 +12034,14 @@ CompositeCollider2D:
Y: -70000000
- X: 150000000
Y: -70000000
- - X: -210000000
Y: -50000000
- X: -250000000
Y: -50000000
- X: -250000000
Y: -70000000
- X: -210000000
Y: -70000000
- - X: 120000000
Y: -80000000
- X: 100000000

36
Assets/Sprites/Tiles/Square_0.asset Normal file
View File

@@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Square_0
m_EditorClassIdentifier:
m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

8
Assets/Sprites/Tiles/Square_0.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a90c720ce19664bb08bfdc21f6f18c94
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

36
Assets/Sprites/Tiles/Square_1.asset Normal file
View File

@@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Square_1
m_EditorClassIdentifier:
m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

8
Assets/Sprites/Tiles/Square_1.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd7ebd6ddea49432382bac53c04a142e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: