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

Catchy Tune several things

Browse source 
* barely sounds
* miss animation for pineapple
* background for catchy tune 2
* new game action for switching bg
This commit is contained in:
kkuhn317 2023-01-16 19:46:57 -05:00
parent ec7dad9fb6
commit 83effdc82c
14 changed files with 6326 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1597
Assets/Resources/Games/catchyTune.prefab
View file

File diff suppressed because it is too large Load diff

BIN
Assets/Resources/Sfx/games/catchyTune/barely left.wav Normal file
View file

Binary file not shown.

22
Assets/Resources/Sfx/games/catchyTune/barely left.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7935ceb4b8af11d4680ddc1f104f319e
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sfx/games/catchyTune/barely right.wav Normal file
View file

Binary file not shown.

22
Assets/Resources/Sfx/games/catchyTune/barely right.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 81c6821c066c0bb41a5c7d4125a225b7
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

35
Assets/Resources/Sprites/Games/CatchyTune/Animations/Alalin and plalin.controller
View file

@ -58,7 +58,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: miss
m_Name: missOrange
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -100,9 +100,12 @@ AnimatorStateMachine:
m_Position: {x: 550, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 5917782446888337801}
m_Position: {x: 240, y: 190, z: 0}
m_Position: {x: 10, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -7176537707024101983}
m_Position: {x: 240, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -4439239395162462404}
m_Position: {x: 240, y: 250, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
@ -114,6 +117,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 50, y: 60, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -257888764932827859}
--- !u!1102 &-4439239395162462404
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: missPineapple
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 7400000, guid: 8ad16865c0a6c00409e555ad41444cc9, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3613986019669567760
AnimatorState:
serializedVersion: 6
@ -229,7 +258,7 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

4203
Assets/Resources/Sprites/Games/CatchyTune/Animations/miss pineapple.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/CatchyTune/Animations/miss pineapple.anim.meta Normal file
View file

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

BIN
Assets/Resources/Sprites/Games/CatchyTune/Catchy_Tune_-_Long_Version_Background.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 MiB

384
Assets/Resources/Sprites/Games/CatchyTune/Catchy_Tune_-_Long_Version_Background.png.meta Normal file
View file

@ -0,0 +1,384 @@
fileFormatVersion: 2
guid: 501cf4e52fd01b742af0c4dab9954c26
TextureImporter:
internalIDToNameTable:
- first:
213: -9151727563585071519
second: Catchy_Tune_-_Long_Version_Background_0
- first:
213: -4598661117349034189
second: Catchy_Tune_-_Long_Version_Background_1
- first:
213: -1400693648978308771
second: Catchy_Tune_-_Long_Version_Background_2
- first:
213: 1328589479685058378
second: Catchy_Tune_-_Long_Version_Background_3
- first:
213: -2277967235406450769
second: Catchy_Tune_-_Long_Version_Background_4
- first:
213: 8576715053357151637
second: Catchy_Tune_-_Long_Version_Background_5
- first:
213: -7779194270142412740
second: Catchy_Tune_-_Long_Version_Background_6
- first:
213: 2500700759019497347
second: Catchy_Tune_-_Long_Version_Background_7
- first:
213: 1158101460820949222
second: Catchy_Tune_-_Long_Version_Background_8
- first:
213: -5937962728300550954
second: Catchy_Tune_-_Long_Version_Background_9
- first:
213: 4178246383348122917
second: Catchy_Tune_-_Long_Version_Background_10
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_0
rect:
serializedVersion: 2
x: 0
y: 2650
width: 1859
height: 2350
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1665c53d4488ef080800000000000000
internalID: -9151727563585071519
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_1
rect:
serializedVersion: 2
x: 2230
y: 3729
width: 813
height: 1206
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 337820a14164e20c0800000000000000
internalID: -4598661117349034189
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_2
rect:
serializedVersion: 2
x: 3302
y: 4332
width: 1340
height: 564
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d5190852c8cbf8ce0800000000000000
internalID: -1400693648978308771
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_3
rect:
serializedVersion: 2
x: 4760
y: 2650
width: 240
height: 2350
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a4fe2f4b719107210800000000000000
internalID: 1328589479685058378
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_4
rect:
serializedVersion: 2
x: 3722
y: 3603
width: 908
height: 304
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fafae9b5ed80360e0800000000000000
internalID: -2277967235406450769
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_5
rect:
serializedVersion: 2
x: 1801
y: 1176
width: 549
height: 1779
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 595391f46ec960770800000000000000
internalID: 8576715053357151637
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_6
rect:
serializedVersion: 2
x: 3441
y: 2943
width: 1189
height: 481
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c384869f600ca0490800000000000000
internalID: -7779194270142412740
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_7
rect:
serializedVersion: 2
x: 0
y: 373
width: 1566
height: 2053
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 38728ee471644b220800000000000000
internalID: 2500700759019497347
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_8
rect:
serializedVersion: 2
x: 2916
y: 2138
width: 1716
height: 632
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6e8f71a8427621010800000000000000
internalID: 1158101460820949222
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_9
rect:
serializedVersion: 2
x: 2531
y: 1503
width: 2106
height: 432
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6d4e22afb5e189da0800000000000000
internalID: -5937962728300550954
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Catchy_Tune_-_Long_Version_Background_10
rect:
serializedVersion: 2
x: 2909
y: 1063
width: 2091
height: 242
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5258687c2fc1cf930800000000000000
internalID: 4178246383348122917
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/Games/CatchyTune/sky.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 KiB

96
Assets/Resources/Sprites/Games/CatchyTune/sky.png.meta Normal file
View file

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: e4b7c1d377aacd548ac8172012ba3e4f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

50
Assets/Scripts/Games/CatchyTune/CatchyTune.cs
View file

@ -45,6 +45,15 @@ namespace HeavenStudio.Games.Loaders
new Param("left" , true, "Left", "Plalin bops head"),
new Param("right", true, "Right", "Alalin bops head")
},
},
new GameAction("background", "Background")
{
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.changeBG(e["BG"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("BG", CatchyTune.Background.Long, "BG", "The background to change to")
},
}
});
}
@ -64,6 +73,12 @@ namespace HeavenStudio.Games
Both
}
public enum Background
{
Short,
Long
}
[Header("Animators")]
public Animator plalinAnim; // Left d-pad
@ -73,9 +88,11 @@ namespace HeavenStudio.Games
public GameObject orangeBase;
public GameObject pineappleBase;
public Transform fruitHolder;
public GameObject heartMessage;
public GameObject bg1;
public GameObject bg2;
// when to stop playing the catch animation
private float stopCatchLeft = 0f;
private float stopCatchRight = 0f;
@ -244,6 +261,20 @@ namespace HeavenStudio.Games
bopRight = right;
}
public void changeBG(int bg)
{
if (bg == 0)
{
bg1.SetActive(true);
bg2.SetActive(false);
}
else
{
bg1.SetActive(false);
bg2.SetActive(true);
}
}
public void catchSuccess(bool side, bool isPineapple, bool smile, float beat)
{
string anim = isPineapple ? "catchPineapple" : "catchOrange";
@ -273,15 +304,17 @@ namespace HeavenStudio.Games
Jukebox.PlayOneShotGame("catchyTune/fruitThrough");
float beat = Conductor.instance.songPositionInBeats;
string fruitType = isPineapple ? "Pineapple" : "Orange";
if (side)
{
alalinAnim.Play("miss", 0, 0);
alalinAnim.Play("miss" + fruitType, 0, 0);
stopCatchRight = beat + 0.7f;
}
else
{
plalinAnim.Play("miss", 0, 0);
plalinAnim.Play("miss" + fruitType, 0, 0);
stopCatchLeft = beat + 0.7f;
}
}
@ -289,6 +322,17 @@ namespace HeavenStudio.Games
public void catchWhiff(bool side)
{
Jukebox.PlayOneShotGame("catchyTune/whiff");
whiffAnim(side);
}
public void catchBarely(bool side)
{
Jukebox.PlayOneShotGame("catchyTune/barely left");
whiffAnim(side);
}
public void whiffAnim(bool side)
{
float beat = Conductor.instance.songPositionInBeats;
if (side)

6
Assets/Scripts/Games/CatchyTune/Fruit.cs
View file

@ -136,14 +136,12 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
private void CatchFruit(PlayerActionEvent caller, float state)
{
if (state < 0f || state > 1f)
if (state <= -1f || state >= 1f)
{
//near miss (barely)
barelyStart = Conductor.instance.songPositionInBeats;
// near miss sound
Jukebox.PlayOneShotGame("catchyTune/barely");
game.catchBarely(side);
// play near miss animation
anim.DoScaledAnimation("barely", barelyStart, isPineapple ? 2f : 1f);