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

Added "Set Mii" to Drumming Practice

Browse source
This commit is contained in:
Carson Kompon 2022-03-07 00:26:59 -05:00
parent 8c33d1a416
commit 48e81d4df9
9 changed files with 598 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Assets/Resources/Prefabs/Games/DrummingPractice/Drummer.prefab
View file

@ -342,9 +342,22 @@ MonoBehaviour:
- {fileID: 81597826380008415, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3} - {fileID: 81597826380008415, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3}
- {fileID: -1794906609286176079, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3} - {fileID: -1794906609286176079, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3}
- {fileID: -5424627565685597510, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3} - {fileID: -5424627565685597510, guid: a3fb8267aa4125840bfbf3b92d842146, type: 3}
- Sprites:
- {fileID: 4139801074871027463, guid: b31507a179bae67468e10918ffef3968, type: 3}
- {fileID: -6932529944776641029, guid: b31507a179bae67468e10918ffef3968, type: 3}
- {fileID: -4493850569072843896, guid: b31507a179bae67468e10918ffef3968, type: 3}
- Sprites:
- {fileID: -379133340629381854, guid: c3deda97ccb1d5c46ac73d7d88a966a2, type: 3}
- {fileID: -2454444141153266199, guid: c3deda97ccb1d5c46ac73d7d88a966a2, type: 3}
- {fileID: 9090822406501296340, guid: c3deda97ccb1d5c46ac73d7d88a966a2, type: 3}
- Sprites:
- {fileID: 282772628057177552, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
- {fileID: -2849857784044403212, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
- {fileID: 7754190052455943695, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
face: {fileID: 3815722542167599503} face: {fileID: 3815722542167599503}
player: 0 player: 0
mii: 0 mii: 0
count: 0
--- !u!1 &3069976543878275002 --- !u!1 &3069976543878275002
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

BIN
Assets/Resources/Sprites/Games/DrummingPractice/mii_marshal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

180
Assets/Resources/Sprites/Games/DrummingPractice/mii_marshal.png.meta Normal file
View file

@ -0,0 +1,180 @@
fileFormatVersion: 2
guid: cf0781e3ff2fc904b95060af750cde14
TextureImporter:
internalIDToNameTable:
- first:
213: 282772628057177552
second: mii_marshal
- first:
213: -2849857784044403212
second: mii_marshal_happy
- first:
213: 7754190052455943695
second: mii_marshal_sad
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: 72
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: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: mii_marshal
rect:
serializedVersion: 2
x: 0
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0dd3d8ff43c9ce300800000000000000
internalID: 282772628057177552
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_marshal_happy
rect:
serializedVersion: 2
x: 512
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4f5c6a1d1754378d0800000000000000
internalID: -2849857784044403212
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_marshal_sad
rect:
serializedVersion: 2
x: 1024
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f0e018de4ca6c9b60800000000000000
internalID: 7754190052455943695
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/DrummingPractice/mii_matt.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 97 KiB

180
Assets/Resources/Sprites/Games/DrummingPractice/mii_matt.png.meta Normal file
View file

@ -0,0 +1,180 @@
fileFormatVersion: 2
guid: b31507a179bae67468e10918ffef3968
TextureImporter:
internalIDToNameTable:
- first:
213: 4139801074871027463
second: mii_matt
- first:
213: -6932529944776641029
second: mii_matt_happy
- first:
213: -4493850569072843896
second: mii_matt_sad
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: 72
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: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: mii_matt
rect:
serializedVersion: 2
x: 0
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 707c77cd427837930800000000000000
internalID: 4139801074871027463
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_matt_happy
rect:
serializedVersion: 2
x: 512
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bf574deceb4bacf90800000000000000
internalID: -6932529944776641029
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_matt_sad
rect:
serializedVersion: 2
x: 1024
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 883e9b487b2a2a1c0800000000000000
internalID: -4493850569072843896
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/DrummingPractice/mii_tsunku.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 112 KiB

180
Assets/Resources/Sprites/Games/DrummingPractice/mii_tsunku.png.meta Normal file
View file

@ -0,0 +1,180 @@
fileFormatVersion: 2
guid: c3deda97ccb1d5c46ac73d7d88a966a2
TextureImporter:
internalIDToNameTable:
- first:
213: -379133340629381854
second: mii_tsunku
- first:
213: -2454444141153266199
second: mii_tsunku_happy
- first:
213: 9090822406501296340
second: mii_tsunku_sad
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: 72
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: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: mii_tsunku
rect:
serializedVersion: 2
x: 0
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 22d47454c3c0dbaf0800000000000000
internalID: -379133340629381854
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_tsunku_happy
rect:
serializedVersion: 2
x: 512
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9e5558dce0010fdd0800000000000000
internalID: -2454444141153266199
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_tsunku_sad
rect:
serializedVersion: 2
x: 1024
y: 0
width: 512
height: 512
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4d8ebaf30d6192e70800000000000000
internalID: 9090822406501296340
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

53
Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs
View file

@ -10,6 +10,19 @@ namespace RhythmHeavenMania.Games.DrummingPractice
{ {
public class DrummingPractice : Minigame public class DrummingPractice : Minigame
{ {
public enum MiiType
{
GuestA,
GuestB,
GuestC,
GuestD,
GuestE,
GuestF,
Matt,
Tsunku,
Marshal
}
[Header("References")] [Header("References")]
public SpriteRenderer backgroundGradient; public SpriteRenderer backgroundGradient;
public Drummer player; public Drummer player;
@ -30,19 +43,7 @@ namespace RhythmHeavenMania.Games.DrummingPractice
// TODO: Move this to OnGameSwitch() when functional? // TODO: Move this to OnGameSwitch() when functional?
private void Start() private void Start()
{ {
player.mii = UnityEngine.Random.Range(0, player.miiFaces.Count); SetMiis(UnityEngine.Random.Range(0, player.miiFaces.Count));
do
{
leftDrummer.mii = UnityEngine.Random.Range(0, leftDrummer.miiFaces.Count);
}
while (leftDrummer.mii == player.mii);
do
{
rightDrummer.mii = UnityEngine.Random.Range(0, rightDrummer.miiFaces.Count);
}
while (rightDrummer.mii == leftDrummer.mii || rightDrummer.mii == player.mii);
SetFaces(0);
} }
private void Update() private void Update()
@ -94,5 +95,31 @@ namespace RhythmHeavenMania.Games.DrummingPractice
rightDrummer.SetFace(type); rightDrummer.SetFace(type);
} }
public void SetMiis(int playerFace, bool all = false)
{
player.mii = playerFace;
if (all)
{
leftDrummer.mii = playerFace;
rightDrummer.mii = playerFace;
}
else
{
do
{
leftDrummer.mii = UnityEngine.Random.Range(0, leftDrummer.miiFaces.Count);
}
while (leftDrummer.mii == player.mii);
do
{
rightDrummer.mii = UnityEngine.Random.Range(0, rightDrummer.miiFaces.Count);
}
while (rightDrummer.mii == leftDrummer.mii || rightDrummer.mii == player.mii);
}
SetFaces(0);
}
} }
} }

5
Assets/Scripts/Minigames.cs
View file

@ -388,6 +388,11 @@ namespace RhythmHeavenMania
{ {
new GameAction("bop", delegate { var e = eventCaller.currentEntity; DrummingPractice.instance.SetBop(e.beat, e.length); }, 0.5f, true), new GameAction("bop", delegate { var e = eventCaller.currentEntity; DrummingPractice.instance.SetBop(e.beat, e.length); }, 0.5f, true),
new GameAction("drum", delegate { DrummingPractice.instance.Prepare(eventCaller.currentEntity.beat); }, 2f), new GameAction("drum", delegate { DrummingPractice.instance.Prepare(eventCaller.currentEntity.beat); }, 2f),
new GameAction("set mii", delegate { var e = eventCaller.currentEntity; DrummingPractice.instance.SetMiis(e.type, e.toggle); }, 0.5f, parameters: new List<Param>()
{
new Param("type", DrummingPractice.MiiType.GuestA, "Mii", "The Mii that the player will control"),
new Param("toggle", false, "Set All", "Whether all Miis should be set")
}),
}), }),
/*new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>() /*new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>()