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

Animation changes

Browse source
This commit is contained in:
Rapandrasmus 2023-01-21 19:56:09 +01:00
parent e7c36ca006
commit 72d5c2c040
2 changed files with 118 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
Assets/Resources/Games/tambourine.prefab
View file

@ -6360,6 +6360,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3769381392087040979
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1858783761050951641}
- component: {fileID: 3994812684083818398}
m_Layer: 0
m_Name: SadFace
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1858783761050951641
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3769381392087040979}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.001, y: -0.948, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 979710770731590833}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3994812684083818398
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3769381392087040979}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_Sprite: {fileID: 7224489272389505764, guid: 8471d5c767f1ecd4ab31873833b0c408, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 3.2, y: 2.25}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3783804301309697915
GameObject:
m_ObjectHideFlags: 0
@ -6471,6 +6553,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7090997627279392267}
- {fileID: 1858783761050951641}
- {fileID: 5766953763708780172}
- {fileID: 8050949689915131618}
m_Father: {fileID: 1785929877216428417}
@ -6746,10 +6829,10 @@ MonoBehaviour:
handsAnimator: {fileID: 1599401704102748781}
monkeyAnimator: {fileID: 241274462882064872}
flowerParticles: {fileID: 5490304671109547141}
monkeyFace: {fileID: 7823810765356384206}
happyFace: {fileID: 7823810765356384206}
sadFace: {fileID: 3769381392087040979}
sweatAnimator: {fileID: 6891318331723545899}
monkeyGrimace: {fileID: 7224489272389505764, guid: 8471d5c767f1ecd4ab31873833b0c408, type: 3}
monkeySmile: {fileID: -8325636423666768275, guid: 8471d5c767f1ecd4ab31873833b0c408, type: 3}
frogAnimator: {fileID: 8987276236670124148}
--- !u!1 &4845574485429671826
GameObject:
m_ObjectHideFlags: 0
@ -7354,7 +7437,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 979710770731590833}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5850330434408002540
SpriteRenderer:
@ -7867,7 +7950,7 @@ Transform:
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 979710770731590833}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7743594156099072088
SpriteRenderer:
@ -7930,7 +8013,7 @@ Animator:
m_GameObject: {fileID: 7073819577067211076}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 8e72d85fe47758f498bce263b5c57a23, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -8258,7 +8341,7 @@ GameObject:
- component: {fileID: 7090997627279392267}
- component: {fileID: 5139428087372587638}
m_Layer: 0
m_Name: Expression
m_Name: HappyFace
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

51
Assets/Scripts/Games/Tambourine/Tambourine.cs
View file

@ -67,18 +67,17 @@ namespace HeavenStudio.Games
[SerializeField] Animator handsAnimator;
[SerializeField] Animator monkeyAnimator;
[SerializeField] ParticleSystem flowerParticles;
[SerializeField] GameObject monkeyFace;
[SerializeField] GameObject happyFace;
[SerializeField] GameObject sadFace;
[SerializeField] Animator sweatAnimator;
[SerializeField] Animator frogAnimator;
[Header("Variables")]
bool intervalStarted;
float intervalStartBeat;
float beatInterval = 4f;
float misses;
[Header("Sprites")]
[SerializeField] Sprite monkeyGrimace;
[SerializeField] Sprite monkeySmile;
bool frogPresent;
public enum WhoBops
{
@ -100,6 +99,7 @@ namespace HeavenStudio.Games
{
instance = this;
sweatAnimator.Play("NoSweat", 0, 0);
frogAnimator.Play("FrogExited", 0, 0);
}
void Update()
@ -116,8 +116,7 @@ namespace HeavenStudio.Games
SummonFrog();
if (!intervalStarted)
{
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeyGrimace;
monkeyFace.SetActive(true);
sadFace.SetActive(true);
}
}
else if (PlayerInput.AltPressed() && !IsExpectingInputNow(InputType.STANDARD_ALT_DOWN))
@ -128,8 +127,7 @@ namespace HeavenStudio.Games
SummonFrog();
if (!intervalStarted)
{
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeyGrimace;
monkeyFace.SetActive(true);
sadFace.SetActive(true);
}
}
}
@ -140,7 +138,8 @@ namespace HeavenStudio.Games
beatInterval = interval;
if (!intervalStarted)
{
monkeyFace.SetActive(false);
DesummonFrog();
sadFace.SetActive(false);
queuedInputs.Clear();
misses = 0;
intervalStarted = true;
@ -179,11 +178,10 @@ namespace HeavenStudio.Games
if (queuedInputs.Count == 0) return;
monkeyAnimator.Play("MonkeyPassTurn", 0, 0);
Jukebox.PlayOneShotGame($"tambourine/monkey/turnPass/{UnityEngine.Random.Range(1, 6)}");
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeySmile;
monkeyFace.SetActive(true);
happyFace.SetActive(true);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 0.3f, delegate { monkeyFace.SetActive(false); })
new BeatAction.Action(beat + 0.3f, delegate { happyFace.SetActive(false); })
});
foreach (var input in queuedInputs)
{
@ -221,6 +219,7 @@ namespace HeavenStudio.Games
public void SuccessFace(float beat)
{
DesummonFrog();
if (misses > 0) return;
flowerParticles.Play();
Jukebox.PlayOneShotGame($"tambourine/player/turnPass/sweep");
@ -231,11 +230,10 @@ namespace HeavenStudio.Games
new MultiSound.Sound("tambourine/player/turnPass/note3", beat + 0.2f),
new MultiSound.Sound("tambourine/player/turnPass/note3", beat + 0.3f),
}, forcePlay: true);
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeySmile;
monkeyFace.SetActive(true);
happyFace.SetActive(true);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 1, delegate { monkeyFace.SetActive(false); }),
new BeatAction.Action(beat + 1, delegate { happyFace.SetActive(false); }),
});
}
@ -250,8 +248,7 @@ namespace HeavenStudio.Games
misses++;
if (!intervalStarted)
{
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeyGrimace;
monkeyFace.SetActive(true);
sadFace.SetActive(true);
}
return;
}
@ -269,8 +266,7 @@ namespace HeavenStudio.Games
misses++;
if (!intervalStarted)
{
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeyGrimace;
monkeyFace.SetActive(true);
sadFace.SetActive(true);
}
return;
}
@ -279,7 +275,7 @@ namespace HeavenStudio.Games
public void Success(bool hit)
{
monkeyFace.SetActive(false);
sadFace.SetActive(false);
if (hit)
{
handsAnimator.Play("Smack", 0, 0);
@ -299,14 +295,23 @@ namespace HeavenStudio.Games
misses++;
if (!intervalStarted)
{
monkeyFace.GetComponent<SpriteRenderer>().sprite = monkeyGrimace;
monkeyFace.SetActive(true);
sadFace.SetActive(true);
}
}
public void SummonFrog()
{
if (frogPresent) return;
Jukebox.PlayOneShotGame("tambourine/frog");
frogAnimator.Play("FrogEnter", 0, 0);
frogPresent = true;
}
public void DesummonFrog()
{
if (!frogPresent) return;
frogAnimator.Play("FrogExit", 0, 0);
frogPresent = false;
}
public void Nothing(PlayerActionEvent caller) {}