mirror of
https://github.com/frizbee19/FebGameJam.git
synced 2026-11-11 04:22:40 +00:00
Added a Move onto next area in crowds :) 👍
read title.
This commit is contained in:
1 parent
11a2af2f5f
commit
8c084b2e01
5 files changed
+70
-100
No files matched your search
@@ -1613,7 +1613,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1466729688}
|
m_Father: {fileID: 1466729688}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &491652224
|
--- !u!114 &491652224
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -1657,7 +1657,7 @@ BoxCollider2D:
|
|||||||
adaptiveTiling: 0
|
adaptiveTiling: 0
|
||||||
m_AutoTiling: 0
|
m_AutoTiling: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Size: {x: 20, y: 0.5}
|
m_Size: {x: 60, y: 0.5}
|
||||||
m_EdgeRadius: 0
|
m_EdgeRadius: 0
|
||||||
--- !u!1 &572681046
|
--- !u!1 &572681046
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -2518,7 +2518,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 990814925}
|
m_GameObject: {fileID: 990814925}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 10, y: 0.3699999, z: 0}
|
m_LocalPosition: {x: 10, y: 0.3699999, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 0.5, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 441527771}
|
m_Father: {fileID: 441527771}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
@@ -3444,6 +3444,7 @@ GameObject:
|
|||||||
- component: {fileID: 1292739684}
|
- component: {fileID: 1292739684}
|
||||||
- component: {fileID: 1292739683}
|
- component: {fileID: 1292739683}
|
||||||
- component: {fileID: 1292739682}
|
- component: {fileID: 1292739682}
|
||||||
|
- component: {fileID: 1292739689}
|
||||||
m_Layer: 9
|
m_Layer: 9
|
||||||
m_Name: Char Movement
|
m_Name: Char Movement
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -3501,7 +3502,7 @@ MonoBehaviour:
|
|||||||
value: 0
|
value: 0
|
||||||
TextBox: {fileID: 1749412398}
|
TextBox: {fileID: 1749412398}
|
||||||
pages:
|
pages:
|
||||||
- ...
|
- Go onto the next place
|
||||||
emotes: 09000000
|
emotes: 09000000
|
||||||
controller: {fileID: 9100000, guid: 7eb4fdbc838e84a8e83347d54fd48aa6, type: 2}
|
controller: {fileID: 9100000, guid: 7eb4fdbc838e84a8e83347d54fd48aa6, type: 2}
|
||||||
startSprite: {fileID: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
|
startSprite: {fileID: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
|
||||||
@@ -3621,6 +3622,22 @@ MonoBehaviour:
|
|||||||
OnCrouchEvent:
|
OnCrouchEvent:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
--- !u!114 &1292739689
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1292739680}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 87e68b3571595ec4cbb4ac2904f27bae, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
forceInteract: 0
|
||||||
|
repeatable: 0
|
||||||
|
value: 0
|
||||||
|
box: {fileID: 1567161290}
|
||||||
--- !u!1 &1298952624
|
--- !u!1 &1298952624
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -3899,7 +3916,6 @@ Transform:
|
|||||||
- {fileID: 1727185278}
|
- {fileID: 1727185278}
|
||||||
- {fileID: 1041657046}
|
- {fileID: 1041657046}
|
||||||
- {fileID: 1567161289}
|
- {fileID: 1567161289}
|
||||||
- {fileID: 3994773715046640929}
|
|
||||||
- {fileID: 491652223}
|
- {fileID: 491652223}
|
||||||
- {fileID: 1908043579}
|
- {fileID: 1908043579}
|
||||||
m_Father: {fileID: 933219795}
|
m_Father: {fileID: 933219795}
|
||||||
@@ -4169,7 +4185,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 1567161288}
|
m_GameObject: {fileID: 1567161288}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 10.1, y: 0.37, z: 0}
|
m_LocalPosition: {x: 10.1, y: 0.37, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 0.5, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1466729688}
|
m_Father: {fileID: 1466729688}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
@@ -4215,8 +4231,8 @@ MonoBehaviour:
|
|||||||
cam: {fileID: 1689002319}
|
cam: {fileID: 1689002319}
|
||||||
cat: {fileID: 865919454}
|
cat: {fileID: 865919454}
|
||||||
box: {fileID: 1567161290}
|
box: {fileID: 1567161290}
|
||||||
camOffset: 10
|
camOffset: 20
|
||||||
catOffset: 5
|
catOffset: 4
|
||||||
countOffset: 10
|
countOffset: 10
|
||||||
--- !u!1 &1689002319
|
--- !u!1 &1689002319
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -5044,11 +5060,11 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1908043578}
|
m_GameObject: {fileID: 1908043578}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 5.5, z: -1.3}
|
m_LocalPosition: {x: 20, y: 8, z: -1.3}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1466729688}
|
m_Father: {fileID: 1466729688}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &1908043580
|
--- !u!114 &1908043580
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -5092,7 +5108,7 @@ BoxCollider2D:
|
|||||||
adaptiveTiling: 0
|
adaptiveTiling: 0
|
||||||
m_AutoTiling: 0
|
m_AutoTiling: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Size: {x: 20, y: 0.5}
|
m_Size: {x: 60, y: 0.5}
|
||||||
m_EdgeRadius: 0
|
m_EdgeRadius: 0
|
||||||
--- !u!1 &1939879639
|
--- !u!1 &1939879639
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -6027,7 +6043,7 @@ CircleCollider2D:
|
|||||||
m_UsedByComposite: 0
|
m_UsedByComposite: 0
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 1.25
|
m_Radius: 1
|
||||||
--- !u!61 &1517753707973891764
|
--- !u!61 &1517753707973891764
|
||||||
BoxCollider2D:
|
BoxCollider2D:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -6299,82 +6315,6 @@ GameObject:
|
|||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
--- !u!114 &3994773715046640926
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3994773715046640928}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 5cf4f43ae0936c443a05276d3fd59404, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
cam: {fileID: 1689002319}
|
|
||||||
cat: {fileID: 865919454}
|
|
||||||
box: {fileID: 3994773715046640927}
|
|
||||||
camOffset: 10
|
|
||||||
catOffset: 3
|
|
||||||
countOffset: 5
|
|
||||||
--- !u!61 &3994773715046640927
|
|
||||||
BoxCollider2D:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3994773715046640928}
|
|
||||||
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: 20, y: 0.5}
|
|
||||||
m_EdgeRadius: 0
|
|
||||||
--- !u!1 &3994773715046640928
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 3994773715046640929}
|
|
||||||
- component: {fileID: 3994773715046640927}
|
|
||||||
- component: {fileID: 3994773715046640926}
|
|
||||||
m_Layer: 8
|
|
||||||
m_Name: Ceiling Trigger Prefab
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!4 &3994773715046640929
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3994773715046640928}
|
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
|
||||||
m_LocalPosition: {x: 0, y: -4.5, z: -1.3}
|
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 1466729688}
|
|
||||||
m_RootOrder: 4
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
--- !u!4 &5500552993246238102
|
--- !u!4 &5500552993246238102
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class MoveOnToNextAreaScript : Trigger
|
||||||
|
{
|
||||||
|
GameObject instance;
|
||||||
|
bool isTrigger = false;
|
||||||
|
public BoxCollider2D box;
|
||||||
|
|
||||||
|
public override void Action()
|
||||||
|
{
|
||||||
|
isTrigger = true;
|
||||||
|
box.isTrigger = true;
|
||||||
|
Debug.Log(isTrigger);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 87e68b3571595ec4cbb4ac2904f27bae
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -22,7 +22,7 @@ public abstract class Trigger : MonoBehaviour
|
|||||||
//checks if player is in range of the trigger
|
//checks if player is in range of the trigger
|
||||||
private void OnTriggerStay2D(Collider2D other) {
|
private void OnTriggerStay2D(Collider2D other) {
|
||||||
if(other.CompareTag("Player")) {
|
if(other.CompareTag("Player")) {
|
||||||
Debug.Log("entered");
|
//Debug.Log("entered");
|
||||||
isActive = true;
|
isActive = true;
|
||||||
}
|
}
|
||||||
// else {
|
// else {
|
||||||
@@ -39,7 +39,7 @@ public abstract class Trigger : MonoBehaviour
|
|||||||
private void OnTriggerExit2D(Collider2D other) {
|
private void OnTriggerExit2D(Collider2D other) {
|
||||||
if(other.CompareTag("Player")) {
|
if(other.CompareTag("Player")) {
|
||||||
isActive = false;
|
isActive = false;
|
||||||
Debug.Log("exit");
|
//Debug.Log("exit");
|
||||||
}
|
}
|
||||||
if(forceInteract && repeatable) {
|
if(forceInteract && repeatable) {
|
||||||
hasOccurred = false;
|
hasOccurred = false;
|
||||||
@@ -65,7 +65,7 @@ public abstract class Trigger : MonoBehaviour
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(Input.GetKeyDown(KeyCode.E)) {
|
if(Input.GetKeyDown(KeyCode.E)) {
|
||||||
Debug.Log("action");
|
//Debug.Log("action");
|
||||||
Action();
|
Action();
|
||||||
if(!repeatable)
|
if(!repeatable)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,18 +31,18 @@ public class WorkingWallTrigger : MonoBehaviour
|
|||||||
}
|
}
|
||||||
void OnTriggerEnter2D(Collider2D col)
|
void OnTriggerEnter2D(Collider2D col)
|
||||||
{
|
{
|
||||||
float ye = cat.transform.position.y;
|
float xe = cat.transform.position.x;
|
||||||
float goaly = box.transform.localPosition.y;
|
float goalx = box.transform.localPosition.x;
|
||||||
if (ye < goaly && counter >= countOffset && col.IsTouchingLayers(layerMask))
|
if (xe < goalx && counter >= countOffset)
|
||||||
{
|
|
||||||
cam.transform.position -= moveCam;
|
|
||||||
cat.transform.position -= moveCat;
|
|
||||||
counter = 0;
|
|
||||||
}
|
|
||||||
else if (ye >= goaly && counter > countOffset && col.IsTouchingLayers(layerMask))
|
|
||||||
{
|
{
|
||||||
cam.transform.position += moveCam;
|
cam.transform.position += moveCam;
|
||||||
cat.transform.position += moveCat;
|
cat.transform.position += moveCat;
|
||||||
|
counter = 0;
|
||||||
|
}
|
||||||
|
else if (xe >= goalx && counter > countOffset)
|
||||||
|
{
|
||||||
|
cam.transform.position -= moveCam;
|
||||||
|
cat.transform.position -= moveCat;
|
||||||
|
|
||||||
counter = 0;
|
counter = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user