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

Merge remote-tracking branch 'RHeavenStudio/master' into jsl-update

Browse source
This commit is contained in:
minenice55 2024-02-03 19:57:05 -05:00
parent 76f676845a eb76f406fe
commit 68de21dbca
14 changed files with 160 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Assets/Resources/Credits.txt
View file

@ -19,6 +19,7 @@
-<indent=5%>Bhaos</indent>
-<indent=5%>RaffyTaffy14</indent>
-<indent=5%>Thinedave</indent>
-<indent=5%>Marc / ThePurpleAnon</indent>
<align="center"><b>Artwork</b></align>
-<indent=5%>Ko Takeuchi <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>
@ -106,4 +107,4 @@ https://github.com/RHeavenStudio/HeavenStudio/blob/master/LICENSE.md
https://github.com/RHeavenStudio/HeavenStudio
https://discord.gg/5rdEq2SFNj
</align>
</align>

BIN
Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 306 KiB

10
Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta
View file

@ -5,8 +5,8 @@ TextureImporter:
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1
@ -67,10 +67,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

BIN
Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

123
Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta Normal file
View file

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 794a65993846fe34a9de36e06e63773d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 1
enableMipMap: 1
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
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 8
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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

10
Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta
View file

@ -5,8 +5,8 @@ TextureImporter:
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1
@ -67,10 +67,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

6
Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta
View file

@ -5,7 +5,7 @@ TextureImporter:
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
@ -67,10 +67,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

10
Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta
View file

@ -5,8 +5,8 @@ TextureImporter:
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1
@ -67,10 +67,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

2
Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta
View file

@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

2
Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta
View file

@ -34,7 +34,7 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
aniso: 8
mipBias: 0
wrapU: 1
wrapV: 1

BIN
Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

2
Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta
View file

@ -259,7 +259,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

2
Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
View file

@ -266,7 +266,7 @@ namespace HeavenStudio.Games
private void ScheduleStep(double beat)
{
PlayerActionEvent input = ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Nothing);
input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly();
// input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly();
}
private void RecursiveStepping(double beat)

23
Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
View file

@ -286,16 +286,6 @@ namespace HeavenStudio.Games
if (dumplings.Count != 0) InputFunctions(3);
}
// blushes when done eating but not when staring
if (needBlush
&& !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss")
&& !isStaring
&& !noBlush)
{
MonkAnim.DoScaledAnimationAsync("Blush", 0.5f);
needBlush = false;
}
// sets hair stuff active when it needs to be
if (growLevel > 0) {
StacheHolder.SetActive(true);
@ -346,6 +336,19 @@ namespace HeavenStudio.Games
}
}
private void LateUpdate()
{
// blushes when done eating but not when staring
if (needBlush
&& !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss")
&& !isStaring
&& !noBlush)
{
MonkAnim.DoScaledAnimationAsync("Blush", 0.5f);
needBlush = false;
}
}
public override void OnBeatPulse(double beat)
{
if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationNames("Bop", "Idle"))