From 8df84480d3661e0fdb0f12fe81d7aa9ca3377364 Mon Sep 17 00:00:00 2001 From: Daniel Tyomin Date: Tue, 20 Aug 2024 00:59:45 +0200 Subject: [PATCH] quick and dirty fixes --- Assets/Meshes/machine2.fbx | 3 + Assets/Meshes/machine2.fbx.meta | 109 ++++++++++++++++++ .../Conveyor/Product Converter 1.prefab | 82 +++++++++++-- .../Prefabs/Conveyor/Product Receiver.prefab | 97 ++++++++++++++-- Assets/Scenes/Main.unity | 6 +- 5 files changed, 276 insertions(+), 21 deletions(-) create mode 100644 Assets/Meshes/machine2.fbx create mode 100644 Assets/Meshes/machine2.fbx.meta diff --git a/Assets/Meshes/machine2.fbx b/Assets/Meshes/machine2.fbx new file mode 100644 index 0000000..5f894d6 --- /dev/null +++ b/Assets/Meshes/machine2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b28055ebe6e3b2b0b782edb547508b94636cb6cc5284e94543ddcb60d7ce6292 +size 21644 diff --git a/Assets/Meshes/machine2.fbx.meta b/Assets/Meshes/machine2.fbx.meta new file mode 100644 index 0000000..d4eee74 --- /dev/null +++ b/Assets/Meshes/machine2.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 9518288925782104585a2d39cb5a1e8d +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Conveyor/Product Converter 1.prefab b/Assets/Prefabs/Conveyor/Product Converter 1.prefab index e2ad104..f2d975a 100644 --- a/Assets/Prefabs/Conveyor/Product Converter 1.prefab +++ b/Assets/Prefabs/Conveyor/Product Converter 1.prefab @@ -132,7 +132,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2484392394099800468 Transform: m_ObjectHideFlags: 0 @@ -251,6 +251,7 @@ Transform: m_Children: - {fileID: 8206931719697506044} - {fileID: 5260530439957074424} + - {fileID: 429257261552183106} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6814229402882482579 @@ -299,7 +300,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2176528733310678998 Transform: m_ObjectHideFlags: 0 @@ -482,7 +483,6 @@ MonoBehaviour: MaxHealth: 5 conversionDuration: 2 conversionClip: {fileID: 8300000, guid: 470cbdb0b0814004e999ee2afb58e46c, type: 3} - enterClip: {fileID: 8300000, guid: db4886d0817a87d46a5897185b89a944, type: 3} launchClip: {fileID: 8300000, guid: a94b638e33b82db4082ac18c2f7842be, type: 3} refuseLauncher: {fileID: 5841623345049199340} launchPower: 7 @@ -569,7 +569,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7643959459257724000 Transform: m_ObjectHideFlags: 0 @@ -707,7 +707,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8396317161230293702 Transform: m_ObjectHideFlags: 0 @@ -812,7 +812,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6621947266374772920 Transform: m_ObjectHideFlags: 0 @@ -899,6 +899,68 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.99999994, y: 0.99999994, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &180071735132831913 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2155638562400233689} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_Name + value: machine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} +--- !u!4 &429257261552183106 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + m_PrefabInstance: {fileID: 180071735132831913} + m_PrefabAsset: {fileID: 0} --- !u!1001 &249079304970627326 PrefabInstance: m_ObjectHideFlags: 0 @@ -1161,7 +1223,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalScale.y - value: 0.6961451 + value: 1.1276659 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.x @@ -1169,7 +1231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.y - value: 0.26 + value: 0.41 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.z @@ -1567,7 +1629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalScale.y - value: 0.6961451 + value: 1.1276659 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.x @@ -1575,7 +1637,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.y - value: 0.26 + value: 0.4100001 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Prefabs/Conveyor/Product Receiver.prefab b/Assets/Prefabs/Conveyor/Product Receiver.prefab index c554ff5..65947c5 100644 --- a/Assets/Prefabs/Conveyor/Product Receiver.prefab +++ b/Assets/Prefabs/Conveyor/Product Receiver.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6124643934757847502 Transform: m_ObjectHideFlags: 0 @@ -129,8 +129,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6de8f4eed85043df853aee4396834741, type: 3} m_Name: m_EditorClassIdentifier: - normalProductCount: 0 - defectiveProductCount: 0 --- !u!65 &4097156240508244912 BoxCollider: m_ObjectHideFlags: 0 @@ -197,7 +195,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4748086957800454890 Transform: m_ObjectHideFlags: 0 @@ -299,6 +297,7 @@ Transform: - {fileID: 7524344916720894899} - {fileID: 1037217556386504287} - {fileID: 8893193092501905694} + - {fileID: 2032957818114081249} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1719646093149120036 @@ -346,7 +345,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7524344916720894899 Transform: m_ObjectHideFlags: 0 @@ -429,7 +428,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &29782541997105855 Transform: m_ObjectHideFlags: 0 @@ -495,6 +494,88 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &1998539543077611018 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6238139087991197689} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalScale.x + value: 137.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalScale.y + value: 68.75 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalScale.z + value: 100 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -6478536213147159724, guid: 9518288925782104585a2d39cb5a1e8d, type: 3} + - target: {fileID: -5754084199372789682, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 4493585093827132993, guid: 9518288925782104585a2d39cb5a1e8d, type: 3} + - target: {fileID: 919132149155446097, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + propertyPath: m_Name + value: machine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} +--- !u!4 &2032957818114081249 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f9aa633ab4416e540a8eac3b2bdaecf9, type: 3} + m_PrefabInstance: {fileID: 1998539543077611018} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7774954112645937165 PrefabInstance: m_ObjectHideFlags: 0 @@ -513,7 +594,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalScale.y - value: 0.6961451 + value: 1.0770925 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.x @@ -521,7 +602,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.y - value: 0.26 + value: 0.484 objectReference: {fileID: 0} - target: {fileID: 7314620182520817234, guid: 2309dc97898f5884fbb87ba691f13d1b, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index d7f9891..29d48fe 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -16336,7 +16336,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &638405052 Transform: m_ObjectHideFlags: 0 @@ -19538,7 +19538,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 49f7d9fae60a4082a271f0a2fa185f79, type: 3} m_Name: m_EditorClassIdentifier: - CurrentObjective: {fileID: 11400000, guid: 2848e32435e805f448572c9f0ec86bfb, type: 2} + CurrentObjective: {fileID: 11400000, guid: b1326e0e514393547971198daa612d49, type: 2} _timeLeft: 0 _running: 0 textMesh: {fileID: 1482407714} @@ -24289,7 +24289,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &934483555 Transform: m_ObjectHideFlags: 0