苗の成長アニメーションを追加
This commit is contained in:
parent
c7fc66879d
commit
39d3d6bdcb
|
|
@ -1,32 +1,5 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1102 &-8051783787151630874
|
||||
AnimatorState:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Wait
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions:
|
||||
- {fileID: -440546901106716930}
|
||||
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: 0}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-4417451168949031892
|
||||
AnimatorState:
|
||||
serializedVersion: 5
|
||||
|
|
@ -75,31 +48,6 @@ AnimatorStateTransition:
|
|||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1101 &-440546901106716930
|
||||
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: GrowingTrigger
|
||||
m_EventTreshold: 0
|
||||
m_DstStateMachine: {fileID: 0}
|
||||
m_DstState: {fileID: -4417451168949031892}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.75
|
||||
m_HasExitTime: 0
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1107 &-130798099334731609
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 5
|
||||
|
|
@ -112,9 +60,6 @@ AnimatorStateMachine:
|
|||
- serializedVersion: 1
|
||||
m_State: {fileID: -4417451168949031892}
|
||||
m_Position: {x: 240, y: 0, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8051783787151630874}
|
||||
m_Position: {x: 250, y: 120, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
|
|
@ -124,7 +69,7 @@ AnimatorStateMachine:
|
|||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -8051783787151630874}
|
||||
m_DefaultState: {fileID: -4417451168949031892}
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -133,13 +78,7 @@ AnimatorController:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ShortenedArrow
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters:
|
||||
- m_Name: GrowingTrigger
|
||||
m_Type: 9
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 0}
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 875275074515791083}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &875275073577673988
|
||||
SpriteRenderer:
|
||||
|
|
@ -131,7 +131,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 875275074515791083}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &875275074110174227
|
||||
SpriteRenderer:
|
||||
|
|
@ -232,7 +232,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 875275074515791083}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &875275074190396079
|
||||
SpriteRenderer:
|
||||
|
|
@ -333,7 +333,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 875275074515791083}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &875275074368017842
|
||||
SpriteRenderer:
|
||||
|
|
@ -432,7 +432,6 @@ Transform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 875275074279153695}
|
||||
- {fileID: 875275074368017840}
|
||||
- {fileID: 875275073577674107}
|
||||
- {fileID: 875275074190396078}
|
||||
|
|
@ -456,90 +455,5 @@ MonoBehaviour:
|
|||
seedlingStage2: {fileID: 875275074190396077}
|
||||
seedlingStage3: {fileID: 875275073577674106}
|
||||
seedlingStage4: {fileID: 875275074368017847}
|
||||
growingArrow: {fileID: 875275074279153694}
|
||||
--- !u!1001 &3637094299625695119
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 875275074515791083}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033234, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ShortenedArrow
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4493492865567033234, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b3d641214f420f74290147d368b221fa, type: 3}
|
||||
--- !u!4 &875275074279153695 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4493492865567033232, guid: b3d641214f420f74290147d368b221fa,
|
||||
growingArrowPrefab: {fileID: 4493492865567033234, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3637094299625695119}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &875275074279153694 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 4493492865567033233, guid: b3d641214f420f74290147d368b221fa,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3637094299625695119}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@ public class CornSeedling : MonoBehaviour
|
|||
[SerializeField] private GameObject seedlingStage2;
|
||||
[SerializeField] private GameObject seedlingStage3;
|
||||
[SerializeField] private GameObject seedlingStage4;
|
||||
[SerializeField] private Animator growingArrow;
|
||||
private readonly int growingTriggerHash = Animator.StringToHash("GrowingTrigger");
|
||||
[SerializeField] private GameObject growingArrowPrefab;
|
||||
private readonly int nextStageTriggerHash = Animator.StringToHash("NextStageTrigger");
|
||||
private static readonly float stage1End = 0.32f;
|
||||
private static readonly float stage2End = 0.67f;
|
||||
|
|
@ -53,11 +52,16 @@ public class CornSeedling : MonoBehaviour
|
|||
seedlingStage4.SetActive(false);
|
||||
}
|
||||
|
||||
public void PromoteGrowth(int newPeriod)
|
||||
public void PromoteGrowth(DateTime newTime)
|
||||
{
|
||||
growingArrow.SetTrigger(growingTriggerHash);
|
||||
period = newPeriod;
|
||||
if (completed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
beginTime = newTime;
|
||||
UpdateStage();
|
||||
var arrow = Instantiate(growingArrowPrefab, transform);
|
||||
this.CallWaitForSeconds(0.5f, () => Destroy(arrow));
|
||||
}
|
||||
|
||||
public void SetSeedlingGene(DateTime dateTime, int periodTime, SeedlingRank rank)
|
||||
|
|
|
|||
Loading…
Reference in New Issue