mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add new anims

Browse source
This commit is contained in:
AstrlJelly 2024-02-28 19:42:33 -05:00
parent 1f6e8a6ca3
commit 0f89cceeb7
4 changed files with 182 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller
View file

@ -43,7 +43,7 @@ AnimatorStateMachine:
m_Position: {x: 280, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 808679152055322211}
m_Position: {x: 319.86536, y: 305.65582, z: 0}
m_Position: {x: 280, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -121,7 +121,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CanCan
m_Name: Can
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -147,7 +147,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CanReopen
m_Name: Reopen
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -207,6 +207,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -3105581592757715715}
m_Position: {x: 280, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 7320030847503406928}
m_Position: {x: 280, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -217,3 +220,29 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3105581592757715715}
--- !u!1102 &7320030847503406928
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flip
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c1f70058be5ba474197762ddf6f964e7, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

133
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim Normal file
View file

@ -0,0 +1,133 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CanFlip
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c1f70058be5ba474197762ddf6f964e7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Scripts/Games/Cannery/Can.cs
View file

@ -12,17 +12,13 @@ namespace HeavenStudio.Games.Scripts_Cannery
public double startBeat;
[Header("Components")]
// [SerializeField] Animator parentAnim;
[SerializeField] Animator anim;
// [SerializeField] SpriteRenderer sr;
public Cannery game;
private void Awake()
{
int random = Random.Range(-1, 1);
var pos = transform.position;
pos.x *= random;
if (Random.Range(0, 1f) >= 0.5f) anim.Play("Flip", 0);
game.ScheduleInput(startBeat, 1, Minigame.InputAction_BasicPress, Hit, null, null);
}
@ -38,7 +34,14 @@ namespace HeavenStudio.Games.Scripts_Cannery
{
game.cannerAnim.DoScaledAnimationAsync("Can", 0.5f);
SoundByte.PlayOneShotGame("cannery/can");
anim.DoScaledAnimationAsync("CanCan", 0.5f, 0, 1);
anim.DoScaledAnimationAsync("Can", 0.5f, 0, 1);
if (state is >= 1 or <= (-1)) {
SoundByte.PlayOneShot("nearMiss");
double beat = caller.startBeat + caller.timer;
BeatAction.New(this, new() {
new(beat + 0.35f, () => anim.DoScaledAnimationAsync("Reopen", 0.5f, 0, 1))
});
}
}
}
}