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

checkpoint

Browse source 
use this for reverting back while changing how stone platforms spawn
This commit is contained in:
ThePurpleAnon 2024-03-06 23:47:35 -06:00
parent a637f8dc42
commit 01f5a0afaa
7 changed files with 68975 additions and 570 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69310
Assets/Resources/Prefabs/Games/ChargingChicken/Island.prefab
View file

File diff suppressed because it is too large Load diff

182
Assets/Resources/Sprites/Games/ChargingChicken/Effects/splash01.png.meta
View file

@ -42,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -103,7 +103,175 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: splash01_0
rect:
serializedVersion: 2
x: 0
y: 512
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f719c443f27959a43862f99515659d93
internalID: -504097230
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_1
rect:
serializedVersion: 2
x: 512
y: 512
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 05646231ab2699f4a8aae94a7c803054
internalID: 1558075343
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_2
rect:
serializedVersion: 2
x: 1024
y: 512
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c986874d83cab384ab019a7b2ea15ed2
internalID: -1577524604
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_3
rect:
serializedVersion: 2
x: 1536
y: 512
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2b2ce8113bdce5e4197242ebcc7f44a2
internalID: 1821375016
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_4
rect:
serializedVersion: 2
x: 0
y: 0
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6f3f683d6750ccf419f6873fbadf7506
internalID: 826174862
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_5
rect:
serializedVersion: 2
x: 512
y: 0
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5c50ca05b6a702e40a4024de97a9f257
internalID: -444047837
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_6
rect:
serializedVersion: 2
x: 1024
y: 0
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: af97810cbb03a684e98e2206c2649ab0
internalID: 1232578755
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: splash01_7
rect:
serializedVersion: 2
x: 1536
y: 0
width: 512
height: 512
alignment: 7
pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ffab88bf17cc4f74ab8a2fbd29c42d47
internalID: 1176685746
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -114,7 +282,15 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
nameFileIdTable:
splash01_0: -504097230
splash01_1: 1558075343
splash01_2: -1577524604
splash01_3: 1821375016
splash01_4: 826174862
splash01_5: -444047837
splash01_6: 1232578755
splash01_7: 1176685746
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

2
Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_cellshader.mat
View file

@ -83,7 +83,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
- _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
- _ColorDelta: {r: 0, g: 0, b: 1, a: 1}

2
Assets/Resources/Sprites/Games/ChargingChicken/Materials/chicken_invert.mat
View file

@ -90,7 +90,7 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _BlendColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
- _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
- _ColorDelta: {r: 0, g: 0, b: 1, a: 1}

4
Assets/Scenes/Editor.unity
View file

@ -24624,7 +24624,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
m_Size: 0.9894025
m_Size: 0.9999918
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -30367,7 +30367,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 101.325195}
m_AnchoredPosition: {x: 0, y: 101.510155}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945

32
Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
View file

@ -263,7 +263,6 @@ namespace HeavenStudio.Games
Island nextIsland;
Island currentIsland;
Island staleIsland;
Island stone;
double journeyIntendedLength;
StonePlatform[] stonePlatformJourney;
@ -279,6 +278,8 @@ namespace HeavenStudio.Games
float forgivenessConstant = 1.3f;
double nextInputReady = 0;
public enum DrumLoopList
{
None,
@ -549,8 +550,8 @@ namespace HeavenStudio.Games
//chicken/water movement speed
if (nextIsland.isMoving) ChickenAnim.SetScaledAnimationSpeed((nextIsland.speed1 / 60) + 0.2f);
float waterFlowSpeed = (nextIsland.speed1 / 5.83f) + ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f);
if ((-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.4f) < 0)
float waterFlowSpeed = (nextIsland.speed1 / 5.83f) + ((1f / Conductor.instance.pitchedSecPerBeat) * 0.1f);
if ((-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f) < 0)
{
if (waterFlowSpeed > 0) WaterAnim.speed = waterFlowSpeed;
if (!flowForward)
@ -561,10 +562,10 @@ namespace HeavenStudio.Games
}
else
{
if ((-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.4f) > 0) WaterAnim.speed = (-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.4f);
if ((-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f) > 0) WaterAnim.speed = (-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f);
if (flowForward)
{
WaterAnim.DoScaledAnimationAsync("AntiScroll", (-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.4f));
WaterAnim.DoScaledAnimationAsync("AntiScroll", (-waterFlowSpeed) - ((1f / Conductor.instance.pitchedSecPerBeat) * 0.2f));
flowForward = false;
}
}
@ -609,7 +610,10 @@ namespace HeavenStudio.Games
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL", volume: 0.5f);
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
{
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.50, delegate { SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL_WATER", volume: 0.5f); }),
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.60, delegate {
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL_WATER", volume: 0.5f);
nextIsland.ChickenFall();
}),
});
checkFallingDistance = false;
}
@ -686,6 +690,11 @@ namespace HeavenStudio.Games
double length = Math.Ceiling(actualLength);
if (length < 4) length = 4;
//don't queue more than one input at a time
if (beat < nextInputReady) return;
nextInputReady = beat + (length * 2);
//set up some variables
yardsTextLength = length;
double journeyBeat = beat + yardsTextLength;
@ -1070,7 +1079,7 @@ namespace HeavenStudio.Games
foreach (var a in stonePlatformJourney)
{
stone = a.thisPlatform;
stone.journeyEnd += (stone.journeyLength - ((stone.journeyBlastOffTime - journeyIntendedLength)) * (stone.journeyLength / (stone.journeyLength + 1))) * platformDistanceConstant * platformsPerBeat + (platformDistanceConstant / 2);
stone.journeyEnd += (stone.journeyLength - ((stone.journeyBlastOffTime - journeyIntendedLength)) * (stone.journeyLength / (stone.journeyLength + 1))) * platformDistanceConstant * platformsPerBeat + (platformDistanceConstant + 1.5);
stone.journeyEnd += stoneAdder;
stone.journeyLength = Math.Clamp(((stone.journeyBlastOffTime - journeyIntendedLength) / 1.5) + (stone.journeyLength / 3) - 1, 0, stone.journeyLength - 2);
}
@ -1236,7 +1245,10 @@ namespace HeavenStudio.Games
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL", volume: 0.5f);
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
{
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.50, delegate { SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL_WATER", volume: 0.5f); }),
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.60, delegate {
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CAR_FALL_WATER", volume: 0.5f);
nextIsland.ChickenFall();
}),
});
}
@ -1258,7 +1270,7 @@ namespace HeavenStudio.Games
ChickenRespawn();
}
public void ChickenRespawn(double length = 0.5)
public void ChickenRespawn(double length = 0.6)
{
isInputting = false;
@ -1279,10 +1291,8 @@ namespace HeavenStudio.Games
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
{
new BeatAction.Action(nextIsland.respawnEnd, delegate {
if (staleIsland != null) staleIsland.isRespawning = false;
currentIsland.isRespawning = false;
nextIsland.isRespawning = false;
if (staleIsland != null) staleIsland.FakeChickenAnim.DoScaledAnimationAsync("Idle", 0.5f);
currentIsland.FakeChickenAnim.DoScaledAnimationAsync("Idle", 0.5f);
nextIsland.FakeChickenAnim.DoScaledAnimationAsync("Idle", 0.5f);
foreach (var a in stonePlatformJourney)

13
Assets/Scripts/Games/ChargingChicken/Island.cs
View file

@ -25,7 +25,9 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
[SerializeField] public GameObject Platform2;
[SerializeField] public GameObject Platform3;
[SerializeField] public ParticleSystem IslandCollapse;
[SerializeField] public ParticleSystem IslandCollapseNg;
[SerializeField] public ParticleSystem StoneSplashEffect;
[SerializeField] public ParticleSystem ChickenSplashEffect;
[NonSerialized]public double journeySave = 0;
[NonSerialized]public double journeyStart = 0;
@ -139,7 +141,7 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
{
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_LAND_RESET", volume: 0.7f);
SmallLandmass.SetActive(false);
IslandCollapse.Play();
IslandCollapseNg.Play();
}
#endregion
@ -167,7 +169,7 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
public void StoneFall(int offset, bool tooLate)
{
if (tooLate) return;
PlatformAnim.DoScaledAnimation("Set", Conductor.instance.songPositionInBeatsAsDouble + ((double)offset / 64), 0.5f);
PlatformAnim.DoScaledAnimation("Set", Conductor.instance.songPositionInBeatsAsDouble/* + ((double)offset / 64) */, 0.5f);
PlatformAnim.speed = (1f / Conductor.instance.pitchedSecPerBeat) * 0.5f;
}
@ -185,6 +187,13 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
isMoving = false;
}
public void ChickenFall()
{
var c = ChickenSplashEffect.transform.localPosition;
ChickenSplashEffect.transform.localPosition = new Vector3(-IslandPos.localPosition.x + 1.5f, c.y, c.z);
ChickenSplashEffect.Play();
}
#endregion
}
}