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

Player movement tweaks, bugfxes; Docs

Browse Source
This commit is contained in:
RochesterX
2025-04-16 19:20:36 -04:00
parent 186811be42
commit 5dee952cad
432 changed files with 66953 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/.DS_Store vendored
View File

Binary file not shown.

840
Assets/Animations/Bones/AirPunch.anim
View File

File diff suppressed because it is too large Load Diff

102
Assets/Animations/Bones/Idle.anim
View File

@@ -478,6 +478,48 @@ AnimationClip:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0019135475
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.9437933
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -639,6 +681,24 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2368279999
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -1786,6 +1846,48 @@ AnimationClip:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0019135475
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.9437933
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

190
Assets/Animations/Bones/Jump.anim
View File

@@ -159,6 +159,22 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: Torso/Head
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.26, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Torso
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
@@ -350,6 +366,48 @@ AnimationClip:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.18016338
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.5796394
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -367,6 +425,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 3869152129
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 4207337212
attribute: 4
@@ -520,6 +587,24 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2368279999
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -1298,6 +1383,111 @@ AnimationClip:
classID: 212
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Torso
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.26
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Torso
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Torso
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.18016338
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.5796394
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

104
Assets/Animations/Bones/Walk.anim
View File

@@ -374,7 +374,49 @@ AnimationClip:
m_RotationOrder: 4
path: Torso
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0019135475
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.9437933
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -473,6 +515,24 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2368279999
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -1719,6 +1779,48 @@ AnimationClip:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.0019135475
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 61
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.9437933
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path:
classID: 61
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:

8
Assets/Games/Trevor/obj.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d1c3638cd8b1b45e9b946459e25d27e3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Games/Trevor/obj/xdoc.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 199b9b068086340408d89ff14f9e5aa8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Games/Trevor/obj/xdoc/cache.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 83efa02ecf680499e84d9e018a530360
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Games/Trevor/obj/xdoc/cache/final.meta vendored Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e350589d23594746aee5ce71ebbd61d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Games/Trevor/obj/xdoc/cache/final/183049870 vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
Assets/Games/Trevor/obj/xdoc/cache/final/183049870.meta vendored Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fce9a43989cac4d99870d9a8fdeb454f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Games/Trevor/obj/xdoc/cache/final/1875984087 vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
Assets/Games/Trevor/obj/xdoc/cache/final/1875984087.meta vendored Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b18935ea94b3c4a06b509f5bb77e1f43
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Games/Trevor/obj/xdoc/cache/obj.meta vendored Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1e67523442c484d8dad3214dab41055f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Games/Trevor/obj/xdoc/cache/obj/.inter vendored Normal file
View File

File diff suppressed because one or more lines are too long

12119
Assets/Games/Trevor/obj/xdoc/cache/obj/alg3052c.4bw vendored Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Games/Trevor/obj/xdoc/cache/obj/alg3052c.4bw.meta vendored Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d18ab6a7d26a5414c8146d7ade4ed7eb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/Materials/Platform.physicsMaterial2D Normal file
View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Platform
serializedVersion: 2
friction: 1
bounciness: 0
m_FrictionCombine: 1
m_BounceCombine: 4

8
Assets/Materials/Platform.physicsMaterial2D.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9638ac26428524c789abe399eb8fea87
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 6200000
userData:
assetBundleName:
assetBundleVariant:

46
Assets/Prefabs/Bones.prefab
View File

@@ -20,6 +20,7 @@ GameObject:
- component: {fileID: 8121950008105218343}
- component: {fileID: 2813634395235005482}
- component: {fileID: 3838772665456314839}
- component: {fileID: 5670226826229230270}
m_Layer: 9
m_Name: Bones
m_TagString: Player
@@ -74,8 +75,8 @@ MonoBehaviour:
turnaroundMultiplier: 2
walkSmooth: 0.98
secondsToFullSpeed: 0
jumpSpeed: 18.5
coyoteTime: 0.1
jumpSpeed: 19
coyoteTime: 0.3
jumpLenience: 0.1
timeUnableToBeDeclaredNotJumping: 0.1
groundCheckDistance: 0.1
@@ -252,7 +253,7 @@ BoxCollider2D:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByEffector: 1
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0.0019135475}
@@ -296,6 +297,25 @@ MonoBehaviour:
itemTag: Hat
holdTime: 0
head: {fileID: 8633935597944319591}
--- !u!251 &5670226826229230270
PlatformEffector2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1375850422501237868}
m_Enabled: 1
m_UseColliderMask: 1
m_ColliderMask:
serializedVersion: 2
m_Bits: 4294967295
m_RotationalOffset: 0
m_UseOneWay: 0
m_UseOneWayGrouping: 0
m_SurfaceArc: 180
m_UseSideFriction: 0
m_UseSideBounce: 0
m_SideArc: 1
--- !u!1 &1648017802882051395
GameObject:
m_ObjectHideFlags: 0
@@ -372,7 +392,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 11
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -506,7 +526,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_SortingOrder: 13
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -747,7 +767,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_SortingOrder: 12
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -882,7 +902,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_SortingOrder: 14
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1016,7 +1036,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_SortingOrder: 15
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1151,7 +1171,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 10
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1286,7 +1306,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 10
m_SortingOrder: 20
m_Sprite: {fileID: 7482667652216324306, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1420,7 +1440,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_SortingOrder: 15
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1555,7 +1575,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_SortingOrder: 14
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -1726,7 +1746,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_SortingOrder: 12
m_Sprite: {fileID: 1406629073, guid: 586cb85cfa61a4214a970f850bffc743, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

2
Assets/Prefabs/Falling Platform Mountain.prefab
View File

@@ -768,7 +768,7 @@ PlatformEffector2D:
serializedVersion: 2
m_Bits: 4294967295
m_RotationalOffset: 0
m_UseOneWay: 1
m_UseOneWay: 0
m_UseOneWayGrouping: 0
m_SurfaceArc: 180
m_UseSideFriction: 0

39
Assets/Prefabs/Game Manager.prefab
View File

@@ -1237,7 +1237,7 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
@@ -1493,6 +1493,7 @@ MonoBehaviour:
gameOver: 0
gameTimer: {fileID: 4832072825095962115}
spawnPosition: {x: -10.25, y: 20}
obstacleCourseSpawnPosition: {x: 0, y: 0}
hatSpawnPositions: []
LeaderboardCanvas: {fileID: 7061268803878077000}
TimerCanvas: {fileID: 2989920920269489744}
@@ -1847,7 +1848,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.x
@@ -1855,15 +1856,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.x
value: 5000
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalPosition.x
@@ -1895,11 +1896,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.x
value: 2500
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.y
value: -210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2058,7 +2059,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.x
@@ -2066,15 +2067,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.x
value: 5000
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalPosition.x
@@ -2106,11 +2107,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.x
value: 2500
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2371,7 +2372,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.x
@@ -2379,15 +2380,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.x
value: 5000
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalPosition.x
@@ -2419,11 +2420,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.x
value: 2500
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_AnchoredPosition.y
value: -130
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3130525157782964738, guid: d9a95e84f7261408c84253a380f8af08, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

313
Assets/Scenes/ObstanceWIP.unity
View File

@@ -371,6 +371,261 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &82942310
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 82942311}
- component: {fileID: 82942313}
- component: {fileID: 82942312}
m_Layer: 6
m_Name: Platform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &82942311
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 82942310}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 459332035}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!483693784 &82942312
TilemapRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 82942310}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1556569731
m_SortingLayer: 3
m_SortingOrder: 1
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
m_Mode: 0
m_DetectChunkCullingBounds: 0
m_MaskInteraction: 0
--- !u!1839735485 &82942313
Tilemap:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 82942310}
m_Enabled: 1
m_Tiles:
- first: {x: -2, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 7
m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 4
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 3
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 2
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 0
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 5
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 6
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: f3c60d26d8016044cbee752ccda1d138, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: c898e4772da387b40bbd9b7c963b59d6, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 795acd37c299617458c4fe3923e0078e, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d29a7130a4d92f04db62cb59531be51c, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 40774031d267ff74a9b019794694850c, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 3ef04ced356dd7040871be2ca1cb5f3f, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 12a4f5e6877acbd4daef9f3edb9d92b3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d59f9eb33f55ddb448289c67555fb5fa, type: 2}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: -1233455833, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1694778792, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1048421994, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1423716052, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 657181656, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1687928656, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: -116972672, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1635279534, guid: fd13a288fd4d82648b181c7a3d62d51f, type: 3}
m_TileMatrixArray:
- m_RefCount: 8
m_Data:
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_TileColorArray:
- m_RefCount: 8
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
m_Origin: {x: -30, y: -4, z: 0}
m_Size: {x: 32, y: 5, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
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
--- !u!1 &86525687
GameObject:
m_ObjectHideFlags: 0
@@ -2210,6 +2465,51 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!1 &459332034
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 459332035}
- component: {fileID: 459332036}
m_Layer: 0
m_Name: Platform Grid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &459332035
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 459332034}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.0025000572, y: -0.15999985, z: -0.031573296}
m_LocalScale: {x: 0.25, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 82942311}
m_Father: {fileID: 1089552032}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!156049354 &459332036
Grid:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 459332034}
m_Enabled: 1
m_CellSize: {x: 1, y: 1, z: 0}
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!1 &469011632
GameObject:
m_ObjectHideFlags: 0
@@ -3815,7 +4115,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 4, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 459332035}
m_Father: {fileID: 2039759869}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!251 &1089552033
@@ -3847,7 +4148,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 9638ac26428524c789abe399eb8fea87, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -3917,7 +4218,7 @@ Rigidbody2D:
m_LinearDamping: 0
m_AngularDamping: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 9638ac26428524c789abe399eb8fea87, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -3973,7 +4274,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3}
m_Color: {r: 1, g: 0.98369956, b: 0.9490196, a: 1}
m_Color: {r: 1, g: 0.98369956, b: 0.9490196, a: 0}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -7042,7 +7343,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!212 &1462972996
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -8690,7 +8991,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!212 &1815355876
SpriteRenderer:
m_ObjectHideFlags: 0

16
Assets/Scenes/Title Screen.unity
View File

@@ -2741,14 +2741,14 @@ MonoBehaviour:
m_Calls: []
m_text: "User gude in game\nMore comments on the code?\nReset confirmation\n#Player
Join screen update (clarify map select)\nSound effects in game\n#Player card
players\nKeep away map\n#Join screen titles\n#Implement music\n#Mountain music\nMake
city playable\nOne way platform mountain\nLeaderboard scaling city obstacle course\nGet
rid of placeholder start stop obstacle course\nPlatform friction\nFacing angle
not velocity-based\nDead player constant velocity\n\nDylan will do:\nFix Time
Left! text\nObstacle course end only works on correct gamemode\nObstacle course
end for mountain\nCorrect time limits for keep away maps\nRespawn after game
over (keep away)\n\nWill try to complete: \nObstacle course flag\nHealth bar
persists after death\n"
players\nKeep away map\n#Join screen titles\n#Implement music\n#Mountain music\n#Make
city playable\n#One way platform mountain\nLeaderboard scaling city obstacle
course\n#Get rid of placeholder start stop obstacle course\nPlatform friction\nFacing
angle not velocity-based\nDead player constant velocity\n\nDylan will do:\nFix
Time Left! text\nObstacle course end only works on correct gamemode\nObstacle
course end for mountain\nCorrect time limits for keep away maps\nRespawn after
game over (keep away)\n\nWill try to complete: \nObstacle course flag\nHealth
bar persists after death\n"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

5
Assets/Scripts/Game/MovingPlatform.cs
View File

@@ -13,7 +13,7 @@ public class MovingPlatform : MonoBehaviour
transform.position = points[startPoint].position;
}
void Update()
void FixedUpdate()
{
// If the platform is close to the target point, it starts moving to the next one
if (Vector2.Distance(transform.position, points[i].position) < 0.02f)
@@ -25,6 +25,7 @@ public class MovingPlatform : MonoBehaviour
}
}
// Moves the platform towards the next point
transform.position = Vector2.MoveTowards(transform.position, points[i].position, speed * Time.deltaTime);
// transform.position = Vector2.MoveTowards(transform.position, points[i].position, speed * Time.deltaTime);
GetComponent<Rigidbody2D>().MovePosition(Vector2.MoveTowards(transform.position, points[i].position, speed * Time.fixedDeltaTime));
}
}

1
Assets/Scripts/Game/RespawnOnTriggerEnter.cs
View File

@@ -20,6 +20,7 @@ public class RespawnOnTriggerEnter : MonoBehaviour
{
if (TryGetComponent(out Damageable damageable))
{
print("Voided out " + other.name);
damageable.Damage(9999f);
}
}

2
Assets/Scripts/Player/Damageable.cs
View File

@@ -77,7 +77,7 @@ public class Damageable : MonoBehaviour
public void Damage(float damage) // Adds damage to player when hit
{
if (GameManager.Instance.gameOver) return; // Prevent damage after game is over
//if (GameManager.Instance.gameOver) return; // Prevent damage after game is over
this.damage += damage;
if (damage >= maxDamage)

20
Assets/Scripts/Player/PlayerMovement.cs
View File

@@ -95,16 +95,26 @@ public class PlayerMovement : MonoBehaviour
animationPlayer.SetState(AnimationPlayer.AnimationState.Jump);
else
{
if (Mathf.Abs(body.linearVelocityX) >= 0.05f)
if (Mathf.Abs(virtualAxisX) >= 0.05f)
animationPlayer.SetState(GameManager.Instance.gameOver ? AnimationPlayer.AnimationState.Walk : AnimationPlayer.AnimationState.Run);
else
animationPlayer.SetState(AnimationPlayer.AnimationState.Idle);
}
if (body.linearVelocityX < -0.1f)
animationPlayer.backwards = true;
else if (body.linearVelocityX > 0.1f)
animationPlayer.backwards = false;
if (true)
{
if (virtualAxisX < -0.01f)
animationPlayer.backwards = true;
else if (virtualAxisX > 0.01f)
animationPlayer.backwards = false;
}
else
{
if (body.linearVelocityX < -0.1f)
animationPlayer.backwards = true;
else if (body.linearVelocityX > 0.1f)
animationPlayer.backwards = false;
}
}
private void Land() // Stops jumping when player lands