From 2d057ac2baf7abba4c067d13277f756257b09e56 Mon Sep 17 00:00:00 2001 From: henrisel Date: Sat, 28 Feb 2026 12:03:52 +0200 Subject: [PATCH] replaced computer printer model, enter key correct sound effect --- 3d-generation-pipeline/README.md | 3 +- .../_PROJECT/Models/ModelGeneration/Old.meta | 8 - .../Models/ModelGeneration/Old/PC_old.fbx | 3 - .../ModelGeneration/Old/PC_old.fbx.meta | 108 --- .../ModelGeneration/ComputerPrinter.prefab | 699 +++++++++--------- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../ModeGeneration/NPCs/ShapeDetectionNPC.cs | 16 +- .../Scripts/ModeGeneration/PushableButton.cs | 6 +- 8 files changed, 362 insertions(+), 485 deletions(-) delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old.meta delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx delete mode 100644 Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx.meta diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index aba3e215..a7c2669e 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -14,7 +14,7 @@ * kui kõik configurationid tehtud, siis midagi juhtub: uks avaneb, quest marker läheb ukse juurde, professor ütleb "thank you" * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit - * PC uus mudel, kus enter key liigub õigesti + õige sound effect enter nupul + tekst ei tohiks clippida läbi ekraani + * custom font arvutiekraanile * shape scanner mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse * shape scanneris prinditud objektid mõnikord ei kao ära kui config success * archery range: @@ -29,6 +29,7 @@ * cafe: * npc võiks olla keeratud sinu poole juba kaugelt * [silence] ei tohiks ilmuda + * custom font notepadile * kasutada OnSegmentUpdated, mitte OnSegmentFinished npc'l kui ootab "yes"/"no" * spawn point panna * npc character: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old.meta b/Assets/_PROJECT/Models/ModelGeneration/Old.meta deleted file mode 100644 index d0354ebc..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1ce1e0e392542234a835f077da110dce -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx b/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx deleted file mode 100644 index 79c9828f..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e4bf40a7786780941bb38950a79bc805e50f88287b82e541e67e20293f19d26 -size 60044 diff --git a/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx.meta b/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx.meta deleted file mode 100644 index 9a0458e0..00000000 --- a/Assets/_PROJECT/Models/ModelGeneration/Old/PC_old.fbx.meta +++ /dev/null @@ -1,108 +0,0 @@ -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/Prefabs/ModelGeneration/ComputerPrinter.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ComputerPrinter.prefab index 00e6a2c6..0ec964b6 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ComputerPrinter.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ComputerPrinter.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2229508846440900796 +--- !u!1 &213212357937065645 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2871764516791464155} - - component: {fileID: 1739713600890084147} - - component: {fileID: 358762795641594485} - - component: {fileID: 990278912769550265} + - component: {fileID: 3453628656712883193} + - component: {fileID: 3414223151150496645} + - component: {fileID: 7724982934134450928} + - component: {fileID: 7527754974329528911} m_Layer: 0 - m_Name: Cube.019 + m_Name: Keyboard m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2871764516791464155 +--- !u!4 &3453628656712883193 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2229508846440900796} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.026315182, y: -0.003085196, z: 0.05236398} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 213212357937065645} + m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalPosition: {x: -0.1708, y: 0.2762, z: -0.32} + m_LocalScale: {x: 0.85858, y: 0.85858, z: 0.85858} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 860079199308771664} + m_Children: + - {fileID: 4098135463850798670} + m_Father: {fileID: 7651009498794437323} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1739713600890084147 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} +--- !u!33 &3414223151150496645 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2229508846440900796} - m_Mesh: {fileID: -3541629673168548286, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} ---- !u!23 &358762795641594485 + m_GameObject: {fileID: 213212357937065645} + m_Mesh: {fileID: -327218276259777663, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!23 &7724982934134450928 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2229508846440900796} + m_GameObject: {fileID: 213212357937065645} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +63,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -876546973899608171, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} + - {fileID: -876546973899608171, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,13 +85,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &990278912769550265 +--- !u!64 &7527754974329528911 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2229508846440900796} + m_GameObject: {fileID: 213212357937065645} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -105,8 +106,8 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: -3541629673168548286, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} ---- !u!1 &3744035915231003463 + m_Mesh: {fileID: -327218276259777663, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!1 &2414871430597756264 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -114,8 +115,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 860079199308771664} - - component: {fileID: 3418229437092294658} + - component: {fileID: 7651009498794437323} + - component: {fileID: 3228915477321120621} m_Layer: 0 m_Name: ComputerPrinter m_TagString: Untagged @@ -123,46 +124,46 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &860079199308771664 +--- !u!4 &7651009498794437323 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3744035915231003463} - m_LocalRotation: {x: -0, y: -0.7076122, z: -0, w: 0.706601} + m_GameObject: {fileID: 2414871430597756264} + m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} m_LocalPosition: {x: 3.393, y: -0.5080004, z: -3.633} - m_LocalScale: {x: 0.6386148, y: 0.6386147, z: 0.6386148} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 2871764516791464155} - - {fileID: 6588117877716564499} - - {fileID: 7896837519614607467} - - {fileID: 2906705505191504994} - - {fileID: 7701139190096395668} + - {fileID: 3453628656712883193} + - {fileID: 2976110480061117201} + - {fileID: 994872250146065409} + - {fileID: 4773038101583722999} + - {fileID: 2199283681039368846} m_Father: {fileID: 0} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: -90.082, z: 0} ---- !u!114 &3418229437092294658 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &3228915477321120621 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3744035915231003463} + m_GameObject: {fileID: 2414871430597756264} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 61da8777d60372649a52316cac583c10, type: 3} m_Name: m_EditorClassIdentifier: - textDisplay: {fileID: 8441036019602360957} - enterKey: {fileID: 3509502228290666066} - ejectionOrigin: {fileID: 7896837519614607467} - ejectionDestination: {fileID: 2906705505191504994} + textDisplay: {fileID: 3561245169278857585} + enterKey: {fileID: 2222074837249984992} + ejectionOrigin: {fileID: 994872250146065409} + ejectionDestination: {fileID: 4773038101583722999} printablePrefab: {fileID: 6521999952126795650, guid: ce48acf249530e046b8d15ebc9bc8f3e, type: 3} ejectionDuration: 1 ---- !u!1 &4425791222534614991 +--- !u!1 &2921272613089454912 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -170,9 +171,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6027102090263401692} - - component: {fileID: 1460025929447898845} - - component: {fileID: 8441036019602360957} + - component: {fileID: 3940152782850606205} + - component: {fileID: 2200074519797164906} + - component: {fileID: 3561245169278857585} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -180,19 +181,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6027102090263401692 +--- !u!224 &3940152782850606205 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4425791222534614991} + m_GameObject: {fileID: 2921272613089454912} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7701139190096395668} + m_Father: {fileID: 2199283681039368846} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -200,21 +201,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1460025929447898845 +--- !u!222 &2200074519797164906 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4425791222534614991} + m_GameObject: {fileID: 2921272613089454912} m_CullTransparentMesh: 1 ---- !u!114 &8441036019602360957 +--- !u!114 &3561245169278857585 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4425791222534614991} + m_GameObject: {fileID: 2921272613089454912} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -302,7 +303,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4711308063877657542 +--- !u!1 &3255093797555209378 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,7 +311,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2906705505191504994} + - component: {fileID: 4773038101583722999} m_Layer: 0 m_Name: EjectionDestination m_TagString: Untagged @@ -318,22 +319,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2906705505191504994 +--- !u!4 &4773038101583722999 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4711308063877657542} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.414, y: 0.151, z: -0.474} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 3255093797555209378} + m_LocalRotation: {x: -0, y: -0.0007150769, z: -0, w: 0.99999976} + m_LocalPosition: {x: -0.43992236, y: 0.16071796, z: -0.5051387} + m_LocalScale: {x: 1.0643501, y: 1.06435, z: 1.0643501} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 860079199308771664} + m_Father: {fileID: 7651009498794437323} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5834877713350771804 +--- !u!1 &5090015013032830508 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -341,10 +342,281 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7701139190096395668} - - component: {fileID: 7366225878241862408} - - component: {fileID: 7124263012066357333} - - component: {fileID: 2712162967957197708} + - component: {fileID: 2976110480061117201} + - component: {fileID: 2048004734108082832} + - component: {fileID: 932798477130104488} + - component: {fileID: 3334571655265361890} + m_Layer: 0 + m_Name: PC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2976110480061117201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5090015013032830508} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.026315182, y: -0.003085196, z: 0.05236398} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7651009498794437323} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2048004734108082832 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5090015013032830508} + m_Mesh: {fileID: -2781502205653088291, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!23 &932798477130104488 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5090015013032830508} + 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: 40a3daba22bb229448d4b719fc70f244, 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 &3334571655265361890 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5090015013032830508} + 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: -2781502205653088291, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!1 &5613169728751704105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 994872250146065409} + m_Layer: 0 + m_Name: EjectionOrigin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &994872250146065409 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5613169728751704105} + m_LocalRotation: {x: -0, y: -0.0007150769, z: -0, w: 0.99999976} + m_LocalPosition: {x: 0.018815646, y: 0.16071796, z: -0.5044774} + m_LocalScale: {x: 1.0643501, y: 1.06435, z: 1.0643501} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7651009498794437323} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7575146636684737363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4098135463850798670} + - component: {fileID: 9211117681078459866} + - component: {fileID: 8267453431175094271} + - component: {fileID: 2222074837249984992} + - component: {fileID: 1991777958871594877} + m_Layer: 0 + m_Name: Enter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4098135463850798670 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575146636684737363} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.033947755, y: 0.19727033, z: -0.24844816} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3453628656712883193} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &9211117681078459866 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575146636684737363} + m_Mesh: {fileID: -7726249702934650104, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!23 &8267453431175094271 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575146636684737363} + 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: 40a3daba22bb229448d4b719fc70f244, 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!114 &2222074837249984992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575146636684737363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 682848c63dbd4614880393ae570f719c, type: 3} + m_Name: + m_EditorClassIdentifier: + startDown: 0 + movableParts: {fileID: 4098135463850798670} + moveDuration: 0.25 + moveAmount: 0.05 + soundEffect: + Guid: + Data1: 2116859508 + Data2: 1165465729 + Data3: 2142829992 + Data4: -912259047 + Path: event:/UI/Hover + wires: [] + wireActiveMaterial: {fileID: 2100000, guid: 41f12eac51f3a45459e319b9f41ecb1a, type: 2} + wireInactiveMaterial: {fileID: -3289729005989683008, guid: 67e3dc7329853164289ca0a55f6f3e0d, + type: 3} +--- !u!64 &1991777958871594877 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7575146636684737363} + 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: -7726249702934650104, guid: 40a3daba22bb229448d4b719fc70f244, type: 3} +--- !u!1 &9125482220991917397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2199283681039368846} + - component: {fileID: 1448690718074261492} + - component: {fileID: 2547432729865292751} + - component: {fileID: 2127205057746290358} m_Layer: 0 m_Name: TextCanvas m_TagString: Untagged @@ -352,34 +624,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7701139190096395668 +--- !u!224 &2199283681039368846 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5834877713350771804} - m_LocalRotation: {x: 0.08611296, y: 0.7023378, z: -0.086236194, w: 0.7013342} - m_LocalPosition: {x: 0, y: 0, z: -0.298} - m_LocalScale: {x: 1.5658889, y: 1.5658895, z: 1.5658889} + m_GameObject: {fileID: 9125482220991917397} + m_LocalRotation: {x: 0.08617459, y: 0.7018361, z: -0.086174585, w: 0.70183617} + m_LocalPosition: {x: 0, y: 0, z: -0.31681973} + m_LocalScale: {x: 1.6666664, y: 1.6666664, z: 1.6666664} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6027102090263401692} - m_Father: {fileID: 860079199308771664} + - {fileID: 3940152782850606205} + m_Father: {fileID: 7651009498794437323} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 14, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.238, y: 1.1712855} + m_AnchoredPosition: {x: 0.2537706, y: 1.2466666} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &7366225878241862408 +--- !u!223 &1448690718074261492 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5834877713350771804} + m_GameObject: {fileID: 9125482220991917397} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -395,13 +667,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &7124263012066357333 +--- !u!114 &2547432729865292751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5834877713350771804} + m_GameObject: {fileID: 9125482220991917397} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -418,13 +690,13 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 1 ---- !u!114 &2712162967957197708 +--- !u!114 &2127205057746290358 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5834877713350771804} + m_GameObject: {fileID: 9125482220991917397} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -435,268 +707,3 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &6570056997143196686 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6872173234111104867} - - component: {fileID: 1041524627658570846} - - component: {fileID: 2429662070253037527} - - component: {fileID: 3509502228290666066} - - component: {fileID: 4522467283113822310} - m_Layer: 0 - m_Name: EnterKey - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6872173234111104867 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6570056997143196686} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.000000057220458, y: -0.0000000023841857, z: 0.000000038146972} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6588117877716564499} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1041524627658570846 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6570056997143196686} - m_Mesh: {fileID: -8936622394817868014, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} ---- !u!23 &2429662070253037527 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6570056997143196686} - 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: 207e7de8e5c90584b8639d55f204b94e, 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!114 &3509502228290666066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6570056997143196686} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 682848c63dbd4614880393ae570f719c, type: 3} - m_Name: - m_EditorClassIdentifier: - startDown: 0 - movableParts: {fileID: 6872173234111104867} - moveDuration: 0.25 - moveAmount: 0.05 - wire: {fileID: 0} - wireActiveMaterial: {fileID: 2100000, guid: 41f12eac51f3a45459e319b9f41ecb1a, type: 2} - wireInactiveMaterial: {fileID: -3289729005989683008, guid: 67e3dc7329853164289ca0a55f6f3e0d, - type: 3} ---- !u!64 &4522467283113822310 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6570056997143196686} - 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: -8936622394817868014, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} ---- !u!1 &7746397362235656403 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7896837519614607467} - m_Layer: 0 - m_Name: EjectionOrigin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7896837519614607467 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7746397362235656403} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.017, y: 0.151, z: -0.474} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 860079199308771664} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7787084486209776014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6588117877716564499} - - component: {fileID: 9086203730234867870} - - component: {fileID: 8229172465479804575} - - component: {fileID: 1412933757597196193} - m_Layer: 0 - m_Name: Cube.020 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6588117877716564499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7787084486209776014} - m_LocalRotation: {x: -0, y: 0.0058594933, z: -0, w: 0.99998283} - m_LocalPosition: {x: -0.19100042, y: 0.26699972, z: -0.25399873} - m_LocalScale: {x: 0.9999999, y: 1, z: 0.9999999} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6872173234111104867} - m_Father: {fileID: 860079199308771664} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0.671, z: 0} ---- !u!33 &9086203730234867870 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7787084486209776014} - m_Mesh: {fileID: 2911736426955009642, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} ---- !u!23 &8229172465479804575 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7787084486209776014} - 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: 207e7de8e5c90584b8639d55f204b94e, 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 &1412933757597196193 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7787084486209776014} - 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: 2911736426955009642, guid: 207e7de8e5c90584b8639d55f204b94e, type: 3} diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index f81ec144..caf7373a 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:a0f6f98a68eee083682e53d4dd567c8cd5cf3636776de614987ffa8241445d9f -size 68602951 +oid sha256:0f6126d1df09c305d0fdbdb11a53313dc4308424d86c62192ef70b6145a7b527 +size 68611406 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs index adad8fbe..8ffa5024 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using UnityEngine; -using UnityEngine.UI; public class ShapeDetectionNPC : NPCController { @@ -12,7 +11,6 @@ public class ShapeDetectionNPC : NPCController public ComputerPrinter computerPrinter; public Printer3DInputHole printerInsertionHole; public Texture2D GeneratedTexture { get; private set; } - public Image imageDisplay; public ShapeScanner shapeScanner; public float radioAmount = 1f; @@ -24,7 +22,6 @@ public class ShapeDetectionNPC : NPCController // 3 - player spoke into the radio // 4 - player pressed enter on keyboard // 5 - player inserted picture into printer - // 6 - finished speaking private int state; private float lastPlayerApproachTime; @@ -117,7 +114,7 @@ public class ShapeDetectionNPC : NPCController } } - private async void OnPlayerInitiatedPrinting() + private void OnPlayerInitiatedPrinting() { if (state == 4) { @@ -125,16 +122,5 @@ public class ShapeDetectionNPC : NPCController state = 5; questMarker.MoveTo(shapeScanner.transform, true); } - - string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG()); - byte[] encodedModel = await TrellisClient.Instance.GenerateModel(encodedTexture); - - GameObject spawnedObject = await ModelGenerationUtils.Instance.SpawnModel(encodedModel); - - - if (state == 5) - { - state = 6; - } } } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs index f30fcb9a..f8d82065 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/PushableButton.cs @@ -1,5 +1,6 @@ using DG.Tweening; +using FMODUnity; using UnityEngine; public class PushableButton : MonoBehaviour @@ -12,6 +13,7 @@ public class PushableButton : MonoBehaviour public Transform movableParts; public float moveDuration = 0.25f; public float moveAmount = 0.05f; + public EventReference soundEffect = FMODEvents.Instance.Click; public MeshRenderer[] wires; public Material wireActiveMaterial; @@ -58,7 +60,7 @@ public class PushableButton : MonoBehaviour { movableParts.DOLocalMoveY(downPositionY, moveDuration); isButtonDown = true; - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject); + AudioManager.Instance.PlayAttachedInstance(soundEffect, gameObject); if (wires != null) { @@ -73,7 +75,7 @@ public class PushableButton : MonoBehaviour { movableParts.DOLocalMoveY(upPositionY, moveDuration); isButtonDown = false; - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject); + AudioManager.Instance.PlayAttachedInstance(soundEffect, gameObject); if (wires != null) {