mirror of
https://github.com/frizbee19/FebGameJam.git
synced 2026-11-11 04:22:40 +00:00
Merge remote-tracking branch 'origin/main' into zoe
This commit is contained in:
5 files changed
+3828
-163
No files matched your search
@@ -506,6 +506,42 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 909522769}
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||||
|
value: ResumeGame
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||||
|
value: GameOver, Assembly-CSharp
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
|
||||||
|
value: ResumeGame()
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 909522769}
|
||||||
|
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||||
|
value: ReturnToMain
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||||
|
value: GameOver, Assembly-CSharp
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 3765277719197793240, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
- target: {fileID: 3765277719197793240, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Game Over
|
value: Game Over
|
||||||
@@ -558,6 +594,18 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 909522769}
|
||||||
|
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||||
|
value: ReturnToReal
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||||
|
value: GameOver, Assembly-CSharp
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
|
||||||
--- !u!1 &163424210
|
--- !u!1 &163424210
|
||||||
@@ -7744,7 +7792,7 @@ MonoBehaviour:
|
|||||||
value: 0
|
value: 0
|
||||||
player: {fileID: 387672841}
|
player: {fileID: 387672841}
|
||||||
respawn: {x: -7.5, y: 6}
|
respawn: {x: -7.5, y: 6}
|
||||||
canHurt: 0
|
canHurt: 1
|
||||||
--- !u!50 &1981804707
|
--- !u!50 &1981804707
|
||||||
Rigidbody2D:
|
Rigidbody2D:
|
||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
@@ -8133,9 +8181,9 @@ SpriteRenderer:
|
|||||||
m_AutoUVMaxDistance: 0.5
|
m_AutoUVMaxDistance: 0.5
|
||||||
m_AutoUVMaxAngle: 89
|
m_AutoUVMaxAngle: 89
|
||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 1027733709
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 2
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 9
|
||||||
m_Sprite: {fileID: -8221170716321238454, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
|
m_Sprite: {fileID: -8221170716321238454, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -2,16 +2,33 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
|
public enum TestingBehavior {
|
||||||
|
Cycle,
|
||||||
|
Set
|
||||||
|
};
|
||||||
|
|
||||||
public class AnimationControllerTester : MonoBehaviour {
|
public class AnimationControllerTester : MonoBehaviour {
|
||||||
public Animator animator;
|
public Animator animator;
|
||||||
public int numberOfAnimations = 1;
|
public int numberOfAnimations = 1;
|
||||||
public string animationPropertyName = "Animation";
|
public string animationPropertyName = "Animation";
|
||||||
|
public TestingBehavior behavior = TestingBehavior.Cycle;
|
||||||
|
public int setAnimationIndex = 0;
|
||||||
|
|
||||||
|
void Start() {
|
||||||
|
if (animator == null) {
|
||||||
|
animator = GetComponent<Animator>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update() {
|
void Update() {
|
||||||
// Get current time
|
if (behavior == TestingBehavior.Cycle) {
|
||||||
int second = (int) (Time.time / 1.5f);
|
// Get current time
|
||||||
int animationIndex = second % numberOfAnimations;
|
int second = (int) (Time.time / 1.5f);
|
||||||
animator.SetInteger(animationPropertyName, animationIndex);
|
int animationIndex = second % numberOfAnimations;
|
||||||
|
animator.SetInteger(animationPropertyName, animationIndex);
|
||||||
|
} else {
|
||||||
|
animator.SetInteger(animationPropertyName, setAnimationIndex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,12 +3,14 @@ using System.Collections.Generic;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class WaterSpirit : MonoBehaviour {
|
public class WaterSpirit : MonoBehaviour {
|
||||||
private Transform player;
|
|
||||||
public BoxCollider2D boxCollider;
|
|
||||||
public float swimSpeed = .25f;
|
public float swimSpeed = .25f;
|
||||||
|
|
||||||
|
private BoxCollider2D boxCollider;
|
||||||
|
private Transform player;
|
||||||
private Rigidbody2D rb;
|
private Rigidbody2D rb;
|
||||||
private Vector2 movement = Vector2.zero;
|
private Vector2 movement = Vector2.zero;
|
||||||
private float sizeOffset = 1;
|
private float sizeOffset = 1;
|
||||||
|
private bool activated = false;
|
||||||
|
|
||||||
void Start() {
|
void Start() {
|
||||||
rb = this.GetComponent<Rigidbody2D>();
|
rb = this.GetComponent<Rigidbody2D>();
|
||||||
|
|||||||
@@ -6,10 +6,17 @@ EditorUserSettings:
|
|||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
m_ConfigSettings:
|
m_ConfigSettings:
|
||||||
RecentlyUsedScenePath-0:
|
RecentlyUsedScenePath-0:
|
||||||
|
<<<<<<< HEAD
|
||||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
|
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-1:
|
RecentlyUsedScenePath-1:
|
||||||
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
|
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
|
||||||
|
=======
|
||||||
|
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-1:
|
||||||
|
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
|
||||||
|
>>>>>>> origin/main
|
||||||
flags: 0
|
flags: 0
|
||||||
vcSharedLogLevel:
|
vcSharedLogLevel:
|
||||||
value: 0d5e400f0650
|
value: 0d5e400f0650
|
||||||
|
|||||||
Reference in new issue
Block a user