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

Added Camera switching needs to be smoothed soon

Browse Source
This commit is contained in:
Unknown
2022-02-23 21:27:36 -06:00
parent 80bf0b7702
commit 0de7c077f7
6 changed files with 131 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Jacob Folder/Ceiling_Trigger.cs
+2 -2
View File
@@ -25,7 +25,7 @@ public class Ceiling_Trigger : MonoBehaviour
}
void OnTriggerEnter2D(Collider2D col)
{
if (!entered && counter >= 69)
if (!entered && counter >= 6)
{
entered = true;
@@ -35,7 +35,7 @@ public class Ceiling_Trigger : MonoBehaviour
Debug.Log(counter);
counter = 0;
}
else if (counter >= 69 && entered)
else if (counter >= 6 && entered)
{
//Debug.Log("Moved cam left");
Debug.Log(counter);
Assets/Jacob Folder/ScriptRayHit.cs
+16 -2
View File
@@ -8,6 +8,9 @@ public class ScriptRayHit : MonoBehaviour
public RaycastHit2D hit;
public Ray ray;
private int counter;
public Camera followCam;
public Camera staticCam;
private bool cam = false;
// Start is called before the first frame update
void Start()
{
@@ -20,8 +23,19 @@ public class ScriptRayHit : MonoBehaviour
hit = Physics2D.Raycast(transform.position, transform.TransformDirection(Vector2.right), 4f);
if (hit)
{
//Debug.Log(" Hit a wall "+ hit.collider.name);
//Debug.Log(counter);
Debug.Log(" Hit a wall "+ hit.collider.name);
staticCam.enabled = true;
followCam.enabled = false;
counter = 0;
cam = true;
}
else if (cam && counter == 30)
{
staticCam.enabled = false;
followCam.enabled = true;
counter = 0;
cam = false;
Debug.Log("");
}
counter++;
}
Assets/Scene 1 Assets/Scripts/WallTrigger.cs
+3 -3
View File
@@ -9,7 +9,7 @@ public class WallTrigger : MonoBehaviour
public GameObject cat;
private int counter = 0;
private Vector3 moveCam = new Vector3(20,0,0);
private Vector3 moveCat = new Vector3(4,0,0);
private Vector3 moveCat = new Vector3(5,0,0);
// Start is called before the first frame update
void Start()
{
@@ -28,7 +28,7 @@ public class WallTrigger : MonoBehaviour
{
Interact(col);
}
if (!entered && counter >= 120)
if (!entered && counter >= 6)
{
entered = true;
@@ -39,7 +39,7 @@ public class WallTrigger : MonoBehaviour
counter = 0;
//PlayerMovement.ChangePos(1, 2);
}
else if (counter >= 120 && entered)
else if (counter >= 6 && entered)
{
//Debug.Log("Moved cam left");
//Debug.Log(counter);
Assets/Scenes/Jacob's Scene.unity
+106 -20
View File
@@ -132,7 +132,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 38840433}
m_Layer: 0
m_Layer: 6
m_Name: BackGround Parent
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -167,7 +167,7 @@ GameObject:
- component: {fileID: 140439527}
- component: {fileID: 140439529}
- component: {fileID: 140439528}
m_Layer: 8
m_Layer: 7
m_Name: Platform_A (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -182,7 +182,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 140439526}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 25.12, y: 2.67, z: 0}
m_LocalPosition: {x: 25, y: 1, z: 0}
m_LocalScale: {x: 2.0063088, y: 1.2821575, z: 1}
m_Children: []
m_Father: {fileID: 377681583}
@@ -252,7 +252,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: 0.0069954395, y: 0}
m_SpriteTilingProperty:
border: {x: 0.25, y: 0.25, z: 0.25, w: 0.25}
pivot: {x: 0.5, y: 0.5}
@@ -263,7 +263,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_Size: {x: 1.5176203, y: 1}
m_EdgeRadius: 0
--- !u!1 &189071651
GameObject:
@@ -349,7 +349,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267604310}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20, y: 5.8, z: 0}
m_LocalPosition: {x: 20, y: 5.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 485861824}
@@ -405,7 +405,7 @@ GameObject:
m_Component:
- component: {fileID: 272334158}
- component: {fileID: 272334159}
m_Layer: 0
m_Layer: 6
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -486,7 +486,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 377681583}
m_Layer: 8
m_Layer: 7
m_Name: Platform
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -611,7 +611,7 @@ GameObject:
- component: {fileID: 588055174}
- component: {fileID: 588055176}
- component: {fileID: 588055175}
m_Layer: 8
m_Layer: 7
m_Name: Platform_A
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -735,8 +735,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636622991}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 11.74, y: 0.64, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 10.5, y: 1, z: 0}
m_LocalScale: {x: 3, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 485861824}
m_RootOrder: 1
@@ -765,7 +765,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 10}
m_Size: {x: 1, y: 7}
m_EdgeRadius: 0
--- !u!114 &636622994
MonoBehaviour:
@@ -891,6 +891,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1fd41423fac95444da8286db867308b4, type: 3}
m_Name:
m_EditorClassIdentifier:
followCam: {fileID: 1477085818}
staticCam: {fileID: 913520876}
--- !u!114 &784188899
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -986,6 +988,7 @@ Transform:
- {fileID: 772189788}
- {fileID: 1772079924}
- {fileID: 784188897}
- {fileID: 1477085816}
m_Father: {fileID: 1330058645}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1084,7 +1087,7 @@ MonoBehaviour:
m_AirControl: 1
m_WhatIsGround:
serializedVersion: 2
m_Bits: 375
m_Bits: 247
m_GroundCheck: {fileID: 1772079924}
m_CeilingCheck: {fileID: 772189788}
m_CrouchDisableCollider: {fileID: 790075219}
@@ -1104,7 +1107,7 @@ GameObject:
m_Component:
- component: {fileID: 853833790}
- component: {fileID: 853833789}
m_Layer: 0
m_Layer: 6
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1187,7 +1190,7 @@ GameObject:
- component: {fileID: 904820523}
- component: {fileID: 904820525}
- component: {fileID: 904820524}
m_Layer: 8
m_Layer: 7
m_Name: Platform_A (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1475,7 +1478,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1058938762}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.39, y: -3.5, z: 0}
m_LocalPosition: {x: 0, y: -4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 760969146}
@@ -1548,7 +1551,7 @@ GameObject:
m_Component:
- component: {fileID: 1363037122}
- component: {fileID: 1363037123}
m_Layer: 0
m_Layer: 6
m_Name: Background Duplicate
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1620,6 +1623,89 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1477085815
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1477085816}
- component: {fileID: 1477085818}
- component: {fileID: 1477085817}
m_Layer: 0
m_Name: Char Cam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1477085816
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1477085815}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -1.21113}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 790075216}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &1477085817
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1477085815}
m_Enabled: 0
--- !u!20 &1477085818
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1477085815}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 1000
field of view: 155
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &1772079923
GameObject:
m_ObjectHideFlags: 0
@@ -1661,7 +1747,7 @@ GameObject:
- component: {fileID: 2023632908}
- component: {fileID: 2023632910}
- component: {fileID: 2023632909}
m_Layer: 8
m_Layer: 7
m_Name: Platform_A (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1746,7 +1832,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: -0.00000032782555, y: 0}
m_SpriteTilingProperty:
border: {x: 0.25, y: 0.25, z: 0.25, w: 0.25}
pivot: {x: 0.5, y: 0.5}
@@ -1757,5 +1843,5 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_Size: {x: 1.5036321, y: 1}
m_EdgeRadius: 0
ProjectSettings/TagManager.asset
+2 -2
View File
@@ -14,8 +14,8 @@ TagManager:
- Water
- UI
- Background
-
-
- Platforms
- Triggers
- Fuki
-
- Textbox
UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -21,10 +21,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650