Merge branch 'main' into riz

This commit is contained in:
frizbee19
2022-02-23 14:21:42 -06:00
committed by GitHub
13 changed files with 2275 additions and 37 deletions
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 44c9f904ad907c24e9891940258fd90e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+48
View File
@@ -0,0 +1,48 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Ceiling_Trigger : MonoBehaviour
{
bool entered = false;
public GameObject cam;
public GameObject cat;
private int counter = 0;
private Vector3 moveCam = new Vector3(0, 10, 0);
private Vector3 moveCat = new Vector3(0, 3, 0);
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
counter++;
}
void OnTriggerEnter2D(Collider2D col)
{
if (!entered && counter >= 69)
{
entered = true;
//Debug.Log("Move Cam Right");
cam.transform.position += moveCam;
cat.transform.position += moveCat;
Debug.Log(counter);
counter = 0;
}
else if (counter >= 69 && entered)
{
//Debug.Log("Moved cam left");
Debug.Log(counter);
cam.transform.position -= moveCam;
//cat.transform.position -= moveCat;
entered = false;
counter = 0;
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5cf4f43ae0936c443a05276d3fd59404
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+30
View File
@@ -0,0 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ScriptRayHit : MonoBehaviour
{
public RaycastHit2D hit;
public Ray ray;
private int counter;
// Start is called before the first frame update
void Start()
{
counter = 0;
}
// Update is called once per frame
void Update()
{
hit = Physics2D.Raycast(transform.position, transform.TransformDirection(Vector2.right), 4f);
if (hit)
{
//Debug.Log(" Hit a wall "+ hit.collider.name);
//Debug.Log(counter);
}
counter++;
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1fd41423fac95444da8286db867308b4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+10
View File
@@ -34,4 +34,14 @@ public class PlayerMovement : MonoBehaviour
controller.Move(horizontalMove * Time.fixedDeltaTime, crouch, jump);
jump = false;
}
public void ChangePos(double x, double y)
{
transform.position = new Vector2();
}
/*void OnTriggerEnter2D(Collider2D col)
{
Debug.Log("Trigger Detected!");
}*/
}
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5e8d962f546e27c4f9ecbed3f4ab3daf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,63 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class WallTrigger : MonoBehaviour
{
bool entered = false;
public GameObject cam;
public GameObject cat;
private int counter = 0;
private Vector3 moveCam = new Vector3(20,0,0);
private Vector3 moveCat = new Vector3(4,0,0);
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
counter++;
}
void OnTriggerEnter2D(Collider2D col)
{
if (Input.GetButtonDown("Interact"))
{
Interact(col);
}
if (!entered && counter >= 120)
{
entered = true;
//Debug.Log("Move Cam Right");
cam.transform.position += moveCam;
cat.transform.position += moveCat;
//Debug.Log(counter);
counter = 0;
//PlayerMovement.ChangePos(1, 2);
}
else if (counter >= 120 && entered)
{
//Debug.Log("Moved cam left");
//Debug.Log(counter);
cam.transform.position -= moveCam;
cat.transform.position -= moveCat;
entered = false;
counter = 0;
}
}
private void Interact(Collider2D col)
{
Debug.Log("Interact Buttion Pressed!!");
}
/*void Interact(Collider2D col, ){
*
}*/
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9e34ddf7efd0cb44ba69abc06b6567d4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 63478eacf32fba646aeb1b1643a15418
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+305 -35
View File
@@ -295,7 +295,7 @@ MonoBehaviour:
m_AirControl: 1
m_WhatIsGround:
serializedVersion: 2
m_Bits: 55
m_Bits: 119
m_GroundCheck: {fileID: 1910266859}
m_CeilingCheck: {fileID: 1142945770}
m_CrouchDisableCollider: {fileID: 187176292}
@@ -315,7 +315,7 @@ CircleCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.41, y: -0.83}
@@ -382,6 +382,37 @@ MonoBehaviour:
m_EditorClassIdentifier:
controller: {fileID: 187176290}
runSpeed: 40
--- !u!1 &469248023
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 469248024}
m_Layer: 0
m_Name: Platform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &469248024
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 469248023}
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_Children:
- {fileID: 900854139}
m_Father: {fileID: 1510530933}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -487,6 +518,115 @@ RectTransform:
m_PrefabInstance: {fileID: 1460165761}
m_PrefabAsset: {fileID: 0}
--- !u!1 &978064013
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 900854139}
- component: {fileID: 900854140}
- component: {fileID: 900854141}
m_Layer: 5
m_Name: Platform_A
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &900854139
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900854138}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.5, y: 0, z: 0}
m_LocalScale: {x: 2.006309, y: 1.2821575, z: 1}
m_Children: []
m_Father: {fileID: 469248024}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &900854140
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900854138}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
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: 3.18, y: 3.09}
newSize: {x: 1.5, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 1
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!212 &900854141
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900854138}
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: 21300000, guid: 4749d35015666ea4fa9076540d768b0e, type: 3}
m_Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 1
m_Size: {x: 1.5, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &978064013
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -495,7 +635,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 978064014}
- component: {fileID: 978064015}
- component: {fileID: 978064016}
m_Layer: 0
m_Name: Wall Boundaries
@@ -512,38 +651,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 978064013}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -18.35, y: -2.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1510530933}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &978064015
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 978064013}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -9, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 12}
m_EdgeRadius: 0
--- !u!61 &978064016
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -557,7 +670,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 9, y: 0}
m_Offset: {x: 9, y: 3}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@@ -918,6 +1031,88 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1143466186
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1143466187}
- component: {fileID: 1143466188}
m_Layer: 0
m_Name: Background Duplicate
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1143466187
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143466186}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 21.69, y: -0.1, z: 0}
m_LocalScale: {x: 1.8342799, y: 1.8342799, z: 1.8342799}
m_Children: []
m_Father: {fileID: 1510530933}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1143466188
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143466186}
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: 21300000, guid: 0fec1a3f5ca37f84d93b1657c5f66fee, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 12, y: 6.3}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1457467879
GameObject:
m_ObjectHideFlags: 0
@@ -1259,6 +1454,9 @@ Transform:
- {fileID: 1457467880}
- {fileID: 2007236407}
- {fileID: 978064014}
- {fileID: 1143466187}
- {fileID: 1743185232}
- {fileID: 469248024}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1579,6 +1777,78 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1743185231
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1743185232}
- component: {fileID: 1743185234}
- component: {fileID: 1743185233}
m_Layer: 7
m_Name: trigger point
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1743185232
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1743185231}
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_Children: []
m_Father: {fileID: 1510530933}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1743185233
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1743185231}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 10}
m_EdgeRadius: 0
--- !u!114 &1743185234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1743185231}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9e34ddf7efd0cb44ba69abc06b6567d4, type: 3}
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 519420028}
cat: {fileID: 1684111836}
--- !u!1 &1910266858
GameObject:
m_ObjectHideFlags: 0
@@ -1603,7 +1873,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1910266858}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.86, z: 0}
m_LocalPosition: {x: 0.74, y: -1.94, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 187176289}
@@ -1619,7 +1889,7 @@ GameObject:
m_Component:
- component: {fileID: 2007236407}
- component: {fileID: 2007236408}
m_Layer: 0
m_Layer: 6
m_Name: Ground
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1634,7 +1904,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2007236406}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.39, y: -4.64, z: 0}
m_LocalPosition: {x: -0.39, y: -3.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1510530933}
@@ -1664,7 +1934,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 22.02, y: 1}
m_Size: {x: 60, y: 1}
m_EdgeRadius: 0
--- !u!1001 &7059772332933783824
PrefabInstance:
+2 -2
View File
@@ -38,11 +38,11 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire1
m_Name: Interact
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left ctrl
positiveButton: e
altNegativeButton:
altPositiveButton: mouse 0
gravity: 1000