diff --git a/Assets/Scenes/sr_sfz.unity b/Assets/Scenes/sr_sfz.unity index 313a8ab..290bc87 100755 --- a/Assets/Scenes/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz.unity @@ -198,7 +198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalPosition.y - value: 56.015503 + value: 180.5 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalPosition.z @@ -319,6 +319,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &288356524 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2912396910665834277, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + m_PrefabInstance: {fileID: 425847537} + m_PrefabAsset: {fileID: 0} +--- !u!64 &288356528 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288356524} + 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: 7854535973315510522, guid: 64b045a17d258ce37b459b444db394d4, type: 3} --- !u!1001 &425847537 PrefabInstance: m_ObjectHideFlags: 0 @@ -459,6 +486,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -205963052689911854, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -205963052689911854, guid: 64b045a17d258ce37b459b444db394d4, type: 3} propertyPath: m_TagString value: TrackLimits @@ -475,6 +506,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3405140382392473387, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 37d964cd6f6bb314bb1d5ca7f495aa2c, type: 2} - target: {fileID: 3978077225595692558, guid: 64b045a17d258ce37b459b444db394d4, type: 3} propertyPath: m_IsActive value: 0 @@ -511,6 +546,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c3980cf3065e76ef8bb1c807b696fd68, type: 2} + - target: {fileID: 6845515188066282248, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7598831704658644451, guid: 64b045a17d258ce37b459b444db394d4, type: 3} propertyPath: m_Enabled value: 0 @@ -555,6 +594,12 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1345436627} + - targetCorrespondingSourceObject: {fileID: 2912396910665834277, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + insertIndex: -1 + addedObject: {fileID: 288356528} - targetCorrespondingSourceObject: {fileID: -5844372059692666277, guid: 64b045a17d258ce37b459b444db394d4, type: 3} insertIndex: -1 addedObject: {fileID: 1713064437} @@ -573,70 +618,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8775984853132938334, guid: 64b045a17d258ce37b459b444db394d4, type: 3} insertIndex: -1 addedObject: {fileID: 98125982} - - targetCorrespondingSourceObject: {fileID: 6845515188066282248, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - insertIndex: -1 - addedObject: {fileID: 425847541} - - targetCorrespondingSourceObject: {fileID: -5913779785563003073, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - insertIndex: -1 - addedObject: {fileID: 425847539} - targetCorrespondingSourceObject: {fileID: -205963052689911854, guid: 64b045a17d258ce37b459b444db394d4, type: 3} insertIndex: -1 addedObject: {fileID: 2117162599} m_SourcePrefab: {fileID: 100100000, guid: 64b045a17d258ce37b459b444db394d4, type: 3} ---- !u!1 &425847538 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -5913779785563003073, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - m_PrefabInstance: {fileID: 425847537} - m_PrefabAsset: {fileID: 0} ---- !u!64 &425847539 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425847538} - 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: -2791751590836414311, guid: 64b045a17d258ce37b459b444db394d4, type: 3} ---- !u!1 &425847540 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6845515188066282248, guid: 64b045a17d258ce37b459b444db394d4, type: 3} - m_PrefabInstance: {fileID: 425847537} - m_PrefabAsset: {fileID: 0} ---- !u!64 &425847541 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425847540} - 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: -5851845345502915902, guid: 64b045a17d258ce37b459b444db394d4, type: 3} --- !u!1 &580552941 GameObject: m_ObjectHideFlags: 0 @@ -664,7 +649,7 @@ Transform: m_GameObject: {fileID: 580552941} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.97195065, z: -0, w: 0.23518482} - m_LocalPosition: {x: 611.48114, y: 56.015503, z: -1946.0573} + m_LocalPosition: {x: 611.48114, y: 174, z: -1946.0573} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1094,7 +1079,7 @@ Transform: m_GameObject: {fileID: 909221686} serializedVersion: 2 m_LocalRotation: {x: -0.03179071, y: -0.87406284, z: -0.017620075, w: -0.48445132} - m_LocalPosition: {x: 1384.024, y: -77.64374, z: 2249.808} + m_LocalPosition: {x: 1384.024, y: -247, z: 2249.808} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1208,7 +1193,7 @@ Transform: m_GameObject: {fileID: 934893631} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: -0, w: -1} - m_LocalPosition: {x: -1504.0255, y: 144.09802, z: 1204.1116} + m_LocalPosition: {x: -1504.0255, y: 470.1, z: 1204.1116} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1306,6 +1291,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1345436625 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 64b045a17d258ce37b459b444db394d4, type: 3} + m_PrefabInstance: {fileID: 425847537} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1345436627 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345436625} + 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: 0 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} --- !u!1 &1428984747 GameObject: m_ObjectHideFlags: 0 @@ -1467,6 +1479,10 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: audio value: @@ -1503,6 +1519,10 @@ PrefabInstance: propertyPath: shipControls value: objectReference: {fileID: 616008081} + - target: {fileID: 5731929726813851803, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder value: 3 diff --git a/Assets/Scenes/sr_sfz/spa-tunnel2.blend b/Assets/Scenes/sr_sfz/spa-tunnel2.blend new file mode 100755 index 0000000..2ccffd3 Binary files /dev/null and b/Assets/Scenes/sr_sfz/spa-tunnel2.blend differ diff --git a/Assets/Scenes/sr_sfz/spa-tunnel2.blend.meta b/Assets/Scenes/sr_sfz/spa-tunnel2.blend.meta new file mode 100755 index 0000000..ae6ce0e --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa-tunnel2.blend.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: d37ee84a33077f543a853c4a0633c110 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + 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: 1 + 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: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa-tunnel2.blend1 b/Assets/Scenes/sr_sfz/spa-tunnel2.blend1 new file mode 100755 index 0000000..e0e5c6a Binary files /dev/null and b/Assets/Scenes/sr_sfz/spa-tunnel2.blend1 differ diff --git a/Assets/Scenes/sr_sfz/spa-tunnel2.blend1.meta b/Assets/Scenes/sr_sfz/spa-tunnel2.blend1.meta new file mode 100755 index 0000000..31ec2e9 --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa-tunnel2.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8174c092d5b8fc2458bf07f644fcf9f1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa.blend b/Assets/Scenes/sr_sfz/spa.blend index 63f1034..bbdbfc9 100755 Binary files a/Assets/Scenes/sr_sfz/spa.blend and b/Assets/Scenes/sr_sfz/spa.blend differ diff --git a/Assets/Scenes/sr_sfz/spa.blend.bak.blend b/Assets/Scenes/sr_sfz/spa.blend.bak.blend new file mode 100755 index 0000000..824d95b Binary files /dev/null and b/Assets/Scenes/sr_sfz/spa.blend.bak.blend differ diff --git a/Assets/Scenes/sr_sfz/spa.blend.bak.blend.meta b/Assets/Scenes/sr_sfz/spa.blend.bak.blend.meta new file mode 100755 index 0000000..bbf8936 --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.blend.bak.blend.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: f950727fa7d271746afab158c6d545d0 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + 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: 2 + 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: 1 + 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: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa.blend.bak.blend1 b/Assets/Scenes/sr_sfz/spa.blend.bak.blend1 new file mode 100755 index 0000000..465a719 Binary files /dev/null and b/Assets/Scenes/sr_sfz/spa.blend.bak.blend1 differ diff --git a/Assets/Scenes/sr_sfz/spa.blend.bak.blend1.meta b/Assets/Scenes/sr_sfz/spa.blend.bak.blend1.meta new file mode 100755 index 0000000..053352a --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.blend.bak.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 392ccf9f82c4f104ca58f2dbf563f7f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa.blend1 b/Assets/Scenes/sr_sfz/spa.blend1 index f39b9ae..942795d 100755 Binary files a/Assets/Scenes/sr_sfz/spa.blend1 and b/Assets/Scenes/sr_sfz/spa.blend1 differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 18b03e8..d5ea7cb 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,8 +138,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 1.0 - preloadedAssets: - - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1