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

fixed particles

Browse source
This commit is contained in:
Rapandrasmus 2024-02-23 18:45:23 +01:00
parent e3f6d62fa9
commit abc5fe0771
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assets/Resources/Games/lumbearjack.prefab
View file

@ -74759,6 +74759,7 @@ MonoBehaviour:
_bigLogCutParticle: {fileID: 77225483305886520} _bigLogCutParticle: {fileID: 77225483305886520}
_hugeLogHitParticle: {fileID: 4465514175500312505} _hugeLogHitParticle: {fileID: 4465514175500312505}
_hugeLogCutParticle: {fileID: 132537577928216743} _hugeLogCutParticle: {fileID: 132537577928216743}
_freezerChipParticle: {fileID: 173406299863492919}
_freezerBreakParticle: {fileID: 3094020854116406872} _freezerBreakParticle: {fileID: 3094020854116406872}
_peachHitParticle: {fileID: 6214329999445395356} _peachHitParticle: {fileID: 6214329999445395356}
_peachCutParticle: {fileID: 8065249703308610300} _peachCutParticle: {fileID: 8065249703308610300}

2
Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab
View file

@ -48,7 +48,7 @@ MonoBehaviour:
_rotationStart: -22 _rotationStart: -22
_rotationEnd: 22 _rotationEnd: 22
_ease: 4 _ease: 4
_logSR: {fileID: 0} _logSR: {fileID: 8098522755323641548}
_logCutSprite: {fileID: 192267312, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} _logCutSprite: {fileID: 192267312, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3}
--- !u!1 &3051440580972758910 --- !u!1 &3051440580972758910
GameObject: GameObject:

2
Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim
View file

@ -694,7 +694,7 @@ AnimationClip:
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
m_HasAdditiveReferencePose: 0 m_HasAdditiveReferencePose: 0
m_LoopTime: 1 m_LoopTime: 0
m_LoopBlend: 0 m_LoopBlend: 0
m_LoopBlendOrientation: 0 m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0 m_LoopBlendPositionY: 0

4
Assets/Scripts/Games/LumBEARjack/LBJBear.cs
View file

@ -51,9 +51,9 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
}); });
} }
public void CutMid() public void CutMid(bool noImpact = false)
{ {
_anim.DoScaledAnimationAsync("BeastCutMid", 0.75f); _anim.DoScaledAnimationAsync("BeastCutMid" + (noImpact ? "NoImpact" : ""), 0.75f);
} }
public void Bop() public void Bop()

2
Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs
View file

@ -153,7 +153,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack
_ => throw new System.NotImplementedException(), _ => throw new System.NotImplementedException(),
}; };
SoundByte.PlayOneShotGame("lumbearjack/" + hitSound); SoundByte.PlayOneShotGame("lumbearjack/" + hitSound);
_bear.CutMid(); _bear.CutMid(_type == LumBEARjack.HugeType.freezer);
_rotationBeat = _soundsToDeleteIfMiss[step - 1].startBeat + _soundsToDeleteIfMiss[step - 1].timer; _rotationBeat = _soundsToDeleteIfMiss[step - 1].startBeat + _soundsToDeleteIfMiss[step - 1].timer;
SetObjectCutSprite(step); SetObjectCutSprite(step);

8
Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
View file

@ -289,6 +289,7 @@ namespace HeavenStudio.Games
[SerializeField] private ParticleSystem _bigLogCutParticle; [SerializeField] private ParticleSystem _bigLogCutParticle;
[SerializeField] private ParticleSystem _hugeLogHitParticle; [SerializeField] private ParticleSystem _hugeLogHitParticle;
[SerializeField] private ParticleSystem _hugeLogCutParticle; [SerializeField] private ParticleSystem _hugeLogCutParticle;
[SerializeField] private ParticleSystem _freezerChipParticle;
[SerializeField] private ParticleSystem _freezerBreakParticle; [SerializeField] private ParticleSystem _freezerBreakParticle;
[SerializeField] private ParticleSystem _peachHitParticle; [SerializeField] private ParticleSystem _peachHitParticle;
[SerializeField] private ParticleSystem _peachCutParticle; [SerializeField] private ParticleSystem _peachCutParticle;
@ -986,7 +987,7 @@ namespace HeavenStudio.Games
break; break;
case SmallType.can: case SmallType.can:
ParticleSystem spawnedParticle1 = Instantiate(_canCutParticle, _particleCutPoint); ParticleSystem spawnedParticle1 = Instantiate(_canCutParticle, _particleCutPoint);
spawnedParticle1.PlayScaledAsyncAllChildren(1); spawnedParticle1.PlayScaledAsyncAllChildren(0.5f);
break; break;
case SmallType.bat: case SmallType.bat:
ParticleSystem spawnedParticle2 = Instantiate(_batCutParticle, _particleCutPoint); ParticleSystem spawnedParticle2 = Instantiate(_batCutParticle, _particleCutPoint);
@ -1019,13 +1020,12 @@ namespace HeavenStudio.Games
spawnedParticle.PlayScaledAsyncAllChildren(0.5f); spawnedParticle.PlayScaledAsyncAllChildren(0.5f);
break; break;
case HugeType.freezer: case HugeType.freezer:
if (hit) break; ParticleSystem spawnedParticle1 = Instantiate(hit ? _freezerChipParticle : _freezerBreakParticle, hit ? _particleHitPoint : _particleCutPoint);
ParticleSystem spawnedParticle1 = Instantiate(_freezerBreakParticle, _particleCutPoint);
spawnedParticle1.PlayScaledAsyncAllChildren(0.5f); spawnedParticle1.PlayScaledAsyncAllChildren(0.5f);
break; break;
case HugeType.peach: case HugeType.peach:
ParticleSystem spawnedParticle2 = Instantiate(hit ? _peachHitParticle : _peachCutParticle, hit ? _particleHitPoint : _particleCutPoint); ParticleSystem spawnedParticle2 = Instantiate(hit ? _peachHitParticle : _peachCutParticle, hit ? _particleHitPoint : _particleCutPoint);
spawnedParticle2.PlayScaledAsyncAllChildren(1); spawnedParticle2.PlayScaledAsyncAllChildren(0.5f);
break; break;
} }
} }

5
Assets/Scripts/Util/ParticleSystemHelpers.cs
View file

@ -6,15 +6,14 @@ namespace HeavenStudio.Util
{ {
public static void PlayScaledAsync(this ParticleSystem particleSystem, float timeScale) public static void PlayScaledAsync(this ParticleSystem particleSystem, float timeScale)
{ {
ParticleSystem.MainModule main = particleSystem.main; SetAsyncScaling(particleSystem, timeScale);
main.simulationSpeed = (1 / Conductor.instance.pitchedSecPerBeat) * timeScale;
particleSystem.Play(); particleSystem.Play();
} }
public static void SetAsyncScaling(this ParticleSystem particleSystem, float timeScale) public static void SetAsyncScaling(this ParticleSystem particleSystem, float timeScale)
{ {
ParticleSystem.MainModule main = particleSystem.main; ParticleSystem.MainModule main = particleSystem.main;
main.simulationSpeed = (1 / Conductor.instance.pitchedSecPerBeat) * timeScale; main.simulationSpeed = main.simulationSpeed / Conductor.instance.pitchedSecPerBeat * timeScale;
} }
public static void PlayScaledAsyncAllChildren(this ParticleSystem particleSystem, float timeScale) public static void PlayScaledAsyncAllChildren(this ParticleSystem particleSystem, float timeScale)