From 4c7e0bfbeeea3be13027da45ec863c15d1f81ce9 Mon Sep 17 00:00:00 2001 From: henrisel Date: Sat, 14 Feb 2026 13:48:13 +0200 Subject: [PATCH] add models and use them in archery range minigame --- .../Models/ModelGeneration/Capsule.fbx | 3 + .../Models/ModelGeneration/Capsule.fbx.meta | 108 +++++ .../Models/ModelGeneration/CornerWire.fbx | 3 + .../ModelGeneration/CornerWire.fbx.meta | 108 +++++ .../_PROJECT/Models/ModelGeneration/Mic.fbx | 3 + .../Models/ModelGeneration/Mic.fbx.meta | 108 +++++ .../Models/ModelGeneration/ModelsTexture.png | 3 + .../ModelGeneration/ModelsTexture.png.meta | 148 +++++++ .../Models/ModelGeneration/NotePad.fbx | 3 + .../Models/ModelGeneration/NotePad.fbx.meta | 108 +++++ Assets/_PROJECT/Models/ModelGeneration/PC.fbx | 3 + .../Models/ModelGeneration/PC.fbx.meta | 108 +++++ .../_PROJECT/Models/ModelGeneration/Pen.fbx | 3 + .../Models/ModelGeneration/Pen.fbx.meta | 108 +++++ .../Models/ModelGeneration/Printer.fbx | 3 + .../Models/ModelGeneration/Printer.fbx.meta | 108 +++++ .../_PROJECT/Models/ModelGeneration/Radio.fbx | 3 + .../Models/ModelGeneration/Radio.fbx.meta | 108 +++++ .../Models/ModelGeneration/Screen1.fbx | 3 + .../Models/ModelGeneration/Screen1.fbx.meta | 108 +++++ .../Models/ModelGeneration/Screen2.fbx | 3 + .../Models/ModelGeneration/Screen2.fbx.meta | 108 +++++ .../Models/ModelGeneration/ShapeChecker.fbx | 3 + .../ModelGeneration/ShapeChecker.fbx.meta | 108 +++++ .../Models/ModelGeneration/StraightWire.fbx | 3 + .../ModelGeneration/StraightWire.fbx.meta | 108 +++++ .../_PROJECT/Models/ModelGeneration/TWire.fbx | 3 + .../Models/ModelGeneration/TWire.fbx.meta | 108 +++++ .../_PROJECT/Models/ModelGeneration/Table.fbx | 3 + .../Models/ModelGeneration/Table.fbx.meta | 108 +++++ .../ModelGeneration/MicrophoneStand.prefab | 381 ++++++++++++++++++ .../MicrophoneStand.prefab.meta | 7 + ...and 1.prefab => MicrophoneStandOld.prefab} | 2 +- ...ab.meta => MicrophoneStandOld.prefab.meta} | 0 .../ModelGeneration/ModelDisplay.prefab | 199 +++++++-- .../ModelGeneration/ModelDisplay.prefab.meta | 2 +- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../ArcheryRange/ModelDisplay.cs | 8 +- .../ModeGeneration/NPCs/ArcheryRangeNPC.cs | 10 +- .../Scripts/ModeGeneration/PushableButton.cs | 3 +- .../Scripts/ModeGeneration/QuestMarker.cs | 2 - 41 files changed, 2279 insertions(+), 44 deletions(-) create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Mic.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Mic.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png create mode 100644 Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/PC.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/PC.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Pen.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Pen.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Printer.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Printer.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Radio.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Radio.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/TWire.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/TWire.fbx.meta create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Table.fbx create mode 100644 Assets/_PROJECT/Models/ModelGeneration/Table.fbx.meta create mode 100644 Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab create mode 100644 Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab.meta rename Assets/_PROJECT/Prefabs/ModelGeneration/{MicrophoneStand 1.prefab => MicrophoneStandOld.prefab} (99%) rename Assets/_PROJECT/Prefabs/ModelGeneration/{MicrophoneStand 1.prefab.meta => MicrophoneStandOld.prefab.meta} (100%) diff --git a/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx b/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx new file mode 100644 index 00000000..2b8cc3a3 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e66c95472b42d3b790887041727fde86c593d8add3634eed709e43435bf4edfc +size 46124 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx.meta new file mode 100644 index 00000000..30b0800b --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Capsule.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: cc54e7b0c8bd25e4fbcfbc23ef13e574 +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 + 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/_PROJECT/Models/ModelGeneration/CornerWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx new file mode 100644 index 00000000..ab7f3324 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:419202ec3e07592dd045ad42cc1101208437045a397d0b8dec812130a99e9e52 +size 19628 diff --git a/Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx.meta new file mode 100644 index 00000000..ce4c7e08 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/CornerWire.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c335d35d124d55d47a083e4c86ad7b51 +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 + 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/_PROJECT/Models/ModelGeneration/Mic.fbx b/Assets/_PROJECT/Models/ModelGeneration/Mic.fbx new file mode 100644 index 00000000..4e8dae2f --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Mic.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:868f0bcc709ffc9ada7eadfbf5fb4548aa9d0f9d58cfc6060ed3f9cda927a6f0 +size 40252 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Mic.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Mic.fbx.meta new file mode 100644 index 00000000..330934f9 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Mic.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8d58d99593882c94f96b623aa6967180 +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 + 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/_PROJECT/Models/ModelGeneration/ModelsTexture.png b/Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png new file mode 100644 index 00000000..0076ed25 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:784d0fcff31a16e7adfbbe6369d5919791b11930cd3cd1cadee1f2ddadc2ef8a +size 11999 diff --git a/Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png.meta b/Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png.meta new file mode 100644 index 00000000..8f4d8b07 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/ModelsTexture.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 6682dbf0af839b349acac427acbc421b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + 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: 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: 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx b/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx new file mode 100644 index 00000000..bc05f851 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2a913fae3e1bbe7d18bfcdb5a53c224d0c4067c9da49d4959546242c09cf9f5 +size 22156 diff --git a/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx.meta new file mode 100644 index 00000000..460beb9f --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/NotePad.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: d130be5832d0d4744876e93d8be542e0 +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 + 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/_PROJECT/Models/ModelGeneration/PC.fbx b/Assets/_PROJECT/Models/ModelGeneration/PC.fbx new file mode 100644 index 00000000..79c9828f --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/PC.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e4bf40a7786780941bb38950a79bc805e50f88287b82e541e67e20293f19d26 +size 60044 diff --git a/Assets/_PROJECT/Models/ModelGeneration/PC.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/PC.fbx.meta new file mode 100644 index 00000000..9a0458e0 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/PC.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 207e7de8e5c90584b8639d55f204b94e +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 + 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/_PROJECT/Models/ModelGeneration/Pen.fbx b/Assets/_PROJECT/Models/ModelGeneration/Pen.fbx new file mode 100644 index 00000000..df65b33e --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Pen.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a614796ab489d3f135b7fac149c9f2693c9179068230bbc4601e270e5fe4f38c +size 23788 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Pen.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Pen.fbx.meta new file mode 100644 index 00000000..a99f917c --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Pen.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 72b65c8e9212b384fa196bc7b40b6a94 +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 + 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/_PROJECT/Models/ModelGeneration/Printer.fbx b/Assets/_PROJECT/Models/ModelGeneration/Printer.fbx new file mode 100644 index 00000000..7c5dfeb5 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Printer.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7435ec9611fec214ce4d8cc0db24ab25cdd7015b0a0fcd4e062269c4f7d270ea +size 42140 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Printer.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Printer.fbx.meta new file mode 100644 index 00000000..2b0cf801 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Printer.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: e3d9312181bf08d40ba90862a37db1a2 +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 + 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/_PROJECT/Models/ModelGeneration/Radio.fbx b/Assets/_PROJECT/Models/ModelGeneration/Radio.fbx new file mode 100644 index 00000000..a05302e2 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Radio.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34fb3e621fea0cebb07a80b8e997c1410a3de84e6f76d83c7429c4ed8f34cd0d +size 28140 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Radio.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Radio.fbx.meta new file mode 100644 index 00000000..761d58af --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Radio.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 11ce75cfd70ba4c4e91118b195b36007 +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 + 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/_PROJECT/Models/ModelGeneration/Screen1.fbx b/Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx new file mode 100644 index 00000000..76d36099 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:933e30b1ed878ecfece7bb8205f6269833a64e3382493def36ad2b0735c87a59 +size 18556 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx.meta new file mode 100644 index 00000000..821486f1 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Screen1.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: bf4edf8ec64d1fa4db0a4a4449ece6fc +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 + 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/_PROJECT/Models/ModelGeneration/Screen2.fbx b/Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx new file mode 100644 index 00000000..8adb94c0 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2ec442389332f7c8ae2ade52a552a99959703094596a4ceb45919dca0f2c4ac +size 18572 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx.meta new file mode 100644 index 00000000..94df3871 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Screen2.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: a1fffeea2e6fb7441b9bc9cdd9523862 +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 + 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/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx b/Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx new file mode 100644 index 00000000..ec20972b --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0a77f75d0e1b0c107b6c83255c11ee6ffc2677b5eb2e5bc5309bb72c6241fd2 +size 59932 diff --git a/Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx.meta new file mode 100644 index 00000000..35e544b2 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/ShapeChecker.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c95a606010af5f14bbb5ce647b77b634 +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 + 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/_PROJECT/Models/ModelGeneration/StraightWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx new file mode 100644 index 00000000..00036704 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aae9a3e614695abc8a63e0384f3d8a7cf8a3f2eb5318242be98dd80fe38eb70a +size 19244 diff --git a/Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx.meta new file mode 100644 index 00000000..741a53c4 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/StraightWire.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: bd70492f76cf8d54ab9404f53896044b +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 + 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/_PROJECT/Models/ModelGeneration/TWire.fbx b/Assets/_PROJECT/Models/ModelGeneration/TWire.fbx new file mode 100644 index 00000000..40dc198e --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/TWire.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4ead93249ef35bdbc1391c5a7f9b5018c709b624e72fb9f33ea8013d15ec63b +size 20412 diff --git a/Assets/_PROJECT/Models/ModelGeneration/TWire.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/TWire.fbx.meta new file mode 100644 index 00000000..e8f27990 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/TWire.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 57b2f59a5da481244b62991f926cb992 +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 + 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/_PROJECT/Models/ModelGeneration/Table.fbx b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx new file mode 100644 index 00000000..4ffda759 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1332319150c313198a063103144ef2078e4757cf20862a87bf7f69958cdee2b0 +size 41596 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Table.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx.meta new file mode 100644 index 00000000..b0644d78 --- /dev/null +++ b/Assets/_PROJECT/Models/ModelGeneration/Table.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: bd6aade83407b0146bc70213528db8e3 +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 + 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/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab new file mode 100644 index 00000000..51dd3b7f --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab @@ -0,0 +1,381 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1228480816127797708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4809606984572048444} + - component: {fileID: 1276569980542663467} + - component: {fileID: 923959671147726427} + - component: {fileID: 8009804560613013494} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4809606984572048444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228480816127797708} + m_LocalRotation: {x: -0, y: 0.9974923, z: -0, w: -0.07077533} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.0013671161, y: 0.0013671163, z: 0.0013671161} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5644920133390460661} + - {fileID: 5533742576861006609} + m_Father: {fileID: 6350200277953360468} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1.519} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &1276569980542663467 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228480816127797708} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &923959671147726427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228480816127797708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &8009804560613013494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228480816127797708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &4133399896732208162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6350200277953360468} + - component: {fileID: 8212827426052675577} + - component: {fileID: 6621835591315127495} + - component: {fileID: 3702137064712532564} + - component: {fileID: 2290950303170375389} + m_Layer: 0 + m_Name: MicrophoneStand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6350200277953360468 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + m_LocalRotation: {x: -0, y: 0.74966615, z: -0, w: 0.6618162} + m_LocalPosition: {x: -4.855707, y: -2.269, z: -3.767624} + m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4809606984572048444} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 97.123, z: 0} +--- !u!33 &8212827426052675577 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + m_Mesh: {fileID: -1716842359454501035, guid: 8d58d99593882c94f96b623aa6967180, type: 3} +--- !u!23 &6621835591315127495 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + 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: -876546973899608171, guid: 8d58d99593882c94f96b623aa6967180, type: 3} + - {fileID: 7544817093886289218, guid: 8d58d99593882c94f96b623aa6967180, type: 3} + 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!135 &3702137064712532564 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.47 + m_Center: {x: 0, y: 0.48, z: 0} +--- !u!114 &2290950303170375389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4133399896732208162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 357101b2cface4943b04dfd25d4944e3, type: 3} + m_Name: + m_EditorClassIdentifier: + outputText: {fileID: 0} + microphoneOffStatus: {fileID: 8834111901074404784} + microphoneOnStatus: {fileID: 7008025959211898135} + fmodWhisperBridge: {fileID: 0} +--- !u!1 &7008025959211898135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5533742576861006609} + - component: {fileID: 2601996648403542267} + - component: {fileID: 2567088406044694651} + m_Layer: 0 + m_Name: MicrophoneOnStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5533742576861006609 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008025959211898135} + m_LocalRotation: {x: -0, y: -0, z: -0, 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: 4809606984572048444} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2601996648403542267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008025959211898135} + m_CullTransparentMesh: 1 +--- !u!114 &2567088406044694651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008025959211898135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3f2516f6ee1cb5c4ba7f85f24c3d4f43, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8834111901074404784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5644920133390460661} + - component: {fileID: 6882382312215729145} + - component: {fileID: 2469827993735726457} + m_Layer: 0 + m_Name: MicrophoneOffStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5644920133390460661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8834111901074404784} + m_LocalRotation: {x: -0, y: -0, z: -0, 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: 4809606984572048444} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6882382312215729145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8834111901074404784} + m_CullTransparentMesh: 1 +--- !u!114 &2469827993735726457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8834111901074404784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 68669679d082ba94bb4a39c08fa91e0d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab.meta new file mode 100644 index 00000000..6b13f219 --- /dev/null +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4827ce3e0a48b754f87ca8f6a808ae9c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStandOld.prefab similarity index 99% rename from Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab rename to Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStandOld.prefab index 75470cb4..34821c76 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStandOld.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 2568780590385977406} - component: {fileID: 1523408157143897080} m_Layer: 0 - m_Name: MicrophoneStand 1 + m_Name: MicrophoneStandOld m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStandOld.prefab.meta similarity index 100% rename from Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand 1.prefab.meta rename to Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStandOld.prefab.meta diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab index a6c77bbe..9402431e 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4841664669366217751 +--- !u!1 &3777094011279582826 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,48 +8,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8059049557656133817} - - component: {fileID: 4918617990459080428} - - component: {fileID: 163498188678022614} - - component: {fileID: 8145483597018112470} - - component: {fileID: 125370255468251911} + - component: {fileID: 4095527020980773007} + - component: {fileID: 9186545014141160676} + - component: {fileID: 4938254940814250602} + - component: {fileID: 7354379025992698604} m_Layer: 0 - m_Name: ModelDisplay + m_Name: CapsuleGlass m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8059049557656133817 +--- !u!4 &4095527020980773007 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4841664669366217751} - m_LocalRotation: {x: -0, y: -0.57596153, z: -0, w: 0.8174768} - m_LocalPosition: {x: -3.6680002, y: -1.2389998, z: 0.41600037} - m_LocalScale: {x: 1.2, y: 1, z: 1.2} + m_GameObject: {fileID: 3777094011279582826} + m_LocalRotation: {x: 0, y: -0.19594614, z: -0, w: 0.98061466} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 7613745937047066136} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: -70.334, z: 0} ---- !u!33 &4918617990459080428 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &9186545014141160676 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4841664669366217751} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &163498188678022614 + m_GameObject: {fileID: 3777094011279582826} + m_Mesh: {fileID: 8909058085973226230, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} +--- !u!23 &4938254940814250602 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4841664669366217751} + m_GameObject: {fileID: 3777094011279582826} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -63,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1892de3c798cec947bcabf6cfc693b8c, type: 2} + - {fileID: 8556262120643298411, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -85,13 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!136 &8145483597018112470 -CapsuleCollider: +--- !u!64 &7354379025992698604 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4841664669366217751} + m_GameObject: {fileID: 3777094011279582826} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -103,25 +102,165 @@ CapsuleCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5000001 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &125370255468251911 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8909058085973226230, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} +--- !u!1 &7316285023247501973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7613745937047066136} + - component: {fileID: 9170921970830479650} + m_Layer: 0 + m_Name: ModelDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7613745937047066136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316285023247501973} + m_LocalRotation: {x: -0, y: 0.8055964, z: -0, w: 0.59246475} + m_LocalPosition: {x: -3.2957067, y: -1.947, z: 0.9123764} + m_LocalScale: {x: 1.7070999, y: 1.7071, z: 1.7070999} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4806555956194206155} + - {fileID: 4095527020980773007} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 107.336, z: 0} +--- !u!114 &9170921970830479650 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4841664669366217751} + m_GameObject: {fileID: 7316285023247501973} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4034b87c80896fe4d9e18ef54faa1ef6, type: 3} m_Name: m_EditorClassIdentifier: + glassTransform: {fileID: 4095527020980773007} modelDisplayActiveMaterial: {fileID: 2100000, guid: e2ac8c5522bae5a4794c3cbdb7bee948, type: 2} wire: {fileID: 0} wireActiveMaterial: {fileID: 2100000, guid: 41f12eac51f3a45459e319b9f41ecb1a, type: 2} generatedObjectRotationSpeed: 10 +--- !u!1 &8551966280857711320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4806555956194206155} + - component: {fileID: 3798386351700195895} + - component: {fileID: 1431232115411058428} + - component: {fileID: 9110709281786864631} + m_Layer: 0 + m_Name: CapsuleFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4806555956194206155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8551966280857711320} + m_LocalRotation: {x: 0, y: -0.19594614, z: -0, w: 0.98061466} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7613745937047066136} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3798386351700195895 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8551966280857711320} + m_Mesh: {fileID: 2393075995482566028, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} +--- !u!23 &1431232115411058428 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8551966280857711320} + 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: -876546973899608171, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} + 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 &9110709281786864631 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8551966280857711320} + 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: 2393075995482566028, guid: cc54e7b0c8bd25e4fbcfbc23ef13e574, type: 3} diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab.meta b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab.meta index cc175408..feca2ee2 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab.meta +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelDisplay.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b4af50e5f21164468207fe4c7d85d0b +guid: 50e7c2bc06debf5478d374d9bd122bbd PrefabImporter: externalObjects: {} userData: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 560702f6..19416921 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0571f8f4665533a77d4edee84b7137eaf67f4002b5142e385d7b69b0afb8d70b -size 68528325 +oid sha256:dcfb38004f36cde4830caf5419ac96ecd5b69e35238336c683a5eb4307caa93a +size 68531603 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs index 5bb41f8c..5e7f3df2 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/ModelDisplay.cs @@ -4,6 +4,8 @@ using UnityEngine; public class ModelDisplay : MonoBehaviour { + public Transform displayPoint; + public Transform glassTransform; public Material modelDisplayActiveMaterial; public Transform wire; public Material wireActiveMaterial; @@ -33,13 +35,13 @@ public class ModelDisplay : MonoBehaviour meshRenderer.material = wireActiveMaterial; } - gameObject.GetComponent().material = modelDisplayActiveMaterial; + glassTransform.GetComponent().material = modelDisplayActiveMaterial; AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ShapeScannerSuccess, gameObject); // Destroy previous generated object Destroy(Model); - modelObject.transform.parent = transform; - modelObject.transform.position = transform.position; + modelObject.transform.parent = displayPoint; + modelObject.transform.position = displayPoint.position; Model = modelObject; } } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs index ea8c4b24..66a6f2e7 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ArcheryRangeNPC.cs @@ -9,11 +9,13 @@ public class ArcheryRangeNPC : NPCController [Header("Archery Range Config")] public QuestMarker questMarker; public MicrophoneStand microphoneStand; + public Transform microphoneStandQuestMarkerPoint; public PushableButton imageGenerationButton; public PushableButton modelGenerationButton; public Image imageDisplay; public ModelDisplay modelDisplay; - public Transform startTarget; + public float modelDisplaySize = 0.75f; + public Transform startTargetQuestMarkerPoint; private Texture2D GeneratedTexture; private EventInstance printingSound; @@ -53,7 +55,7 @@ public class ArcheryRangeNPC : NPCController await Task.Delay(6500); SpeakVoiceLine(2); questMarker.gameObject.SetActive(true); - questMarker.MoveTo(microphoneStand.transform); + questMarker.MoveTo(microphoneStandQuestMarkerPoint.transform); await Task.Delay(3000); state = 1; @@ -110,13 +112,13 @@ public class ArcheryRangeNPC : NPCController string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG()); byte[] encodedModel = await TrellisClient.Instance.GenerateModel(encodedTexture); - GameObject spawnedObject = await ModelGenerationUtils.Instance.SpawnModel(encodedModel); + GameObject spawnedObject = await ModelGenerationUtils.Instance.SpawnModel(encodedModel, modelDisplaySize); modelDisplay.DisplayModel(spawnedObject); if (state == 4) { SpeakVoiceLine(5); - questMarker.MoveTo(startTarget); + questMarker.MoveTo(startTargetQuestMarkerPoint); state = 5; } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs index 877b3e7e..317bdaba 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs @@ -11,6 +11,7 @@ public class PushableButton : MonoBehaviour public bool startDown; public Transform movableParts; public float moveDuration = 0.25f; + public float moveAmount = 0.05f; public Transform wire; public Material wireActiveMaterial; @@ -23,7 +24,7 @@ public class PushableButton : MonoBehaviour private void Awake() { upPositionY = movableParts.localPosition.y; - downPositionY = movableParts.localPosition.y - 0.1f; + downPositionY = movableParts.localPosition.y - moveAmount; isButtonDown = false; } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs b/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs index 43c453dd..49baf476 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs @@ -35,9 +35,7 @@ public class QuestMarker : MonoBehaviour if (hoverAboveTransform != null) { - Debug.Log("pos before floating: " + transform.position); transform.position = hoverAboveTransform.position + new Vector3(0f, heightAboveTarget, 0f); - Debug.Log("pos after floating: " + transform.position); } }