update MeatGrinder.cs, replace assets

background is still temporary but this is all im doing til ev can help
This commit is contained in:
AstrlJelly 2023-11-01 18:46:52 -04:00
parent f6fbefb193
commit d09e432f62
6 changed files with 260 additions and 212 deletions

View file

@ -204,7 +204,7 @@ SpriteRenderer:
m_Size: {x: 4.58, y: 2.76}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &638645428268555852
@ -818,13 +818,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0
MeatBase: {fileID: 151360738741628551}
BossAnim: {fileID: 8611037719571569512}
TackAnim: {fileID: 8591333713642157499}
beatInterval: 4
bossAnnoyed: 0
--- !u!1 &3432557403964010436
GameObject:
@ -1489,7 +1486,7 @@ SpriteRenderer:
m_Size: {x: 0.54, y: 0.52}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7228436346524652036
@ -1685,8 +1682,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8179118432937757279}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.8337, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0.99320865}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4773680412020886884}
@ -1733,12 +1730,12 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_Sprite: {fileID: 2504170125896549414, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
m_Sprite: {fileID: 21300000, guid: 02bc34c5a848bac4c94ba914ea1d18f6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 2
m_Size: {x: 57.807255, y: 11.081}
m_DrawMode: 0
m_Size: {x: 52.780003, y: 31.673157}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

View file

@ -53,7 +53,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 148.56
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -126,10 +126,10 @@ TextureImporter:
name: LightMeat_Smear
rect:
serializedVersion: 2
x: 1854
y: 2519
width: 505
height: 207
x: 2620
y: 331
width: 735
height: 291
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -147,10 +147,10 @@ TextureImporter:
name: BossFace_Idle
rect:
serializedVersion: 2
x: 273
y: 2491
width: 266
height: 222
x: 509
y: 2297
width: 377
height: 317
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -168,10 +168,10 @@ TextureImporter:
name: BossFace_Start
rect:
serializedVersion: 2
x: 589
y: 2493
width: 266
height: 222
x: 959
y: 2300
width: 379
height: 315
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -189,10 +189,10 @@ TextureImporter:
name: Pounder_Head
rect:
serializedVersion: 2
x: 913
y: 2247
width: 476
height: 474
x: 1422
y: 1950
width: 687
height: 684
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -210,10 +210,10 @@ TextureImporter:
name: Pounder_Joint
rect:
serializedVersion: 2
x: 1493
y: 2247
width: 106
height: 330
x: 2226
y: 2140
width: 150
height: 469
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -231,10 +231,10 @@ TextureImporter:
name: LightMeat_Ball
rect:
serializedVersion: 2
x: 2491
y: 2533
width: 238
height: 186
x: 2825
y: 1112
width: 336
height: 264
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -252,10 +252,10 @@ TextureImporter:
name: DarkMeat_Smack
rect:
serializedVersion: 2
x: 2813
y: 2297
width: 304
height: 433
x: 3793
y: 1253
width: 431
height: 622
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -273,10 +273,10 @@ TextureImporter:
name: TackFace_Relieved
rect:
serializedVersion: 2
x: 3645
y: 1747
width: 451
height: 452
x: 5389
y: 1948
width: 643
height: 645
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -294,10 +294,10 @@ TextureImporter:
name: LightMeat_Smack
rect:
serializedVersion: 2
x: 3211
y: 2295
width: 258
height: 435
x: 3345
y: 1225
width: 365
height: 622
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -315,10 +315,10 @@ TextureImporter:
name: BossFace_Barely
rect:
serializedVersion: 2
x: 275
y: 2193
width: 266
height: 222
x: 509
y: 1872
width: 379
height: 315
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -336,10 +336,10 @@ TextureImporter:
name: BossFace_Call
rect:
serializedVersion: 2
x: 597
y: 2177
width: 264
height: 240
x: 971
y: 1850
width: 375
height: 340
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -357,10 +357,10 @@ TextureImporter:
name: DarkMeat_Smear
rect:
serializedVersion: 2
x: 1703
y: 2311
width: 692
height: 180
x: 2410
y: 35
width: 997
height: 252
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -378,10 +378,10 @@ TextureImporter:
name: DarkMeat_Ball
rect:
serializedVersion: 2
x: 2471
y: 2309
width: 272
height: 188
x: 2798
y: 1520
width: 386
height: 266
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -399,10 +399,10 @@ TextureImporter:
name: BossBody_Idle
rect:
serializedVersion: 2
x: 265
y: 1875
width: 304
height: 246
x: 497
y: 1418
width: 429
height: 350
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -420,10 +420,10 @@ TextureImporter:
name: BossBody_Sway
rect:
serializedVersion: 2
x: 601
y: 1867
width: 279
height: 268
x: 977
y: 1408
width: 396
height: 378
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -437,35 +437,14 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_15
rect:
serializedVersion: 2
x: 917
y: 2113
width: 54
height: 52
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 91eb2f34f36d656f0800000000000000
internalID: -696133525170897383
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: TackFace_Idle
rect:
serializedVersion: 2
x: 1589
y: 1757
width: 452
height: 452
x: 2449
y: 1962
width: 643
height: 644
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -483,10 +462,10 @@ TextureImporter:
name: TackFace_Barely
rect:
serializedVersion: 2
x: 2101
y: 1757
width: 452
height: 454
x: 3180
y: 1963
width: 645
height: 645
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -504,10 +483,10 @@ TextureImporter:
name: TackFace_Base
rect:
serializedVersion: 2
x: 2619
y: 1757
width: 452
height: 454
x: 3921
y: 1965
width: 645
height: 644
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -525,10 +504,10 @@ TextureImporter:
name: TackFace_Happy
rect:
serializedVersion: 2
x: 3123
y: 1759
width: 452
height: 452
x: 4642
y: 1966
width: 643
height: 643
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -546,10 +525,10 @@ TextureImporter:
name: BossArmRight_Call
rect:
serializedVersion: 2
x: 921
y: 1877
width: 126
height: 198
x: 77
y: 1419
width: 178
height: 280
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -567,10 +546,10 @@ TextureImporter:
name: BossArmLeft_Call
rect:
serializedVersion: 2
x: 1113
y: 1865
width: 100
height: 218
x: 347
y: 1406
width: 141
height: 310
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -588,10 +567,10 @@ TextureImporter:
name: BossArmLeft_Idle
rect:
serializedVersion: 2
x: 293
y: 1729
width: 174
height: 99
x: 298
y: 1211
width: 246
height: 139
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -609,10 +588,10 @@ TextureImporter:
name: BossArmRight_Idle
rect:
serializedVersion: 2
x: 553
y: 1729
width: 174
height: 96
x: 669
y: 1213
width: 245
height: 132
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -630,10 +609,10 @@ TextureImporter:
name: BossLeg_Idle
rect:
serializedVersion: 2
x: 833
y: 1707
width: 109
height: 142
x: 1038
y: 1162
width: 153
height: 199
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -651,10 +630,10 @@ TextureImporter:
name: BossLeg_Call
rect:
serializedVersion: 2
x: 1083
y: 1721
width: 140
height: 112
x: 1305
y: 1185
width: 195
height: 159
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -672,10 +651,10 @@ TextureImporter:
name: BossRail
rect:
serializedVersion: 2
x: 51
y: 1151
width: 936
height: 440
x: 0
y: 331
width: 1555
height: 696
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -693,10 +672,10 @@ TextureImporter:
name: MeatBowl
rect:
serializedVersion: 2
x: 1055
y: 1183
width: 626
height: 378
x: 1606
y: 448
width: 902
height: 555
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -714,10 +693,10 @@ TextureImporter:
name: TackStand
rect:
serializedVersion: 2
x: 1729
y: 1171
width: 320
height: 522
x: 1720
y: 1124
width: 456
height: 763
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -735,10 +714,10 @@ TextureImporter:
name: Shock
rect:
serializedVersion: 2
x: 2093
y: 1543
width: 150
height: 106
x: 1415
y: 1752
width: 121
height: 120
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -752,48 +731,6 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: Background
rect:
serializedVersion: 2
x: 2
y: 0
width: 1979
height: 1108
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 13e26c8d1ac03e190800000000000000
internalID: 2504170125896549414
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Hammer_Smear
rect:
serializedVersion: 2
x: 2156
y: 1227
width: 458
height: 276
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ec6f229daa29939f0800000000000000
internalID: -488197822107945266
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

View file

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 02bc34c5a848bac4c94ba914ea1d18f6
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: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 288
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: 2048
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: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -145,8 +145,7 @@ namespace HeavenStudio.Games
if (passedTurns.Count > 0)
{
foreach (var pass in passedTurns)
{
foreach (var pass in passedTurns) {
PassTurnStandalone(pass);
}
passedTurns.Clear();
@ -199,22 +198,18 @@ namespace HeavenStudio.Games
}
}));
}
BeatAction.New(gameObject, bops);
BeatAction.New(this, bops);
}
}
public static void PreInterval(double beat, float length, bool autoPassTurn)
{
SoundByte.PlayOneShot("games/meatGrinder/startSignal", beat - 1);
SoundByte.PlayOneShotGame(sfxName + "startSignal", beat - 1, forcePlay: true);
if (GameManager.instance.currentGame == "meatGrinder")
{
if (GameManager.instance.currentGame == "meatGrinder") {
instance.StartInterval(beat, length, beat, autoPassTurn);
}
else
{
queuedIntervals.Add(new QueuedInterval()
{
} else {
queuedIntervals.Add(new QueuedInterval() {
beat = beat,
length = length,
autoPassTurn = autoPassTurn
@ -247,7 +242,7 @@ namespace HeavenStudio.Games
}
}
BeatAction.New(gameObject, actions);
BeatAction.New(this, actions);
if (autoPassTurn)
{
@ -269,17 +264,14 @@ namespace HeavenStudio.Games
public void MeatCall()
{
BossAnim.DoScaledAnimationAsync("BossCall", 0.5f);
SoundByte.PlayOneShotGame(sfxName+"signal");
SoundByte.PlayOneShotGame(sfxName + "signal");
}
public static void PrePassTurn(double beat)
{
if (GameManager.instance.currentGame == "meatGrinder")
{
if (GameManager.instance.currentGame == "meatGrinder") {
instance.PassTurnStandalone(beat);
}
else
{
} else {
passedTurns.Add(beat);
}
}
@ -300,16 +292,15 @@ namespace HeavenStudio.Games
for (int i = 0; i < allCallEvents.Count; i++)
{
double relativeBeat = allCallEvents[i].beat - intervalBeat;
meatCalls.Add(new BeatAction.Action(beat + relativeBeat - 1, delegate
{
MeatToss Meat = Instantiate(MeatBase, gameObject.transform).GetComponent<MeatToss>();
meatCalls.Add(new BeatAction.Action(beat + relativeBeat - 1, delegate {
MeatToss Meat = Instantiate(MeatBase, transform).GetComponent<MeatToss>();
Meat.startBeat = beat;
Meat.cueLength = relativeBeat;
Meat.cueBased = false;
Meat.meatType = "LightMeat";
}));
}
BeatAction.New(gameObject, meatCalls);
BeatAction.New(this, meatCalls);
}
}
}