buncha shit again
oh lawd we getting close, if only these fuckin game breaking bugs would stop showing up
This commit is contained in:
parent
24004463b2
commit
67d1b6f24b
|
@ -101,7 +101,7 @@ Material:
|
||||||
- _ColorMask: 15
|
- _ColorMask: 15
|
||||||
- _CullMode: 0
|
- _CullMode: 0
|
||||||
- _Diffuse: 0.5
|
- _Diffuse: 0.5
|
||||||
- _FaceDilate: 0
|
- _FaceDilate: -0.18
|
||||||
- _FaceUVSpeedX: 0
|
- _FaceUVSpeedX: 0
|
||||||
- _FaceUVSpeedY: 0
|
- _FaceUVSpeedY: 0
|
||||||
- _GlowInner: 0.05
|
- _GlowInner: 0.05
|
||||||
|
@ -119,8 +119,8 @@ Material:
|
||||||
- _PerspectiveFilter: 0.875
|
- _PerspectiveFilter: 0.875
|
||||||
- _Reflectivity: 10
|
- _Reflectivity: 10
|
||||||
- _ScaleRatioA: 0.9
|
- _ScaleRatioA: 0.9
|
||||||
- _ScaleRatioB: 0.73125
|
- _ScaleRatioB: 0.89325
|
||||||
- _ScaleRatioC: 0.73125
|
- _ScaleRatioC: 0.89325
|
||||||
- _ScaleX: 1
|
- _ScaleX: 1
|
||||||
- _ScaleY: 1
|
- _ScaleY: 1
|
||||||
- _ShaderFlags: 0
|
- _ShaderFlags: 0
|
||||||
|
@ -370,6 +370,60 @@ MonoBehaviour:
|
||||||
m_LigatureGlyphID: 9817
|
m_LigatureGlyphID: 9817
|
||||||
- m_ComponentGlyphIDs: 19000000100000001a000000
|
- m_ComponentGlyphIDs: 19000000100000001a000000
|
||||||
m_LigatureGlyphID: 9805
|
m_LigatureGlyphID: 9805
|
||||||
|
- m_ComponentGlyphIDs: 1200000010000000120000001100000011000000
|
||||||
|
m_LigatureGlyphID: 9824
|
||||||
|
- m_ComponentGlyphIDs: 1200000011000000100000001200000012000000
|
||||||
|
m_LigatureGlyphID: 9819
|
||||||
|
- m_ComponentGlyphIDs: 1200000012000000100000001200000013000000
|
||||||
|
m_LigatureGlyphID: 9823
|
||||||
|
- m_ComponentGlyphIDs: 12000000100000001200000011000000
|
||||||
|
m_LigatureGlyphID: 9806
|
||||||
|
- m_ComponentGlyphIDs: 12000000100000001200000012000000
|
||||||
|
m_LigatureGlyphID: 9810
|
||||||
|
- m_ComponentGlyphIDs: 12000000100000001200000013000000
|
||||||
|
m_LigatureGlyphID: 9820
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000013000000
|
||||||
|
m_LigatureGlyphID: 8184
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000014000000
|
||||||
|
m_LigatureGlyphID: 9781
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000015000000
|
||||||
|
m_LigatureGlyphID: 8185
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000016000000
|
||||||
|
m_LigatureGlyphID: 9784
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000017000000
|
||||||
|
m_LigatureGlyphID: 9788
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000018000000
|
||||||
|
m_LigatureGlyphID: 9790
|
||||||
|
- m_ComponentGlyphIDs: 120000001000000019000000
|
||||||
|
m_LigatureGlyphID: 9796
|
||||||
|
- m_ComponentGlyphIDs: 12000000100000001a000000
|
||||||
|
m_LigatureGlyphID: 9800
|
||||||
|
- m_ComponentGlyphIDs: 17000000100000001200000012000000
|
||||||
|
m_LigatureGlyphID: 9815
|
||||||
|
- m_ComponentGlyphIDs: 170000001000000018000000
|
||||||
|
m_LigatureGlyphID: 9795
|
||||||
|
- m_ComponentGlyphIDs: 14000000100000001200000011000000
|
||||||
|
m_LigatureGlyphID: 9807
|
||||||
|
- m_ComponentGlyphIDs: 14000000100000001200000012000000
|
||||||
|
m_LigatureGlyphID: 9812
|
||||||
|
- m_ComponentGlyphIDs: 140000001000000015000000
|
||||||
|
m_LigatureGlyphID: 9783
|
||||||
|
- m_ComponentGlyphIDs: 140000001000000016000000
|
||||||
|
m_LigatureGlyphID: 9786
|
||||||
|
- m_ComponentGlyphIDs: 140000001000000018000000
|
||||||
|
m_LigatureGlyphID: 9792
|
||||||
|
- m_ComponentGlyphIDs: 140000001000000019000000
|
||||||
|
m_LigatureGlyphID: 9797
|
||||||
|
- m_ComponentGlyphIDs: 13000000100000001200000012000000
|
||||||
|
m_LigatureGlyphID: 9811
|
||||||
|
- m_ComponentGlyphIDs: 130000001000000014000000
|
||||||
|
m_LigatureGlyphID: 9782
|
||||||
|
- m_ComponentGlyphIDs: 130000001000000016000000
|
||||||
|
m_LigatureGlyphID: 9785
|
||||||
|
- m_ComponentGlyphIDs: 130000001000000018000000
|
||||||
|
m_LigatureGlyphID: 9791
|
||||||
|
- m_ComponentGlyphIDs: 13000000100000001a000000
|
||||||
|
m_LigatureGlyphID: 9801
|
||||||
m_GlyphPairAdjustmentRecords:
|
m_GlyphPairAdjustmentRecords:
|
||||||
- m_FirstAdjustmentRecord:
|
- m_FirstAdjustmentRecord:
|
||||||
m_GlyphIndex: 79
|
m_GlyphIndex: 79
|
||||||
|
|
BIN
Assets/Resources/Sfx/games/chargingChicken/PumpStart.ogg
Normal file
BIN
Assets/Resources/Sfx/games/chargingChicken/PumpStart.ogg
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 26ab1cf6d1db6bd408a5ca6bee1b3cc6
|
guid: 107ac7b6ea3bdff4ebdd5d13fa207d4a
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
BIN
Assets/Resources/Sfx/games/chargingChicken/bbBeep.wav
Normal file
BIN
Assets/Resources/Sfx/games/chargingChicken/bbBeep.wav
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/chargingChicken/bbBeep.wav.meta
Normal file
22
Assets/Resources/Sfx/games/chargingChicken/bbBeep.wav.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 23ff97989a9b54b488b71f6495ac0cdf
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/chargingChicken/chargeLoop.wav
Normal file
BIN
Assets/Resources/Sfx/games/chargingChicken/chargeLoop.wav
Normal file
Binary file not shown.
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 74d5169cfda3c7048b3ebf3415d693d2
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/chargingChicken/chargeRelease.wav
Normal file
BIN
Assets/Resources/Sfx/games/chargingChicken/chargeRelease.wav
Normal file
Binary file not shown.
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 74a424250d1133641b472739393dce52
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -83,7 +83,7 @@ Material:
|
||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
|
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
|
||||||
- _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
|
- _ColorAlpha: {r: 1, g: 0, b: 0, a: 1}
|
||||||
- _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
|
- _ColorBravo: {r: 0, g: 1, b: 0, a: 1}
|
||||||
- _ColorDelta: {r: 0, g: 0, b: 1, a: 1}
|
- _ColorDelta: {r: 0, g: 0, b: 1, a: 1}
|
||||||
|
|
|
@ -414,9 +414,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &9435782
|
--- !u!114 &9435782
|
||||||
|
@ -3846,9 +3846,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 32, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &121871281
|
--- !u!114 &121871281
|
||||||
|
@ -4070,9 +4070,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 72, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &129013734
|
--- !u!114 &129013734
|
||||||
|
@ -4206,9 +4206,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 539838476}
|
m_Father: {fileID: 539838476}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 112, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &151246938
|
--- !u!114 &151246938
|
||||||
|
@ -8194,7 +8194,7 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 14
|
m_fontSize: 9.65
|
||||||
m_fontSizeBase: 14.3
|
m_fontSizeBase: 14.3
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 1
|
m_enableAutoSizing: 1
|
||||||
|
@ -24624,7 +24624,7 @@ MonoBehaviour:
|
||||||
m_HandleRect: {fileID: 1589389271}
|
m_HandleRect: {fileID: 1589389271}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1
|
m_Value: 1
|
||||||
m_Size: 0.9897467
|
m_Size: 0.99998003
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -30367,7 +30367,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 121.101654}
|
m_AnchoredPosition: {x: 0, y: 101.51023}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &1154875945
|
--- !u!222 &1154875945
|
||||||
|
@ -34621,9 +34621,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 40, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &1345846031
|
--- !u!114 &1345846031
|
||||||
|
@ -39827,8 +39827,8 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1220118245}
|
m_TargetGraphic: {fileID: 1220118245}
|
||||||
m_HandleRect: {fileID: 1220118244}
|
m_HandleRect: {fileID: 1220118244}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 1.0000005
|
m_Value: 1.0000004
|
||||||
m_Size: 0.60513115
|
m_Size: 0.44279897
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -42945,9 +42945,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 574002313}
|
m_Father: {fileID: 574002313}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 80, y: -21}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 32, y: 32}
|
m_SizeDelta: {x: 32, y: 32}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &1783491359
|
--- !u!114 &1783491359
|
||||||
|
|
|
@ -256,6 +256,8 @@ namespace HeavenStudio.Games
|
||||||
double drumFadeStart = 0;
|
double drumFadeStart = 0;
|
||||||
double drumFadeLength = 0;
|
double drumFadeLength = 0;
|
||||||
bool drumFadeIn = true;
|
bool drumFadeIn = true;
|
||||||
|
Sound whirring;
|
||||||
|
bool isWhirringPlaying = false;
|
||||||
|
|
||||||
Island nextIsland;
|
Island nextIsland;
|
||||||
Island currentIsland;
|
Island currentIsland;
|
||||||
|
@ -578,11 +580,17 @@ namespace HeavenStudio.Games
|
||||||
drumVolume = Mathf.Lerp(drumFadeIn ? 0 : 1, drumFadeIn ? 1 : 0, (float)valueFade);
|
drumVolume = Mathf.Lerp(drumFadeIn ? 0 : 1, drumFadeIn ? 1 : 0, (float)valueFade);
|
||||||
Conductor.instance.SetMinigameVolume(drumFadeIn ? (float)valueFade : 1 - (float)valueFade);
|
Conductor.instance.SetMinigameVolume(drumFadeIn ? (float)valueFade : 1 - (float)valueFade);
|
||||||
|
|
||||||
//reset volume if not holding
|
//various sound loops and shizz
|
||||||
|
if (isInputting)
|
||||||
|
{
|
||||||
|
if (!isWhirringPlaying) { whirring = SoundByte.PlayOneShotGame("chargingChicken/chargeLoop", volume: 0.5f, looping: true); isWhirringPlaying = true; }
|
||||||
|
}
|
||||||
if (!isInputting)
|
if (!isInputting)
|
||||||
{
|
{
|
||||||
Conductor.instance.FadeMinigameVolume(0, 0, 1);
|
Conductor.instance.FadeMinigameVolume(0, 0, 1);
|
||||||
drumVolume = 1;
|
drumVolume = 1;
|
||||||
|
|
||||||
|
if (isWhirringPlaying) { whirring.Stop(); isWhirringPlaying = false; }
|
||||||
}
|
}
|
||||||
|
|
||||||
//chicken fall off the right of the platform
|
//chicken fall off the right of the platform
|
||||||
|
@ -727,6 +735,7 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//if the player didn't hold, just dump 'em in the ocean
|
||||||
currentIsland.ChargerAnim.DoScaledAnimationAsync("Idle", 0.5f);
|
currentIsland.ChargerAnim.DoScaledAnimationAsync("Idle", 0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -803,7 +812,7 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
//sound
|
//sound
|
||||||
isInputting = true; //starts the drums
|
isInputting = true; //starts the drums
|
||||||
//SoundByte.PlayOneShotGame("chargingChicken/inputJust", pitch: 0.9f, volume: 0.8f);
|
PumpSound(state);
|
||||||
|
|
||||||
//chicken animation
|
//chicken animation
|
||||||
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
||||||
|
@ -819,7 +828,7 @@ namespace HeavenStudio.Games
|
||||||
isInputting = true; //starts the drums
|
isInputting = true; //starts the drums
|
||||||
SoundByte.PlayOneShotGame("chargingChicken/kick");
|
SoundByte.PlayOneShotGame("chargingChicken/kick");
|
||||||
SoundByte.PlayOneShotGame("chargingChicken/hihat");
|
SoundByte.PlayOneShotGame("chargingChicken/hihat");
|
||||||
//SoundByte.PlayOneShotGame("chargingChicken/inputJust", pitch: 0.9f, volume: 0.8f);
|
PumpSound(state);
|
||||||
|
|
||||||
//chicken animation
|
//chicken animation
|
||||||
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
||||||
|
@ -834,7 +843,7 @@ namespace HeavenStudio.Games
|
||||||
//sound
|
//sound
|
||||||
isInputting = true; //starts the drums
|
isInputting = true; //starts the drums
|
||||||
SoundByte.PlayOneShotGame("chargingChicken/AMEN1");
|
SoundByte.PlayOneShotGame("chargingChicken/AMEN1");
|
||||||
//SoundByte.PlayOneShotGame("chargingChicken/inputJust", pitch: 0.9f, volume: 0.8f);
|
PumpSound(state);
|
||||||
|
|
||||||
//chicken animation
|
//chicken animation
|
||||||
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
ChickenAnim.DoScaledAnimationAsync("Charge", 0.5f);
|
||||||
|
@ -857,9 +866,26 @@ namespace HeavenStudio.Games
|
||||||
countBubble.SetActive(false);
|
countBubble.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PumpSound(float state)
|
||||||
|
{
|
||||||
|
if (state >= 1f || state <= -1f)
|
||||||
|
{
|
||||||
|
SoundByte.PlayOneShot("miss");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SoundByte.PlayOneShotGame("chargingChicken/PumpStart");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void EndChargingJust(PlayerActionEvent caller, float state)
|
public void EndChargingJust(PlayerActionEvent caller, float state)
|
||||||
{
|
{
|
||||||
BlastOff(state, false);
|
BlastOff(state, false);
|
||||||
|
|
||||||
|
if (state >= 1f || state <= -1f)
|
||||||
|
{
|
||||||
|
SoundByte.PlayOneShot("miss");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void EndChargingMiss(PlayerActionEvent caller)
|
public void EndChargingMiss(PlayerActionEvent caller)
|
||||||
|
@ -910,10 +936,14 @@ namespace HeavenStudio.Games
|
||||||
|
|
||||||
public void SpawnJourney(double beat, double length)
|
public void SpawnJourney(double beat, double length)
|
||||||
{
|
{
|
||||||
|
//pass along the next island data
|
||||||
staleIsland = currentIsland;
|
staleIsland = currentIsland;
|
||||||
currentIsland = nextIsland;
|
currentIsland = nextIsland;
|
||||||
nextIsland = Instantiate(IslandBase, transform).GetComponent<Island>();
|
nextIsland = Instantiate(IslandBase, transform).GetComponent<Island>();
|
||||||
|
|
||||||
|
//despawn old islands
|
||||||
|
if (staleIsland != null) Destroy(staleIsland.gameObject);
|
||||||
|
|
||||||
nextIsland.SetUpCollapse(beat + length);
|
nextIsland.SetUpCollapse(beat + length);
|
||||||
|
|
||||||
nextIsland.transform.localPosition = new Vector3((float)(length * platformDistanceConstant * platformsPerBeat + (platformDistanceConstant / 2)), 0, 0);
|
nextIsland.transform.localPosition = new Vector3((float)(length * platformDistanceConstant * platformsPerBeat + (platformDistanceConstant / 2)), 0, 0);
|
||||||
|
@ -1039,13 +1069,6 @@ namespace HeavenStudio.Games
|
||||||
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
|
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
|
||||||
{
|
{
|
||||||
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + currentIsland.journeyLength, delegate {
|
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + currentIsland.journeyLength, delegate {
|
||||||
nextIsland.isMoving = false;
|
|
||||||
currentIsland.isMoving = false;
|
|
||||||
foreach (var a in stonePlatformJourney)
|
|
||||||
{
|
|
||||||
stone = a.thisPlatform;
|
|
||||||
stone.isMoving = false;
|
|
||||||
}
|
|
||||||
ChickenFall(fellTooFar);
|
ChickenFall(fellTooFar);
|
||||||
checkFallingDistance = false;
|
checkFallingDistance = false;
|
||||||
}),
|
}),
|
||||||
|
@ -1069,13 +1092,6 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
new BeatAction.Action(journeyIntendedLength + (currentIsland.journeyLength * 2) + 1, delegate {
|
new BeatAction.Action(journeyIntendedLength + (currentIsland.journeyLength * 2) + 1, delegate {
|
||||||
SuccessAnim();
|
SuccessAnim();
|
||||||
nextIsland.isMoving = false;
|
|
||||||
currentIsland.isMoving = false;
|
|
||||||
foreach (var a in stonePlatformJourney)
|
|
||||||
{
|
|
||||||
stone = a.thisPlatform;
|
|
||||||
stone.isMoving = false;
|
|
||||||
}
|
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1103,6 +1119,7 @@ namespace HeavenStudio.Games
|
||||||
currentIsland.ChargerAnim.DoScaledAnimationAsync("Idle", 0.5f);
|
currentIsland.ChargerAnim.DoScaledAnimationAsync("Idle", 0.5f);
|
||||||
|
|
||||||
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CHARGE_CANCEL");
|
SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_CHARGE_CANCEL");
|
||||||
|
SoundByte.PlayOneShotGame("chargingChicken/chargeRelease", volume: 0.5f);
|
||||||
|
|
||||||
isInputting = false;
|
isInputting = false;
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,10 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
|
||||||
float newX1 = Util.EasingFunction.EaseOutCubic((float)journeyStart, (float)journeyEnd, value1);
|
float newX1 = Util.EasingFunction.EaseOutCubic((float)journeyStart, (float)journeyEnd, value1);
|
||||||
IslandPos.localPosition = new Vector3(newX1, 0, 0);
|
IslandPos.localPosition = new Vector3(newX1, 0, 0);
|
||||||
}
|
}
|
||||||
|
if (value1 >= 1)
|
||||||
|
{
|
||||||
|
isMoving = false;
|
||||||
|
}
|
||||||
if (respawnStart < Conductor.instance.songPositionInBeatsAsDouble && isRespawning)
|
if (respawnStart < Conductor.instance.songPositionInBeatsAsDouble && isRespawning)
|
||||||
{
|
{
|
||||||
float value2 = (Conductor.instance.GetPositionFromBeat(respawnStart, respawnEnd - respawnStart));
|
float value2 = (Conductor.instance.GetPositionFromBeat(respawnStart, respawnEnd - respawnStart));
|
||||||
|
@ -76,6 +80,7 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
|
||||||
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
|
BeatAction.New(GameManager.instance, new List<BeatAction.Action>()
|
||||||
{
|
{
|
||||||
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.50, delegate { StoneSplash(); }),
|
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 0.50, delegate { StoneSplash(); }),
|
||||||
|
new BeatAction.Action(Conductor.instance.songPositionInBeatsAsDouble + 3.00, delegate { Destroy(gameObject); }),
|
||||||
});
|
});
|
||||||
canFall = false;
|
canFall = false;
|
||||||
}
|
}
|
||||||
|
@ -168,6 +173,11 @@ namespace HeavenStudio.Games.Scripts_ChargingChicken
|
||||||
if (IslandPos.localPosition.x > -8) SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_BLOCK_FALL_WATER_PITCH400", pitch: SoundByte.GetPitchFromCents(UnityEngine.Random.Range(-400, 401), false), volume: 0.5f);
|
if (IslandPos.localPosition.x > -8) SoundByte.PlayOneShotGame("chargingChicken/SE_CHIKEN_BLOCK_FALL_WATER_PITCH400", pitch: SoundByte.GetPitchFromCents(UnityEngine.Random.Range(-400, 401), false), volume: 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ThisIsNotMoving()
|
||||||
|
{
|
||||||
|
isMoving = false;
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -17,85 +17,67 @@ MonoBehaviour:
|
||||||
DenseViewWidthThreshold: 512
|
DenseViewWidthThreshold: 512
|
||||||
_disableAutoReloadInBackground: 0
|
_disableAutoReloadInBackground: 0
|
||||||
ImportedScriptPaths:
|
ImportedScriptPaths:
|
||||||
- Assets/Scripts/Games/Tunnel/Tunnel.cs
|
- Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
|
||||||
- Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
|
- Assets/Scripts/Games/ChargingChicken/Island.cs
|
||||||
- Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs
|
- Assets/Scripts/GameManager.cs
|
||||||
- Assets/Scripts/Games/TotemClimb/TotemClimb.cs
|
- Assets/Scripts/Games/Cannery/Cannery.cs
|
||||||
- Assets/Plugins/StandaloneFileBrowser/IStandaloneFileBrowser.cs
|
|
||||||
- Assets/Scripts/LevelEditor/Commands/CommandManager.cs
|
|
||||||
- Assets/Scripts/Games/FirstContact/Translator.cs
|
|
||||||
- Assets/Scripts/LevelEditor/TooltipGiver.cs
|
|
||||||
- Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs
|
|
||||||
- Assets/Scripts/Games/DrummingPractice/DrummerHit.cs
|
|
||||||
- Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs
|
|
||||||
- Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
|
|
||||||
- Assets/Scripts/StudioDance/Dancer.cs
|
|
||||||
- Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs
|
|
||||||
- Assets/Scripts/Games/Lockstep/Lockstep.cs
|
|
||||||
- Assets/Scripts/Games/TotemClimb/TCTotemManager.cs
|
|
||||||
- Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs
|
|
||||||
- Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
|
|
||||||
- Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs
|
|
||||||
- Assets/Scripts/Games/DoubleDate/SoccerBall.cs
|
|
||||||
- Assets/Scripts/Games/RhythmTweezers/Tweezers.cs
|
|
||||||
- Assets/Scripts/Games/WorkingDough/WorkingDough.cs
|
|
||||||
- Assets/Scripts/Games/TotemClimb/TCFrog.cs
|
|
||||||
- Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs
|
|
||||||
- Assets/Scripts/Games/SpaceDance/SpaceDance.cs
|
|
||||||
- Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs
|
|
||||||
- Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs
|
|
||||||
- Assets/Scripts/Games/TotemClimb/TCPillarManager.cs
|
|
||||||
- Assets/Scripts/Games/Fireworks/Fireworks.cs
|
|
||||||
- Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
|
|
||||||
- Assets/Scripts/Games/WizardsWaltz/Wizard.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/WatchMonkeyHandler.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/WatchBackgroundHandler.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/BalloonHandler.cs
|
|
||||||
- Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs
|
|
||||||
- Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
|
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs
|
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs
|
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJBear.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJBear.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs
|
- Assets/Scripts/LevelEditor/Commands/Block.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs
|
- Assets/Scripts/Games/ClapTrap/ClapTrap.cs
|
||||||
- Assets/Scripts/Util/ParticleSystemHelpers.cs
|
- Assets/Scripts/Games/SoundEffects.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
|
- Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs
|
||||||
|
- Assets/Scripts/LevelEditor/Tooltip.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
|
||||||
|
- Assets/Scripts/Util/SoundByte.cs
|
||||||
|
- Assets/Scripts/Games/Rockers/Rockers.cs
|
||||||
|
- Assets/Scripts/Games/NailCarpenter/LongNail.cs
|
||||||
|
- Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs
|
||||||
|
- Assets/Scripts/Games/BonOdori/BonOdori.cs
|
||||||
|
- Assets/Scripts/Minigames.cs
|
||||||
|
- Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs
|
||||||
|
- Assets/Scripts/AppInfo.cs
|
||||||
|
- Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
|
||||||
|
- Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
|
||||||
|
- Assets/Scripts/Games/Cannery/Can.cs
|
||||||
|
- Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs
|
||||||
|
- Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
|
||||||
|
- Assets/Scripts/Games/LumBEARjack/LBJBomb.cs
|
||||||
|
- Assets/Scripts/Games/TossBoys/TossBoys.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJBaby.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJBaby.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJObjectRotate.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJObjectRotate.cs
|
||||||
|
- Assets/Scripts/Games/Tambourine/Tambourine.cs
|
||||||
|
- Assets/Scripts/Util/MultiSound.cs
|
||||||
|
- Assets/Scripts/Games/SpaceDance/SpaceDance.cs
|
||||||
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs
|
||||||
|
- Assets/Scripts/Util/ParticleSystemHelpers.cs
|
||||||
|
- Assets/Scripts/Util/EntityTypes.cs
|
||||||
|
- Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
|
||||||
|
- Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs
|
||||||
|
- Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJMissObject.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJMissObject.cs
|
||||||
- Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/BoolChartPropertyPrefab.cs
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/DropdownPropertyPrefab.cs
|
||||||
- Assets/Plugins/Starpelly/Textures.cs
|
- Assets/Scripts/LevelEditor/Timeline/Timeline.cs
|
||||||
- Assets/Plugins/Starpelly/OS.cs
|
- Assets/Scripts/PersistentDataManager.cs
|
||||||
- Assets/Plugins/Color picker/ColorPreview.cs
|
- Assets/Scripts/Games/ForkLifter/ForkLifter.cs
|
||||||
- Assets/Scripts/Games/Manzai/Manzai.cs
|
- Assets/Scripts/Games/NailCarpenter/Nail.cs
|
||||||
- Assets/Plugins/Starpelly/Starpelly.cs
|
- Assets/Scripts/Games/CoinToss/CoinToss.cs
|
||||||
- Assets/Scripts/LevelEditor/Tooltip.cs
|
- Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs
|
||||||
- Assets/Scripts/Games/SoundEffects.cs
|
- Assets/Scripts/Games/Minigame.cs
|
||||||
- Assets/Plugins/Starpelly/Random.cs
|
- Assets/Scripts/Games/Kitties/Kitties.cs
|
||||||
- Assets/Plugins/Starpelly/OperatingSystem/Linux.cs
|
- Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
|
||||||
- Assets/Plugins/Starpelly/Utils.cs
|
- Assets/Scripts/Games/Tunnel/Tunnel.cs
|
||||||
- Assets/Plugins/Starpelly/Enums/Windows.cs
|
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ButtonPropertyPrefab.cs
|
||||||
- Assets/Plugins/Starpelly/OperatingSystem/Windows.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs
|
||||||
- Assets/Plugins/Starpelly/Pelly.cs
|
- Assets/Scripts/Games/ClapTrap/Sword.cs
|
||||||
- Assets/Plugins/Starpelly/Enums/StringType.cs
|
- Assets/Scripts/Games/KarateMan/KarateMan.cs
|
||||||
- Assets/Plugins/Starpelly/OperatingSystem/User32.cs
|
- Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
|
||||||
- Assets/Plugins/Starpelly/Extensions.cs
|
- Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
|
||||||
- Assets/Plugins/Starpelly/ScreenUtility.cs
|
- Assets/Scripts/Games/NailCarpenter/Sweet.cs
|
||||||
- Assets/Plugins/Starpelly/Properties/Strings.cs
|
- Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs
|
||||||
- Assets/Plugins/Starpelly/Anchors.cs
|
- Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
|
||||||
- Assets/Plugins/Starpelly/Properties/Arrays.cs
|
|
||||||
- Assets/Plugins/Starpelly/OperatingSystem/IOperatingSystem.cs
|
|
||||||
- Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertyPrefab.cs
|
|
||||||
- Assets/Scripts/LevelEditor/Timeline/LayerLabel.cs
|
|
||||||
- Assets/Plugins/Starpelly/Transformer.cs
|
|
||||||
- Assets/Plugins/Starpelly/RendererExtensions.cs
|
|
||||||
- Assets/Scripts/Util/StringUtils.cs
|
|
||||||
- Assets/Plugins/Starpelly/OperatingSystem/MacOS.cs
|
|
||||||
- Assets/Plugins/Starpelly/Common.cs
|
|
||||||
- Assets/Scripts/Games/LumBEARjack/LBJBomb.cs
|
|
||||||
- Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
|
|
||||||
- Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
|
|
||||||
PathsToSkipImportEvent: []
|
PathsToSkipImportEvent: []
|
||||||
PathsToIgnoreOverwriteSettingOnAttribute: []
|
PathsToIgnoreOverwriteSettingOnAttribute: []
|
||||||
|
|
Loading…
Reference in a new issue