Merge branch 'master' of https://github.com/nothke/quality-control

Assets/Data/Objectives/Level 3.asset

@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 65221132d7bd4e79856cce65eeb5ce58, type: 3}
+  m_Name: Level 3
+  m_EditorClassIdentifier: 
+  Stage: 4
+  Quotas:
+  - Type: {fileID: 11400000, guid: 42240b227563f074aa0dd8fee3c0cb35, type: 2}
+    Quantity: 40
+  TimeLimit: 180
+  MaxDefectivePercentage: 60
+  LevelMessage: We are pleased to announce that we have secured the capital for the
+    expansion.
+  SuccessMessage: Great job!
+  FailureMessage: Try again!

Assets/Data/Objectives/Level 3.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2848e32435e805f448572c9f0ec86bfb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Conveyor/Conveyor Segment V2.prefab

@@ -1315,6 +1315,10 @@ PrefabInstance:
       propertyPath: volume
       value: 0.15
       objectReference: {fileID: 0}
+    - target: {fileID: 9037283188299472763, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
+      propertyPath: audioSource
+      value: 
+      objectReference: {fileID: 4773769602309382013}
     - target: {fileID: 9037283188299472763, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
       propertyPath: conveyorClip
       value: 
@@ -1340,10 +1344,114 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 5395015294641904379, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
       insertIndex: -1
       addedObject: {fileID: 7550839803931256216}
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 4725720213480161345, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4773769602309382013}
   m_SourcePrefab: {fileID: 100100000, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
 --- !u!4 &6294371338692470165 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5395015294641904379, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
   m_PrefabInstance: {fileID: 2127080774116327278}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6634305615740698415 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4725720213480161345, guid: 77c4432b466fdea49b2742cc3018dd47, type: 3}
+  m_PrefabInstance: {fileID: 2127080774116327278}
+  m_PrefabAsset: {fileID: 0}
+--- !u!82 &4773769602309382013
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6634305615740698415}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 07668ba2dee122144a01b9d9872664e4, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.5
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 2
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Prefabs/Products/E/Original E.prefab

@@ -100,7 +100,7 @@ Rigidbody:
   serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
-  m_AngularDrag: 100
+  m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}
   m_InertiaTensor: {x: 1, y: 1, z: 1}
   m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}

Assets/Scripts/ConveyorBelt.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ConveyorBelt : MonoBehaviour, IResetable
+public class ConveyorBelt : MonoBehaviour
 {
     Rigidbody _rb;
     Rigidbody rb { get { if (!_rb) _rb = GetComponent<Rigidbody>(); return _rb; } }
@@ -15,33 +15,14 @@ public class ConveyorBelt : MonoBehaviour, IResetable
     public float scrollingTextureSpeedMult = 1;
     public Renderer scrollingTextureRenderer;
 
-    public AudioClip conveyorClip;
+    public AudioSource audioSource;
-    public float volume = 0.25f;
-    private AudioSource _audioSource;
-    
-    public void ResetMachine()
-    {
-        if (_audioSource)
-        {
-            _audioSource.Stop();
-            Destroy(_audioSource.gameObject);
-            _audioSource = null;
-        }
-
-        if (isActiveAndEnabled)
-        {
-            _audioSource = NAudio.Play(conveyorClip, transform.position, volume);
-            _audioSource.loop = true;   
-        }
-    }
     
     private void Start()
     {
-        ResetMachine();
+        audioSource.time += Random.Range(1f, 3f);
+        audioSource.pitch = Random.Range(-0.05f, 0.05f) + speed / 2f;
         
         startPosition = rb.position;
-
-        //scrollingTextureSpeedMult = -0.1625f * speed;
     }
 
     private void FixedUpdate()