diff --git a/Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/KarateMan.controller b/Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/KarateMan.controller index dd6f751a..b71be03c 100644 --- a/Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/KarateMan.controller +++ b/Assets/Bundled/Games/KarateMan/Sprites/anime/karateman/KarateMan.controller @@ -415,7 +415,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Beat - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/Bach.mat b/Assets/Bundled/Games/Lockstep/Sprites/Bach.mat index 33274fa5..572cadc5 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/Bach.mat +++ b/Assets/Bundled/Games/Lockstep/Sprites/Bach.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bach - m_Shader: {fileID: 4800000, guid: dc75e67aba5234445888c2f9b11d16e8, type: 3} + m_Shader: {fileID: 4800000, guid: cb054fcfa63e9a14688d9ae2b8fa43de, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -20,6 +20,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BlendTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,6 +66,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - PixelSnap: 0 - _Alpha: 1 - _BlendDst: 10 - _BlendSrc: 5 @@ -70,6 +75,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnableExternalAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -86,6 +92,7 @@ Material: - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 + - _Threshold: 0 - _UVSec: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 @@ -93,6 +100,9 @@ Material: - _BlendColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _Tint1: {r: 1, g: 1, b: 1, a: 0} - _Tint2: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/OffbeatPortrait.PNG.meta b/Assets/Bundled/Games/Lockstep/Sprites/OffbeatPortrait.PNG.meta index 7816c425..d2e7ccd6 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/OffbeatPortrait.PNG.meta +++ b/Assets/Bundled/Games/Lockstep/Sprites/OffbeatPortrait.PNG.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/Bundled/Games/Lockstep/Sprites/OnbeatPortrait.PNG.meta b/Assets/Bundled/Games/Lockstep/Sprites/OnbeatPortrait.PNG.meta index f17d6d07..49e6e4c2 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/OnbeatPortrait.PNG.meta +++ b/Assets/Bundled/Games/Lockstep/Sprites/OnbeatPortrait.PNG.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat new file mode 100644 index 00000000..a56b7c77 --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SteppersDV + m_Shader: {fileID: 4800000, guid: d7b4adf5fb5bbce47b388a2bcab80065, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BlendTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 128, y: 128} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _LightingEnabled: 0 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _BlendColor: {r: 1, g: 1, b: 1, a: 1} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat.meta b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat.meta new file mode 100644 index 00000000..7e67d44e --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersDV.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f64dd79340a900419db9cec732380c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat new file mode 100644 index 00000000..fb5c2974 --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SteppersNearBottom + m_Shader: {fileID: 4800000, guid: d7b4adf5fb5bbce47b388a2bcab80065, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BlendTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _LightingEnabled: 0 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _BlendColor: {r: 1, g: 1, b: 1, a: 1} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat.meta b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat.meta new file mode 100644 index 00000000..d512b7cb --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearBottom.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ba567e351978844989b7384bbf2f47d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ntrbackbeat/common + assetBundleVariant: diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat similarity index 67% rename from Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat rename to Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat index 55f99a0d..326cea33 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat @@ -7,20 +7,24 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: SteppersTileable - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Name: SteppersNearTop + m_Shader: {fileID: 4800000, guid: d7b4adf5fb5bbce47b388a2bcab80065, type: 3} m_ValidKeywords: [] m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON - m_LightmapFlags: 4 + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BlendTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -43,7 +47,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 8600000, guid: 7772de3e46eb44448b1d178755b3e627, type: 2} - m_Scale: {x: 100, y: 100} + m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -59,23 +63,43 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 + - _LightingEnabled: 0 - _Metallic: 0 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: + - _BlendColor: {r: 1, g: 1, b: 1, a: 1} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat.meta b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat.meta similarity index 81% rename from Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat.meta rename to Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat.meta index 393b2752..be0da1a3 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersTileable.mat.meta +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/Materials/SteppersNearTop.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat new file mode 100644 index 00000000..03a3a58c --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerMaterial + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: + - UNITY_UI_ALPHACLIP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3001 + 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_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 1 + - _StencilComp: 8 + - _StencilOp: 2 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 1 + 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: [] diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat.meta b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat.meta new file mode 100644 index 00000000..18547d0f --- /dev/null +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/PlayerMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de721cc1c07b6444392d239d6f8164f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/StepperMaterial.mat.meta b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/StepperMaterial.mat.meta index 2f54f269..58b3396a 100644 --- a/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/StepperMaterial.mat.meta +++ b/Assets/Bundled/Games/Lockstep/Sprites/RenderTextures/StepperMaterial.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrbackbeat/common assetBundleVariant: diff --git a/Assets/Bundled/Games/Lockstep/lockstep.prefab b/Assets/Bundled/Games/Lockstep/lockstep.prefab index 5b4cada9..7b5df83f 100644 --- a/Assets/Bundled/Games/Lockstep/lockstep.prefab +++ b/Assets/Bundled/Games/Lockstep/lockstep.prefab @@ -1,78 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &248919358109151952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2375695223665235410} - - component: {fileID: 3191838581837730284} - - component: {fileID: 1412824496340258240} - m_Layer: 9 - m_Name: SteppersTiledBottomR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2375695223665235410 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248919358109151952} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5830852029726441606} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 103.515, y: -366.3} - m_SizeDelta: {x: 370, y: 740} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3191838581837730284 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248919358109151952} - m_CullTransparentMesh: 1 ---- !u!114 &1412824496340258240 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248919358109151952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 50 - height: 100 --- !u!1 &762188371928891401 GameObject: m_ObjectHideFlags: 0 @@ -98,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762188371928891401} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.375, y: 0, z: -10} + m_LocalPosition: {x: -6.39, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -316,79 +243,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1147277675345997946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8623245509888770180} - - component: {fileID: 2579217082310009958} - - component: {fileID: 5608916635847886312} - m_Layer: 9 - m_Name: SteppersTiledBottomL - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8623245509888770180 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1147277675345997946} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5830852029726441606} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -103.515, y: -366.3} - m_SizeDelta: {x: 370, y: 740} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2579217082310009958 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1147277675345997946} - m_CullTransparentMesh: 1 ---- !u!114 &5608916635847886312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1147277675345997946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 50 - height: 100 --- !u!1 &1240378160117201720 GameObject: m_ObjectHideFlags: 0 @@ -978,8 +832,12 @@ Transform: - {fileID: 4904300105776718479} - {fileID: 6282292135211262012} - {fileID: 5822623106182197534} - - {fileID: 8741503478682748471} - - {fileID: 5830852029726441606} + - {fileID: 5378682590765791359} + - {fileID: 7348067315635370724} + - {fileID: 7223382287548486262} + - {fileID: 7963192531532995817} + - {fileID: 6653806046963132454} + - {fileID: 4983577928202856203} - {fileID: 7054522558614666336} m_Father: {fileID: 0} m_RootOrder: 0 @@ -997,7 +855,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - scheduledInputs: [] currentBGOnColor: {r: 0.9411765, g: 0.2, b: 0.5529412, a: 0} currentBGOffColor: {r: 0.6039216, g: 0.15294118, b: 0.3764706, a: 0} stepswitcherPlayer: {fileID: 5548089329135658778} @@ -1033,15 +890,13 @@ MonoBehaviour: cameraNear1: {fileID: 4375666065977025420} cameraNear2: {fileID: 5999766133995784627} cameraDV: {fileID: 1430771648366705456} - topT: {fileID: 828408474045052941} - topN: {fileID: 734131896781435878} - bottomL: {fileID: 5608916635847886312} - bottomC: {fileID: 4640860822531792563} - bottomR: {fileID: 1412824496340258240} - bottomN: {fileID: 2902868773272670157} background: {fileID: 6381378020296668381} + playerMaterial: {fileID: 2100000, guid: de721cc1c07b6444392d239d6f8164f2, type: 2} stepperMaterial: {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} ---- !u!1 &3794864692894715104 + topNear: {fileID: 2100000, guid: 899f393faa1cb814199a561de4ac55f2, type: 2} + bottomNear: {fileID: 2100000, guid: 0ba567e351978844989b7384bbf2f47d, type: 2} + distantView: {fileID: 2100000, guid: 7f64dd79340a900419db9cec732380c4, type: 2} +--- !u!1 &3444736693128216284 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1049,84 +904,188 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5830852029726441606} - - component: {fileID: 5039912107881256782} - - component: {fileID: 241668285863875867} + - component: {fileID: 7223382287548486262} + - component: {fileID: 68566057075284331} + - component: {fileID: 2553045315500778889} + - component: {fileID: 669408389785531233} m_Layer: 9 - m_Name: CanvasBottom + m_Name: DVTop m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5830852029726441606 -RectTransform: +--- !u!4 &7223382287548486262 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3794864692894715104} + m_GameObject: {fileID: 3444736693128216284} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9, y: 1.9, z: 1} + m_LocalPosition: {x: 6.39, y: 900.27, z: 0} + m_LocalScale: {x: 979.2, y: 1779.2, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8623245509888770180} - - {fileID: 5405956803993455839} - - {fileID: 2375695223665235410} - - {fileID: 4388960903062199605} + m_Children: [] m_Father: {fileID: 931641041398444854} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0.25} - m_SizeDelta: {x: 18, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &5039912107881256782 -Canvas: +--- !u!33 &68566057075284331 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3794864692894715104} + m_GameObject: {fileID: 3444736693128216284} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2553045315500778889 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3444736693128216284} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7f64dd79340a900419db9cec732380c4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 2 - m_TargetDisplay: 0 ---- !u!114 &241668285863875867 -MonoBehaviour: + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &669408389785531233 +SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3794864692894715104} + m_GameObject: {fileID: 3444736693128216284} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &3786615272125134678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4983577928202856203} + - component: {fileID: 7766548088008942782} + - component: {fileID: 4659871460133268742} + - component: {fileID: 4740839832152568550} + m_Layer: 9 + m_Name: DVRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4983577928202856203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3786615272125134678} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 493.425, y: 3.72, z: 0} + m_LocalScale: {x: 979.2, y: 1779.2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 931641041398444854} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7766548088008942782 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3786615272125134678} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4659871460133268742 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3786615272125134678} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7f64dd79340a900419db9cec732380c4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &4740839832152568550 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3786615272125134678} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &3813497118971944784 GameObject: m_ObjectHideFlags: 0 @@ -1347,7 +1306,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: b7e66e2d993ab004c987363cc64eee3a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1379,90 +1338,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4346017363568625719 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8741503478682748471} - - component: {fileID: 5506039511119804873} - - component: {fileID: 2512548337001196724} - m_Layer: 9 - m_Name: CanvasTop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8741503478682748471 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346017363568625719} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9, y: 1.9, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 656860731254070304} - - {fileID: 7910763406400322622} - m_Father: {fileID: 931641041398444854} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0.25} - m_SizeDelta: {x: 18, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &5506039511119804873 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346017363568625719} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: -1 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &2512548337001196724 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346017363568625719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 --- !u!1 &4936480110009519431 GameObject: m_ObjectHideFlags: 0 @@ -1952,7 +1827,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5512859029938398357} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.375, y: 6.96, z: -10} + m_LocalPosition: {x: -6.39, y: 6.96, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2002,6 +1877,101 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &5559118719800105181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7348067315635370724} + - component: {fileID: 6122077441687091340} + - component: {fileID: 1603950951644542290} + - component: {fileID: 1147382113147945795} + m_Layer: 9 + m_Name: NearBottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7348067315635370724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5559118719800105181} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -3.24, z: 0} + m_LocalScale: {x: 7.65, y: 13.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 931641041398444854} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6122077441687091340 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5559118719800105181} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1603950951644542290 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5559118719800105181} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0ba567e351978844989b7384bbf2f47d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &1147382113147945795 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5559118719800105181} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 --- !u!1 &5571786821249855786 GameObject: m_ObjectHideFlags: 0 @@ -2310,13 +2280,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6717430194562386115} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.5, y: 0, z: 0} - m_LocalScale: {x: 3.41, y: 3.41, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3.45, y: 3.45, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2880036267901204128} m_Father: {fileID: 931641041398444854} - m_RootOrder: 5 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4503733643126543576 Animator: @@ -2339,7 +2309,7 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &6841444080171222974 +--- !u!1 &6901738454805546193 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2347,71 +2317,93 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7910763406400322622} - - component: {fileID: 7461764327364303783} - - component: {fileID: 734131896781435878} + - component: {fileID: 6653806046963132454} + - component: {fileID: 5261919657635446257} + - component: {fileID: 6501059004061376897} + - component: {fileID: 2436822229137906646} m_Layer: 9 - m_Name: SteppersNearTop + m_Name: DVLeft m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7910763406400322622 -RectTransform: +--- !u!4 &6653806046963132454 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6841444080171222974} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} + m_GameObject: {fileID: 6901738454805546193} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -493.425, y: 3.72, z: 0} + m_LocalScale: {x: 979.2, y: 1779.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8741503478682748471} - m_RootOrder: 1 + m_Father: {fileID: 931641041398444854} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.02, y: 1.853} - m_SizeDelta: {x: 29.6, y: 7.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7461764327364303783 -CanvasRenderer: +--- !u!33 &5261919657635446257 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6841444080171222974} - m_CullTransparentMesh: 1 ---- !u!114 &734131896781435878 -MonoBehaviour: + m_GameObject: {fileID: 6901738454805546193} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6501059004061376897 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6841444080171222974} + m_GameObject: {fileID: 6901738454805546193} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 4 - height: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7f64dd79340a900419db9cec732380c4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &2436822229137906646 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6901738454805546193} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &6922905230201307739 GameObject: m_ObjectHideFlags: 0 @@ -2496,6 +2488,101 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6944616850938155423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7963192531532995817} + - component: {fileID: 5292059643249843244} + - component: {fileID: 569400947679299876} + - component: {fileID: 7341590023702660758} + m_Layer: 9 + m_Name: DVBottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7963192531532995817 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6944616850938155423} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.39, y: -899.79, z: 0} + m_LocalScale: {x: 979.2, y: 1779.2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 931641041398444854} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5292059643249843244 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6944616850938155423} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &569400947679299876 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6944616850938155423} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7f64dd79340a900419db9cec732380c4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &7341590023702660758 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6944616850938155423} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &7062683915984729381 GameObject: m_ObjectHideFlags: 0 @@ -2664,6 +2751,101 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7213699450057633677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5378682590765791359} + - component: {fileID: 1954238508936166584} + - component: {fileID: 1014715068144993159} + - component: {fileID: 4252614867243163831} + m_Layer: 9 + m_Name: NearTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5378682590765791359 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213699450057633677} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.72, z: 0} + m_LocalScale: {x: 7.65, y: 13.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 931641041398444854} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1954238508936166584 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213699450057633677} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1014715068144993159 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213699450057633677} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 899f393faa1cb814199a561de4ac55f2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!210 &4252614867243163831 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7213699450057633677} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &7345214566934624889 GameObject: m_ObjectHideFlags: 0 @@ -2888,7 +3070,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7831405996027355545} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.375, y: 0, z: -10} + m_LocalPosition: {x: -6.39, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3131,7 +3313,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8739124183978051246} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.375, y: 3.72, z: 0} + m_LocalPosition: {x: 6.39, y: 3.72, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3180,79 +3362,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &8821926663072982714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 656860731254070304} - - component: {fileID: 5586901401903849668} - - component: {fileID: 828408474045052941} - m_Layer: 9 - m_Name: SteppersTiledTop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &656860731254070304 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821926663072982714} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8741503478682748471} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 373.7} - m_SizeDelta: {x: 740, y: 740} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5586901401903849668 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821926663072982714} - m_CullTransparentMesh: 1 ---- !u!114 &828408474045052941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821926663072982714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 100 - height: 100 --- !u!1 &8927128551330321277 GameObject: m_ObjectHideFlags: 0 @@ -3337,79 +3446,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8938814519977152897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5405956803993455839} - - component: {fileID: 3015223263267614390} - - component: {fileID: 4640860822531792563} - m_Layer: 9 - m_Name: SteppersTiledBottomC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5405956803993455839 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8938814519977152897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5830852029726441606} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -373.705} - m_SizeDelta: {x: 14.8, y: 740} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3015223263267614390 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8938814519977152897} - m_CullTransparentMesh: 1 ---- !u!114 &4640860822531792563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8938814519977152897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 2 - height: 100 --- !u!1 &9015027120403414015 GameObject: m_ObjectHideFlags: 0 @@ -3463,7 +3499,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2} + - {fileID: 2100000, guid: de721cc1c07b6444392d239d6f8164f2, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3516,76 +3552,3 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &9116370775353988715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4388960903062199605} - - component: {fileID: 7542766724158656623} - - component: {fileID: 2902868773272670157} - m_Layer: 9 - m_Name: SteppersNearBottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4388960903062199605 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9116370775353988715} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.545, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5830852029726441606} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.02, y: -1.853} - m_SizeDelta: {x: 29.6, y: 7.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7542766724158656623 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9116370775353988715} - m_CullTransparentMesh: 1 ---- !u!114 &2902868773272670157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9116370775353988715} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 4 - height: 1 diff --git a/Assets/Resources/MainMixer.mixer b/Assets/Resources/MainMixer.mixer index 17fc5332..0617d184 100644 --- a/Assets/Resources/MainMixer.mixer +++ b/Assets/Resources/MainMixer.mixer @@ -95,7 +95,7 @@ AudioMixerController: - 4f0b7ddcf4e12a14c888732f2ab0fda0 name: View m_CurrentViewIndex: 0 - m_TargetSnapshot: {fileID: 752586362724348005} + m_TargetSnapshot: {fileID: 24500006} --- !u!243 &24300002 AudioMixerGroupController: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/Lockstep/Lockstep.cs b/Assets/Scripts/Games/Lockstep/Lockstep.cs index 6fd96aa3..1a8c082e 100644 --- a/Assets/Scripts/Games/Lockstep/Lockstep.cs +++ b/Assets/Scripts/Games/Lockstep/Lockstep.cs @@ -201,10 +201,10 @@ namespace HeavenStudio.Games // rendertextures update when the slave steppers change sprites [SerializeField] Vector2 rtSize; [SerializeField] Camera cameraNear1, cameraNear2, cameraDV; - [SerializeField] RawImage topT, topN, bottomL, bottomC, bottomR, bottomN; [SerializeField] SpriteRenderer background; - [SerializeField] Material stepperMaterial; + [SerializeField] Material playerMaterial, stepperMaterial; + [SerializeField] Material topNear, bottomNear, distantView; [Header("Properties")] static List queuedInputs = new(); @@ -267,12 +267,16 @@ namespace HeavenStudio.Games cameraNear2.targetTexture = renderTextures[1]; cameraDV.targetTexture = renderTextures[2]; - topT.texture = renderTextures[2]; - topN.texture = renderTextures[0]; - bottomL.texture = renderTextures[2]; - bottomC.texture = renderTextures[2]; - bottomR.texture = renderTextures[2]; - bottomN.texture = renderTextures[1]; + // topT.texture = renderTextures[2]; + // topN.texture = renderTextures[0]; + // bottomL.texture = renderTextures[2]; + // bottomC.texture = renderTextures[2]; + // bottomR.texture = renderTextures[2]; + // bottomN.texture = renderTextures[1]; + + topNear.SetTexture("_MainTex", renderTextures[0]); + bottomNear.SetTexture("_MainTex", renderTextures[1]); + distantView.SetTexture("_MainTex", renderTextures[2]); } void OnDestroy() @@ -347,6 +351,10 @@ namespace HeavenStudio.Games stepperMaterial.SetColor("_ColorBravo", stepperDark); stepperMaterial.SetColor("_ColorDelta", stepperLight); + playerMaterial.SetColor("_ColorAlpha", stepperOut); + playerMaterial.SetColor("_ColorBravo", stepperDark); + playerMaterial.SetColor("_ColorDelta", stepperLight); + EntityPreCheck(Conductor.instance.songPositionInBeatsAsDouble); @@ -772,7 +780,10 @@ namespace HeavenStudio.Games private void MissOn(PlayerActionEvent caller) { if (currentMissStage == HowMissed.MissedOn) return; - stepswitcherPlayer?.Play("OnbeatMiss", 0, 0); + if (stepswitcherPlayer is not null) + { + stepswitcherPlayer?.Play("OnbeatMiss", 0, 0); + } SoundByte.PlayOneShotGame("lockstep/wayOff"); currentMissStage = HowMissed.MissedOn; } @@ -780,7 +791,10 @@ namespace HeavenStudio.Games private void MissOff(PlayerActionEvent caller) { if (currentMissStage == HowMissed.MissedOff) return; - stepswitcherPlayer?.Play("OffbeatMiss", 0, 0); + if (stepswitcherPlayer is not null) + { + stepswitcherPlayer?.Play("OffbeatMiss", 0, 0); + } SoundByte.PlayOneShotGame("lockstep/wayOff"); currentMissStage = HowMissed.MissedOff; } @@ -816,6 +830,10 @@ namespace HeavenStudio.Games stepperMaterial.SetColor("_ColorAlpha", outlineColor); stepperMaterial.SetColor("_ColorBravo", darkColor); stepperMaterial.SetColor("_ColorDelta", lightColor); + + playerMaterial.SetColor("_ColorAlpha", outlineColor); + playerMaterial.SetColor("_ColorBravo", darkColor); + playerMaterial.SetColor("_ColorDelta", lightColor); } public void Nothing(PlayerActionEvent caller) {} diff --git a/Assets/Shaders/Stencil.meta b/Assets/Shaders/Stencil.meta new file mode 100644 index 00000000..d27c03e5 --- /dev/null +++ b/Assets/Shaders/Stencil.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08d6554125784be45898da3abecebe95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Stencil/CopyAlpha.shader b/Assets/Shaders/Stencil/CopyAlpha.shader new file mode 100644 index 00000000..4b25a0fc --- /dev/null +++ b/Assets/Shaders/Stencil/CopyAlpha.shader @@ -0,0 +1,68 @@ +Shader "Custom/Copy Alpha" +{ + Properties + { + _Color ("Main Color", Color) = (1,1,1,1) + _MainTex ("Albedo (RGB)", 2D) = "white" {} + } + SubShader + { + Tags + { + "Queue"="Transparent+2" + "RenderType"="Transparent" + "PreviewType"="Plane" + } + + Stencil + { + Ref 1 + Comp equal + } + + Cull Off + Lighting Off + ZWrite Off + Blend SrcAlpha OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float2 texcoord : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = tex2D(_MainTex, i.texcoord); + + return col; + } + ENDCG + } + } + FallBack "Diffuse" +} \ No newline at end of file diff --git a/Assets/Shaders/Stencil/CopyAlpha.shader.meta b/Assets/Shaders/Stencil/CopyAlpha.shader.meta new file mode 100644 index 00000000..47136e3a --- /dev/null +++ b/Assets/Shaders/Stencil/CopyAlpha.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: cb054fcfa63e9a14688d9ae2b8fa43de +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Stencil/SetAlpha.shader b/Assets/Shaders/Stencil/SetAlpha.shader new file mode 100644 index 00000000..8bcd6c4d --- /dev/null +++ b/Assets/Shaders/Stencil/SetAlpha.shader @@ -0,0 +1,74 @@ +Shader "Custom/Set Alpha" +{ + Properties + { + _Color ("Main Color", Color) = (1,1,1,1) + _MainTex ("Albedo (RGB)", 2D) = "white" {} + } + SubShader + { + Tags + { + "Queue"="Transparent+1" + "IgnoreProjector"="True" + "RenderType"="Transparent" + } + + Stencil + { + Ref 1 + Comp always + Pass replace + } + + Cull Off + Lighting Off + ZWrite Off + Blend One OneMinusSrcAlpha + + Pass { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 2.0 + + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f { + float4 vertex : SV_POSITION; + float2 texcoord : TEXCOORD0; + UNITY_FOG_COORDS(1) + UNITY_VERTEX_OUTPUT_STEREO + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = tex2D(_MainTex, i.texcoord); + + clip (col.a - 0.001); + return col; + } + ENDCG + } + } + FallBack "Diffuse" +} \ No newline at end of file diff --git a/Assets/Shaders/Stencil/SetAlpha.shader.meta b/Assets/Shaders/Stencil/SetAlpha.shader.meta new file mode 100644 index 00000000..2f671df8 --- /dev/null +++ b/Assets/Shaders/Stencil/SetAlpha.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d7b4adf5fb5bbce47b388a2bcab80065 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: