Conjure/PillowFight
6
0
Fork 0
mirror of https://github.com/ConjureETS/PillowFight.git synced 2026-03-24 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit for pull

Browse Source
This commit is contained in:
Patrice Vignola 2015-08-23 13:20:22 -04:00
parent e7671d3014
commit e4ee5509f6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scenes/PatScene.unity
View File

@ -1014,6 +1014,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PlayerCount: 4 PlayerCount: 4
mom: {fileID: 1257411050}
--- !u!4 &945259370 --- !u!4 &945259370
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2522,6 +2523,10 @@ Prefab:
propertyPath: PlayerNumber propertyPath: PlayerNumber
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 134552, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0

2
Assets/Scripts/Child.cs
View File

@ -15,6 +15,7 @@ public class Child : MonoBehaviour
public Pillow pillow; public Pillow pillow;
public MomBehavior Mom; public MomBehavior Mom;
public Animator Animator; public Animator Animator;
public GameObject AnimationPillow;
private Rigidbody _rb; private Rigidbody _rb;
private bool _isGrounded = false; private bool _isGrounded = false;
@ -48,6 +49,7 @@ public class Child : MonoBehaviour
void Awake() void Awake()
{ {
_rb = GetComponent<Rigidbody>(); _rb = GetComponent<Rigidbody>();
AnimationPillow.SetActive(false);
} }
void Update() void Update()