bat fix
This commit is contained in:
parent
919fc149dd
commit
f788bd5e59
|
|
@ -199,6 +199,37 @@ Transform:
|
|||
m_Father: {fileID: 7609283403775189878}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2876489453856083489
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 951742979905966104}
|
||||
m_Layer: 0
|
||||
m_Name: PivotSingle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &951742979905966104
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2876489453856083489}
|
||||
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: 7609283403775189878}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &5920352441626343011
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -319,6 +350,7 @@ Transform:
|
|||
- {fileID: 4398076241187744673}
|
||||
- {fileID: 3145076079615732040}
|
||||
- {fileID: 5921619119855021811}
|
||||
- {fileID: 951742979905966104}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -355,6 +387,7 @@ MonoBehaviour:
|
|||
_ease: 4
|
||||
_pivotLeft: {fileID: 3145076079615732040}
|
||||
_pivotRight: {fileID: 5921619119855021811}
|
||||
_pivotSingle: {fileID: 951742979905966104}
|
||||
_objectsToMove:
|
||||
- {fileID: 1948694922747606563}
|
||||
- {fileID: 2854676978937244060}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
[Header("References")]
|
||||
[SerializeField] private Transform _pivotLeft;
|
||||
[SerializeField] private Transform _pivotRight;
|
||||
[SerializeField] private Transform _pivotSingle;
|
||||
[SerializeField] private Transform[] _objectsToMove;
|
||||
|
||||
|
||||
|
|
@ -43,6 +44,20 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
_pivotLeft.localEulerAngles = new Vector3(0, 0, newRotation);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void SingleMove(double beat, double length, bool right)
|
||||
{
|
||||
float normalized = Conductor.instance.GetPositionFromBeat(beat - length, length * 2, false);
|
||||
if (!right) normalized = 1 - normalized;
|
||||
var func = EasingFunction.GetEasingFunction(_ease);
|
||||
foreach (var o in _objectsToMove)
|
||||
{
|
||||
if (o.parent != _pivotSingle) o.SetParent(_pivotSingle, true);
|
||||
}
|
||||
float newRotation = func(_rotationRight, _rotationLeft, normalized);
|
||||
_pivotSingle.localEulerAngles = new Vector3(0, 0, newRotation);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,11 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
|
|||
|
||||
private void Update()
|
||||
{
|
||||
if (_type == LumBEARjack.SmallType.bat)
|
||||
{
|
||||
_rotateObject.SingleMove(_rotationBeat, _rotationLength, _right);
|
||||
return;
|
||||
}
|
||||
_rotateObject.Move(_rotationBeat, _rotationLength, _right);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue