diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 9a07f03..c836de3 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -152,6 +152,7 @@ + @@ -161,7 +162,9 @@ + + @@ -179,7 +182,6 @@ - diff --git a/Assets/Materials/Assorted/M_Brick.mat b/Assets/Materials/Assorted/M_Brick.mat new file mode 100644 index 0000000..389b47c --- /dev/null +++ b/Assets/Materials/Assorted/M_Brick.mat @@ -0,0 +1,101 @@ +%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: M_Brick + m_Shader: {fileID: 4800000, guid: 73221e691bb7f9d449fc6a0db165b958, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AOTex: + m_Texture: {fileID: 0} + m_Scale: {x: 0.4875, y: 0.4875} + 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: 0.005, y: 0.005} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormal: + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} + m_Scale: {x: 0.15, y: 0.15} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: d998877a999be404b89138ca135c4131, type: 3} + m_Scale: {x: 0.15, y: 0.15} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 0.5, y: 0.5} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 922e8f9d75e81844db491772c20dab7d, type: 3} + m_Scale: {x: 0.4875, y: 0.4875} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalTex: + m_Texture: {fileID: 2800000, guid: e942e166f52480540a58a2d952433a50, type: 3} + m_Scale: {x: 0.4875, y: 0.4875} + 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: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailIntensity: 0.648 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.0435 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Assorted/M_Brick.mat.meta b/Assets/Materials/Assorted/M_Brick.mat.meta new file mode 100644 index 0000000..556ff83 --- /dev/null +++ b/Assets/Materials/Assorted/M_Brick.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3dd5e8fccdad6a46a32b54ace01f525 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Assorted/M_ConkCrete.mat b/Assets/Materials/Assorted/M_ConkCrete.mat index e23e9a8..2018f69 100644 --- a/Assets/Materials/Assorted/M_ConkCrete.mat +++ b/Assets/Materials/Assorted/M_ConkCrete.mat @@ -13,7 +13,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: - _NORMALMAP m_LightmapFlags: 4 @@ -32,7 +31,7 @@ Material: m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0.1, y: 0.1} m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} @@ -44,11 +43,11 @@ Material: m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 0.2, y: 0.2} + m_Scale: {x: 0.025, y: 0.025} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} - m_Scale: {x: 0.2, y: 0.2} + m_Scale: {x: 0.025, y: 0.025} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -65,14 +64,14 @@ Material: m_Ints: [] m_Floats: - _Bicubic: 0 - - _BumpScale: 1 + - _BumpScale: 0.75 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableGeometricSpecularAA: 1 - _GlossMapScale: 1 - _Glossiness: 0 - - _GlossyReflections: 0 + - _GlossyReflections: 1 - _LightmapType: 0 - _Metallic: 0 - _Mode: 0 @@ -86,6 +85,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/Assorted/M_Wood.mat b/Assets/Materials/Assorted/M_Wood.mat index 607ba9a..3f59fb8 100644 --- a/Assets/Materials/Assorted/M_Wood.mat +++ b/Assets/Materials/Assorted/M_Wood.mat @@ -18,7 +18,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/Materials/Assorted/M_Wood2.mat b/Assets/Materials/Assorted/M_Wood2.mat index 58a8181..bdc6be7 100644 --- a/Assets/Materials/Assorted/M_Wood2.mat +++ b/Assets/Materials/Assorted/M_Wood2.mat @@ -18,7 +18,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/Materials/M_TheChaseBillboard.mat b/Assets/Materials/M_TheChaseBillboard.mat index 9032566..1054496 100644 --- a/Assets/Materials/M_TheChaseBillboard.mat +++ b/Assets/Materials/M_TheChaseBillboard.mat @@ -88,6 +88,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _TextThickness: 0.1 - _UVSec: 0 - _VerticalLineCorrection: 0 - _ZWrite: 0 diff --git a/Assets/Materials/M_X.mat b/Assets/Materials/M_X.mat new file mode 100644 index 0000000..3944b98 --- /dev/null +++ b/Assets/Materials/M_X.mat @@ -0,0 +1,108 @@ +%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: M_X + m_Shader: {fileID: 4800000, guid: 425fd677d4694b044973d26bd5f48af5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColourTex: + 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: 2800000, guid: 0b1771fb0d6a12b409d47ec9b55a8e79, type: 3} + 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} + - _Text: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextAlpha: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BorderSize: 0.95 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _FillSize: 0.6666667 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _LineThickness: 0.15 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SDFCutoff: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _VerticalLineCorrection: 0 + - _ZWrite: 1 + m_Colors: + - _BorderColour: {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} + - _FillColour: {r: 0.78431374, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_X.mat.meta b/Assets/Materials/M_X.mat.meta new file mode 100644 index 0000000..63cc3b9 --- /dev/null +++ b/Assets/Materials/M_X.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d64bef778e23fd841ad6a19b2e6faa80 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Maps/M_MapDot.mat b/Assets/Materials/Maps/M_MapDot.mat index ab8f0f6..871e355 100644 --- a/Assets/Materials/Maps/M_MapDot.mat +++ b/Assets/Materials/Maps/M_MapDot.mat @@ -8,13 +8,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_MapDot - m_Shader: {fileID: 4800000, guid: 4a6a7578b4e624749b7e468421281b66, type: 3} + m_Shader: {fileID: 4800000, guid: 425fd677d4694b044973d26bd5f48af5, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: + m_ValidKeywords: - _DETAIL - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: - _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -47,7 +47,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 3f516eeb4315b4349a3a394222837a6b, type: 3} + m_Texture: {fileID: 2800000, guid: 6c66a343bb6aab449b87e1bc5b1e3a75, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -65,11 +65,13 @@ Material: m_Ints: [] m_Floats: - _Bicubic: 0 + - _BorderSize: 0.95 - _BumpScale: 0.225 - _Cutoff: 0.5 - _DetailNormalMapScale: 0.225 - _DstBlend: 0 - _EnableGeometricSpecularAA: 1 + - _FillSize: 0.33333334 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -86,6 +88,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: + - _BorderColour: {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} + - _FillColour: {r: 0.78431374, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/SM_ConkCreteAlleyway.fbx b/Assets/Models/SM_ConkCreteAlleyway.fbx new file mode 100644 index 0000000..0503a26 Binary files /dev/null and b/Assets/Models/SM_ConkCreteAlleyway.fbx differ diff --git a/Assets/Models/SM_ConkCreteAlleyway.fbx.meta b/Assets/Models/SM_ConkCreteAlleyway.fbx.meta new file mode 100644 index 0000000..f777888 --- /dev/null +++ b/Assets/Models/SM_ConkCreteAlleyway.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 46bc81196d666d547b1fd14b181728e7 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_Round1DoorwayStairs.fbx b/Assets/Models/SM_Round1DoorwayStairs.fbx index f10c1f7..20154f2 100644 Binary files a/Assets/Models/SM_Round1DoorwayStairs.fbx and b/Assets/Models/SM_Round1DoorwayStairs.fbx differ diff --git a/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx b/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx new file mode 100644 index 0000000..b496e41 Binary files /dev/null and b/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx differ diff --git a/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx.meta b/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx.meta new file mode 100644 index 0000000..fab97ec --- /dev/null +++ b/Assets/Models/SM_Round1DoorwayStairs_Indoor.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: ce325db213ddf894e9ad90b47c50fe26 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx b/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx new file mode 100644 index 0000000..f3bf337 Binary files /dev/null and b/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx differ diff --git a/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx.meta b/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx.meta new file mode 100644 index 0000000..436285c --- /dev/null +++ b/Assets/Models/SM_Round1DoorwayStairs_Outdoor.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 5411da33b9d095341b3b8ece387e743d +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Position Marker.prefab b/Assets/Prefabs/Player Position Marker.prefab new file mode 100644 index 0000000..19b3e60 --- /dev/null +++ b/Assets/Prefabs/Player Position Marker.prefab @@ -0,0 +1,191 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5533035425597213559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4463098059789612786} + - component: {fileID: 8494422802375911728} + - component: {fileID: 3906164720926364940} + m_Layer: 0 + m_Name: Player Position Marker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4463098059789612786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5533035425597213559} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071069, y: 0.0000000014976426, z: 0.00000014751397, w: 0.7071067} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 11362095004056127} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8494422802375911728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5533035425597213559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 3906164720926364940} + _Marker: {fileID: 6339790211674806269} +--- !u!114 &3906164720926364940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5533035425597213559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 981ef74e27200a048a9ef94bde9ec221, + type: 2} + programSource: {fileID: 11400000, guid: 8937477f17b84354abef6783261f331e, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &6339790211674806269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11362095004056127} + - component: {fileID: 7549471800078836096} + - component: {fileID: 3964201995310458731} + - component: {fileID: 7259255827041204352} + m_Layer: 22 + m_Name: Position Marker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &11362095004056127 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339790211674806269} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -7.1054257e-15, z: -7.7715595e-15, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4463098059789612786} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &7549471800078836096 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339790211674806269} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3964201995310458731 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339790211674806269} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: d64bef778e23fd841ad6a19b2e6faa80, 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!64 &7259255827041204352 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339790211674806269} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/Player Position Marker.prefab.meta b/Assets/Prefabs/Player Position Marker.prefab.meta new file mode 100644 index 0000000..9ba3433 --- /dev/null +++ b/Assets/Prefabs/Player Position Marker.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5834382dc9989b6408c88553754e4fa8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.lighting b/Assets/Scenes/witwics.lighting index 49cd2d3..a08c89d 100644 --- a/Assets/Scenes/witwics.lighting +++ b/Assets/Scenes/witwics.lighting @@ -27,7 +27,7 @@ LightingSettings: m_CompAOExponentDirect: 0 m_ExtractAO: 0 m_MixedBakeMode: 1 - m_LightmapsBakeMode: 0 + m_LightmapsBakeMode: 1 m_FilterMode: 1 m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4630812..48edca2 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -3902,190 +3902,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4953860686005405531} m_PrefabAsset: {fileID: 0} ---- !u!1001 &102513283 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 760334291} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.219 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.026 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.49999994 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.5000001 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.5000001 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.49999982 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_ScaleInLightmap - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_StitchLightmapSeams - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - target: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_Name - value: SM_Round1DoorwayStairs - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - insertIndex: -1 - addedObject: {fileID: 612908862} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - insertIndex: -1 - addedObject: {fileID: 102513292} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - insertIndex: -1 - addedObject: {fileID: 102513291} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - insertIndex: -1 - addedObject: {fileID: 102513290} - m_SourcePrefab: {fileID: 100100000, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} ---- !u!1 &102513284 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - m_PrefabInstance: {fileID: 102513283} - m_PrefabAsset: {fileID: 0} ---- !u!4 &102513287 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e895dfd21d145a545bdf44e3d1658043, - type: 3} - m_PrefabInstance: {fileID: 102513283} - m_PrefabAsset: {fileID: 0} ---- !u!65 &102513290 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102513284} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 3.1192005, y: 2.4384, z: 0.18} - m_Center: {x: 0.14530191, y: 0.0000004873316, z: -0.09} ---- !u!65 &102513291 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102513284} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.5198677, y: 2.4384, z: 0.18} - m_Center: {x: 0.14635493, y: 0.00000051660527, z: 0.09} ---- !u!65 &102513292 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102513284} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.9182721, y: 2.4384, z: 0.18} - m_Center: {x: 0.14521681, y: 0.00000053763466, z: 0.27} --- !u!1 &103872201 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4930710003381606841, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -9974,6 +9790,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 732678857} - {fileID: 1629735785} - {fileID: 760334291} - {fileID: 1427476863} @@ -12854,6 +12671,101 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &233243363 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1149080868} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.25000003 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071069 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000014976426 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000014751397 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Player Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &233243364 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 233243363} + m_PrefabAsset: {fileID: 0} --- !u!1 &235126501 stripped GameObject: m_CorrespondingSourceObject: {fileID: 879550886261809809, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -20110,6 +20022,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &407044803 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 4881855407002070440} + m_PrefabAsset: {fileID: 0} --- !u!1 &408428549 GameObject: m_ObjectHideFlags: 0 @@ -21201,7 +21119,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 749395701} + - {fileID: 1045828621} - {fileID: 1976503210} + - {fileID: 549554641} m_Father: {fileID: 1652837901} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &442197767 stripped @@ -25097,6 +25017,151 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547548764} m_CullTransparentMesh: 1 +--- !u!1001 &549554640 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 439419218} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.364 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalPosition.z + value: -13.8279 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5372997 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.84339136 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - target: {fileID: -7511558181221131132, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - target: {fileID: -7511558181221131132, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - target: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_Name + value: SM_DrywallPanel5x16 (1) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + insertIndex: -1 + addedObject: {fileID: 549554643} + m_SourcePrefab: {fileID: 100100000, guid: 7f60bf193aca11b40bedd54a396f38fe, type: 3} +--- !u!4 &549554641 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + m_PrefabInstance: {fileID: 549554640} + m_PrefabAsset: {fileID: 0} +--- !u!1 &549554642 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + m_PrefabInstance: {fileID: 549554640} + m_PrefabAsset: {fileID: 0} +--- !u!65 &549554643 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 549554642} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 15.999998, y: 5, z: 0.114301145} + m_Center: {x: -7.999997, y: 2.5, z: -0.057146765} --- !u!1 &549602626 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9213222445483219211, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -27483,14 +27548,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612908861} serializedVersion: 2 - m_LocalRotation: {x: -0.50000024, y: 0.5, z: 0.49999967, w: -0.50000006} - m_LocalPosition: {x: 2.1241827, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0.70710635, z: -0, w: 0.7071072} + m_LocalPosition: {x: 2.1200058, y: 0, z: 0.0020005703} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1592727110} - m_Father: {fileID: 102513287} - m_LocalEulerAnglesHint: {x: 0, y: -55, z: 0} + m_Father: {fileID: 1392345920} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &612926145 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7590994631439921647, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -31747,6 +31812,132 @@ Transform: - {fileID: 832323182} m_Father: {fileID: 1657587667} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &732678856 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 167305400} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalPosition.x + value: 14.741551 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.10795 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.893093 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_ProbeAnchor + value: + objectReference: {fileID: 1684289505} + - target: {fileID: -7511558181221131132, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - target: {fileID: 919132149155446097, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_Name + value: SM_ConkCreteAlleyway + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 732678859} + m_SourcePrefab: {fileID: 100100000, guid: 46bc81196d666d547b1fd14b181728e7, type: 3} +--- !u!4 &732678857 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + m_PrefabInstance: {fileID: 732678856} + m_PrefabAsset: {fileID: 0} +--- !u!1 &732678858 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 46bc81196d666d547b1fd14b181728e7, + type: 3} + m_PrefabInstance: {fileID: 732678856} + m_PrefabAsset: {fileID: 0} +--- !u!64 &732678859 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732678858} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5927643213209730358, guid: 46bc81196d666d547b1fd14b181728e7, type: 3} --- !u!1 &734018435 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4476962291825252709, guid: aecb18996fccac6488cfcd38604796da, @@ -32905,7 +33096,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[2] value: - objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - target: {fileID: 919132149155446097, guid: bdc2556a1453c2c41b6f9c6825812054, type: 3} propertyPath: m_Name @@ -33079,7 +33270,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[3] value: - objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - target: {fileID: -7511558181221131132, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} propertyPath: m_Materials.Array.data[4] @@ -33113,7 +33304,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} insertIndex: -1 - addedObject: {fileID: 102513287} + addedObject: {fileID: 1408106473} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} insertIndex: -1 @@ -36726,6 +36917,9 @@ MonoBehaviour: _PlayerConfettiCannons: - {fileID: 173137748} - {fileID: 905695708} + _PlayerPositionMarkers: + - {fileID: 4881855407002070443} + - {fileID: 1248667630} _JailPlayer: {fileID: 115578771} --- !u!1001 &867006604 PrefabInstance: @@ -45689,6 +45883,151 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1045828620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 439419218} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalPosition.x + value: 19.81 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.16 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.30070582 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.95371693 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -145 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - target: {fileID: -7511558181221131132, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - target: {fileID: -7511558181221131132, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - target: {fileID: 919132149155446097, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_Name + value: SM_DrywallPanel5x20 (1) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1045828623} + m_SourcePrefab: {fileID: 100100000, guid: bdc2556a1453c2c41b6f9c6825812054, type: 3} +--- !u!4 &1045828621 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + m_PrefabInstance: {fileID: 1045828620} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1045828622 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bdc2556a1453c2c41b6f9c6825812054, + type: 3} + m_PrefabInstance: {fileID: 1045828620} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1045828623 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045828622} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 19.999998, y: 5, z: 0.11430115} + m_Center: {x: 9.999995, y: 2.5, z: 0.05715106} --- !u!1 &1047388942 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4294144169429098507, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -49546,6 +49885,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 233243364} - {fileID: 905695707} - {fileID: 208954849} m_Father: {fileID: 808969078} @@ -51884,6 +52224,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &1248667628 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 233243363} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1248667630 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 233243363} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248667628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1249864385 PrefabInstance: m_ObjectHideFlags: 0 @@ -57241,6 +57599,54 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1390751084} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1392345919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1408106473} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - target: {fileID: 919132149155446097, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + propertyPath: m_Name + value: SM_Round1DoorwayStairs_Outdoor + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 612908862} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5411da33b9d095341b3b8ece387e743d, type: 3} +--- !u!4 &1392345920 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5411da33b9d095341b3b8ece387e743d, + type: 3} + m_PrefabInstance: {fileID: 1392345919} + m_PrefabAsset: {fileID: 0} --- !u!1 &1392677813 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6125622359357326373, guid: be33bc7f6c414e6409becfa348b9310d, @@ -57785,6 +58191,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1408106472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1408106473} + m_Layer: 0 + m_Name: Doorway Stairs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1408106473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408106472} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.70710635, z: -0, w: 0.7071072} + m_LocalPosition: {x: -3.2190022, y: 0, z: -0.026006103} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1538206740} + - {fileID: 1392345920} + m_Father: {fileID: 760334291} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1409356551 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8850973822348098808, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -68641,6 +69080,85 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1538206739 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1408106473} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - target: {fileID: 919132149155446097, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + propertyPath: m_Name + value: SM_Round1DoorwayStairs_Indoor + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce325db213ddf894e9ad90b47c50fe26, type: 3} +--- !u!4 &1538206740 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ce325db213ddf894e9ad90b47c50fe26, + type: 3} + m_PrefabInstance: {fileID: 1538206739} + m_PrefabAsset: {fileID: 0} --- !u!1 &1539961713 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8729636926385515984, guid: e9914385266bca24db809c39e395f03c, @@ -71587,7 +72105,6 @@ Transform: - {fileID: 51189180} - {fileID: 7240854401870329234} - {fileID: 295257087} - - {fileID: 1713757808} - {fileID: 1230983058} - {fileID: 1468229609714695595} - {fileID: 1470660571} @@ -71919,7 +72436,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[3] value: - objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - target: {fileID: -7511558181221131132, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} propertyPath: m_Materials.Array.data[4] @@ -72207,7 +72724,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalPosition.y - value: -0.107 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -76207,6 +76724,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4881855407002070441} - {fileID: 173137746} - {fileID: 1204040936} m_Father: {fileID: 2134288142} @@ -76364,110 +76882,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1713757807 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1583513123} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalScale.x - value: 0.8470499 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalScale.y - value: 0.84705013 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalScale.z - value: 0.84705 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.899 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.832 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.4526633 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.4526632 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.54322726 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.5432275 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 100.392 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_Name - value: SpawnMarker (2) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_TagString - value: EditorOnly - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} ---- !u!4 &1713757808 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - m_PrefabInstance: {fileID: 1713757807} - m_PrefabAsset: {fileID: 0} --- !u!1 &1714284228 stripped GameObject: m_CorrespondingSourceObject: {fileID: 164377805661239424, guid: be33bc7f6c414e6409becfa348b9310d, @@ -85974,7 +86388,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[2] value: - objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + objectReference: {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - target: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, type: 3} propertyPath: m_Name @@ -97712,6 +98126,98 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ea9e1433e50c5f4a86660d2480f84b3, type: 3} +--- !u!1001 &4881855407002070440 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1707600714} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071069 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000014976426 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000014751397 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Player Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &4881855407002070441 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 4881855407002070440} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4881855407002070443 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 4881855407002070440} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407044803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4947127878132079487 PrefabInstance: m_ObjectHideFlags: 0 @@ -100638,78 +101144,78 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} @@ -100719,9 +101225,10 @@ MonoBehaviour: - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} @@ -106274,6 +106781,14 @@ MonoBehaviour: ID: 1327 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 407044803} + ID: 1328 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1248667628} + ID: 1329 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 0a65f29..9516fea 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..21377f9 Binary files /dev/null and b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..5b0a208 --- /dev/null +++ b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: f5d456b7970be824989dfdd74309d26c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 4e27222..7ac72af 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/OcclusionCullingData.asset b/Assets/Scenes/witwics/OcclusionCullingData.asset index 4cf0cdb..9a54b90 100644 --- a/Assets/Scenes/witwics/OcclusionCullingData.asset +++ b/Assets/Scenes/witwics/OcclusionCullingData.asset @@ -7,7 +7,7 @@ OcclusionCullingData: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OcclusionCullingData - m_PVSData: 120000d6de7678cf902900000000a04100000000000020c20000a0c10000a0c10000a0410000a0410000204220000000500100000000000001000000600100005a000000800200000000000000000000f00a0000a7000000a00100007700000000000000000000000000000000000000000000000000000000000000010000006002000000000000900100000100000001000000010000007001000080010000600c0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002c00000000000000000000008790080be108bb6f088ad008a7c00a2e111bba1008858008947009a3500a843009a68022ad000b3473088ac00891b00b41c314d2500dd930088910088f600882d008906022ac101bb83109808011a0c1099f10088490088360108ac0080f32099680219e40081cf1098160100951080b42219320088010088480088591109230099030088f10098120081431129390108cf0088310088400089680099390100cf1098320088030098100098f2008903009830000000000000000000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641e20d84c0748f93bddb552041309a49be3797ef3e62365f41ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040a85d99bf74be1b8c8309e03faf2901410000a040afc16e41a635a1c0e014dd3da082144112ba973d5474a340ed4c66414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a411efc44c1e414dd3d8e369a41cc405bc05474a34003bca741a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c41e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be4fb79c417240064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0e74213c0df14dd3d355b50c0be7bffbf383c753f001935c079d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebe224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bfb96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3f6f4eb43f4f6b963f511189c00189d23fe27a02400fb971c0a507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff62880418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f4163d8ecc01c36793f80029c416a2096c07c771d40a8e89f413998f1c04846f33f3f379f41b791eac034830b40efd89f41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d41fc5798c04846f33ff00c9b41438692c034830b40f1359c41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc990418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c4140f32fbfa63ca43f09405b411e30d1be6c24f73fd3b65f4105482ebf72d7aa3fea5c5b41c36910bfd2bcbb3fce3a5d416268afbfa63ca43f32525041c9ba8bbf6c24f73ffcc85441b492aebf72d7aa3f136f504194a39fbfd2bcbb3ff74c52417e6b83bfa63ca43fcfd15541cb7b3fbf6c24f73f99485a41cc9582bf72d7aa3fb0ee5541574d67bfd2bcbb3f94cc5741b1c8aebe72d7aa3f24cb60415e1866bed2bcbb3f08a96241501fb2bea63ca43f42ae6041b6a38dbd6c24f73f0c256541b1c8aebe3580034024cb60415e1866bee5f20b4008a96241501fb2bece32004042ae6041b6a38dbdb1a629400c2565410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d41a44f64c0208edd3f7f2d2d41d2054bc04a0c2640f57f3341ce1f46c0208edd3f49b73441fad52cc04a0c2640bf093b416268afbfdc3b0e3f32525041c9ba8bbfb4059a3ffcc85441b492aebf74711b3f136f504194a39fbf343c3d3ff74c5241501fb2bedc3b0e3f42ae6041b6a38dbdb4059a3f0c256541b1c8aebe74711b3f24cb60415e1866be343c3d3f08a962416268afbfce32004032525041c9ba8bbfb1a62940fcc85441b492aebf35800340136f504194a39fbfe5f20b40f74c52417e6b83bfce320040cfd15541cb7b3fbfb1a6294099485a41cc9582bf35800340b0ee5541574d67bfe5f20b4094cc574157f32fbfce32004009405b414230d1beb0a62940bdb55f413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a8941437d2bc035efe83e91133a41fb0ae6bfe8de25408431484120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e41d49582bf74711b3fafee5541674d67bf343c3d3f93cc57417c6b83bfdc3b0e3fcdd15541c77b3fbfb4059a3f97485a4105482ebf74711b3fea5c5b41c36910bf343c3d3fce3a5d4140f32fbfdc3b0e3f09405b411e30d1beb4059a3fd3b65f413b00000050000000080000005200000041000000290000002e0000003f000000020000004b000000140000001000000000000000370000003e0000001b000000210000001600000013000000150000000a0000002d0000002a000000010000004a0000001e0000004000000038000000470000003a00000051000000480000002200000057000000560000001a0000002b0000000e000000300000002c000000240000002f0000003d0000003c000000340000003900000043000000420000004500000044000000460000004f000000120000001100000017000000070000000f0000000400000003000000260000002500000036000000350000004d0000004c000000540000005500000058000000590000004e00000049000000530000001f0000000d0000001d0000001c000000060000000500000019000000180000000c0000000b00000009000000200000003300000023000000310000003200000027000000280000000000000000000000700c0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7780000c0190000701b00001b000000001b000001201d000000a03e2c0001005000000080060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c0000004d000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c0000000600000062000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000006200000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004f00000008000000000000000000000000005555aaaa5555008000803000000007000000460000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000002700000006000000000000000000000000000000aaaaaaaaffff00804200000009000000370000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e0000006e000000040000000000000000000000ff7f00000040000055d500c059000000070000006c000000050000000000000000000000ff7fff3fffff0000561500c060000000010000006d000000050000000000000000000000ff7fff3f564daa1600bc00b261000000070000004b0000000a0000000000000000000000ff7faa4e0080aa16555500b268000000060000006c000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff770000000400000063000000050000000000000000000000ff7fff7faaaaaa16003000a07b0000000500000063000000060000000000000000000000ff81ff7faaaaaa16ab2a00b280000000090000003f0000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a000000310000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000033000000090000000000000000000000ff81aaaa55b1aa32ab4e00a095000000070000005a000000060000000000000000000000ff7faa4e55555555aaaa00a09c000000040000005b000000060000000000000000000000ff8baa4e55555555559500b2a0000000050000004c000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb0000000040000004c000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000000d000000070000000000000000000000ff7f5555005c555555950086b80000000c00000005000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000075000000020000000000000000000000ffb35555ffff5555aaaaffffcb0000000600000043000000090000000000000000000000ff7f5495aaaa5555008000a0d10000000200000035000000050000000000000000000000ff7faaa6aaaaaa56556100a0d30000000800000068000000060000000000000000000000ff9f5495aaaa5555aaaa00b2db0000000600000000000000300000000000000000000000ff815495aaaaff7faaaa00a0e10000000900000027000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000056000000060000000000000000000000ff7fff3fffff54bd55d500a0f20000000700000073000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c0010100000800000055000000040000000000000000000000ff9f5555ffffaaaa55d5ffff090100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff12010000070000001b000000150000000000000000000000ff81aaaa00ccaa6aaaaa00a0190100000300000025000000040000000000000000000000ff8154b100ccaa6a009000a01c010000090000005e000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b2250100000300000057000000040000000000000000000000ff8154b900ccff97aaaa00a028010000060000006f000000040000000000000000000000ff81aaaa00c0aaaa00bc00b22e0100000600000054000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f210054d5a9beaaaaff3f00000060ff7f2300ffff54d55555000000000060ff7f2500ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f210054d5a9beffffaaaa00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52300ff3f0000ffbfff7f00000020ff3f2100ff9fff7f54d554bd00000020ff3f2200ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2700ffcb54b1ff9fff81000000a0aa6a260054adaaaaff9fff81000000a0aa6a2800ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa20005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa22005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf220054d5aaaa5555ff3f00000040ffbf2300ffff54d5555500000000002055552400ffffffbf54d5aaaa0000002055552500ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa20005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2000aa825555ff9fff81000000a0aaaa200054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2400ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2600ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2800ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ff9fff8100000020aaaa2600ff9fff81ff8fff7f00000020aaaa2600ff9fff81aaaaff9300000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa1f00aaaa5495ff9fff8100000020aaaa2a00ff9fff8154b5aaaa00000020aaaa2a00ffb1ff9fffbbaaaa00000020aaaa2b00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f220054d554bd5555ff3f000000a054d523005555ff3fff9fff7f00000060ff9f240054d554bdffff5555000000a054d52500ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f210054d554bd5555ff3f000000a054d523005555ff3fffbfff9f0000002055552400ffbfffb354bdaaaa0000002055552400ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d521005555ff3fff9fff7f0000008054d522005555ff3fffbfff9f0000002055552500ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f210054d554bdffff5555000000a054d52500ffff5555ffffff9f0000000055552200ffbfffb354bdaaaa0000000055552200ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52100ffff5555ff9fff7f0000008054d52400ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552300ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2800aaaaaa6affbfaaaa00000060ff9f2800ff9f5485ffcbffbf000000a0aaaa2a0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa1f00ff9fff81aaaaff9300000080aa6a1200ffcb54b1ff9fff8100000060ff9f2800ff7faa6affbf54b100000060ff9f2800ff8faa6affcbffbf00000040ff9f2600aaaaaa6affbfaaaa00000040ff9f2600ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2700ff7faa6affbf54b100000040ff9f2700ff8faa6affcbffbf00000040ff9f2900aaaaff97ffcb54b9000000a0aaaa2a00ffbfaaaaffb1ff9f000000a0aaaa2b00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2800aaaaff97ffcb54b9000000a0aaaa2b0054bd54b9ff9fff9d000000a0aaaa2b00ffcb54bdff9fff8100000040ff9f2b00ffbbaaaaffbfaaaa00000020ffbf2b00ffb1ff9fffbbaaaa00000080aaaa260054b5aaaaff9fff8100000080aaaa2800ffbfaaaaffb1ff9f00000000aaaa2000ff9fff8154b5aaaa00000000aaaa2000ffb1ff9fffbbaaaa00000060ff9f2a00ffbbaaaaffbfaaaa00000000ffbf2a00ffb1ff9fffbbaaaa00000080aaaa2800ffcbffbfffb1ff9f00000080aaaa290054bd54b9ff9fff9d00000080aaaa2900ffcb54bdff9fff8100000000aaaa2000ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f37edfd594dfadb62a4f3f73433f7ceb1f1171f377ebeb19740ff0e3563df3cfafbfef2bc2f4d150f3fe43edf43aefffb0aaef9c9dfdf00cf3c03231334cf374378e12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f4322f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0fe33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10f3fff3c73e6fcfec3fbf3fffffdffcfccfdff9cfff3f33737f3defcffbffdccff33fb8ffdfbfff3fff8ffcf030000a8003a01ac0100000e19232c343f4d5a646f7a828b939e08131a252e333e474f57606a737f880811181e292f383d42494e565f656b03081015161a1f26292e323500000000000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7a62418000205c36573296d48898442d1488c480a462311222d188c4844229124129a4488244185480bc6a2c178401a918644d2d068349acf46e3019d2428d386b1682c188c46a3c168441a0d4963a1d170349bcd2624026d36a6146ab35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c1b108804229d4c920d6a633aad562bd56ac158301e8f48443291542a968585b2b068340b50084402914c27d329b50a915424d28ac458301e8f8744329148169445655159542a96050563c968381cd06221128142211089743299522693299552ad56a1908aa422ad482bd282f1803c208fc82322994824144aa5b2a02c2a8bca62815968329c056811028540a20508443a994c2793e9643a9d4c269329a552855424d28a448a3c261389642299482895458542a95430190da7d3e12c40a00568b110814420d3c9643a994ea6d4c974329952a6946aa55a8554a415e91179442492c98452595416984ca6c3e92c40a00508b41089442290c9643a994ea1d54432914c24194da6b3002d400b114804329d4ca6d34432c968389d0508040a9952a6d444b200995226530a000000000000000000 + m_PVSData: 120000d6102f2533802900000000a04100000000000020c20000a0c10000a0c10000a0410000a0410000204220000000500100000000000001000000600100005a000000700200000000000000000000e00a0000a7000000a00100007400000000000000000000000000000000000000000000000000000000000000010000005002000000000000900100000100000001000000010000007001000080010000500c0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002c000000000000000000000007c118bb5f0889b0082ae10a325113ba100886a008947009a3500a84300926c212af410bb7510888d00891400ccbf01452611d83700881f0088920088b000929e21235811b93000818011a1c110884700883500808d1080f32099680219f40089c11088570188a42219320088010088460088570209230099030088f100981200814311293500887d0088f30088140088060099830098570088bd0089c300882000893100890f0088200099330080000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fa635a1c0e014dd3da082144112ba973d5474a340ed4c6641ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040a85d99bf74be1b8c8309e03faf2901410000a040afc16e4186b775c0748f93bddb552041309a49be3397ef3e539d5a41b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641ca2f92c191c2753ed6a3b04074da8cc10ad7233feb5178411efc44c1e414dd3d8e369a41cc405bc05474a34003bca7414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c41e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be4fb79c417240064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bfb96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3f79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebee74213c0df14dd3d355b50c0be7bffbf383c753f001935c0a507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff6288041e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc990413d4de6c049a912402a5a9e41cd1de0c05989244075629f41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f41fc5798c04846f33ff00c9b41438692c034830b40f1359c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c4163d8ecc01c36793f80029c416a2096c07c771d40a8e89f413998f1c04846f33f3f379f41b791eac034830b40efd89f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41982773c0208edd3f82772941c6dd59c04a0c2640f8c92f4198c298bf74711b3f1629534178d389bf343c3d3ffa065541469899bfdc3b0e3f360c53415bd56bbfb4059a3f008357412295c5bfa63ca43f9a8c4d4189e7a1bf6c24f73f6403524178bfc4bf72d7aa3f7aa94d4158d0b5bfd2bcbb3f5e874f4198c298bf72d7aa3f1629534178d389bfd2bcbb3ffa065541409899bfa63ca43f350c53414fd56bbf6c24f73fff825741bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a894120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e4195a15abf74711b3f5297584153c33cbf343c3d3f36755a41ec4c5cbfdc3b0e3f707a5841bbf114bfb4059a3f3af15c4195a15abf72d7aa3f5297584153c33cbfd2bcbb3f36755a41ec4c5cbfa63ca43f707a5841bbf114bf6c24f73f3af15c4178bfc4bf358003407aa94d4158d0b5bfe5f20b405e874f412295c5bfce3200409a8c4d4189e7a1bfb1a62940640352410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff17141bff754c0208edd3f4b013141ebad3bc04a0c2640c153374178bfc4bf74711b3f7aa94d4158d0b5bf343c3d3f5e874f412295c5bfdc3b0e3f9a8c4d4189e7a1bfb4059a3f64035241206905bfdc3b0e3fabe85d41bb3778beb4059a3f755f6241edbd03bf74711b3f8c055e4157bfcbbe343c3d3f70e35f41ef4c5cbfce320040707a5841b9f114bfb0a6294024f05c41edbd03bf72d7aa3f8c055e4157bfcbbed2bcbb3f70e35f41206905bfa63ca43fabe85d41bb3778be6c24f73f755f6241409899bfce320040350c53414fd56bbfb1a62940ff82574198c298bf358003401629534178d389bfe5f20b40fa065541edbd03bf358003408c055e4157bfcbbee5f20b4070e35f413c6905bfce320040aae85d412b3878beb1a62940745f624105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41437d2bc035efe83e91133a41fb0ae6bfe8de2540843148412e0000004a000000130000001b0000001d000000290000003b0000000e0000000900000059000000240000004b000000350000003a000000360000004300000056000000190000003e0000002a000000300000005500000048000000510000004400000017000000200000001c0000000d0000001000000023000000450000002600000006000000520000002b0000002d000000110000003300000032000000280000002f000000310000002c00000046000000490000004c000000470000000c0000000b00000008000000070000000500000004000000120000001a000000250000001800000016000000410000003f000000400000003d0000003c000000380000003900000037000000420000004d0000004e0000004f00000053000000540000005700000058000000500000000a000000000000000100000003000000020000000f0000001e0000001f0000001500000014000000210000002200000027000000340000000000000000000000600c0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7780000c0190000701b00001b000000001b000001201d000000a03e2c0001005000000080060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c00000047000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c000000060000005d000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000005d00000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004900000008000000000000000000000000005555aaaa5555008000803000000007000000410000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000002400000006000000000000000000000000000000aaaaaaaaffff00804200000009000000330000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e0000006b000000040000000000000000000000ff7f00000040000055d500c0590000000700000069000000050000000000000000000000ff7fff3fffff0000561500c060000000010000006a000000050000000000000000000000ff7fff3f564daa1600bc00b26100000007000000450000000a0000000000000000000000ff7faa4e0080aa16555500b2680000000600000069000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff77000000040000005e000000050000000000000000000000ff7fff7faaaaaa16003000a07b000000050000005e000000060000000000000000000000ff81ff7faaaaaa16ab2a00b280000000090000003b0000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a0000002e0000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000030000000090000000000000000000000ff81aaaa55b1aa32ab4e00a0950000000700000054000000060000000000000000000000ff7faa4e55555555aaaa00a09c0000000400000055000000060000000000000000000000ff8baa4e55555555559500b2a00000000500000046000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb00000000400000046000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000000b000000070000000000000000000000ff7f5555005c555555950086b80000000c00000003000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000072000000020000000000000000000000ffb35555ffff5555aaaaffffcb000000060000003f000000090000000000000000000000ff7f5495aaaa5555008000a0d10000000200000032000000050000000000000000000000ff7faaa6aaaaaa56556100a0d30000000800000063000000060000000000000000000000ff9f5495aaaa5555aaaa00b2db0000000600000000000000300000000000000000000000ff815495aaaaff7faaaa00a0e10000000900000024000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000050000000060000000000000000000000ff7fff3fffff54bd55d500a0f20000000700000070000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c001010000080000004f000000040000000000000000000000ff9f5555ffffaaaa55d5ffff090100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff120100000700000019000000120000000000000000000000ff81aaaa00ccaa6aaaaa00a0190100000300000022000000040000000000000000000000ff8154b100ccaa6a009000a01c0100000900000058000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b2250100000300000051000000040000000000000000000000ff8154b900ccff97aaaa00a028010000060000006c000000040000000000000000000000ff81aaaa00c0aaaa00bc00b22e010000060000004e000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f210054d5a9beaaaaff3f00000060ff7f2300ffff54d55555000000000060ff7f2500ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f210054d5a9beffffaaaa00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52300ff3f0000ffbfff7f00000020ff3f2100ff9fff7f54d554bd00000020ff3f2200ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2700ffcb54b1ff9fff81000000a0aa6a260054adaaaaff9fff81000000a0aa6a2800ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa20005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa22005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf220054d5aaaa5555ff3f00000040ffbf2300ffff54d5555500000000002055552400ffffffbf54d5aaaa0000002055552500ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa20005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2000aa825555ff9fff81000000a0aaaa200054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2400ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2600ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2800ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ff9fff8100000020aaaa2600ff9fff81ff8fff7f00000020aaaa2600ff9fff81aaaaff9300000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa1f00aaaa5495ff9fff8100000020aaaa2a00ff9fff8154b5aaaa00000020aaaa2a00ffb1ff9fffbbaaaa00000020aaaa2b00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f220054d554bd5555ff3f000000a054d523005555ff3fff9fff7f00000060ff9f240054d554bdffff5555000000a054d52500ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f210054d554bd5555ff3f000000a054d523005555ff3fffbfff9f0000002055552400ffbfffb354bdaaaa0000002055552400ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d521005555ff3fff9fff7f0000008054d522005555ff3fffbfff9f0000002055552500ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f210054d554bdffff5555000000a054d52500ffff5555ffffff9f0000000055552200ffbfffb354bdaaaa0000000055552200ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52100ffff5555ff9fff7f0000008054d52400ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552300ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2800aaaaaa6affbfaaaa00000060ff9f2800ff9f5485ffcbffbf000000a0aaaa2a0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa1f00ff9fff81aaaaff9300000080aa6a1200ffcb54b1ff9fff8100000060ff9f2800ff7faa6affbf54b100000060ff9f2800ff8faa6affcbffbf00000040ff9f2600aaaaaa6affbfaaaa00000040ff9f2600ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2700ff7faa6affbf54b100000040ff9f2700ff8faa6affcbffbf00000040ff9f2900aaaaff97ffcb54b9000000a0aaaa2a00ffbfaaaaffb1ff9f000000a0aaaa2b00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2800aaaaff97ffcb54b9000000a0aaaa2b0054bd54b9ff9fff9d000000a0aaaa2b00ffcb54bdff9fff8100000040ff9f2b00ffbbaaaaffbfaaaa00000020ffbf2b00ffb1ff9fffbbaaaa00000080aaaa260054b5aaaaff9fff8100000080aaaa2800ffbfaaaaffb1ff9f00000000aaaa2000ff9fff8154b5aaaa00000000aaaa2000ffb1ff9fffbbaaaa00000060ff9f2a00ffbbaaaaffbfaaaa00000000ffbf2a00ffb1ff9fffbbaaaa00000080aaaa2800ffcbffbfffb1ff9f00000080aaaa290054bd54b9ff9fff9d00000080aaaa2900ffcb54bdff9fff8100000000aaaa2000ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f37edfd594dfadb62a4f3f73433f7ceb1f1171f377ebeb19740ff0e3563df3cfafbfef2bc2f4d150f3fe43edf43aefffb0aaef9c9dfdf00cf3c03231334cf374378e12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f4322f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0fe33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10f3fff3c73e6fcfec3fbf3fffffdffcfccfdff9cfff3f33737f3defcffbffdccff33fb8ffdfbfff3fff8ffcf030000a8003a01ac0100000e19232c343f4d5a646f7a828b939e08131a252e333e474f57606a737f880811181e292f383d42494e565f656b03081015161a1f26292e323500000000000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7a62418000205c36573296d48898442d1488c480a462311222d188c4844229124129a4488244185480bc6a2c178401a918644d2d068349acf46e3019d2428d386b1682c188c46a3c168441a0d4963a1d170349bcd2624026d36a6146ab35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c1b108804229d4c920d6a633aad562bd56ac158301e8f48443291542a968585b2b068340b50084402914c27d329b50a915424d28ac458301e8f8744329148169445655159542a96050563c968381cd06221128142211089743299522693299552ad56a1908aa422ad482bd282f1803c208fc82322994824144aa5b2a02c2a8bca62815968329c056811028540a20508443a994c2793e9643a9d4c269329a552855424d28a448a3c261389642299482895458542a95430190da7d3e12c40a00568b110814420d3c9643a994ea6d4c974329952a6946aa55a8554a415e91179442492c98452595416984ca6c3e92c40a00508b41089442290c9643a994ea1d54432914c24194da6b3002d400b114804329d4ca6d34432c968389d0508040a9952a6d444b200995226530a000000000000000000 m_Scenes: - indexRenderers: 0 sizeRenderers: 90 @@ -15,184 +15,184 @@ OcclusionCullingData: sizePortals: 0 scene: 234ac6652f2be3943b8974a3fcbaba1f m_StaticRenderers: - - targetObject: -7511558181221131132 - targetPrefab: 1427476862 - - targetObject: 4351601775851787701 - targetPrefab: 633609066 - - targetObject: 4351601775851787701 - targetPrefab: 1294116878969307432 - - targetObject: -7511558181221131132 - targetPrefab: 1188236244 - - targetObject: -7511558181221131132 - targetPrefab: 1584083749 + - targetObject: 1466060218924807064 + targetPrefab: 1918973202 + - targetObject: 2751096909771140069 + targetPrefab: 1918973202 - targetObject: 1466060218924807064 targetPrefab: 1305776201 - targetObject: 2751096909771140069 targetPrefab: 1305776201 - targetObject: -7511558181221131132 - targetPrefab: 353645666 - - targetObject: 2708739958050211779 - targetPrefab: 146729477 + targetPrefab: 859579629 - targetObject: -7511558181221131132 - targetPrefab: 1557255132 - - targetObject: 4351601775851787701 - targetPrefab: 1768602428 - - targetObject: 1466060218924807064 - targetPrefab: 1249864385 - - targetObject: 2751096909771140069 - targetPrefab: 1249864385 + targetPrefab: 580345162 + - targetObject: 7006853779014437907 + targetPrefab: 1049045427 + - targetObject: 1968900501911500709 + targetPrefab: 937910637 + - targetObject: 940995387610717004 + targetPrefab: 937910637 + - targetObject: -7511558181221131132 + targetPrefab: 102513283 - targetObject: 5395762849033877597 targetPrefab: 789002245204939195 + - targetObject: 1968900501911500709 + targetPrefab: 172614115 + - targetObject: 940995387610717004 + targetPrefab: 172614115 + - targetObject: -7511558181221131132 + targetPrefab: 2119386629 + - targetObject: -7511558181221131132 + targetPrefab: 1976503209 + - targetObject: -7511558181221131132 + targetPrefab: 1557255132 + - targetObject: -7511558181221131132 + targetPrefab: 1470660570 - targetObject: 4351601775851787701 targetPrefab: 832323181 + - targetObject: -7511558181221131132 + targetPrefab: 1279360754 + - targetObject: 2708739958050211779 + targetPrefab: 146729477 + - targetObject: 1466060218924807064 + targetPrefab: 1249864385 + - targetObject: 2751096909771140069 + targetPrefab: 1249864385 + - targetObject: -7511558181221131132 + targetPrefab: 2045833766 + - targetObject: -7511558181221131132 + targetPrefab: 2128415471 + - targetObject: -7511558181221131132 + targetPrefab: 1584083749 + - targetObject: -7511558181221131132 + targetPrefab: 1586593148 + - targetObject: -7511558181221131132 + targetPrefab: 1299739207 + - targetObject: 2708739958050211779 + targetPrefab: 1582278623 + - targetObject: -7511558181221131132 + targetPrefab: 808969077 + - targetObject: -7511558181221131132 + targetPrefab: 267965641 + - targetObject: 1466060218924807064 + targetPrefab: 990092987 + - targetObject: 2751096909771140069 + targetPrefab: 990092987 + - targetObject: -7511558181221131132 + targetPrefab: 124273105 + - targetObject: 1466060218924807064 + targetPrefab: 428989207 + - targetObject: 2751096909771140069 + targetPrefab: 428989207 + - targetObject: 4856842162814790411 + targetPrefab: 6044205050412544512 + - targetObject: 4351601775851787701 + targetPrefab: 2024292607 - targetObject: -7511558181221131132 targetPrefab: 723913190 - - targetObject: 5444317254943555344 - targetPrefab: 4953860686005405531 - - targetObject: 1968900501911500709 - targetPrefab: 4438766482650780789 - - targetObject: 940995387610717004 - targetPrefab: 4438766482650780789 - - targetObject: 8810932174823803713 - targetPrefab: 1669769486 + - targetObject: 5395762849033877597 + targetPrefab: 1984717371 + - targetObject: -7511558181221131132 + targetPrefab: 25650784 + - targetObject: -7511558181221131132 + targetPrefab: 353645666 - targetObject: -7511558181221131132 targetPrefab: 760334290 - targetObject: 2708739958050211779 targetPrefab: 1369540354 - - targetObject: -7511558181221131132 - targetPrefab: 1586593148 - - targetObject: -7511558181221131132 - targetPrefab: 1463594309 - - targetObject: 1466060218924807064 - targetPrefab: 1962599170 - - targetObject: 2751096909771140069 - targetPrefab: 1962599170 - targetObject: 4351601775851787701 targetPrefab: 1720149715 - targetObject: -7511558181221131132 - targetPrefab: 749395700 - - targetObject: 1466060218924807064 - targetPrefab: 1918973202 - - targetObject: 2751096909771140069 - targetPrefab: 1918973202 + targetPrefab: 1188236244 + - targetObject: 4351601775851787701 + targetPrefab: 1058862682 + - targetObject: 2708739958050211779 + targetPrefab: 934922675 - targetObject: -7511558181221131132 - targetPrefab: 2128415471 + targetPrefab: 366681287 + - targetObject: 4351601775851787701 + targetPrefab: 1768602428 + - targetObject: -7511558181221131132 + targetPrefab: 651901189 + - targetObject: 1968900501911500709 + targetPrefab: 4438766482650780789 + - targetObject: 940995387610717004 + targetPrefab: 4438766482650780789 + - targetObject: 8810932174823803713 + targetPrefab: 6146163849592780820 + - targetObject: 5444317254943555344 + targetPrefab: 4953860686005405531 + - targetObject: -7511558181221131132 + targetPrefab: 1123331143 + - targetObject: -7511558181221131132 + targetPrefab: 1012354932 + - targetObject: 1466060218924807064 + targetPrefab: 4480648499976004208 + - targetObject: 2751096909771140069 + targetPrefab: 4480648499976004208 + - targetObject: -7511558181221131132 + targetPrefab: 1427476862 + - targetObject: 4351601775851787701 + targetPrefab: 1294116878969307432 + - targetObject: 1466060218924807064 + targetPrefab: 1329794381 + - targetObject: 2751096909771140069 + targetPrefab: 1329794381 + - targetObject: 8810932174823803713 + targetPrefab: 1669769486 + - targetObject: 1466060218924807064 + targetPrefab: 298932333 + - targetObject: 2751096909771140069 + targetPrefab: 298932333 - targetObject: 7006853779014437907 targetPrefab: 515796176453664510 - targetObject: -7511558181221131132 targetPrefab: 1548013197 - - targetObject: 2708739958050211779 - targetPrefab: 734635744 - - targetObject: 7006853779014437907 - targetPrefab: 1049045427 - targetObject: -7511558181221131132 - targetPrefab: 1488972618 - - targetObject: -7511558181221131132 - targetPrefab: 366681287 - - targetObject: 1466060218924807064 - targetPrefab: 414428781 - - targetObject: 2751096909771140069 - targetPrefab: 414428781 - - targetObject: 1466060218924807064 - targetPrefab: 1018401441 - - targetObject: 2751096909771140069 - targetPrefab: 1018401441 - - targetObject: 4351601775851787701 - targetPrefab: 2024292607 - - targetObject: -7511558181221131132 - targetPrefab: 139770782 - - targetObject: 4351601775851787701 - targetPrefab: 1058862682 - - targetObject: -7511558181221131132 - targetPrefab: 859579629 - - targetObject: 4351601775851787701 - targetPrefab: 91371483 - - targetObject: -7511558181221131132 - targetPrefab: 297529246 - - targetObject: -7511558181221131132 - targetPrefab: 600479467 - - targetObject: -7511558181221131132 - targetPrefab: 1873800957 - - targetObject: 1466060218924807064 - targetPrefab: 298932333 - - targetObject: 2751096909771140069 - targetPrefab: 298932333 - - targetObject: 8810932174823803713 - targetPrefab: 6146163849592780820 - - targetObject: -7511558181221131132 - targetPrefab: 1279360754 - - targetObject: 1466060218924807064 - targetPrefab: 1329794381 - - targetObject: 2751096909771140069 - targetPrefab: 1329794381 - - targetObject: -7511558181221131132 - targetPrefab: 1629735784 - - targetObject: -7511558181221131132 - targetPrefab: 2134288141 - - targetObject: -7511558181221131132 - targetPrefab: 1299739207 - - targetObject: 4856842162814790411 - targetPrefab: 6044205050412544512 - - targetObject: 2708739958050211779 - targetPrefab: 934922675 - - targetObject: 1968900501911500709 - targetPrefab: 172614115 - - targetObject: 940995387610717004 - targetPrefab: 172614115 - - targetObject: -7511558181221131132 - targetPrefab: 1123331143 - - targetObject: -7511558181221131132 - targetPrefab: 102513283 - - targetObject: -7511558181221131132 - targetPrefab: 124273105 - - targetObject: -7511558181221131132 - targetPrefab: 267965641 - - targetObject: 1968900501911500709 - targetPrefab: 937910637 - - targetObject: 940995387610717004 - targetPrefab: 937910637 - - targetObject: -7511558181221131132 - targetPrefab: 2045833766 - - targetObject: -7511558181221131132 - targetPrefab: 580345162 - - targetObject: -7511558181221131132 - targetPrefab: 651901189 - - targetObject: -7511558181221131132 - targetPrefab: 1470660570 - - targetObject: -7511558181221131132 - targetPrefab: 2119386629 - - targetObject: -7511558181221131132 - targetPrefab: 25650784 + targetPrefab: 749395700 - targetObject: -7511558181221131132 targetPrefab: 1617502299 - targetObject: -7511558181221131132 - targetPrefab: 1976503209 - - targetObject: 1466060218924807064 - targetPrefab: 4480648499976004208 - - targetObject: 2751096909771140069 - targetPrefab: 4480648499976004208 + targetPrefab: 2134288141 - targetObject: -7511558181221131132 - targetPrefab: 383052033 + targetPrefab: 1873800957 - targetObject: -7511558181221131132 - targetPrefab: 1972023585 + targetPrefab: 600479467 + - targetObject: -7511558181221131132 + targetPrefab: 139770782 + - targetObject: -7511558181221131132 + targetPrefab: 1463594309 - targetObject: 2708739958050211779 targetPrefab: 1584295245487527435 - targetObject: -7511558181221131132 - targetPrefab: 808969077 - - targetObject: 2708739958050211779 - targetPrefab: 1582278623 + targetPrefab: 1629735784 - targetObject: -7511558181221131132 - targetPrefab: 1012354932 + targetPrefab: 1972023585 + - targetObject: -7511558181221131132 + targetPrefab: 1488972618 - targetObject: 1466060218924807064 - targetPrefab: 990092987 + targetPrefab: 1018401441 - targetObject: 2751096909771140069 - targetPrefab: 990092987 + targetPrefab: 1018401441 + - targetObject: -7511558181221131132 + targetPrefab: 383052033 + - targetObject: 4351601775851787701 + targetPrefab: 633609066 - targetObject: -7511558181221131132 targetPrefab: 577030235 - - targetObject: 5395762849033877597 - targetPrefab: 1984717371 - targetObject: 1466060218924807064 - targetPrefab: 428989207 + targetPrefab: 414428781 - targetObject: 2751096909771140069 - targetPrefab: 428989207 + targetPrefab: 414428781 + - targetObject: 4351601775851787701 + targetPrefab: 91371483 + - targetObject: 2708739958050211779 + targetPrefab: 734635744 + - targetObject: 1466060218924807064 + targetPrefab: 1962599170 + - targetObject: 2751096909771140069 + targetPrefab: 1962599170 + - targetObject: -7511558181221131132 + targetPrefab: 297529246 m_Portals: [] diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 697f83c..9bd42e7 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 6ca981d..e43de3b 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 638e63d..1cb3aef 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 84f70d6..a945546 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index c1a78ac..55ed905 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index bdeefc1..735bee5 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr index 7de2d7b..63d98cb 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-6.exr and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Shaders/Brick.shader b/Assets/Shaders/Brick.shader new file mode 100644 index 0000000..73f3b64 --- /dev/null +++ b/Assets/Shaders/Brick.shader @@ -0,0 +1,48 @@ +Shader "Carmen/Brick" +{ + Properties + { + _MainTex ("Colour", 2D) = "white" {} + _NormalTex ("Normal", 2D) = "bump" {} + _AOTex ("Ambient Occlusion", 2D) = "white" {} + + _DetailTex ("Detail Colour", 2D) = "gray" {} + _DetailNormal ("Detail Normal", 2D) = "bump" {} + _DetailIntensity ("Detail Intensity", Range(0.0, 1.0)) = 1.0 + } + SubShader + { + Tags { "RenderType" = "Opaque" } + LOD 200 + + CGPROGRAM + #pragma surface surf Lambert + + struct Input { + float2 uv_MainTex; + float2 uv_NormalTex; + float2 uv_AOTex; + float2 uv_DetailTex; + float2 uv_DetailNormal; + }; + + UNITY_DECLARE_TEX2D(_MainTex); + UNITY_DECLARE_TEX2D(_NormalTex); + UNITY_DECLARE_TEX2D(_AOTex); + UNITY_DECLARE_TEX2D(_DetailTex); + UNITY_DECLARE_TEX2D(_DetailNormal); + half _DetailIntensity; + + void surf (Input IN, inout SurfaceOutput o) { + o.Albedo = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex).rgb; + o.Albedo *= UNITY_SAMPLE_TEX2D(_AOTex, IN.uv_MainTex).r; + o.Albedo *= saturate((UNITY_SAMPLE_TEX2D(_DetailTex, IN.uv_DetailTex).rgb * 2.0) * _DetailIntensity); + + half3 normaltex = UnpackNormal(UNITY_SAMPLE_TEX2D(_NormalTex, IN.uv_NormalTex)); + half3 normaldetail = UnpackNormal(UNITY_SAMPLE_TEX2D(_DetailNormal, IN.uv_DetailNormal)); + o.Normal = normalize(half3(normaltex.xy + normaldetail.xy, normaltex.z)); + } + ENDCG + } + Fallback "VRChat/Mobile/Standard Lite" +} \ No newline at end of file diff --git a/Assets/Shaders/SDF Map Dot.shader.meta b/Assets/Shaders/Brick.shader.meta similarity index 80% rename from Assets/Shaders/SDF Map Dot.shader.meta rename to Assets/Shaders/Brick.shader.meta index 595e4dd..aca55f7 100644 --- a/Assets/Shaders/SDF Map Dot.shader.meta +++ b/Assets/Shaders/Brick.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a6a7578b4e624749b7e468421281b66 +guid: 73221e691bb7f9d449fc6a0db165b958 ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/Shaders/Marker.shader b/Assets/Shaders/Marker.shader new file mode 100644 index 0000000..f45136f --- /dev/null +++ b/Assets/Shaders/Marker.shader @@ -0,0 +1,82 @@ +Shader "Carmen/SDF/Marker" +{ + Properties + { + _MainTex ("SDF", 2D) = "white" {} + + _BorderColour ("Border Colour", Color) = (1.0, 1.0, 1.0, 1.0) + _BorderSize ("Border Size", Range(0.05, 0.95)) = 0.95 + + _FillColour ("Fill Colour", Color) = (0.0, 0.0, 0.0, 1.0) + _FillSize ("Fill Size", Range(0.05, 0.95)) = 0.66666666666666 + } + SubShader + { + Tags { "Queue"="Transparent" "RenderType" = "Transparent" } + LOD 200 + + Pass { + Cull Back + Lighting Off + Blend SrcAlpha OneMinusSrcAlpha + Offset -1, -1 + + CGPROGRAM + #include "UnityCG.cginc" + #pragma target 4.5 + #pragma vertex vert + #pragma fragment frag + + UNITY_DECLARE_TEX2D(_MainTex); + float4 _MainTex_ST; + half4 _BorderColour; + half _BorderSize; + half4 _FillColour; + half _FillSize; + + + struct Data + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct V2F + { + float4 position : SV_POSITION; + float2 uv : TEXCOORD0; + }; + + + V2F vert(Data v) + { + V2F o; + o.position = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag(V2F i) : SV_TARGET + { + half sdf_sample = UNITY_SAMPLE_TEX2D(_MainTex, i.uv).r; + + half border_halfchange = (abs(ddx(sdf_sample)) + abs(ddy(sdf_sample))) / 2.0; + half border_loweredge = (1.0 - _BorderSize) - border_halfchange; + half border_upperedge = (1.0 - _BorderSize) + border_halfchange; + half border_mask = saturate((sdf_sample - border_loweredge) / (border_upperedge - border_loweredge)); + + half fill_halfchange = (abs(ddx(sdf_sample)) + abs(ddy(sdf_sample))) / 2.0; + half fill_loweredge = (1.0 - _FillSize) - fill_halfchange; + half fill_upperedge = (1.0 - _FillSize) + fill_halfchange; + half fill_mask = saturate((sdf_sample - fill_loweredge) / (fill_upperedge - fill_loweredge)); + + half3 blend_colour = lerp(_BorderColour, _FillColour, fill_mask); + + return fixed4(blend_colour, border_mask); + } + ENDCG + } + + } + Fallback "VRChat/Mobile/Standard Lite" +} \ No newline at end of file diff --git a/Assets/Shaders/Marker.shader.meta b/Assets/Shaders/Marker.shader.meta new file mode 100644 index 0000000..c40c3c7 --- /dev/null +++ b/Assets/Shaders/Marker.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 425fd677d4694b044973d26bd5f48af5 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/RenderTextureUI.shader b/Assets/Shaders/RenderTextureUI.shader index da0a265..c554368 100644 --- a/Assets/Shaders/RenderTextureUI.shader +++ b/Assets/Shaders/RenderTextureUI.shader @@ -37,7 +37,6 @@ Shader "Carmen/Render Texture UI" UNITY_DECLARE_TEX2D(_MainTex); float4 _MainTex_ST; half4 _Color; - half4 _Skew; struct Data { diff --git a/Assets/Shaders/SDF Map Borders.shader b/Assets/Shaders/SDF Map Borders.shader index 9072952..2025854 100644 --- a/Assets/Shaders/SDF Map Borders.shader +++ b/Assets/Shaders/SDF Map Borders.shader @@ -6,245 +6,250 @@ Shader "Carmen/Maps/SDF Map Borders" { - Properties - { - _MainTex ("SDF", 2D) = "white" {} - _ColourTex ("Country Colours", 2D) = "white" {} + Properties + { + _MainTex ("SDF", 2D) = "white" {} + _ColourTex ("Country Colours", 2D) = "white" {} - _LineThickness ("Line Thickness", float) = 0.15 - _VerticalLineCorrection ("Vertical Line Correction", float) = 0.0 - } + _LineThickness ("Line Thickness", float) = 0.15 + _VerticalLineCorrection ("Vertical Line Correction", float) = 0.0 + } - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 200 - - CGPROGRAM + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + CGPROGRAM - #include "UnityCG.cginc" - #include "UnityPBSLighting.cginc" + #include "UnityCG.cginc" + #include "UnityPBSLighting.cginc" - #define _SPECULARHIGHLIGHTS_OFF - #define _GLOSSYREFLECTIONS_OFF + #define _SPECULARHIGHLIGHTS_OFF + #define _GLOSSYREFLECTIONS_OFF - // Use our squeezed BRDF on mobile - // In general we want FLOAT_MIN to be the smallest value such that (1.0f + FLOAT_MIN) != FLOAT_MIN - #if defined(SHADER_API_MOBILE) - #define VRC_BRDF_PBS BRDF2_VRC_PBS - #define FLOAT_MIN 1e-4 - #else - #define VRC_BRDF_PBS UNITY_BRDF_PBS - #define FLOAT_MIN 1e-6 - #endif + // Use our squeezed BRDF on mobile + // In general we want FLOAT_MIN to be the smallest value such that (1.0f + FLOAT_MIN) != FLOAT_MIN + #if defined(SHADER_API_MOBILE) + #define VRC_BRDF_PBS BRDF2_VRC_PBS + #define FLOAT_MIN 1e-4 + #else + #define VRC_BRDF_PBS UNITY_BRDF_PBS + #define FLOAT_MIN 1e-6 + #endif - #pragma target 4.5 - #pragma surface surf LambertVRC exclude_path:prepass exclude_path:deferred noforwardadd + #pragma target 4.5 + #pragma surface surf LambertVRC exclude_path:prepass exclude_path:deferred noforwardadd - UNITY_DECLARE_TEX2D(_MainTex); - UNITY_DECLARE_TEX2D(_ColourTex); + UNITY_DECLARE_TEX2D(_MainTex); + UNITY_DECLARE_TEX2D(_ColourTex); - CBUFFER_START(UnityPerMaterial) - float _LineThickness; - float _VerticalLineCorrection; - CBUFFER_END + CBUFFER_START(UnityPerMaterial) + float _LineThickness; + float _VerticalLineCorrection; + CBUFFER_END - struct SurfaceOutputVRC - { - fixed3 Albedo; - fixed3 Normal; - fixed3 Emission; - half Specular; - fixed Gloss; - fixed Alpha; - }; + struct SurfaceOutputVRC + { + fixed3 Albedo; + fixed3 Normal; + fixed3 Emission; + half Specular; + fixed Gloss; + fixed Alpha; + }; - struct Input - { - float2 uv_MainTex; - half4 colour : COLOR; - }; - + struct Input + { + float2 uv_MainTex; + half4 colour : COLOR; + }; + - void surf (Input IN, inout SurfaceOutputVRC o) - { - half linestep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex), _LineThickness + (_VerticalLineCorrection * IN.uv_MainTex.y)); - o.Albedo = lerp(UNITY_SAMPLE_TEX2D(_ColourTex, IN.uv_MainTex), half4(0.0, 0.0, 0.0, 1.0), linestep); - o.Alpha = 1.0f; - } - + void surf (Input IN, inout SurfaceOutputVRC o) + { + half linestep_sample = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex).r; + half linestep_halfchange = (abs(ddx(linestep_sample)) + abs(ddy(linestep_sample))) / 2.0; + half linestep_loweredge = (1.0 - _LineThickness) - linestep_halfchange; + half linestep_upperedge = (1.0 - _LineThickness) + linestep_halfchange; + half linestep_mask = saturate((linestep_sample - linestep_loweredge) / (linestep_upperedge - linestep_loweredge)); + + o.Albedo = lerp(UNITY_SAMPLE_TEX2D(_ColourTex, IN.uv_MainTex), half4(0.0, 0.0, 0.0, 1.0), linestep_mask); + o.Alpha = 1.0f; + } + - inline half3 VRC_SafeNormalize(half3 value) - { - float lenSqr = max((float)dot(value, value), FLOAT_MIN); - return value * (half) rsqrt(lenSqr); - } + inline half3 VRC_SafeNormalize(half3 value) + { + float lenSqr = max((float)dot(value, value), FLOAT_MIN); + return value * (half) rsqrt(lenSqr); + } - inline half shEvaluateDiffuseL1Geomerics(half L0, half3 L1, half3 n) - { - // avg direction of incoming light - half3 R1 = 0.5f * L1; + inline half shEvaluateDiffuseL1Geomerics(half L0, half3 L1, half3 n) + { + // avg direction of incoming light + half3 R1 = 0.5f * L1; - // directional brightness - half lenR1 = length(R1); + // directional brightness + half lenR1 = length(R1); - // linear angle between normal and direction 0-1, saturate fix from filamented - half q = dot(VRC_SafeNormalize(R1), n) * 0.5 + 0.5; - q = isnan(q) ? 1 : q; - q = saturate(q); + // linear angle between normal and direction 0-1, saturate fix from filamented + half q = dot(VRC_SafeNormalize(R1), n) * 0.5 + 0.5; + q = isnan(q) ? 1 : q; + q = saturate(q); - // power for q - // lerps from 1 (linear) to 3 (cubic) based on directionality - //half p = 1.0f + 2.0f * lenR1 / L0; + // power for q + // lerps from 1 (linear) to 3 (cubic) based on directionality + //half p = 1.0f + 2.0f * lenR1 / L0; - // dynamic range constant - // should vary between 4 (highly directional) and 0 (ambient) - //half a = (1.0f - lenR1 / L0) / (1.0f + lenR1 / L0); + // dynamic range constant + // should vary between 4 (highly directional) and 0 (ambient) + //half a = (1.0f - lenR1 / L0) / (1.0f + lenR1 / L0); - // negative ambient fix, if L0 <= 0, return 0 - //return (L0 <= 0.f) ? 0.f : (L0 * (a + (1.0f - a) * (p + 1.0f) * pow(q, p))); + // negative ambient fix, if L0 <= 0, return 0 + //return (L0 <= 0.f) ? 0.f : (L0 * (a + (1.0f - a) * (p + 1.0f) * pow(q, p))); - // optimized reordering. thanks wolfram - return (L0 <= 0.f) ? 0.f : ( 4. * lenR1 * pow(q, (2 * lenR1) / L0 + 1) + ( L0 * (L0 - lenR1) )/(L0 + lenR1)); - } + // optimized reordering. thanks wolfram + return (L0 <= 0.f) ? 0.f : ( 4. * lenR1 * pow(q, (2 * lenR1) / L0 + 1) + ( L0 * (L0 - lenR1) )/(L0 + lenR1)); + } - inline UnityGI UnityGI_BaseVRC(UnityGIInput data, half occlusion, half3 normalWorld, half3 eyeVec, half smoothness, half hasReflProbe) - { - UnityGI o_gi; + inline UnityGI UnityGI_BaseVRC(UnityGIInput data, half occlusion, half3 normalWorld, half3 eyeVec, half smoothness, half hasReflProbe) + { + UnityGI o_gi; - // Base pass with Lightmap support is responsible for handling ShadowMask / blending here for performance reason - #if defined(HANDLE_SHADOWS_BLENDING_IN_GI) - half bakedAtten = UnitySampleBakedOcclusion(data.lightmapUV.xy, data.worldPos); - float zDist = dot(_WorldSpaceCameraPos - data.worldPos, UNITY_MATRIX_V[2].xyz); - float fadeDist = UnityComputeShadowFadeDistance(data.worldPos, zDist); - data.atten = UnityMixRealtimeAndBakedShadows(data.atten, bakedAtten, UnityComputeShadowFade(fadeDist)); - #endif + // Base pass with Lightmap support is responsible for handling ShadowMask / blending here for performance reason + #if defined(HANDLE_SHADOWS_BLENDING_IN_GI) + half bakedAtten = UnitySampleBakedOcclusion(data.lightmapUV.xy, data.worldPos); + float zDist = dot(_WorldSpaceCameraPos - data.worldPos, UNITY_MATRIX_V[2].xyz); + float fadeDist = UnityComputeShadowFadeDistance(data.worldPos, zDist); + data.atten = UnityMixRealtimeAndBakedShadows(data.atten, bakedAtten, UnityComputeShadowFade(fadeDist)); + #endif - o_gi.light = data.light; - o_gi.light.color *= data.atten; + o_gi.light = data.light; + o_gi.light.color *= data.atten; - #if defined(LIGHTMAP_ON) - #if defined(_MONOSH) - BakeryMonoSH(o_gi.indirect.diffuse, o_gi.indirect.specular, data.lightmapUV.xy, normalWorld, eyeVec, smoothness, occlusion); - #else - // Baked lightmaps + #if defined(LIGHTMAP_ON) + #if defined(_MONOSH) + BakeryMonoSH(o_gi.indirect.diffuse, o_gi.indirect.specular, data.lightmapUV.xy, normalWorld, eyeVec, smoothness, occlusion); + #else + // Baked lightmaps - half3 bakedColor = half3(1.0, 1.0, 1.0); - half4 bakedColorTex = UNITY_SAMPLE_TEX2D(unity_Lightmap, data.lightmapUV.xy); - #if defined(FORCE_UNITY_DLDR_LIGHTMAP_ENCODING) - bakedColor = DecodeLightmapDoubleLDR(bakedColorTex, unity_Lightmap_HDR); - #elif defined(FORCE_UNITY_RGBM_LIGHTMAP_ENCODING) - bakedColor = DecodeLightmapRGBM(bakedColorTex, unity_Lightmap_HDR); - #elif defined(FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING) - bakedColor = bakedColorTex; - #else - bakedColor = DecodeLightmap(bakedColorTex); - #endif + half3 bakedColor = half3(1.0, 1.0, 1.0); + half4 bakedColorTex = UNITY_SAMPLE_TEX2D(unity_Lightmap, data.lightmapUV.xy); + #if defined(FORCE_UNITY_DLDR_LIGHTMAP_ENCODING) + bakedColor = DecodeLightmapDoubleLDR(bakedColorTex, unity_Lightmap_HDR); + #elif defined(FORCE_UNITY_RGBM_LIGHTMAP_ENCODING) + bakedColor = DecodeLightmapRGBM(bakedColorTex, unity_Lightmap_HDR); + #elif defined(FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING) + bakedColor = bakedColorTex; + #else + bakedColor = DecodeLightmap(bakedColorTex); + #endif - // Can be set if the renderer has a valid lightmap but the shader doesn't use it - #if !defined(UNITY_LIGHTMAP_NONE) - #if defined(DIRLIGHTMAP_COMBINED) - fixed4 bakedDirTex = UNITY_SAMPLE_TEX2D_SAMPLER(unity_LightmapInd, unity_Lightmap, data.lightmapUV.xy); - o_gi.indirect.diffuse = DecodeDirectionalLightmap(bakedColor, bakedDirTex, normalWorld); - #else // not directional lightmap - o_gi.indirect.diffuse = bakedColor; - #endif - #else - o_gi.indirect.diffuse = 1; - #endif + // Can be set if the renderer has a valid lightmap but the shader doesn't use it + #if !defined(UNITY_LIGHTMAP_NONE) + #if defined(DIRLIGHTMAP_COMBINED) + fixed4 bakedDirTex = UNITY_SAMPLE_TEX2D_SAMPLER(unity_LightmapInd, unity_Lightmap, data.lightmapUV.xy); + o_gi.indirect.diffuse = DecodeDirectionalLightmap(bakedColor, bakedDirTex, normalWorld); + #else // not directional lightmap + o_gi.indirect.diffuse = bakedColor; + #endif + #else + o_gi.indirect.diffuse = 1; + #endif - o_gi.indirect.specular = 0; - #endif - o_gi.indirect.diffuse *= occlusion; - #elif defined(UNITY_SHOULD_SAMPLE_SH) - o_gi.indirect.diffuse.r = shEvaluateDiffuseL1Geomerics(unity_SHAr.w, unity_SHAr.xyz, normalWorld); - o_gi.indirect.diffuse.g = shEvaluateDiffuseL1Geomerics(unity_SHAg.w, unity_SHAg.xyz, normalWorld); - o_gi.indirect.diffuse.b = shEvaluateDiffuseL1Geomerics(unity_SHAb.w, unity_SHAb.xyz, normalWorld); + o_gi.indirect.specular = 0; + #endif + o_gi.indirect.diffuse *= occlusion; + #elif defined(UNITY_SHOULD_SAMPLE_SH) + o_gi.indirect.diffuse.r = shEvaluateDiffuseL1Geomerics(unity_SHAr.w, unity_SHAr.xyz, normalWorld); + o_gi.indirect.diffuse.g = shEvaluateDiffuseL1Geomerics(unity_SHAg.w, unity_SHAg.xyz, normalWorld); + o_gi.indirect.diffuse.b = shEvaluateDiffuseL1Geomerics(unity_SHAb.w, unity_SHAb.xyz, normalWorld); - #if !defined(_SPECULARHIGHLIGHTS_OFF) - UNITY_BRANCH - #if !defined(_GLOSSYREFLECTIONS_OFF) - if(!any(o_gi.light.color) && !hasReflProbe) - #else - if(!any(o_gi.light.color)) - #endif - { - half3 L0rgb = half3(unity_SHAr.w, unity_SHAg.w, unity_SHAb.w); - half3x3 L1rgb = half3x3(unity_SHAr.x, unity_SHAg.x, unity_SHAb.x, - unity_SHAr.y, unity_SHAg.y, unity_SHAb.y, - unity_SHAr.z, unity_SHAg.z, unity_SHAb.z); - half3 L1 = unity_SHAr.xyz + unity_SHAg.xyz + unity_SHAb.xyz; + #if !defined(_SPECULARHIGHLIGHTS_OFF) + UNITY_BRANCH + #if !defined(_GLOSSYREFLECTIONS_OFF) + if(!any(o_gi.light.color) && !hasReflProbe) + #else + if(!any(o_gi.light.color)) + #endif + { + half3 L0rgb = half3(unity_SHAr.w, unity_SHAg.w, unity_SHAb.w); + half3x3 L1rgb = half3x3(unity_SHAr.x, unity_SHAg.x, unity_SHAb.x, + unity_SHAr.y, unity_SHAg.y, unity_SHAb.y, + unity_SHAr.z, unity_SHAg.z, unity_SHAb.z); + half3 L1 = unity_SHAr.xyz + unity_SHAg.xyz + unity_SHAb.xyz; - half3 dominantDir = VRC_SafeNormalize(L1); + half3 dominantDir = VRC_SafeNormalize(L1); - // Light can be anywhere from 'fully sparse' to 'completely focused' based on how much of it is L0 or L1rgb. - half L1len = length(L1); - half focus = L1len / (length(L0rgb) + L1len); - half specularTerm = ComputeSpecularGGX(dominantDir, eyeVec, normalWorld, smoothness * focus); - - // L0 + L1, the total light energy expected, is the same over the whole mesh. This is a problem with specular highlights - // as they have a second peak in the negative direction - normally hidden by the fact that light energy there is normally zero. - // Multiplying by non-linear diffuse gives satisfactory results, though isn't particularly physically accurate. - // The brightness vs ground truth (a reflection probe) is too low though... closest we can get appears to be - // a dimensionless version, shEvaluateDiffuseL1Geometrics but applied to just the ratio. - half energyFactor = shEvaluateDiffuseL1Normalized(dot(L0rgb, 1), L1, normalWorld); - half3 sh = (L0rgb + mul(dominantDir, L1rgb)) * energyFactor; - - o_gi.indirect.specular = max(specularTerm * sh, 0.0); + // Light can be anywhere from 'fully sparse' to 'completely focused' based on how much of it is L0 or L1rgb. + half L1len = length(L1); + half focus = L1len / (length(L0rgb) + L1len); + half specularTerm = ComputeSpecularGGX(dominantDir, eyeVec, normalWorld, smoothness * focus); + + // L0 + L1, the total light energy expected, is the same over the whole mesh. This is a problem with specular highlights + // as they have a second peak in the negative direction - normally hidden by the fact that light energy there is normally zero. + // Multiplying by non-linear diffuse gives satisfactory results, though isn't particularly physically accurate. + // The brightness vs ground truth (a reflection probe) is too low though... closest we can get appears to be + // a dimensionless version, shEvaluateDiffuseL1Geometrics but applied to just the ratio. + half energyFactor = shEvaluateDiffuseL1Normalized(dot(L0rgb, 1), L1, normalWorld); + half3 sh = (L0rgb + mul(dominantDir, L1rgb)) * energyFactor; + + o_gi.indirect.specular = max(specularTerm * sh, 0.0); - // Reflection Probes use occlusion, direct lights don't. MonoSH and Specular Hack are both somewhere in between, - // so we use focus to split the difference - 1.0 is direct, 0.0 is reflection probe, so we invert. - o_gi.indirect.specular *= LerpOneTo(occlusion, 1 - focus); - } - else - { - o_gi.indirect.specular = 0; - } - #else - o_gi.indirect.specular = 0; - #endif - o_gi.indirect.diffuse += data.ambient; - o_gi.indirect.diffuse *= occlusion; - #else - o_gi.indirect.specular = 0; - o_gi.indirect.diffuse = 0; - #endif + // Reflection Probes use occlusion, direct lights don't. MonoSH and Specular Hack are both somewhere in between, + // so we use focus to split the difference - 1.0 is direct, 0.0 is reflection probe, so we invert. + o_gi.indirect.specular *= LerpOneTo(occlusion, 1 - focus); + } + else + { + o_gi.indirect.specular = 0; + } + #else + o_gi.indirect.specular = 0; + #endif + o_gi.indirect.diffuse += data.ambient; + o_gi.indirect.diffuse *= occlusion; + #else + o_gi.indirect.specular = 0; + o_gi.indirect.diffuse = 0; + #endif - return o_gi; - } + return o_gi; + } - inline fixed4 UnityLambertVRCLight (SurfaceOutputVRC s, UnityLight light) - { - fixed diff = max (0, dot (s.Normal, light.dir)); + inline fixed4 UnityLambertVRCLight (SurfaceOutputVRC s, UnityLight light) + { + fixed diff = max (0, dot (s.Normal, light.dir)); - fixed4 c; - c.rgb = s.Albedo * light.color * diff; - c.a = s.Alpha; - return c; - } + fixed4 c; + c.rgb = s.Albedo * light.color * diff; + c.a = s.Alpha; + return c; + } - inline fixed4 LightingLambertVRC (SurfaceOutputVRC s, UnityGI gi) - { - fixed4 c; - c = UnityLambertVRCLight (s, gi.light); + inline fixed4 LightingLambertVRC (SurfaceOutputVRC s, UnityGI gi) + { + fixed4 c; + c = UnityLambertVRCLight (s, gi.light); - #if defined(UNITY_LIGHT_FUNCTION_APPLY_INDIRECT) - c.rgb += s.Albedo * gi.indirect.diffuse; - #endif + #if defined(UNITY_LIGHT_FUNCTION_APPLY_INDIRECT) + c.rgb += s.Albedo * gi.indirect.diffuse; + #endif - return c; - } + return c; + } - inline void LightingLambertVRC_GI ( - SurfaceOutputVRC s, - UnityGIInput data, - inout UnityGI gi) - { - gi = UnityGI_BaseVRC(data, 1.0, s.Normal, half3(0, 0, 0), half(0), 0); - } + inline void LightingLambertVRC_GI ( + SurfaceOutputVRC s, + UnityGIInput data, + inout UnityGI gi) + { + gi = UnityGI_BaseVRC(data, 1.0, s.Normal, half3(0, 0, 0), half(0), 0); + } - ENDCG - } + ENDCG + } - FallBack "Diffuse" + FallBack "Diffuse" } diff --git a/Assets/Shaders/SDF Map Dot.shader b/Assets/Shaders/SDF Map Dot.shader deleted file mode 100644 index d7ef1a0..0000000 --- a/Assets/Shaders/SDF Map Dot.shader +++ /dev/null @@ -1,247 +0,0 @@ -// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) - -// Simplified Diffuse shader. Differences from regular Diffuse one: -// - no Main Color -// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. - -Shader "Carmen/Maps/SDF Map Dot" -{ - Properties - { - _MainTex ("SDF", 2D) = "white" {} - } - - SubShader - { - Tags { "Queue"="AlphaTest" "IgnoreProjector"="True" "RenderType"="TransparentCutout" } - LOD 200 - - CGPROGRAM - - #include "UnityCG.cginc" - #include "UnityPBSLighting.cginc" - - #define _SPECULARHIGHLIGHTS_OFF - #define _GLOSSYREFLECTIONS_OFF - - // Use our squeezed BRDF on mobile - // In general we want FLOAT_MIN to be the smallest value such that (1.0f + FLOAT_MIN) != FLOAT_MIN - #if defined(SHADER_API_MOBILE) - #define VRC_BRDF_PBS BRDF2_VRC_PBS - #define FLOAT_MIN 1e-4 - #else - #define VRC_BRDF_PBS UNITY_BRDF_PBS - #define FLOAT_MIN 1e-6 - #endif - - #pragma target 4.5 - #pragma surface surf LambertVRC alphatest:_Cutoff exclude_path:prepass exclude_path:deferred noforwardadd - - UNITY_DECLARE_TEX2D(_MainTex); - UNITY_DECLARE_TEX2D(_ColourTex); - - struct SurfaceOutputVRC - { - fixed3 Albedo; - fixed3 Normal; - fixed3 Emission; - half Specular; - fixed Gloss; - fixed Alpha; - }; - - struct Input - { - float2 uv_MainTex; - half4 colour : COLOR; - }; - - - void surf (Input IN, inout SurfaceOutputVRC o) - { - half alphastep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex), 0.99); - if (alphastep < 0.5) discard; - - half dotstep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex), 0.4); - o.Albedo = lerp(half4(1.0, 1.0, 1.0, 1.0), half4(0.8, 0.0, 0.0, 1.0), dotstep); - o.Alpha = alphastep; - - o.Gloss = 0.0; - o.Normal = fixed3(0.0, 0.0, 1.0); - } - - - inline half3 VRC_SafeNormalize(half3 value) - { - float lenSqr = max((float)dot(value, value), FLOAT_MIN); - return value * (half) rsqrt(lenSqr); - } - - inline half shEvaluateDiffuseL1Geomerics(half L0, half3 L1, half3 n) - { - // avg direction of incoming light - half3 R1 = 0.5f * L1; - - // directional brightness - half lenR1 = length(R1); - - // linear angle between normal and direction 0-1, saturate fix from filamented - half q = dot(VRC_SafeNormalize(R1), n) * 0.5 + 0.5; - q = isnan(q) ? 1 : q; - q = saturate(q); - - // power for q - // lerps from 1 (linear) to 3 (cubic) based on directionality - //half p = 1.0f + 2.0f * lenR1 / L0; - - // dynamic range constant - // should vary between 4 (highly directional) and 0 (ambient) - //half a = (1.0f - lenR1 / L0) / (1.0f + lenR1 / L0); - - // negative ambient fix, if L0 <= 0, return 0 - //return (L0 <= 0.f) ? 0.f : (L0 * (a + (1.0f - a) * (p + 1.0f) * pow(q, p))); - - // optimized reordering. thanks wolfram - return (L0 <= 0.f) ? 0.f : ( 4. * lenR1 * pow(q, (2 * lenR1) / L0 + 1) + ( L0 * (L0 - lenR1) )/(L0 + lenR1)); - } - - inline UnityGI UnityGI_BaseVRC(UnityGIInput data, half occlusion, half3 normalWorld, half3 eyeVec, half smoothness, half hasReflProbe) - { - UnityGI o_gi; - - // Base pass with Lightmap support is responsible for handling ShadowMask / blending here for performance reason - #if defined(HANDLE_SHADOWS_BLENDING_IN_GI) - half bakedAtten = UnitySampleBakedOcclusion(data.lightmapUV.xy, data.worldPos); - float zDist = dot(_WorldSpaceCameraPos - data.worldPos, UNITY_MATRIX_V[2].xyz); - float fadeDist = UnityComputeShadowFadeDistance(data.worldPos, zDist); - data.atten = UnityMixRealtimeAndBakedShadows(data.atten, bakedAtten, UnityComputeShadowFade(fadeDist)); - #endif - - o_gi.light = data.light; - o_gi.light.color *= data.atten; - - #if defined(LIGHTMAP_ON) - #if defined(_MONOSH) - BakeryMonoSH(o_gi.indirect.diffuse, o_gi.indirect.specular, data.lightmapUV.xy, normalWorld, eyeVec, smoothness, occlusion); - #else - // Baked lightmaps - - half3 bakedColor = half3(1.0, 1.0, 1.0); - half4 bakedColorTex = UNITY_SAMPLE_TEX2D(unity_Lightmap, data.lightmapUV.xy); - #if defined(FORCE_UNITY_DLDR_LIGHTMAP_ENCODING) - bakedColor = DecodeLightmapDoubleLDR(bakedColorTex, unity_Lightmap_HDR); - #elif defined(FORCE_UNITY_RGBM_LIGHTMAP_ENCODING) - bakedColor = DecodeLightmapRGBM(bakedColorTex, unity_Lightmap_HDR); - #elif defined(FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING) - bakedColor = bakedColorTex; - #else - bakedColor = DecodeLightmap(bakedColorTex); - #endif - - // Can be set if the renderer has a valid lightmap but the shader doesn't use it - #if !defined(UNITY_LIGHTMAP_NONE) - #if defined(DIRLIGHTMAP_COMBINED) - fixed4 bakedDirTex = UNITY_SAMPLE_TEX2D_SAMPLER(unity_LightmapInd, unity_Lightmap, data.lightmapUV.xy); - o_gi.indirect.diffuse = DecodeDirectionalLightmap(bakedColor, bakedDirTex, normalWorld); - #else // not directional lightmap - o_gi.indirect.diffuse = bakedColor; - #endif - #else - o_gi.indirect.diffuse = 1; - #endif - - o_gi.indirect.specular = 0; - #endif - o_gi.indirect.diffuse *= occlusion; - #elif defined(UNITY_SHOULD_SAMPLE_SH) - o_gi.indirect.diffuse.r = shEvaluateDiffuseL1Geomerics(unity_SHAr.w, unity_SHAr.xyz, normalWorld); - o_gi.indirect.diffuse.g = shEvaluateDiffuseL1Geomerics(unity_SHAg.w, unity_SHAg.xyz, normalWorld); - o_gi.indirect.diffuse.b = shEvaluateDiffuseL1Geomerics(unity_SHAb.w, unity_SHAb.xyz, normalWorld); - - #if !defined(_SPECULARHIGHLIGHTS_OFF) - UNITY_BRANCH - #if !defined(_GLOSSYREFLECTIONS_OFF) - if(!any(o_gi.light.color) && !hasReflProbe) - #else - if(!any(o_gi.light.color)) - #endif - { - half3 L0rgb = half3(unity_SHAr.w, unity_SHAg.w, unity_SHAb.w); - half3x3 L1rgb = half3x3(unity_SHAr.x, unity_SHAg.x, unity_SHAb.x, - unity_SHAr.y, unity_SHAg.y, unity_SHAb.y, - unity_SHAr.z, unity_SHAg.z, unity_SHAb.z); - half3 L1 = unity_SHAr.xyz + unity_SHAg.xyz + unity_SHAb.xyz; - - half3 dominantDir = VRC_SafeNormalize(L1); - - // Light can be anywhere from 'fully sparse' to 'completely focused' based on how much of it is L0 or L1rgb. - half L1len = length(L1); - half focus = L1len / (length(L0rgb) + L1len); - half specularTerm = ComputeSpecularGGX(dominantDir, eyeVec, normalWorld, smoothness * focus); - - // L0 + L1, the total light energy expected, is the same over the whole mesh. This is a problem with specular highlights - // as they have a second peak in the negative direction - normally hidden by the fact that light energy there is normally zero. - // Multiplying by non-linear diffuse gives satisfactory results, though isn't particularly physically accurate. - // The brightness vs ground truth (a reflection probe) is too low though... closest we can get appears to be - // a dimensionless version, shEvaluateDiffuseL1Geometrics but applied to just the ratio. - half energyFactor = shEvaluateDiffuseL1Normalized(dot(L0rgb, 1), L1, normalWorld); - half3 sh = (L0rgb + mul(dominantDir, L1rgb)) * energyFactor; - - o_gi.indirect.specular = max(specularTerm * sh, 0.0); - - // Reflection Probes use occlusion, direct lights don't. MonoSH and Specular Hack are both somewhere in between, - // so we use focus to split the difference - 1.0 is direct, 0.0 is reflection probe, so we invert. - o_gi.indirect.specular *= LerpOneTo(occlusion, 1 - focus); - } - else - { - o_gi.indirect.specular = 0; - } - #else - o_gi.indirect.specular = 0; - #endif - o_gi.indirect.diffuse += data.ambient; - o_gi.indirect.diffuse *= occlusion; - #else - o_gi.indirect.specular = 0; - o_gi.indirect.diffuse = 0; - #endif - - return o_gi; - } - - inline fixed4 UnityLambertVRCLight (SurfaceOutputVRC s, UnityLight light) - { - fixed diff = max (0, dot (s.Normal, light.dir)); - - fixed4 c; - c.rgb = s.Albedo * light.color * diff; - c.a = s.Alpha; - return c; - } - - inline fixed4 LightingLambertVRC (SurfaceOutputVRC s, UnityGI gi) - { - fixed4 c; - c = UnityLambertVRCLight (s, gi.light); - - #if defined(UNITY_LIGHT_FUNCTION_APPLY_INDIRECT) - c.rgb += s.Albedo * gi.indirect.diffuse; - #endif - - return c; - } - - inline void LightingLambertVRC_GI ( - SurfaceOutputVRC s, - UnityGIInput data, - inout UnityGI gi) - { - gi = UnityGI_BaseVRC(data, 1.0, s.Normal, half3(0, 0, 0), half(0), 0); - } - - ENDCG - } - - FallBack "Diffuse" -} diff --git a/Assets/Shaders/SDF The Chase.shader b/Assets/Shaders/SDF The Chase.shader index febbce7..802de9f 100644 --- a/Assets/Shaders/SDF The Chase.shader +++ b/Assets/Shaders/SDF The Chase.shader @@ -11,101 +11,120 @@ Shader "Carmen/SDF/The Chase" { - Properties - { + Properties + { _MainTex ("SDF", 2D) = "white" {} - [ShowAsVector2] _Skew ("Skew", Vector) = (0.0, 0.0, 0.0, 0.0) + [ShowAsVector2] _Skew ("Skew", Vector) = (0.0, 0.0, 0.0, 0.0) _LeftColour ("Left Colour", Color) = (1.0, 0.0, 0.0, 1.0) _RightColour ("Right Colour", Color) = (0.0, 0.0, 1.0, 1.0) - _LeftLineColour ("Left Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) - _RightLineColour ("Right Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) + _LeftLineColour ("Left Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) + _RightLineColour ("Right Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) _LineThickness ("Line Thickness", float) = 0.25 - } - SubShader - { - Tags { "Queue"="Overlay" "RenderType"="Opaque" "CanUseSpriteAtlas"="True" } - LOD 200 + _TextThickness ("Text Thickness", float) = 0.1 + } + SubShader + { + Tags { "Queue"="Overlay" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" } + LOD 200 - Pass { - Cull Back - Lighting Off - //ZWrite Off - //ZTest Always + Pass { + Cull Back + Lighting Off + Blend SrcAlpha OneMinusSrcAlpha + ZWrite Off + //ZTest Always - CGPROGRAM - #include "UnityCG.cginc" + CGPROGRAM + #include "UnityCG.cginc" #pragma target 4.5 - #pragma vertex vert - #pragma fragment frag + #pragma vertex vert + #pragma fragment frag UNITY_DECLARE_TEX2D(_MainTex); - float4 _MainTex_ST; + float4 _MainTex_ST; - half4 _Skew; + half4 _Skew; half4 _LeftColour; half4 _RightColour; - half4 _LeftLineColour; - half4 _RightLineColour; - float _LineThickness; + half4 _LeftLineColour; + half4 _RightLineColour; + half _LineThickness; + half _TextThickness; - struct Data - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - }; + struct Data + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; - struct V2F - { - float4 position : SV_POSITION; - float2 uv : TEXCOORD0; - }; + struct V2F + { + float4 position : SV_POSITION; + float2 uv : TEXCOORD0; + }; - V2F vert(Data v) - { - V2F o; + V2F vert(Data v) + { + V2F o; - // Skew and scale as needed - float4x4 skewmatrix = float4x4( - 1.0, _Skew.x, 0.0, 0.0, - _Skew.y, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0 - ); - o.position = mul(skewmatrix, v.vertex); - o.position = mul(UNITY_MATRIX_P, - mul(UNITY_MATRIX_MV, float4(0.0, 0.0, 0.0, 1.0)) - + float4(o.position.x, o.position.y, 0.0, 0.0) - * float4( - length(unity_ObjectToWorld._m00_m10_m20), - length(unity_ObjectToWorld._m01_m11_m21), - 1.0, 1.0)); + // Skew and scale as needed + float4x4 skewmatrix = float4x4( + 1.0, _Skew.x, 0.0, 0.0, + _Skew.y, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.0, 1.0 + ); + o.position = mul(skewmatrix, v.vertex); + o.position = mul(UNITY_MATRIX_P, + mul(UNITY_MATRIX_MV, float4(0.0, 0.0, 0.0, 1.0)) + + float4(o.position.x, o.position.y, 0.0, 0.0) + * float4( + length(unity_ObjectToWorld._m00_m10_m20), + length(unity_ObjectToWorld._m01_m11_m21), + 1.0, 1.0)); - o.uv = TRANSFORM_TEX(v.uv, _MainTex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); - return o; - } + return o; + } - fixed4 frag(V2F i) : SV_TARGET - { - half texsample = UNITY_SAMPLE_TEX2D(_MainTex, i.uv).r; + fixed4 frag(V2F i) : SV_TARGET + { + half sdf_sample = UNITY_SAMPLE_TEX2D(_MainTex, i.uv).r; + half sdf_halfchange = (abs(ddx(sdf_sample)) + abs(ddy(sdf_sample))) / 2.0; - half alphastep = step(texsample, _LineThickness); - if (alphastep < 0.5) discard; + half alphastep_loweredge = (1.0 - _LineThickness) - sdf_halfchange; + half alphastep_upperedge = (1.0 - _LineThickness) + sdf_halfchange; + half alphastep = saturate((sdf_sample - alphastep_loweredge) / (alphastep_upperedge - alphastep_loweredge)); - half linestep = step(texsample, 0.1); - half uvrange = i.uv.x % 1.0; - return lerp( - lerp(_LeftLineColour, _RightLineColour, uvrange), - lerp(_LeftColour, _RightColour, uvrange), - linestep); - } - ENDCG - } - } - FallBack "Diffuse" + half textstep_loweredge = (1.0 - _TextThickness) - sdf_halfchange; + half textstep_upperedge = (1.0 - _TextThickness) + sdf_halfchange; + half textstep = saturate((sdf_sample - textstep_loweredge) / (textstep_upperedge - textstep_loweredge)); + + half uvrange = i.uv.x % 1.0; + + half3 outline = lerp(_LeftLineColour.rgb, _RightLineColour.rgb, uvrange); + half3 fill = lerp(_LeftColour.rgb, _RightColour.rgb, uvrange); + + return fixed4(lerp(outline, fill, textstep).rgb, alphastep); + + //half alphastep = step(texsample, _LineThickness); + //if (alphastep < 0.5) discard; + + // half linestep = step(texsample, 0.1); + // half uvrange = i.uv.x % 1.0; + // return lerp( + // lerp(_LeftLineColour, _RightLineColour, uvrange), + // lerp(_LeftColour, _RightColour, uvrange), + // linestep); + } + ENDCG + } + } + FallBack "Diffuse" } diff --git a/Assets/Shaders/ScreenNoise.shader b/Assets/Shaders/ScreenNoise.shader index e5d09d5..eacd178 100644 --- a/Assets/Shaders/ScreenNoise.shader +++ b/Assets/Shaders/ScreenNoise.shader @@ -1,4 +1,4 @@ -Shader "Custom/ScreenNoise" +Shader "Custom/Screen Noise" { Properties { diff --git a/Assets/Textures/Maps/T_Africa_SDF.png b/Assets/Textures/Maps/T_Africa_SDF.png index 42a13fa..62042a8 100644 Binary files a/Assets/Textures/Maps/T_Africa_SDF.png and b/Assets/Textures/Maps/T_Africa_SDF.png differ diff --git a/Assets/Textures/Maps/T_Asia_SDF.png b/Assets/Textures/Maps/T_Asia_SDF.png index 7572061..0516dde 100644 Binary files a/Assets/Textures/Maps/T_Asia_SDF.png and b/Assets/Textures/Maps/T_Asia_SDF.png differ diff --git a/Assets/Textures/Maps/T_Europe_SDF.png b/Assets/Textures/Maps/T_Europe_SDF.png index f5deb35..c61f996 100644 Binary files a/Assets/Textures/Maps/T_Europe_SDF.png and b/Assets/Textures/Maps/T_Europe_SDF.png differ diff --git a/Assets/Textures/Maps/T_MapDot_SDF.png b/Assets/Textures/Maps/T_MapDot_SDF.png deleted file mode 100644 index d19150e..0000000 Binary files a/Assets/Textures/Maps/T_MapDot_SDF.png and /dev/null differ diff --git a/Assets/Textures/Maps/T_NorthAmerica_SDF.png b/Assets/Textures/Maps/T_NorthAmerica_SDF.png index 2389db9..e0871c4 100644 Binary files a/Assets/Textures/Maps/T_NorthAmerica_SDF.png and b/Assets/Textures/Maps/T_NorthAmerica_SDF.png differ diff --git a/Assets/Textures/Maps/T_SouthAmerica_SDF.png b/Assets/Textures/Maps/T_SouthAmerica_SDF.png index ddbca8a..bc92365 100644 Binary files a/Assets/Textures/Maps/T_SouthAmerica_SDF.png and b/Assets/Textures/Maps/T_SouthAmerica_SDF.png differ diff --git a/Assets/Textures/T_Brick_AO.png b/Assets/Textures/T_Brick_AO.png new file mode 100644 index 0000000..b8cd472 Binary files /dev/null and b/Assets/Textures/T_Brick_AO.png differ diff --git a/Assets/Textures/T_Brick_AO.png.meta b/Assets/Textures/T_Brick_AO.png.meta new file mode 100644 index 0000000..31411e5 --- /dev/null +++ b/Assets/Textures/T_Brick_AO.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 8fb70a333687198428549edd75a6b812 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + singleChannelComponent: 1 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_Brick_Albedo.png b/Assets/Textures/T_Brick_Albedo.png new file mode 100644 index 0000000..492196b Binary files /dev/null and b/Assets/Textures/T_Brick_Albedo.png differ diff --git a/Assets/Textures/T_Brick_Albedo.png.meta b/Assets/Textures/T_Brick_Albedo.png.meta new file mode 100644 index 0000000..7e963f2 --- /dev/null +++ b/Assets/Textures/T_Brick_Albedo.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 922e8f9d75e81844db491772c20dab7d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_Brick_Height.png b/Assets/Textures/T_Brick_Height.png new file mode 100644 index 0000000..2a27a69 Binary files /dev/null and b/Assets/Textures/T_Brick_Height.png differ diff --git a/Assets/Textures/T_Brick_Height.png.meta b/Assets/Textures/T_Brick_Height.png.meta new file mode 100644 index 0000000..7c552ba --- /dev/null +++ b/Assets/Textures/T_Brick_Height.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 81bbe759ae6450e4ab0dc98f4d3acfc2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_Brick_Normal.png b/Assets/Textures/T_Brick_Normal.png new file mode 100644 index 0000000..e1da417 Binary files /dev/null and b/Assets/Textures/T_Brick_Normal.png differ diff --git a/Assets/Textures/T_Brick_Normal.png.meta b/Assets/Textures/T_Brick_Normal.png.meta new file mode 100644 index 0000000..9db70eb --- /dev/null +++ b/Assets/Textures/T_Brick_Normal.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e942e166f52480540a58a2d952433a50 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_Dot_SDF.png b/Assets/Textures/T_Dot_SDF.png new file mode 100644 index 0000000..27e2c9e Binary files /dev/null and b/Assets/Textures/T_Dot_SDF.png differ diff --git a/Assets/Textures/Maps/T_MapDot_SDF.png.meta b/Assets/Textures/T_Dot_SDF.png.meta similarity index 93% rename from Assets/Textures/Maps/T_MapDot_SDF.png.meta rename to Assets/Textures/T_Dot_SDF.png.meta index 32a8abf..4e548fa 100644 --- a/Assets/Textures/Maps/T_MapDot_SDF.png.meta +++ b/Assets/Textures/T_Dot_SDF.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f516eeb4315b4349a3a394222837a6b +guid: 6c66a343bb6aab449b87e1bc5b1e3a75 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -37,9 +37,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -71,10 +71,10 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: 9 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 64 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 64 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_TheChase.png b/Assets/Textures/T_TheChase.png index 50bbc61..98c8cae 100644 Binary files a/Assets/Textures/T_TheChase.png and b/Assets/Textures/T_TheChase.png differ diff --git a/Assets/Textures/T_X_SDF.png b/Assets/Textures/T_X_SDF.png new file mode 100644 index 0000000..a19e56c Binary files /dev/null and b/Assets/Textures/T_X_SDF.png differ diff --git a/Assets/Textures/T_X_SDF.png.meta b/Assets/Textures/T_X_SDF.png.meta new file mode 100644 index 0000000..e4e2f9a --- /dev/null +++ b/Assets/Textures/T_X_SDF.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 0b1771fb0d6a12b409d47ec9b55a8e79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + singleChannelComponent: 1 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 26 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 39c58e0..9ecd1a0 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 27 + Data: 28 - Name: Entry: 7 Data: @@ -842,16 +842,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailPlayer + Data: _PlayerPositionMarkers - Name: $v Entry: 7 Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailPlayer + Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 Data: 56|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PositionMarker[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 57|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _JailPlayer + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _JailPlayer + - Name: k__BackingField + Entry: 7 + Data: 61|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -875,13 +941,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -903,84 +969,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _Location - - Name: $v - Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Location - - Name: k__BackingField - Entry: 7 - Data: 60|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 60 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _Landmarks - Name: $v Entry: 7 Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Landmarks + Data: _Location - Name: k__BackingField Entry: 7 Data: 65|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: System.String, mscorlib - Name: Entry: 8 Data: @@ -1004,13 +1004,79 @@ MonoBehaviour: Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 68|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Landmarks + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Landmarks + - Name: k__BackingField + Entry: 7 + Data: 70|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 70 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1031,13 +1097,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 69|System.RuntimeType, mscorlib + Data: 74|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1046,7 +1112,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 69 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1061,13 +1127,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1091,16 +1157,16 @@ MonoBehaviour: Data: _CurrentPlayerCounter - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 69 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 69 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1115,13 +1181,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1145,16 +1211,16 @@ MonoBehaviour: Data: _Players - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Players - Name: k__BackingField Entry: 9 - Data: 65 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 65 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1169,13 +1235,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1199,7 +1265,7 @@ MonoBehaviour: Data: _RoundIsOver - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RoundIsOver @@ -1223,13 +1289,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1253,13 +1319,13 @@ MonoBehaviour: Data: _CameraControllerRound2 - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1283,7 +1349,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1307,7 +1373,7 @@ MonoBehaviour: Data: _PlayingJailCall - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayingJailCall @@ -1329,108 +1395,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _PanelToReveal_Cache - - Name: $v - Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PanelToReveal_Cache - - Name: k__BackingField - Entry: 9 - Data: 69 - - Name: k__BackingField - Entry: 9 - Data: 69 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 89|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 89 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - Name: _fieldAttributes Entry: 7 Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1454,19 +1418,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: _PanelToReveal_Cache - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: _PanelToReveal_Cache - Name: k__BackingField Entry: 9 - Data: 89 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 89 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1502,19 +1466,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_STANDARD - Name: $v Entry: 7 Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 89 + Entry: 7 + Data: 94|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 89 + Data: 94 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1529,7 +1499,103 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_RED + - Name: $v + Entry: 7 + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_RED + - Name: k__BackingField + Entry: 9 + Data: 94 + - Name: k__BackingField + Entry: 9 + Data: 94 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_YELLOW + - Name: $v + Entry: 7 + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_YELLOW + - Name: k__BackingField + Entry: 9 + Data: 94 + - Name: k__BackingField + Entry: 9 + Data: 94 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1553,16 +1619,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 89 + Data: 94 - Name: k__BackingField Entry: 9 - Data: 89 + Data: 94 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1577,7 +1643,8 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 8e78810..ae8e60d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -26,6 +26,7 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private JailChain _JailChain; [SerializeField] private JailPhone _JailPhone; [SerializeField] private ParticleSystem[] _PlayerConfettiCannons; + [SerializeField] private PositionMarker[] _PlayerPositionMarkers; [SerializeField] private RandomVideoPlayer _JailPlayer; @@ -71,6 +72,12 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Initialise(); _JailPhone.Initialise(); + string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers(); + for (int i = 0; i < _PlayerPositionMarkers.Length && i < WinningPlayers.Length; i++) + { + _PlayerPositionMarkers[i].SetPlayer(WinningPlayers[i]); + } + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); _CameraControllerRound2.InitialiseCameras(); @@ -90,6 +97,11 @@ public class GameManagerRound2 : GameManagerBase _JailPhone.Activate = false; _JailChain.Show = false; + for (int i = 0; i < _PlayerPositionMarkers.Length; i++) + { + _PlayerPositionMarkers[i].ClearPlayer(); + } + _CameraControllerRound2.DeinitialiseCameras(); _CameraControllerRound2.PlayModemZoom(false); diff --git a/Assets/UdonSharp/PositionMarker.asset b/Assets/UdonSharp/PositionMarker.asset new file mode 100644 index 0000000..945266d --- /dev/null +++ b/Assets/UdonSharp/PositionMarker.asset @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: PositionMarker + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 981ef74e27200a048a9ef94bde9ec221, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 5563268629326726702 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Marker + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Marker + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PlayerName + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayerName + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/PositionMarker.asset.meta b/Assets/UdonSharp/PositionMarker.asset.meta new file mode 100644 index 0000000..9d8e0a5 --- /dev/null +++ b/Assets/UdonSharp/PositionMarker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8937477f17b84354abef6783261f331e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/PositionMarker.cs b/Assets/UdonSharp/PositionMarker.cs new file mode 100644 index 0000000..7798f22 --- /dev/null +++ b/Assets/UdonSharp/PositionMarker.cs @@ -0,0 +1,39 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon.Common; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class PositionMarker : UdonSharpBehaviour +{ + [SerializeField] private GameObject _Marker; + + [UdonSynced] private string _PlayerName; + + + public override void OnDeserialization(DeserializationResult Result) + { + _SetPlayer_Synced(); + base.OnDeserialization(Result); + } + + public void SetPlayer(string Name) + { + _PlayerName = Name; + _SetPlayer_Synced(); + RequestSerialization(); + } + private void _SetPlayer_Synced() + { + _Marker.SetActive(Networking.LocalPlayer.displayName == _PlayerName); + } + + public void ClearPlayer() + { + _PlayerName = ""; + _SetPlayer_Synced(); + RequestSerialization(); + } +} diff --git a/Assets/UdonSharp/PositionMarker.cs.meta b/Assets/UdonSharp/PositionMarker.cs.meta new file mode 100644 index 0000000..3faf258 --- /dev/null +++ b/Assets/UdonSharp/PositionMarker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f09218772ba50c40af1b3aec63a6b55 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Raw Files/Brick Texture.xcf b/Raw Files/Brick Texture.xcf new file mode 100644 index 0000000..3b947ec Binary files /dev/null and b/Raw Files/Brick Texture.xcf differ diff --git a/Raw Files/Dot SDF.svg b/Raw Files/Dot SDF.svg new file mode 100644 index 0000000..52b32ea --- /dev/null +++ b/Raw Files/Dot SDF.svg @@ -0,0 +1,48 @@ + + + + + + + + + + diff --git a/Raw Files/X SDF.svg b/Raw Files/X SDF.svg new file mode 100644 index 0000000..6564c2a --- /dev/null +++ b/Raw Files/X SDF.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + +