diff --git a/Assets/Animation/EnemyAlert_Low.anim b/Assets/Animation/EnemyAlert_Low.anim index 2fe7624..fc8ad85 100644 --- a/Assets/Animation/EnemyAlert_Low.anim +++ b/Assets/Animation/EnemyAlert_Low.anim @@ -30,7 +30,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -39,7 +39,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -67,7 +67,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -76,7 +76,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -104,7 +104,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -113,7 +113,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -141,7 +141,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 0.5 inSlope: 0 outSlope: 0 @@ -150,7 +150,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -166,7 +166,7 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -207,7 +207,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.28333333 + m_StopTime: 1.4166666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -236,7 +236,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -245,7 +245,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -273,7 +273,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -282,7 +282,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -310,7 +310,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 1 inSlope: 0 outSlope: 0 @@ -319,7 +319,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 @@ -347,7 +347,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.6666667 value: 0.5 inSlope: 0 outSlope: 0 @@ -356,7 +356,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 1.4166666 value: 1 inSlope: 0 outSlope: 0 diff --git a/Assets/Animation/Image.controller b/Assets/Animation/Image.controller index 6d5841e..0a8eeda 100644 --- a/Assets/Animation/Image.controller +++ b/Assets/Animation/Image.controller @@ -36,7 +36,7 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 3 + - m_ConditionMode: 4 m_ConditionEvent: Enemies m_EventTreshold: 15 m_DstStateMachine: {fileID: 0} @@ -196,7 +196,7 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 3 + - m_ConditionMode: 4 m_ConditionEvent: Enemies m_EventTreshold: 10 m_DstStateMachine: {fileID: 0} diff --git a/Assets/Scenes/NaomiScene.unity b/Assets/Scenes/NaomiScene.unity index 8c92417..0c7cf3b 100644 --- a/Assets/Scenes/NaomiScene.unity +++ b/Assets/Scenes/NaomiScene.unity @@ -871,7 +871,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -65, y: 0} + m_AnchoredPosition: {x: -65, y: 61} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &168072897 @@ -1583,7 +1583,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 61} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &289919235 @@ -7420,7 +7420,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 65, y: 0} + m_AnchoredPosition: {x: 65, y: 61} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1460369144