meatsplash start, fix riqentity find bug

This commit is contained in:
AstrlJelly 2023-12-26 13:59:15 -05:00
parent dce1369761
commit 570b8e2f6b
4 changed files with 291 additions and 32 deletions

View file

@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &7113627674537123824 --- !u!4 &7113627674537123824
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1309,7 +1309,7 @@ MonoBehaviour:
SoundSequences: [] SoundSequences: []
scheduledInputs: [] scheduledInputs: []
MeatBase: {fileID: 151360738741628551} MeatBase: {fileID: 151360738741628551}
MeatSplash: {fileID: 0} MeatSplash: {fileID: 4889169104401510376}
Gears: Gears:
- {fileID: 4255429133276147351} - {fileID: 4255429133276147351}
- {fileID: 6673086640620398125} - {fileID: 6673086640620398125}
@ -2052,7 +2052,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &4077919287188577320 --- !u!4 &4077919287188577320
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2076,7 +2076,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5367660552507315250} m_GameObject: {fileID: 5367660552507315250}
serializedVersion: 8 serializedVersion: 8
lengthInSec: 5 lengthInSec: 0.2
simulationSpeed: 1 simulationSpeed: 1
stopAction: 0 stopAction: 0
cullingMode: 0 cullingMode: 0
@ -2085,7 +2085,7 @@ ParticleSystem:
emitterVelocityMode: 1 emitterVelocityMode: 1
looping: 0 looping: 0
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 0
useUnscaledTime: 0 useUnscaledTime: 0
autoRandomSeed: 1 autoRandomSeed: 1
startDelay: startDelay:
@ -2320,7 +2320,7 @@ ParticleSystem:
startSize: startSize:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 1 scalar: 0.5
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -2643,7 +2643,7 @@ ParticleSystem:
gravityModifier: gravityModifier:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0 scalar: 5
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -2902,7 +2902,7 @@ ParticleSystem:
rateOverTime: rateOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 10 scalar: 0
minScalar: 10 minScalar: 10
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -3005,10 +3005,68 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_BurstCount: 0 m_BurstCount: 1
m_Bursts: [] m_Bursts:
- serializedVersion: 2
time: 0
countCurve:
serializedVersion: 2
minMaxState: 0
scalar: 10
minScalar: 30
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
cycleCount: 1
repeatInterval: 0.01
probability: 1
SizeModule: SizeModule:
enabled: 0 enabled: 1
curve: curve:
serializedVersion: 2 serializedVersion: 2
minMaxState: 1 minMaxState: 1
@ -3019,21 +3077,21 @@ ParticleSystem:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0 value: 1
inSlope: 0 inSlope: 0
outSlope: 1 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 0.50146484
value: 1 value: 0
inSlope: 1 inSlope: 0.07242867
outSlope: 0 outSlope: 0.07242867
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.24877101
outWeight: 0.33333334 outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
@ -3398,13 +3456,13 @@ ParticleSystem:
m_NumAlphaKeys: 2 m_NumAlphaKeys: 2
UVModule: UVModule:
serializedVersion: 2 serializedVersion: 2
enabled: 0 enabled: 1
mode: 0 mode: 1
timeMode: 0 timeMode: 0
fps: 30 fps: 30
frameOverTime: frameOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 1 minMaxState: 0
scalar: 0.9999 scalar: 0.9999
minScalar: 0.9999 minScalar: 0.9999
maxCurve: maxCurve:
@ -3414,16 +3472,16 @@ ParticleSystem:
time: 0 time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 1 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 1 time: 1
value: 1 value: 0
inSlope: 1 inSlope: 1
outSlope: 0 outSlope: 1
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
@ -3517,11 +3575,13 @@ ParticleSystem:
uvChannelMask: -1 uvChannelMask: -1
rowMode: 1 rowMode: 1
sprites: sprites:
- sprite: {fileID: 0} - sprite: {fileID: 956318709, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
- sprite: {fileID: 254911747, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
- sprite: {fileID: -1859398730, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
flipU: 0 flipU: 0
flipV: 0 flipV: 0
VelocityModule: VelocityModule:
enabled: 0 enabled: 1
x: x:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
@ -3578,7 +3638,7 @@ ParticleSystem:
y: y:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 0 scalar: 1.81
minScalar: 0 minScalar: 0
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
@ -6816,7 +6876,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 1000
m_RenderMode: 0 m_RenderMode: 0
m_MeshDistribution: 0 m_MeshDistribution: 0
m_SortMode: 0 m_SortMode: 0

View file

@ -1013,7 +1013,7 @@ TextureImporter:
width: 1202 width: 1202
height: 1083 height: 1083
alignment: 0 alignment: 0
pivot: {x: 0, y: 0} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 1} border: {x: 0, y: 0, z: 0, w: 1}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -1034,7 +1034,7 @@ TextureImporter:
width: 395 width: 395
height: 334 height: 334
alignment: 0 alignment: 0
pivot: {x: 0, y: 0} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 8} border: {x: 0, y: 0, z: 0, w: 8}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -1055,7 +1055,7 @@ TextureImporter:
width: 1201 width: 1201
height: 1084 height: 1084
alignment: 0 alignment: 0
pivot: {x: 0, y: 0} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 8, z: 0, w: 0} border: {x: 0, y: 8, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -1067,6 +1067,195 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
- serializedVersion: 2
name: MeatGrinder_0
rect:
serializedVersion: 2
x: 2271
y: 1777
width: 65
height: 64
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0cff8536cdf29fc44bfe14fcd045a2b4
internalID: 956318709
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_1
rect:
serializedVersion: 2
x: 2425
y: 1763
width: 97
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c0fc2b352f0331a4dbb75611ca759266
internalID: 254911747
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_2
rect:
serializedVersion: 2
x: 2574
y: 1773
width: 86
height: 71
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 495037536a3ba914582b5b5450f3794e
internalID: -1859398730
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_3
rect:
serializedVersion: 2
x: 2280
y: 1619
width: 65
height: 63
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 94a6ae96baa4c314eba4d4508cb1201c
internalID: -1267345776
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_4
rect:
serializedVersion: 2
x: 2433
y: 1623
width: 96
height: 89
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e7435e64fb439d8468a32cfa6e0fb90c
internalID: -1087476415
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_5
rect:
serializedVersion: 2
x: 2581
y: 1633
width: 86
height: 72
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5ceb13e26e632c24bb8bf3162876e2c2
internalID: -153435262
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_6
rect:
serializedVersion: 2
x: 2265
y: 1508
width: 75
height: 70
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 41be6f2f75e3d0449ba11c90aef165af
internalID: 656107612
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_7
rect:
serializedVersion: 2
x: 2413
y: 1494
width: 104
height: 75
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d44b3a2e5f81e444dad6164b6be6e61a
internalID: 148945787
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MeatGrinder_8
rect:
serializedVersion: 2
x: 2593
y: 1516
width: 74
height: 43
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 7ae86f60388073948b9d92f6a3108ccb
internalID: 1900531226
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
@ -1111,7 +1300,16 @@ TextureImporter:
LightMeat_Smack: -8867440539974192047 LightMeat_Smack: -8867440539974192047
LightMeat_Smear: -4224877059003839859 LightMeat_Smear: -4224877059003839859
MeatBowl: 5295954126975429523 MeatBowl: 5295954126975429523
MeatGrinder_0: 956318709
MeatGrinder_1: 254911747
MeatGrinder_15: -696133525170897383 MeatGrinder_15: -696133525170897383
MeatGrinder_2: -1859398730
MeatGrinder_3: -1267345776
MeatGrinder_4: -1087476415
MeatGrinder_5: -153435262
MeatGrinder_6: 656107612
MeatGrinder_7: 148945787
MeatGrinder_8: 1900531226
Pounder_Head: 7282857851290212827 Pounder_Head: 7282857851290212827
Pounder_Joint: 7058567707624637937 Pounder_Joint: 7058567707624637937
Shock: -3946390436822436375 Shock: -3946390436822436375

View file

@ -110,6 +110,7 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder
// if (meatType == MeatType.BaconBall) { // if (meatType == MeatType.BaconBall) {
// game.DoExpressions(0, (int)MeatGrinder.BossExpressions.Scared); // game.DoExpressions(0, (int)MeatGrinder.BossExpressions.Scared);
// } // }
game.MeatSplash.Play();
if (tackReaction.expression > 0) { if (tackReaction.expression > 0) {
BeatAction.New(game, new List<BeatAction.Action>() { BeatAction.New(game, new List<BeatAction.Action>() {

View file

@ -314,7 +314,7 @@ namespace HeavenStudio.Games
public override void OnPlay(double beat) public override void OnPlay(double beat)
{ {
List<RiqEntity> allEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel[.."meatGrinder".Length] == "meatGrinder"); List<RiqEntity> allEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == "meatGrinder");
RiqEntity cg = allEntities.Find(c => c.datamodel == "meatGrinder/cartGuy"); RiqEntity cg = allEntities.Find(c => c.datamodel == "meatGrinder/cartGuy");
if (cg != null) { if (cg != null) {
CartGuy(cg.beat, cg.length, cg["spider"], cg["direction"], cg["ease"]); CartGuy(cg.beat, cg.length, cg["spider"], cg["direction"], cg["ease"]);