recolorable spaceball, sneaky spirits slowdown off by default, citra error mii

This commit is contained in:
wookywok 2024-05-10 07:32:04 -05:00 committed by minenice55
parent 424ee1f3a7
commit dfe0a25119
8 changed files with 296 additions and 7 deletions

View file

@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0.59, y: -1.41, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7906571214772796556}
m_RootOrder: 4
@ -42,6 +43,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -109,6 +111,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: -0.51, y: -1.41, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7906571214772796556}
m_RootOrder: 3
@ -124,6 +127,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -191,6 +195,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.02, y: -0.014337629, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6877510499459155249}
- {fileID: 7067430149518069805}
@ -211,6 +216,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -279,6 +285,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7906571214772796556}
- {fileID: 7240312491594842671}
@ -287,7 +294,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &5678965914420976874
Animator:
serializedVersion: 3
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -300,10 +307,12 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5360671827229239631
MonoBehaviour:
m_ObjectHideFlags: 0
@ -354,6 +363,10 @@ MonoBehaviour:
- {fileID: 282772628057177552, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
- {fileID: -2849857784044403212, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
- {fileID: 7754190052455943695, guid: cf0781e3ff2fc904b95060af750cde14, type: 3}
- Sprites:
- {fileID: -1534976312, guid: 647d8c2c002755049a1037fd51046723, type: 3}
- {fileID: 980442806, guid: 647d8c2c002755049a1037fd51046723, type: 3}
- {fileID: -1264990263, guid: 647d8c2c002755049a1037fd51046723, type: 3}
face: {fileID: 3815722542167599503}
player: 0
mii: 0
@ -385,6 +398,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0.17364816, w: 0.9848078}
m_LocalPosition: {x: -0.088, y: 0.255, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1638874375947481481}
m_Father: {fileID: 7067430149518069805}
@ -401,6 +415,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -468,6 +483,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.93, z: 0}
m_LocalScale: {x: 0.55, y: 0.55, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7906571214772796556}
m_RootOrder: 0
@ -483,6 +499,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -550,6 +567,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0.869614, w: 0.49373233}
m_LocalPosition: {x: -0.03, y: 0.65, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7541858542024806067}
m_RootOrder: 0
@ -565,6 +583,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -632,6 +651,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7240312491594842671}
m_RootOrder: 0
@ -647,6 +667,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -714,6 +735,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7240312491594842671}
m_RootOrder: 1
@ -729,6 +751,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -796,6 +819,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: -0.17364825, w: 0.9848078}
m_LocalPosition: {x: 0.088, y: 0.255, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2838906087511509573}
m_Father: {fileID: 125215917473510436}
@ -812,6 +836,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -879,6 +904,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: 0.87333983, w: 0.4871115}
m_LocalPosition: {x: 0.018, y: 0.718, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8481947367689097775}
m_RootOrder: 0
@ -894,6 +920,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -960,6 +987,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -4.11, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1444218136717594588}
- {fileID: 9081614079195925749}
@ -993,6 +1021,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.43, y: 0.13298833, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7541858542024806067}
m_Father: {fileID: 7906571214772796556}
@ -1009,6 +1038,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1076,6 +1106,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0.16799995, w: 0.98578703}
m_LocalPosition: {x: -1.43, y: 1.8670707, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8481947367689097775}
m_Father: {fileID: 7906571214772796556}
@ -1092,6 +1123,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1

View file

@ -0,0 +1,189 @@
fileFormatVersion: 2
guid: 647d8c2c002755049a1037fd51046723
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
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: 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:
- serializedVersion: 2
name: mii_error_neut
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: 40542a472f7370444ab452b6a61da025
internalID: -1534976312
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_error_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: a113a4dbcfb54a34b8c527c1f8d2d30f
internalID: 980442806
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mii_error_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: bc536fa17d30bbd44b4b229b5d997e6b
internalID: -1264990263
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
mii_error_happy: 980442806
mii_error_neut: -1534976312
mii_error_sad: -1264990263
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -6667,6 +6667,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
SoundSequences: []
scheduledInputs: []
bg: {fileID: 6584942080059084143}
square: {fileID: 6584942079035923114}
Ball: {fileID: 6584942079543401345}
BallsHolder: {fileID: 6584942079139059257}
Dispenser: {fileID: 6584942078977133660}

View file

@ -102,7 +102,8 @@ namespace HeavenStudio.Games
GuestF,
Matt,
Tsunku,
Marshal
Marshal,
Error
}
[Header("References")]
@ -240,7 +241,7 @@ namespace HeavenStudio.Games
{
do
{
player.mii = UnityEngine.Random.Range(0, player.miiFaces.Count);
player.mii = UnityEngine.Random.Range(0, player.miiFaces.Count-1);
}
while (player.mii == leftFace || player.mii == rightFace);
}
@ -258,7 +259,7 @@ namespace HeavenStudio.Games
{
do
{
leftDrummer.mii = UnityEngine.Random.Range(0, player.miiFaces.Count);
leftDrummer.mii = UnityEngine.Random.Range(0, player.miiFaces.Count-1);
}
while (leftDrummer.mii == player.mii);
}
@ -269,7 +270,7 @@ namespace HeavenStudio.Games
{
do
{
rightDrummer.mii = UnityEngine.Random.Range(0, player.miiFaces.Count);
rightDrummer.mii = UnityEngine.Random.Range(0, player.miiFaces.Count-1);
}
while (rightDrummer.mii == leftDrummer.mii || rightDrummer.mii == player.mii);
}

View file

@ -29,7 +29,7 @@ namespace HeavenStudio.Games.Loaders
},
parameters = new List<Param>()
{
new Param("slowDown", true, "Slowdown Effect", "Toggle if there should be a slowdown effect when the ghost is hit."),
new Param("slowDown", false, "Slowdown Effect", "Toggle if there should be a slowdown effect when the ghost is hit."),
new Param("volume1", new EntityTypes.Integer(0, 100, 100), "Move Volume 1", "Set the height and volume the ghost should have at this position."),
new Param("volume2", new EntityTypes.Integer(0, 100, 100), "Move Volume 2", "Set the height and volume the ghost should have at this position."),
new Param("volume3", new EntityTypes.Integer(0, 100, 100), "Move Volume 3", "Set the height and volume the ghost should have at this position."),

View file

@ -65,6 +65,18 @@ namespace HeavenStudio.Games.Loaders
{
function = delegate { Spaceball.instance.PrepareDispenser(); },
},
new GameAction("fade background", "Background Color")
{
function = delegate {var e = eventCaller.currentEntity; Spaceball.instance.BackgroundColor(e.beat, e.length, e["colorStart"], e["colorEnd"], e["ease"]); },
defaultLength = 4f,
resizable = true,
parameters = new List<Param>()
{
new Param("colorStart", Spaceball.defaultBGColor, "Start Color", "Set the color at the start of the event."),
new Param("colorEnd", Spaceball.defaultBGColor, "End Color", "Set the color at the end of the event."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
}
},
},
new List<string>() {"agb", "normal"},
"agbbatter", "en",
@ -93,6 +105,9 @@ namespace HeavenStudio.Games
SphereHead
}
[SerializeField] SpriteRenderer bg;
[SerializeField] SpriteRenderer square;
[SerializeField] GameObject Ball;
[SerializeField] GameObject BallsHolder;
@ -106,6 +121,8 @@ namespace HeavenStudio.Games
private int currentZoomIndex;
public static Color defaultBGColor = new Color(0, 0f, 0.4509804f);
[SerializeField] Sprite[] BallSprites;
[SerializeField] Material[] CostumeColors;
@ -121,6 +138,12 @@ namespace HeavenStudio.Games
{
for (int i = 1; i < BallsHolder.transform.childCount; i++)
Destroy(BallsHolder.transform.GetChild(i).gameObject);
PersistColor(beat);
}
public override void OnPlay(double beat)
{
PersistColor(beat);
}
public override void OnTimeChange()
@ -148,6 +171,7 @@ namespace HeavenStudio.Games
private void Update()
{
BackgroundColorUpdate();
if (_allCameraEvents.Count > 0)
{
if (currentZoomIndex < _allCameraEvents.Count && currentZoomIndex >= 0)
@ -266,5 +290,31 @@ namespace HeavenStudio.Games
{
SpaceballPlayer.instance.SetCostume(CostumeColors[type], type);
}
//color stuff
private ColorEase bgColorEase = new(defaultBGColor);
public void BackgroundColor(double beat, float length, Color startColor, Color endColor, int ease)
{
bgColorEase = new(beat, length, startColor, endColor, ease);
}
private void BackgroundColorUpdate()
{
bg.color = bgColorEase.GetColor();
square.color = bgColorEase.GetColor();
}
private void PersistColor(double beat)
{
var allEventsBeforeBeat = EventCaller.GetAllInGameManagerList("spaceball", new string[] { "fade background" }).FindAll(x => x.beat < beat);
if (allEventsBeforeBeat.Count > 0)
{
allEventsBeforeBeat.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case
var lastEvent = allEventsBeforeBeat[^1];
BackgroundColor(lastEvent.beat, lastEvent.length, lastEvent["colorStart"], lastEvent["colorEnd"], lastEvent["ease"]);
}
}
}
}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5e35f520ae736c7458245890a45f1eaf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c9e70feb4666b5b43b52dc662a9d5f40
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: