mirror of
https://github.com/frizbee19/FebGameJam.git
synced 2026-09-11 08:17:01 +00:00
Nyctophobia 2/3
Nyctophobia
This commit is contained in:
@@ -53,6 +53,31 @@ AnimatorState:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1101 &-368347621306417452
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name:
|
||||
m_Conditions:
|
||||
- m_ConditionMode: 2
|
||||
m_ConditionEvent: Shy?
|
||||
m_EventTreshold: 0
|
||||
m_DstStateMachine: {fileID: 0}
|
||||
m_DstState: {fileID: 0}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 1
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0
|
||||
m_HasExitTime: 0
|
||||
m_HasFixedDuration: 0
|
||||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -68,6 +93,12 @@ AnimatorController:
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 0}
|
||||
- m_Name: Direction
|
||||
m_Type: 1
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 0}
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
@@ -95,16 +126,16 @@ AnimatorStateMachine:
|
||||
m_Position: {x: 80, y: -30, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -1075850449819430760}
|
||||
m_Position: {x: 310, y: -30, z: 0}
|
||||
m_Position: {x: 280, y: -70, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions:
|
||||
- {fileID: 3771788973604469295}
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 330, y: -100, z: 0}
|
||||
m_AnyStatePosition: {x: 440, y: -140, z: 0}
|
||||
m_EntryPosition: {x: 100, y: -100, z: 0}
|
||||
m_ExitPosition: {x: 210, y: 60, z: 0}
|
||||
m_ExitPosition: {x: 330, y: 50, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -2103742996739158432}
|
||||
--- !u!1101 &3771788973604469295
|
||||
|
||||
@@ -70,7 +70,7 @@ TextureImporter:
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 16
|
||||
spritePixelsToUnits: 32
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
|
||||
@@ -25,8 +25,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 776050268538294905}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.191, y: -0.063, z: 0}
|
||||
m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3103723802129481039}
|
||||
m_RootOrder: 0
|
||||
@@ -44,7 +44,7 @@ BoxCollider2D:
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Offset: {x: -0.09, y: -0.1}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
@@ -55,7 +55,7 @@ BoxCollider2D:
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 2.79, y: 6.9}
|
||||
m_Size: {x: 0.46, y: 0.54}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &3103723802129481037
|
||||
GameObject:
|
||||
@@ -69,6 +69,7 @@ GameObject:
|
||||
- component: {fileID: 3103723802129481036}
|
||||
- component: {fileID: 3103723802129481033}
|
||||
- component: {fileID: 3103723802129481074}
|
||||
- component: {fileID: 1331037034804418945}
|
||||
m_Layer: 8
|
||||
m_Name: Spoopy Ghoste (Jumpscare Warning)
|
||||
m_TagString: Untagged
|
||||
@@ -131,7 +132,7 @@ SpriteRenderer:
|
||||
m_SortingLayerID: 1027733709
|
||||
m_SortingLayer: 2
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -5029764186598712489, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3}
|
||||
m_Sprite: {fileID: -4819166152505672304, guid: 11f1c18ac45a940769c85c3c17315fb4, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
@@ -180,3 +181,23 @@ MonoBehaviour:
|
||||
cat: {fileID: 0}
|
||||
ball: 0
|
||||
mvt: {fileID: 0}
|
||||
anim: {fileID: 1331037034804418945}
|
||||
--- !u!95 &1331037034804418945
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3103723802129481037}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 11a230482c553484f92721b47ab590a2, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+11
-21
@@ -13,6 +13,7 @@ public class booMovement : MonoBehaviour
|
||||
public GameObject cat;
|
||||
public bool ball;
|
||||
public Movement mvt;
|
||||
public Animator anim;
|
||||
|
||||
void Start()
|
||||
{
|
||||
@@ -21,8 +22,6 @@ public class booMovement : MonoBehaviour
|
||||
sizeOffset = Random.Range(2f, 10f);
|
||||
player = cat.transform;
|
||||
|
||||
|
||||
//player = GameObject.FindWithTag("Player").transform;
|
||||
if (player == null)
|
||||
{
|
||||
Debug.Log("Player not found! Make sure Seiden's Char Movement has a tag of Player!");
|
||||
@@ -36,27 +35,18 @@ public class booMovement : MonoBehaviour
|
||||
mvt = cat.GetComponent<Movement>();
|
||||
ball = mvt.m_FacingRight;
|
||||
|
||||
if ((transform.position.x < player.position.x && ball)||(transform.position.x > player.position.x && !ball))
|
||||
{
|
||||
//Debug.Log("Away");
|
||||
if ((transform.position.x < player.position.x && ball)||(transform.position.x > player.position.x && !ball)) {
|
||||
player = cat.transform;
|
||||
Vector3 direction = player.position - transform.position;
|
||||
movement = direction.normalized;
|
||||
// Scale spirit size so they look like the swim like squid lol
|
||||
float size = Mathf.Sin(Time.time * sizeOffset) * .25f + 1;
|
||||
transform.localScale = new Vector3(size, size, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void FixedUpdate()
|
||||
{
|
||||
void FixedUpdate() {
|
||||
if (Movement.pause) return;
|
||||
if ((transform.position.x < player.position.x && ball) || (transform.position.x > player.position.x && !ball))
|
||||
{
|
||||
moveMe(movement);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((transform.position.x < player.position.x && ball) || (transform.position.x > player.position.x && !ball)) {
|
||||
moveMe(movement);
|
||||
} else {
|
||||
noMoveMe(transform);
|
||||
}
|
||||
}
|
||||
@@ -69,12 +59,12 @@ public class booMovement : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
void moveMe(Vector2 direction)
|
||||
{
|
||||
void moveMe(Vector2 direction) {
|
||||
if (anim != null) anim.SetBool("Shy?", false);
|
||||
rb.MovePosition(rb.position + direction * swimSpeed * Time.fixedDeltaTime);
|
||||
}
|
||||
void noMoveMe(Transform transform)
|
||||
{
|
||||
void noMoveMe(Transform transform) {
|
||||
if (anim != null) anim.SetBool("Shy?", true);
|
||||
rb.MovePosition(new Vector2(transform.position.x, transform.position.y));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,30 +5,6 @@ EditorUserSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedScenePath-0:
|
||||
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-1:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-2:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-3:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662e23e7e53078cee220eceb742a323016f6
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-6:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-7:
|
||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
|
||||
flags: 0
|
||||
vcSharedLogLevel:
|
||||
value: 0d5e400f0650
|
||||
flags: 0
|
||||
|
||||
Reference in New Issue
Block a user