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

Music implementation, cloud art, and bug fixes

Browse Source 
Implemented music
Added cloud tiles
Made players be able to stand on each others' heads
Synced the music and day/night cycle
Added a transition in to the gameplay scene
Fixed blocking while dying bug
This commit is contained in:
RochesterX
2025-03-07 23:32:42 -05:00
parent 3d28357b56
commit 7b4bdd927e
115 changed files with 5516 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Prefabs/DayNightSkyBackground.prefab
View File

@@ -138,7 +138,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa71934bcd9b18642ba5d540a54e7c27, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -288,7 +288,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa4f23c96bac3a543a458e42b1441a96, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -375,7 +375,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 645fa4f207e6ab4458bf76503e2ec229, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -462,7 +462,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -714855980216048057, guid: 25908a168d8dbcb45a4d157f99375239, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -549,7 +549,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -2060458028463906976, guid: 6c35f282486c84b47a8f047f823d3e25, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -636,7 +636,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 23e619d279ffccb48876f686a6f7c92b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -820,7 +820,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa4f23c96bac3a543a458e42b1441a96, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -970,7 +970,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa71934bcd9b18642ba5d540a54e7c27, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1057,7 +1057,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 193514457
m_SortingLayer: -4
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 7ecdb30a55c4c2848a8d04a351bfd3e1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1259,7 +1259,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa71934bcd9b18642ba5d540a54e7c27, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1348,7 +1348,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 23e619d279ffccb48876f686a6f7c92b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1435,7 +1435,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -714855980216048057, guid: 25908a168d8dbcb45a4d157f99375239, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1524,7 +1524,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 645fa4f207e6ab4458bf76503e2ec229, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1611,7 +1611,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 645fa4f207e6ab4458bf76503e2ec229, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1823,7 +1823,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 193514457
m_SortingLayer: -4
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 7c4799a7402ac7546932b5f877bdffc8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1910,7 +1910,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -2060458028463906976, guid: 6c35f282486c84b47a8f047f823d3e25, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1976,7 +1976,7 @@ MonoBehaviour:
eveningFrontClouds: {fileID: 5130336266710968951}
nightFrontClouds: {fileID: 4842171852287331600}
transitionDuration: 5
cycleDuration: 10
cycleDuration: 27.5
--- !u!1 &7578286127223878208
GameObject:
m_ObjectHideFlags: 0
@@ -2054,7 +2054,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -2060458028463906976, guid: 6c35f282486c84b47a8f047f823d3e25, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2191,7 +2191,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 193514457
m_SortingLayer: -4
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -4335302255335457946, guid: 9309886511085ea49a3f643085f04062, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2278,7 +2278,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 23e619d279ffccb48876f686a6f7c92b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2430,7 +2430,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -599741771
m_SortingLayer: -3
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: fa4f23c96bac3a543a458e42b1441a96, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2519,7 +2519,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1995452543
m_SortingLayer: -2
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -714855980216048057, guid: 25908a168d8dbcb45a4d157f99375239, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0