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

Lockstep Additions (#360)

Browse source 
* tiled stepswitchers

* recolourable step switchers

change text used in the properties edit menu

* fix colour setup on game load

* colourize text based on track

* B
This commit is contained in:
minenice55 2023-03-26 22:26:01 -04:00 committed by GitHub
parent c60cce17dd
commit 26248b0f83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 3517 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2945
Assets/Resources/Games/lockstep.prefab
View file

File diff suppressed because it is too large Load diff

4
Assets/Resources/Prefabs/GameTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 2560
m_Height: 1440
m_Width: 2238
m_Height: 1258
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2

4
Assets/Resources/Prefabs/OverlayTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 3840
m_Height: 2160
m_Width: 3357
m_Height: 1887
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2

16
Assets/Resources/Sprites/Games/Lockstep/Animations/Bop.anim
View file

@ -20,13 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.041666668
value: {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.125
value: {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.20833333
value: {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -46,10 +46,10 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

4
Assets/Resources/Sprites/Games/Lockstep/Animations/BopIdle.anim
View file

@ -20,7 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -40,7 +40,7 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

28
Assets/Resources/Sprites/Games/Lockstep/Animations/BopReset.anim
View file

@ -20,19 +20,19 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.083333336
value: {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.16666667
value: {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.25
value: {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.33333334
value: {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.41666666
value: {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.5
value: {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -52,13 +52,13 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 4632143454527972695, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -7689431612274100930, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -1578962635485543256, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 6678189707026698426, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 4875565029690583818, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -6501618365320185404, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 3567852363888940705, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -1918475703581822183, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

4
Assets/Resources/Sprites/Games/Lockstep/Animations/Idle.anim
View file

@ -20,7 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -6961290807587789438, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -6366962435105001689, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -40,7 +40,7 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -6961290807587789438, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -6366962435105001689, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

16
Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMarch.anim
View file

@ -20,13 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -7069434044889276691, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 1117155169284464673, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.033333335
value: {fileID: 6671823371719840549, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -9013239299422517548, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.13333334
value: {fileID: 4448651475430373734, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -1481155383222858642, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.16666667
value: {fileID: 9047975854256012390, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 9219949000286105305, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -46,10 +46,10 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -7069434044889276691, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 6671823371719840549, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 4448651475430373734, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 9047975854256012390, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 1117155169284464673, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -9013239299422517548, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -1481155383222858642, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 9219949000286105305, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

8
Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMiss.anim
View file

@ -20,9 +20,9 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 7051025833746117958, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 1952597663773370460, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.083333336
value: {fileID: -7900508199032304796, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 8493793611061283836, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -42,8 +42,8 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 7051025833746117958, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -7900508199032304796, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 1952597663773370460, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 8493793611061283836, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

4
Assets/Resources/Sprites/Games/Lockstep/Animations/OffbeatMissRest.anim
View file

@ -20,7 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -7900508199032304796, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 8493793611061283836, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -40,7 +40,7 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -7900508199032304796, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 8493793611061283836, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

16
Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMarch.anim
View file

@ -20,13 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1292918056351840569, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 8217225921531253787, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.033333335
value: {fileID: 3854965462330847857, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -7353580249722972513, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.13333334
value: {fileID: 5037155186664620574, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 7392681990337583900, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.16666667
value: {fileID: 9130296555604909335, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -4212271592851182626, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -46,10 +46,10 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1292918056351840569, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 3854965462330847857, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 5037155186664620574, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 9130296555604909335, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 8217225921531253787, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -7353580249722972513, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: 7392681990337583900, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -4212271592851182626, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

8
Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMiss.anim
View file

@ -20,9 +20,9 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1380531955285550272, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: 4227672332529170852, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- time: 0.06666667
value: {fileID: -662792740418096914, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -8552915065781114029, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -42,8 +42,8 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1380531955285550272, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -662792740418096914, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: 4227672332529170852, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
- {fileID: -8552915065781114029, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

4
Assets/Resources/Sprites/Games/Lockstep/Animations/OnbeatMissRest.anim
View file

@ -20,7 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -662792740418096914, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
value: {fileID: -8552915065781114029, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -40,7 +40,7 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -662792740418096914, guid: bab2c0bd9904cdb46bf49674024d3da6, type: 3}
- {fileID: -8552915065781114029, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

14
Assets/Resources/Sprites/Games/Lockstep/OffbeatPortrait.PNG.meta
View file

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -75,6 +75,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
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: []

14
Assets/Resources/Sprites/Games/Lockstep/OnbeatPortrait.PNG.meta
View file

@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@ -75,6 +75,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
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: []

2
Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs copy.meta → Assets/Resources/Sprites/Games/Lockstep/RenderTextures.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 28745dfd251ff86468a98978665f553b
guid: 6aedb22a2a137fb4ba926f2adce2c7d3
folderAsset: yes
DefaultImporter:
externalObjects: {}

45
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/StepperMaterial.mat Normal file
View file

@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: StepperMaterial
m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 0.6039216, g: 0.15294118, b: 0.3764706, a: 1}
- _ColorBravo: {r: 0.4509804, g: 0.4509804, b: 0.4509804, a: 1}
- _ColorCharlie: {r: 1, g: 0, b: 1, a: 1}
- _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

8
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/StepperMaterial.mat.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 471c4a2ed0684d24d9abb5c5aeffc0c4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

53
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearBottom.asset Normal file
View file

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!86 &8600000
CustomRenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SteppersNearBottom
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 1024
m_Height: 1860
m_AntiAliasing: 2
m_MipCount: -1
m_DepthFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_Material: {fileID: 0}
m_InitSource: 0
m_InitMaterial: {fileID: 0}
m_InitColor: {r: 0, g: 0, b: 0, a: 0}
m_InitTexture: {fileID: 0}
m_UpdateMode: 1
m_InitializationMode: 0
m_UpdateZoneSpace: 0
m_CurrentUpdateZoneSpace: 0
m_UpdateZones: []
m_UpdatePeriod: 0
m_ShaderPass: 0
m_CubemapFaceMask: 4294967295
m_DoubleBuffered: 1
m_WrapUpdateZones: 0

8
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearBottom.asset.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6db82951191c9bb4a9433416ec4b8acd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8600000
userData:
assetBundleName:
assetBundleVariant:

53
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearTop.asset Normal file
View file

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!86 &8600000
CustomRenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SteppersNearTop
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 1024
m_Height: 1860
m_AntiAliasing: 2
m_MipCount: -1
m_DepthFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_Material: {fileID: 0}
m_InitSource: 0
m_InitMaterial: {fileID: 0}
m_InitColor: {r: 0, g: 0, b: 0, a: 0}
m_InitTexture: {fileID: 0}
m_UpdateMode: 1
m_InitializationMode: 0
m_UpdateZoneSpace: 0
m_CurrentUpdateZoneSpace: 0
m_UpdateZones: []
m_UpdatePeriod: 0
m_ShaderPass: 0
m_CubemapFaceMask: 4294967295
m_DoubleBuffered: 1
m_WrapUpdateZones: 0

8
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersNearTop.asset.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fc18082ae04938247a9aef9892d1ae5b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8600000
userData:
assetBundleName:
assetBundleVariant:

53
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersTileable.asset Normal file
View file

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!86 &8600000
CustomRenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SteppersTileable
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 1024
m_Height: 1860
m_AntiAliasing: 2
m_MipCount: -1
m_DepthFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_Material: {fileID: 0}
m_InitSource: 0
m_InitMaterial: {fileID: 0}
m_InitColor: {r: 0, g: 0, b: 0, a: 0}
m_InitTexture: {fileID: 0}
m_UpdateMode: 1
m_InitializationMode: 0
m_UpdateZoneSpace: 0
m_CurrentUpdateZoneSpace: 0
m_UpdateZones: []
m_UpdatePeriod: 0
m_ShaderPass: 0
m_CubemapFaceMask: 4294967295
m_DoubleBuffered: 1
m_WrapUpdateZones: 0

8
Assets/Resources/Sprites/Games/Lockstep/RenderTextures/SteppersTileable.asset.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7772de3e46eb44448b1d178755b3e627
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8600000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 467 KiB

272
Assets/Resources/Sprites/Games/Lockstep/locksteptiled.png.meta
View file

@ -56,6 +56,12 @@ TextureImporter:
- first:
213: 3542085270979761920
second: locksteptiled_17
- first:
213: -8525071947605157033
second: locksteptiled_18
- first:
213: -7006387834967121328
second: locksteptiled_19
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -100,7 +106,7 @@ TextureImporter:
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 200
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -119,7 +125,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -131,7 +137,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -148,16 +154,16 @@ TextureImporter:
name: locksteptiled_0
rect:
serializedVersion: 2
x: 79
y: 1536
width: 240
height: 512
x: 2
y: 3098
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 72f6f4d166104a7a0800000000000000
internalID: -6366962435105001689
@ -169,16 +175,16 @@ TextureImporter:
name: locksteptiled_1
rect:
serializedVersion: 2
x: 409
y: 1536
width: 409
height: 512
x: 933
y: 3098
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: edbe2aacd410b85c0800000000000000
internalID: -4212271592851182626
@ -190,16 +196,16 @@ TextureImporter:
name: locksteptiled_2
rect:
serializedVersion: 2
x: 818
y: 1536
width: 409
height: 512
x: 1864
y: 3098
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: c1bdf732a15189660800000000000000
internalID: 7392681990337583900
@ -211,16 +217,16 @@ TextureImporter:
name: locksteptiled_3
rect:
serializedVersion: 2
x: 1227
y: 1536
width: 409
height: 512
x: 2795
y: 3098
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: b14900c5073790270800000000000000
internalID: 8217225921531253787
@ -232,16 +238,16 @@ TextureImporter:
name: locksteptiled_4
rect:
serializedVersion: 2
x: 1636
y: 1536
width: 409
height: 512
x: 3726
y: 3098
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: f961feb49b5d2f990800000000000000
internalID: -7353580249722972513
@ -253,16 +259,16 @@ TextureImporter:
name: locksteptiled_5
rect:
serializedVersion: 2
x: 0
y: 1024
width: 409
height: 512
x: 2
y: 2100
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 9de654134c6d3ff70800000000000000
internalID: 9219949000286105305
@ -274,16 +280,16 @@ TextureImporter:
name: locksteptiled_6
rect:
serializedVersion: 2
x: 409
y: 1024
width: 409
height: 512
x: 933
y: 2100
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: e6c08d5c601e17be0800000000000000
internalID: -1481155383222858642
@ -295,16 +301,16 @@ TextureImporter:
name: locksteptiled_7
rect:
serializedVersion: 2
x: 818
y: 1024
width: 409
height: 512
x: 1864
y: 2100
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 120213025bee08f00800000000000000
internalID: 1117155169284464673
@ -316,16 +322,16 @@ TextureImporter:
name: locksteptiled_8
rect:
serializedVersion: 2
x: 1227
y: 1024
width: 409
height: 512
x: 2795
y: 2100
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 4d684528c9a8ae280800000000000000
internalID: -9013239299422517548
@ -337,16 +343,16 @@ TextureImporter:
name: locksteptiled_9
rect:
serializedVersion: 2
x: 1636
y: 1024
width: 409
height: 512
x: 3726
y: 2100
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: c58287ada35091b10800000000000000
internalID: 1952597663773370460
@ -358,16 +364,16 @@ TextureImporter:
name: locksteptiled_10
rect:
serializedVersion: 2
x: 0
y: 512
width: 409
height: 512
x: 2
y: 1102
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 913b9c913843065e0800000000000000
internalID: -1918475703581822183
@ -379,16 +385,16 @@ TextureImporter:
name: locksteptiled_11
rect:
serializedVersion: 2
x: 409
y: 512
width: 409
height: 512
x: 933
y: 1102
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 1a653a852de838130800000000000000
internalID: 3567852363888940705
@ -400,16 +406,16 @@ TextureImporter:
name: locksteptiled_12
rect:
serializedVersion: 2
x: 818
y: 512
width: 409
height: 512
x: 1864
y: 1102
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 4c93fe53b8c95c5a0800000000000000
internalID: -6501618365320185404
@ -421,16 +427,16 @@ TextureImporter:
name: locksteptiled_13
rect:
serializedVersion: 2
x: 1227
y: 512
width: 409
height: 512
x: 2795
y: 1102
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: a0b260a009c79a340800000000000000
internalID: 4875565029690583818
@ -442,16 +448,16 @@ TextureImporter:
name: locksteptiled_14
rect:
serializedVersion: 2
x: 1636
y: 512
width: 409
height: 512
x: 3726
y: 1102
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: cfb4ac6894400e570800000000000000
internalID: 8493793611061283836
@ -463,16 +469,16 @@ TextureImporter:
name: locksteptiled_15
rect:
serializedVersion: 2
x: 0
y: 0
width: 409
height: 512
x: 2
y: 104
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 4a9f5275695bbaa30800000000000000
internalID: 4227672332529170852
@ -484,16 +490,16 @@ TextureImporter:
name: locksteptiled_16
rect:
serializedVersion: 2
x: 409
y: 0
width: 409
height: 512
x: 933
y: 104
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: 35ba70e1011fd4980800000000000000
internalID: -8552915065781114029
@ -505,19 +511,61 @@ TextureImporter:
name: locksteptiled_17
rect:
serializedVersion: 2
x: 818
y: 0
width: 409
height: 512
x: 1864
y: 104
width: 929
height: 996
alignment: 0
pivot: {x: 0.5, y: 0.5}
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 00754e489c3082130800000000000000
internalID: 3542085270979761920
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: locksteptiled_18
rect:
serializedVersion: 2
x: 2795
y: 104
width: 929
height: 996
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 00754e489c3082130800000000000000
internalID: 3542085270979761920
spriteID: 75bd85e3b3cd0b980800000000000000
internalID: -8525071947605157033
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: locksteptiled_19
rect:
serializedVersion: 2
x: 3726
y: 104
width: 929
height: 996
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 052aa22b26f44ce90800000000000000
internalID: -7006387834967121328
vertices: []
indices:
edges: []

8
Assets/Resources/Sprites/Games/Lockstep/reference.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17c0cbeaf35705941b892f713db07a87
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

21
Assets/Scenes/Editor.unity
View file

@ -3689,7 +3689,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -289.15002, y: 2}
m_AnchoredPosition: {x: -289.15005, y: 2}
m_SizeDelta: {x: -578.29, y: 49.92}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &156962255
@ -12996,7 +12996,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 704039020}
m_Direction: 0
m_Value: 0
m_Size: 0.1051881
m_Size: 0.10518809
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -14922,7 +14922,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -84, y: -128.09998}
m_AnchoredPosition: {x: -84, y: -128.1}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &683816223
@ -19474,7 +19474,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -22883,7 +22883,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -408.97998, y: -17}
m_AnchoredPosition: {x: -408.98004, y: -17}
m_SizeDelta: {x: -817.96, y: -46.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1121370303
@ -24039,7 +24039,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: 129.87315}
m_AnchoredPosition: {x: 0, y: 171.96332}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944
@ -24618,7 +24618,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -49.999878}
m_AnchoredPosition: {x: 0, y: -49.99991}
m_SizeDelta: {x: -48, y: -148}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1182686745
@ -28488,7 +28488,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
MainCanvas: {fileID: 1791483802}
EditorCamera: {fileID: 2047408675}
GameLetterbox: {fileID: 0}
ScreenRenderTexture: {fileID: 8400000, guid: d3f3d6ca32122da4d9e3a8e7aa2ede16, type: 2}
Screen: {fileID: 558010761}
GridGameSelector: {fileID: 1154875943}
@ -32413,7 +32412,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1292844878}
m_HandleRect: {fileID: 1292844877}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -33264,7 +33263,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 111.50012, y: -29.533966}
m_AnchoredPosition: {x: 111.50012, y: -29.533981}
m_SizeDelta: {x: 223, y: -108.27}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1671351976
@ -38703,7 +38702,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -29.529938}
m_AnchoredPosition: {x: 0, y: -29.529953}
m_SizeDelta: {x: 0, y: -108.26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1980243267

2
Assets/Scripts/Games/KarateMan/KarateMan.cs
View file

@ -382,7 +382,7 @@ namespace HeavenStudio.Games
[Header("Colour Map")]
public Material MappingMaterial;
public static Color BodyColor = Color.white;
public static Color HighlightColor = Color.white;
public static Color HighlightColor = new Color(0.81f,0.81f,0.81f,1);
public static Color ItemColor = Color.white;
[Header("Word")]

172
Assets/Scripts/Games/Lockstep/Lockstep.cs
View file

@ -55,13 +55,16 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 1f,
inactiveFunction = delegate { var e = eventCaller.currentEntity; Lockstep.instance.Ho(e.beat);}
},
new GameAction("set colours", "Set Background Colours")
new GameAction("set colours", "Set Colours")
{
function = delegate {var e = eventCaller.currentEntity; Lockstep.instance.SetbackgroundColours(e["colorA"], e["colorB"]); },
function = delegate {var e = eventCaller.currentEntity; Lockstep.instance.SetBackgroundColours(e["colorA"], e["colorB"], e["objColA"], e["objColB"], e["objColC"]); },
parameters = new List<Param>()
{
new Param("colorA", Lockstep.defaultBGColorOn, "Onbeat", "Select the color that appears for the onbeat."),
new Param("colorB", Lockstep.defaultBGColorOff, "Offbeat", "Select the color that appears for the offbeat."),
new Param("colorA", Lockstep.defaultBGColorOn, "Background Onbeat", "Select the color that appears for the onbeat."),
new Param("colorB", Lockstep.defaultBGColorOff, "Background Offbeat", "Select the color that appears for the offbeat."),
new Param("objColA", Lockstep.stepperOut, "Stepper Outline", "Select the color used for the outline of the stepswitchers."),
new Param("objColB", Lockstep.stepperDark, "Stepper Dark", "Select the color that appears for the dark side of the stepwitchers."),
new Param("objColC", Lockstep.stepperLight, "Stepper Light", "Select the color that appears for the light side of the stepwitchers."),
},
defaultLength = 0.5f,
}
@ -96,19 +99,62 @@ namespace HeavenStudio.Games
}
}
private static Color _stepperDark;
public static Color stepperDark
{
get
{
ColorUtility.TryParseHtmlString("#737373", out _stepperDark);
return _stepperDark;
}
}
private static Color _stepperLight;
public static Color stepperLight
{
get
{
ColorUtility.TryParseHtmlString("#FFFFFF", out _stepperLight);
return _stepperLight;
}
}
private static Color _stepperOut;
public static Color stepperOut
{
get
{
ColorUtility.TryParseHtmlString("#9A2760", out _stepperOut);
return _stepperOut;
}
}
public Color currentBGOnColor;
public Color currentBGOffColor;
[Header("Components")]
[SerializeField] Animator stepswitcherP;
[SerializeField] Animator stepswitcher0;
[SerializeField] Animator stepswitcher1;
[SerializeField] SpriteRenderer background;
[SerializeField] Animator stepswitcherPlayer;
[SerializeField] Animator stepswitcherLeft;
[SerializeField] Animator stepswitcherRight;
// master stepper dictates what sprite the slave steppers use
[SerializeField] Animator masterStepperAnim;
[SerializeField] SpriteRenderer masterStepperSprite;
// slave steppers copy the sprite of the master stepper
[SerializeField] SpriteRenderer[] slaveSteppers;
// rendertextures update when the slave steppers change sprites
[SerializeField] CustomRenderTexture[] renderTextures;
[SerializeField] SpriteRenderer background;
[SerializeField] Material stepperMaterial;
[Header("Properties")]
static List<float> queuedInputs = new List<float>();
Sprite masterSprite;
HowMissed currentMissStage;
bool lessSteppers = false;
public enum HowMissed
{
NotMissed = 0,
@ -128,11 +174,46 @@ namespace HeavenStudio.Games
currentBGOffColor = defaultBGColorOff;
}
void Start() {
stepperMaterial.SetColor("_ColorAlpha", stepperOut);
stepperMaterial.SetColor("_ColorBravo", stepperDark);
stepperMaterial.SetColor("_ColorDelta", stepperLight);
masterSprite = masterStepperSprite.sprite;
stepswitcherLeft.gameObject.SetActive(lessSteppers);
stepswitcherRight.gameObject.SetActive(lessSteppers);
masterStepperAnim.gameObject.SetActive(!lessSteppers);
UpdateAndRenderSlaves();
}
void OnDestroy()
{
if (queuedInputs.Count > 0) queuedInputs.Clear();
}
void UpdateAndRenderSlaves()
{
foreach (var stepper in slaveSteppers)
{
stepper.sprite = masterSprite;
}
}
void PlayStepperAnim(string animName, bool player, float timescale = 1f, float startpos = 0f, int layer = -1)
{
if (player) stepswitcherPlayer.DoScaledAnimationAsync(animName, timescale, startpos, layer);
if (lessSteppers)
{
stepswitcherLeft.DoScaledAnimationAsync(animName, timescale, startpos, layer);
stepswitcherRight.DoScaledAnimationAsync(animName, timescale, startpos, layer);
}
else
{
masterStepperAnim.DoScaledAnimationAsync(animName, timescale, startpos, layer);
}
}
public void Update()
{
var cond = Conductor.instance;
@ -142,9 +223,7 @@ namespace HeavenStudio.Games
{
if (goBop)
{
stepswitcher0.DoScaledAnimationAsync("Bop", 0.5f);
stepswitcher1.DoScaledAnimationAsync("Bop", 0.5f);
stepswitcherP.DoScaledAnimationAsync("Bop", 0.5f);
PlayStepperAnim("Bop", true, 0.5f);
}
}
if (queuedInputs.Count > 0)
@ -162,14 +241,24 @@ namespace HeavenStudio.Games
if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN))
{
currentMissStage = HowMissed.NotMissed;
var beatAnimCheck = Math.Round(cond.songPositionInBeats * 2);
var stepPlayerAnim = (beatAnimCheck % 2 != 0 ? "OffbeatMarch" : "OnbeatMarch");
double beatAnimCheck = cond.songPositionInBeatsAsDouble - 0.25;
if (beatAnimCheck % 1.0 >= 0.5)
{
stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
}
else
{
stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
}
Jukebox.PlayOneShotGame("lockstep/miss");
stepswitcherP.DoScaledAnimationAsync(stepPlayerAnim, 0.5f);
ScoreMiss();
}
}
if (masterSprite != masterStepperSprite.sprite)
{
masterSprite = masterStepperSprite.sprite;
UpdateAndRenderSlaves();
}
}
public void Bop(float beat, float length, bool shouldBop, bool autoBop)
@ -183,9 +272,7 @@ namespace HeavenStudio.Games
{
new BeatAction.Action(beat + i, delegate
{
stepswitcher0.DoScaledAnimationAsync("Bop", 0.5f);
stepswitcher1.DoScaledAnimationAsync("Bop", 0.5f);
stepswitcherP.DoScaledAnimationAsync("Bop", 0.5f);
PlayStepperAnim("Bop", true, 0.5f);
})
});
}
@ -247,14 +334,13 @@ namespace HeavenStudio.Games
{
if (GameManager.instance.currentGame == "lockstep")
{
List<BeatAction.Action> actions = new List<BeatAction.Action>();
for (int i = 0; i < length; i++)
{
Lockstep.instance.ScheduleInput(beat - 1, 1 + i, InputType.STANDARD_DOWN, Lockstep.instance.Just, Lockstep.instance.Miss, Lockstep.instance.Nothing);
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + i, delegate { Lockstep.instance.EvaluateMarch(); }),
});
actions.Add(new BeatAction.Action(beat + i, delegate { Lockstep.instance.EvaluateMarch(); }));
}
BeatAction.New(instance.gameObject, actions);
}
else
{
@ -271,50 +357,48 @@ namespace HeavenStudio.Games
var beatAnimCheck = Math.Round(cond.songPositionInBeats * 2);
if (beatAnimCheck % 2 != 0)
{
stepswitcher0.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
stepswitcher1.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
PlayStepperAnim("OffbeatMarch", false, 0.5f);
}
else
{
stepswitcher0.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
stepswitcher1.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
PlayStepperAnim("OnbeatMarch", false, 0.5f);
}
}
public void Just(PlayerActionEvent caller, float state)
{
currentMissStage = HowMissed.NotMissed;
var cond = Conductor.instance;
if (state >= 1f || state <= -1f)
{
var cond = Conductor.instance;
var beatAnimCheck = Math.Round(caller.startBeat * 2);
if (beatAnimCheck % 2 != 0)
double beatAnimCheck = cond.songPositionInBeatsAsDouble - 0.25;
if (beatAnimCheck % 1.0 >= 0.5)
{
Jukebox.PlayOneShotGame("lockstep/tink");
stepswitcherP.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
}
else
{
Jukebox.PlayOneShotGame("lockstep/tink");
stepswitcherP.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
}
return;
}
Success(caller.startBeat);
Success(cond.songPositionInBeatsAsDouble);
}
public void Success(float beat)
public void Success(double beat)
{
var beatAnimCheck = Math.Round(beat * 2);
if (beatAnimCheck % 2 != 0)
double beatAnimCheck = beat - 0.25;
if (beatAnimCheck % 1.0 >= 0.5)
{
Jukebox.PlayOneShotGame($"lockstep/marchOffbeat{UnityEngine.Random.Range(1, 3)}");
stepswitcherP.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
Jukebox.PlayOneShotGame($"lockstep/marchOnbeat{UnityEngine.Random.Range(1, 3)}");
stepswitcherPlayer.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
}
else
{
Jukebox.PlayOneShotGame($"lockstep/marchOnbeat{UnityEngine.Random.Range(1, 3)}");
stepswitcherP.DoScaledAnimationAsync("OnbeatMarch", 0.5f);
Jukebox.PlayOneShotGame($"lockstep/marchOffbeat{UnityEngine.Random.Range(1, 3)}");
stepswitcherPlayer.DoScaledAnimationAsync("OffbeatMarch", 0.5f);
}
}
@ -324,13 +408,13 @@ namespace HeavenStudio.Games
if (beatAnimCheck % 2 != 0 && currentMissStage != HowMissed.MissedOff)
{
stepswitcherP.Play("OffbeatMiss", 0, 0);
stepswitcherPlayer.Play("OffbeatMiss", 0, 0);
Jukebox.PlayOneShotGame("lockstep/wayOff");
currentMissStage = HowMissed.MissedOff;
}
else if (beatAnimCheck % 2 == 0 && currentMissStage != HowMissed.MissedOn)
{
stepswitcherP.Play("OnbeatMiss", 0, 0);
stepswitcherPlayer.Play("OnbeatMiss", 0, 0);
Jukebox.PlayOneShotGame("lockstep/wayOff");
currentMissStage = HowMissed.MissedOn;
}
@ -350,7 +434,7 @@ namespace HeavenStudio.Games
}
}
public void SetbackgroundColours(Color onColor, Color offColor)
public void SetBackgroundColours(Color onColor, Color offColor, Color outlineColor, Color darkColor, Color lightColor)
{
currentBGOnColor = onColor;
currentBGOffColor = offColor;
@ -363,6 +447,10 @@ namespace HeavenStudio.Games
{
background.color = currentBGOnColor;
}
stepperMaterial.SetColor("_ColorAlpha", outlineColor);
stepperMaterial.SetColor("_ColorBravo", darkColor);
stepperMaterial.SetColor("_ColorDelta", lightColor);
}
public void Nothing(PlayerActionEvent caller) {}

12
Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
View file

@ -67,6 +67,15 @@ namespace HeavenStudio.Editor
AddParams(entity);
}
static string TrackToThemeColour(int track) => track switch
{
1 => EditorTheme.theme.properties.Layer2Col,
2 => EditorTheme.theme.properties.Layer3Col,
3 => EditorTheme.theme.properties.Layer4Col,
4 => EditorTheme.theme.properties.Layer5Col,
_ => EditorTheme.theme.properties.Layer1Col
};
private void AddParams(DynamicBeatmap.DynamicEntity entity)
{
var minigame = EventCaller.instance.GetMinigame(entity.datamodel.Split(0));
@ -78,7 +87,8 @@ namespace HeavenStudio.Editor
eventSelector.SetActive(false);
this.entity = entity;
Editor.instance.SetGameEventTitle($"Properties for {entity.datamodel}");
string col = TrackToThemeColour(entity.track);
Editor.instance.SetGameEventTitle($"Properties for <color=#{col}>{action.displayName}</color> on Beat {entity.beat}");
DestroyParams();