etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 11:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Space soccer animation testing

Browse source
This commit is contained in:
Braedon 2022-01-24 05:13:46 -05:00
parent dcc378ce84
commit 0c51d8fd77
11 changed files with 1209 additions and 1735 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Assets/Resources/Games/spaceSoccer.prefab
View file

@ -72,7 +72,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -100
m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3}
m_Color: {r: 0.43921572, g: 0.9725491, b: 0.5647059, a: 1}
m_Color: {r: 0.45098042, g: 1, b: 0.5803922, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -107,8 +107,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 257854180901420889}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.8686998, y: 0.3261, z: 0}
m_LocalScale: {x: 1.0345623, y: 1.0010417, z: 1.0151522}
m_LocalPosition: {x: -3.384, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 482351987616570803}
m_RootOrder: 0
@ -292,8 +292,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 8336007186072323660}
handleType: 0
leftHandleLocalPosition: {x: -2.3238418, y: 11.478075, z: 0}
rightHandleLocalPosition: {x: 2.3238418, y: -11.478075, z: -0}
leftHandleLocalPosition: {x: -1.668371, y: 12.237039, z: 0}
rightHandleLocalPosition: {x: 1.668371, y: -12.237039, z: -0}
--- !u!1 &1349843762207368530
GameObject:
m_ObjectHideFlags: 0
@ -1410,6 +1410,7 @@ MonoBehaviour:
toeCurve: {fileID: 8336007186072323660}
dispensedBeat: 0
dispensing: 0
hitTimes: 0
canKick: 0
--- !u!1 &4832865564766322567
GameObject:
@ -1951,8 +1952,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 8336007186072323660}
handleType: 0
leftHandleLocalPosition: {x: -1.0425408, y: -7.0436463, z: -0}
rightHandleLocalPosition: {x: 1.0425408, y: 7.0436463, z: 0}
leftHandleLocalPosition: {x: -0.7524991, y: -7.840443, z: -0}
rightHandleLocalPosition: {x: 0.7524991, y: 7.840443, z: 0}
--- !u!1 &7976131226454805035
GameObject:
m_ObjectHideFlags: 0
@ -2029,8 +2030,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 6429945450899169262}
handleType: 0
leftHandleLocalPosition: {x: -2.0023239, y: 9.526556, z: 0}
rightHandleLocalPosition: {x: 2.0023239, y: -9.526556, z: -0}
leftHandleLocalPosition: {x: -2.191154, y: 12.986072, z: 0}
rightHandleLocalPosition: {x: 2.191154, y: -12.986072, z: -0}
--- !u!1 &8665788574861104969
GameObject:
m_ObjectHideFlags: 0
@ -2241,5 +2242,5 @@ MonoBehaviour:
m_EditorClassIdentifier:
curve: {fileID: 6429945450899169262}
handleType: 0
leftHandleLocalPosition: {x: -2.8676462, y: -14.786469, z: -0}
rightHandleLocalPosition: {x: 2.8676462, y: 14.786469, z: 0}
leftHandleLocalPosition: {x: -2.66308, y: -13.201346, z: -0}
rightHandleLocalPosition: {x: 2.66308, y: 13.201346, z: 0}

1288
Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim
View file

File diff suppressed because it is too large Load diff

2
Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickLeft.anim.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9d8b68c5ac526c84ca51cab516742ef2
guid: 05c0a0dee77b0bd40a6cb9a6b777ec93
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

1463
Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim
View file

File diff suppressed because it is too large Load diff

2
Assets/Resources/Sprites/Games/SpaceSoccer/Animations/KickRight.anim.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 86f86d1bf4236e248bf2dfa49c38483e
guid: 3c5a4f185ff7fd9439a76c39dee3d8b9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

33
Assets/Resources/Sprites/Games/SpaceSoccer/Animations/Space Kicker.controller
View file

@ -40,6 +40,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -6379243465187239046}
m_Position: {x: 130, y: -130, z: 0}
- serializedVersion: 1
m_State: {fileID: 8478891986015278982}
m_Position: {x: 10, y: -80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -71,7 +74,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 86f86d1bf4236e248bf2dfa49c38483e, type: 2}
m_Motion: {fileID: 7400000, guid: 3c5a4f185ff7fd9439a76c39dee3d8b9, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -98,7 +101,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 9d8b68c5ac526c84ca51cab516742ef2, type: 2}
m_Motion: {fileID: 7400000, guid: 05c0a0dee77b0bd40a6cb9a6b777ec93, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -174,3 +177,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8478891986015278982
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: High
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: c8a487e47c47df84faa2f2809a36bd27, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

BIN
Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 43 KiB

96
Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main - Copy.png.meta Normal file
View file

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 8858e627b1f5e4443946fbf02509b2f2
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:

BIN
Assets/Resources/Sprites/Games/SpaceSoccer/spaceSoccer_main.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 886 KiB

4
Assets/Scenes/Editor.unity
View file

@ -7940,8 +7940,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f86858990a87c764892672104bdaef1f, type: 3}
m_Name:
m_EditorClassIdentifier:
level: {fileID: 4900000, guid: 5e794baa94fb06d4f939aaf032fab5ea, type: 3}
music: {fileID: 8300000, guid: f3b9f9179bad8394a98f617bda265a62, type: 3}
level: {fileID: 4900000, guid: fafaeee85f4121643a0699a4de97da53, type: 3}
music: {fileID: 8300000, guid: a0589cdba27fb254e90da17b4804c2fe, type: 3}
debugUI: 0
playOnStart: 0
editor: 1

33
Assets/Scripts/Games/SpaceSoccer/Ball.cs
View file

@ -71,17 +71,22 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
{
Jukebox.PlayOneShotGame("spaceSoccer/highkicktoe1_hit");
lastSpriteRot = spriteHolder.transform.eulerAngles.z;
kicked.enabled = false;
highKicked.enabled = true;
highKicked.startBeat = Conductor.instance.songPositionInBeats;
highKickCurve.KeyPoints[0].transform.position = holder.transform.position;
ResetState();
}
public void Toe()
{
Jukebox.PlayOneShotGame("spaceSoccer/highkicktoe3_hit");
lastSpriteRot = spriteHolder.transform.eulerAngles.z;
highKicked.enabled = false;
kicked.enabled = false;
kickPrepare = false;
@ -90,6 +95,7 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
toe.startBeat = Conductor.instance.songPositionInBeats;
toeCurve.KeyPoints[0].transform.position = holder.transform.position;
ResetState();
}
private void Update()
@ -106,9 +112,9 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
if (PlayerInput.Pressed())
{
Kick();
if (state.perfect)
{
Kick();
}
}
}
@ -130,16 +136,16 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
if (PlayerInput.Pressed())
{
if (kicker.canHighKick)
{
HighKick();
}
else if (kicker.canKick)
{
Kick();
}
if (state.perfect)
{
if (kicker.canHighKick)
{
HighKick();
}
else if (kicker.canKick)
{
Kick();
}
// print(normalizedBeat);
}
}
@ -150,6 +156,10 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
holder.transform.position = highKickCurve.GetPoint(normalizedBeatAnim);
spriteHolder.transform.eulerAngles = new Vector3(0, 0, Mathf.Lerp(lastSpriteRot, -460f, normalizedBeatAnim));
float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(highKicked.startBeat, 1.5f);
StateCheck(normalizedBeat);
// if (state.perfect) Debug.Break();
if (PlayerInput.Pressed())
{
kickPrepare = true;
@ -159,7 +169,10 @@ namespace RhythmHeavenMania.Games.SpaceSoccer
{
if (PlayerInput.PressedUp())
{
Toe();
if (state.perfect)
{
Toe();
}
}
}
}