diff --git a/Assets/Resources/Credits.txt b/Assets/Resources/Credits.txt index dffb32968..b131603aa 100644 --- a/Assets/Resources/Credits.txt +++ b/Assets/Resources/Credits.txt @@ -19,6 +19,7 @@ -Bhaos -RaffyTaffy14 -Thinedave +-Marc / ThePurpleAnon Artwork -Ko Takeuchi (Original Rhythm Heaven Assets) @@ -106,4 +107,4 @@ https://github.com/RHeavenStudio/HeavenStudio/blob/master/LICENSE.md https://github.com/RHeavenStudio/HeavenStudio https://discord.gg/5rdEq2SFNj - \ No newline at end of file + diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png index 2826172d5..df64b06ee 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png and b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta index fb71449d9..c5096182b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta @@ -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 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png new file mode 100644 index 000000000..68e872239 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta new file mode 100644 index 000000000..d2876ad98 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta @@ -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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta index a3052ceb6..a32417aec 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta @@ -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 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta index f85a51eed..9f93b7120 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta @@ -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 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta index b15b317ee..2e01e9aff 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta @@ -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 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta index 0d16ff4e3..887e425a8 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta index f9e56820c..4d16e06ee 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png index d3cf329c7..dd640fc2f 100644 Binary files a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png and b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png differ diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta index f55c17187..f422b4a3a 100644 --- a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta +++ b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta @@ -259,7 +259,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index f2344a8e6..e5dce774f 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -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) diff --git a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs index 791a4e88d..0bfc9c935 100644 --- a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs +++ b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs @@ -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"))