lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

character fall asleep when low energy

Browse Source
This commit is contained in:
Vladimir Koshevarov
2022-11-17 17:53:30 +02:00
parent c8047bd170
commit ed1c16db33
6 changed files with 4906 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Characters/Animations/FemaleAnimation.controller
+87
View File
@@ -12,6 +12,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -3094273592758750395}
- {fileID: 6790371418476383064}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -77,6 +78,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-331182733467432999
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: IsSleeping
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5486930935274134635}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.96359223
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -98,6 +124,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: IsSleeping
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -129,6 +161,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 8788785512435524937}
m_Position: {x: 330, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: 8580685621360077188}
m_Position: {x: 50, y: 380, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -167,6 +202,58 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6790371418476383064
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsSleeping
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8580685621360077188}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9849699
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8580685621360077188
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sleeping
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -331182733467432999}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 066a9ec36ca523142ae3a1f2200582c3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8788785512435524937
AnimatorState:
serializedVersion: 6
Assets/Characters/Animations/Sleeping.anim
+4757
View File
File diff suppressed because it is too large Load Diff
Assets/Characters/Animations/Sleeping.anim.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 066a9ec36ca523142ae3a1f2200582c3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/CityOutside.unity
+25 -80
View File
@@ -274,7 +274,7 @@ Transform:
- {fileID: 1152324441}
- {fileID: 1382752553}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &107380536
GameObject:
@@ -2773,7 +2773,7 @@ Transform:
- {fileID: 712058892}
- {fileID: 723568106}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1 &307039698
GameObject:
@@ -2874,7 +2874,6 @@ GameObject:
- component: {fileID: 329780515}
- component: {fileID: 329780514}
- component: {fileID: 329780513}
- component: {fileID: 329780517}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -2966,22 +2965,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &329780517
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 329780512}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2649ed9748ff3864880311f1c2aecdef, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerController: {fileID: 1476341271}
_timeText: {fileID: 2089282903}
_moneyText: {fileID: 443940496}
_energy: {fileID: 910851332}
--- !u!1 &443940494
GameObject:
m_ObjectHideFlags: 0
@@ -3220,6 +3203,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 497576566}
- component: {fileID: 497576567}
m_Layer: 5
m_Name: PlayerStats
m_TagString: Untagged
@@ -3252,6 +3236,23 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 22.531006}
m_SizeDelta: {x: 0, y: -45.062}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &497576567
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 497576565}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2649ed9748ff3864880311f1c2aecdef, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerController: {fileID: 1476341271}
_timeText: {fileID: 2089282903}
_moneyText: {fileID: 443940496}
_energy: {fileID: 910851332}
_food: {fileID: 1326618498}
--- !u!1 &548419713
GameObject:
m_ObjectHideFlags: 0
@@ -4106,7 +4107,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759, type: 3}
propertyPath: m_RootOrder
value: 9
value: 8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759, type: 3}
propertyPath: m_LocalScale.x
@@ -6370,50 +6371,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1301998795
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1301998797}
- component: {fileID: 1301998796}
m_Layer: 0
m_Name: DialogTest
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1301998796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1301998795}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9922754e62fe4b84397a0d1f84482f7e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1301998797
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1301998795}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1326618496
GameObject:
m_ObjectHideFlags: 0
@@ -11456,7 +11413,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!1 &1366991730
GameObject:
@@ -11667,23 +11624,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1476341272
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476341266}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e34d78101f2c2b842864fce206379a7c, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1476341269}
playerAnimator: {fileID: 1476341268}
playerCamera: {fileID: 963194227}
targetDest: {fileID: 1359374190}
allowMovement: 0
allowMovement: 1
--- !u!54 &1476341273
Rigidbody:
m_ObjectHideFlags: 0
@@ -12833,7 +12778,7 @@ MonoBehaviour:
_title: {fileID: 107380538}
_choiceButton: {fileID: 890493768}
_closeBtn: {fileID: 1396013895}
_player: {fileID: 1476341272}
_playerManager: {fileID: 1476341271}
conversationChangeEvent:
m_PersistentCalls:
m_Calls:
@@ -13070,7 +13015,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2051386990
GameObject:
Assets/Scripts/PlayerManager.cs
+28 -4
View File
@@ -5,10 +5,11 @@ using UnityEngine.AI;
public class PlayerManager : MonoBehaviour
{
public Stat money = new Stat("Money", 1000.0f);
private enum States { Idle, Walking, Sleeping };
public Stat money = new Stat("Money", 100.0f);
public Stat rentAccount = new Stat("Rent Account", 0);
public Stat food = new Stat("Food Energy", 100);
public Stat energy = new Stat("Energy", 100);
public Stat energy = new Stat("Energy", 12);
// bank
public Stat bankAccount = new Stat("Bank Account", 0);
@@ -47,6 +48,8 @@ public class PlayerManager : MonoBehaviour
public ParticleSystem targetDest;
public bool allowMovement = true;
private States _state;
private void OnEnable()
{
TimeManager.OnMinuteChanged += DecreaseEnergy;
@@ -96,8 +99,29 @@ public class PlayerManager : MonoBehaviour
public void DecreaseEnergy()
{
food.deduct(1f);
energy.deduct(0.096f); // 24 hours it's 100, 100/1440=~0.096 per minute
food.deduct(0.034f); // 48 hours it's 100, 100/2880=~0.034 per minute
switch (_state)
{
case States.Idle:
case States.Walking:
energy.deduct(0.1f); // 24 hours it's 100, 100/1440=~0.096 per minute
break;
case States.Sleeping:
energy.increase(1f);
break;
}
if (energy.Value <= 10 && _state != States.Sleeping)
{
_state = States.Sleeping;
allowMovement = false;
playerAnimator.SetBool("IsSleeping", true);
}
if (energy.Value >= 100 && _state == States.Sleeping)
{
_state = States.Idle;
allowMovement = false;
playerAnimator.SetBool("IsSleeping", false);
}
}
public bool TryBuyAction(BaseAction action)
Assets/Scripts/TimeManager.cs
+1 -1
View File
@@ -40,7 +40,7 @@ public class TimeManager : MonoBehaviour
private float _timer;
[SerializeField]
private float _minuteToRealTime = 0.5f;
private float _minuteToRealTime = 0.01f;
public static TimeSpan CurrentTime { get; private set; }