More lockstep stuff
i have no clue
This commit is contained in:
parent
0dc34cb001
commit
5b692f4dc2
Binary file not shown.
|
@ -1,22 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6d097efc1e7ab2349937b5361a65e5e0
|
||||
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.
|
@ -1,22 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 11bbc21fd4f409f499cf4addeac698ea
|
||||
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:
|
|
@ -0,0 +1,96 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb5ddb61fba73a847b18eb196ad17ced
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
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
|
||||
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: 100
|
||||
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
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -14,7 +14,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
public static Minigame AddGame(EventCaller eventCaller)
|
||||
{
|
||||
return new Minigame("lockstep", "Lockstep \n<color=#eb5454>[WIP]</color>", "0058CE", false, false, new List<GameAction>()
|
||||
return new Minigame("lockstep", "Lockstep \n<color=#eb5454>[INITIALIZATION ONLY]</color>", "0058CE", false, false, new List<GameAction>()
|
||||
{
|
||||
new GameAction("bop", "Bop")
|
||||
{
|
||||
|
@ -26,13 +26,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
defaultLength = 1f,
|
||||
},
|
||||
|
||||
new GameAction("startStepping", "Start Stepping")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.BeginStepping(e.beat); },
|
||||
defaultLength = 1f
|
||||
|
||||
|
||||
},
|
||||
|
||||
|
||||
new GameAction("hai", "Hai!")
|
||||
{
|
||||
|
@ -46,10 +40,6 @@ namespace HeavenStudio.Games.Loaders
|
|||
new GameAction("offbeatSwitch", "Switch to Offbeat")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.OnbeatSwitch(e.beat); },
|
||||
/* parameters = new List<Param>()
|
||||
{
|
||||
new Param("toggle", true, "'Ho ho ho ho'", "Whether or not 'Ho ho ho ho' will be said after 'Hai hai hai ha-hai!'")
|
||||
}, */
|
||||
defaultLength = 8f
|
||||
|
||||
|
||||
|
@ -71,6 +61,14 @@ namespace HeavenStudio.Games.Loaders
|
|||
hidden = true
|
||||
},
|
||||
|
||||
new GameAction("startStepping", "Start Stepping")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.BeginStepping(e.beat); },
|
||||
defaultLength = 1f,
|
||||
hidden = true
|
||||
|
||||
},
|
||||
|
||||
new GameAction("test1", "onbeat march test")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; Lockstep.instance.OnbeatMarch(e.beat); },
|
||||
|
@ -126,11 +124,13 @@ namespace HeavenStudio.Games
|
|||
|
||||
var cond = Conductor.instance;
|
||||
|
||||
if (Conductor.instance.ReportBeat(ref lastReportedBeat))
|
||||
if (goStep)
|
||||
{
|
||||
if (goStep)
|
||||
print("stepping is on");
|
||||
if (Conductor.instance.ReportBeat(ref lastReportedBeat))
|
||||
{
|
||||
Jukebox.PlayOneShotGame("marchingOrders/step1");
|
||||
print("one small step for switch");
|
||||
Jukebox.PlayOneShotGame("Lockstep/marchOnBeat1");
|
||||
stepswitcherP.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
|
||||
stepswitcher0.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
|
||||
stepswitcher1.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
|
||||
|
@ -186,7 +186,10 @@ namespace HeavenStudio.Games
|
|||
public void BeginStepping(float beat)
|
||||
{
|
||||
|
||||
goStep = true;
|
||||
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat, delegate { goStep = true; }),
|
||||
});
|
||||
|
||||
print("Start Stepping");
|
||||
print(goStep);
|
||||
|
|
BIN
UpgradeLog.htm
Normal file
BIN
UpgradeLog.htm
Normal file
Binary file not shown.
Loading…
Reference in a new issue