mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from frizbee19/Rizzz

Browse Source 
Worked on first level
This commit is contained in:
frizbee19
2022-02-24 22:47:43 -06:00
committed by GitHub
parent 9586240adb ea193c2076
commit 0f18816951
10 changed files with 1051 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Font/SFCartoonistHand SDF.asset
+57 -9
View File
File diff suppressed because one or more lines are too long
Assets/Prefabs/Collectible.prefab
+135
View File
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2242710701008615249
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2242710701008615245}
- component: {fileID: 2242710701008615244}
- component: {fileID: 2242710701008615247}
- component: {fileID: 2242710701008615246}
m_Layer: 0
m_Name: Collectible
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2242710701008615245
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.47, y: 2.09, z: 0}
m_LocalScale: {x: 1, y: 1.9308459, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2242710701008615244
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 3625043607559282579, guid: 045b15ec09bba42448d89db77fa6f20a, type: 3}
m_Color: {r: 1, g: 0.9364519, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 0.5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &2242710701008615247
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -1}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 0.5}
newSize: {x: 1, y: 0.5}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 2}
m_EdgeRadius: 0
--- !u!114 &2242710701008615246
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58ad46602c4301d47a7b6f71726a1cd9, type: 3}
m_Name:
m_EditorClassIdentifier:
forceInteract: 0
repeatable: 0
value: 0
TextBox: {fileID: 0}
pages:
- congrats, you did it!
emotes: 00000000
controller: {fileID: 0}
startSprite: {fileID: 3625043607559282579, guid: 045b15ec09bba42448d89db77fa6f20a, type: 3}
audioManager: {fileID: 0}
isTalking: 0
Assets/Prefabs/Collectible.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d17fc3156a0dea745a31a3be8fff0e8e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Platform.prefab
+148
View File
@@ -0,0 +1,148 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2621127337476526745
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2621127337476526756}
- component: {fileID: 2621127337476526747}
- component: {fileID: 2621127337476526746}
- component: {fileID: 2621127337476526757}
- component: {fileID: 2621127337476526758}
m_Layer: 7
m_Name: Platform
m_TagString: Platform
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2621127337476526756
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.27, y: -1.78, z: 0}
m_LocalScale: {x: 3, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2621127337476526747
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2621127337476526746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56977ce248620a94199b7ddedef0152e, type: 3}
m_Name:
m_EditorClassIdentifier:
isMoving: 0
positionToMoveTo: {x: 0, y: 0, z: 0}
length: 4
goThrough: 1
--- !u!61 &2621127337476526757
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 1
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.95, y: 0.8}
m_EdgeRadius: 0.15
--- !u!251 &2621127337476526758
PlatformEffector2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_UseColliderMask: 1
m_ColliderMask:
serializedVersion: 2
m_Bits: 8
m_RotationalOffset: 0
m_UseOneWay: 1
m_UseOneWayGrouping: 1
m_SurfaceArc: 90
m_UseSideFriction: 0
m_UseSideBounce: 0
m_SideArc: 1
Assets/Prefabs/Platform.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4847344a5a8497746b1fabd92e4360ea
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scene 1 Assets/Movement.cs
+1 -1
View File
@@ -19,7 +19,7 @@ public class Movement : MonoBehaviour
const float k_CeilingRadius = .2f; // Radius of the overlap circle to determine if the player can stand up
private Rigidbody2D m_Rigidbody2D;
private bool m_FacingRight = true; // For determining which way the player is currently facing.
private Vector3 m_Velocity = Vector3.zero;
public Vector3 m_Velocity = Vector3.zero;
public static bool pause = false;
private bool dj = false;
Assets/Scene 1 Assets/Scripts/Platform.cs
+27 -6
View File
@@ -4,13 +4,18 @@ using UnityEngine;
public class Platform : MonoBehaviour
{
public bool isMoving;
public Vector3 positionToMoveTo;
public float length;
float prevY;
Vector3 startPos;
void Start()
{
startPos = transform.position;
StartCoroutine(LerpPosition(positionToMoveTo, length));
if(isMoving)
{
startPos = transform.position;
StartCoroutine(LerpPosition(positionToMoveTo, length));
}
}
IEnumerator LerpPosition(Vector3 targetPosition, float duration)
{
@@ -35,11 +40,27 @@ public class Platform : MonoBehaviour
// Update is called once per frame
void Update()
{
if(transform.position == positionToMoveTo) {
Switch();
StartCoroutine(LerpPosition(positionToMoveTo, length));
if(isMoving) {
if(transform.position == positionToMoveTo) {
Switch();
StartCoroutine(LerpPosition(positionToMoveTo, length));
}
}
}
// void OnCollisionEnter2D (Collision2D other) {
// if (other.gameObject.tag == "Player") {
// if(goThrough) {
// if(other.gameObject.GetComponent<Movement>().m_Velocity.y > 0.01f) {
// GetComponent<Collider2D>().isTrigger = true;
// }
// else
// {
// GetComponent<Collider2D>().isTrigger = false;
// }
// }
// }
// }
}
Assets/Scenes/Benji's Scene.unity
+5
View File
@@ -397,6 +397,11 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 2, y: 12}
m_EdgeRadius: 0
--- !u!95 &1124948658 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5439994586602100319, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
m_PrefabInstance: {fileID: 5439994587558609906}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1336567756
GameObject:
m_ObjectHideFlags: 0
Assets/Scenes/Platform test.unity
+638 -397
View File
File diff suppressed because it is too large Load Diff
UserSettings/EditorUserSettings.asset
+26 -5
View File
@@ -6,12 +6,21 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-2:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
=======
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-3:
@@ -28,15 +37,27 @@ EditorUserSettings:
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
>>>>>>> main
flags: 0
RecentlyUsedScenePath-8:
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
=======
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
>>>>>>> main
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650