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

Assets/Data/Types/Boxed E.asset

@@ -14,7 +14,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Prefab: {fileID: 4275785426082247918, guid: b4f4c7d91f7d6bc4ebc212f3d2bb13ef, type: 3}
   normalClips:
-  - {fileID: 8300000, guid: 9a6a34ed8fef73c49ba83ab5c792877b, type: 3}
+  - {fileID: 8300000, guid: a6a3cbda2ccc6cf45b5ee5cb55fe85a3, type: 3}
+  - {fileID: 8300000, guid: 1520e07284cc30f4b8f3e27fa1aa34aa, type: 3}
+  - {fileID: 8300000, guid: 8968a8ad3584cd64f8fde27aa298a437, type: 3}
+  - {fileID: 8300000, guid: c6a504d2fc7d66d428d1723550ee7bac, type: 3}
   defectiveClips:
-  - {fileID: 8300000, guid: 9a6a34ed8fef73c49ba83ab5c792877b, type: 3}
+  - {fileID: 8300000, guid: a6a3cbda2ccc6cf45b5ee5cb55fe85a3, type: 3}
+  - {fileID: 8300000, guid: 1520e07284cc30f4b8f3e27fa1aa34aa, type: 3}
+  - {fileID: 8300000, guid: 8968a8ad3584cd64f8fde27aa298a437, type: 3}
+  - {fileID: 8300000, guid: c6a504d2fc7d66d428d1723550ee7bac, type: 3}
   DefectProbabilities: []

Assets/Data/Types/Boxed Torus.asset

@@ -14,9 +14,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Prefab: {fileID: 5301951847822309914, guid: b83fa12312697144992b762dc5084341, type: 3}
   normalClips:
-  - {fileID: 8300000, guid: 8f2502b0ea356614faad568cc2ce8d28, type: 3}
+  - {fileID: 8300000, guid: a6a3cbda2ccc6cf45b5ee5cb55fe85a3, type: 3}
+  - {fileID: 8300000, guid: 1520e07284cc30f4b8f3e27fa1aa34aa, type: 3}
+  - {fileID: 8300000, guid: 8968a8ad3584cd64f8fde27aa298a437, type: 3}
+  - {fileID: 8300000, guid: c6a504d2fc7d66d428d1723550ee7bac, type: 3}
   defectiveClips:
-  - {fileID: 8300000, guid: 8f2502b0ea356614faad568cc2ce8d28, type: 3}
+  - {fileID: 8300000, guid: a6a3cbda2ccc6cf45b5ee5cb55fe85a3, type: 3}
+  - {fileID: 8300000, guid: 1520e07284cc30f4b8f3e27fa1aa34aa, type: 3}
+  - {fileID: 8300000, guid: 8968a8ad3584cd64f8fde27aa298a437, type: 3}
+  - {fileID: 8300000, guid: c6a504d2fc7d66d428d1723550ee7bac, type: 3}
   DefectProbabilities:
   - Defect: 0
     Probability: 50

Assets/Prefabs/Products/Basic Torus.prefab

@@ -176,7 +176,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   profile: {fileID: 11400000, guid: 1c204304ac4bfa44099474b89b8c2616, type: 2}
-  volumeVelocityMult: 0.05
+  volumeVelocityMult: 0.025
   timeout: 0.05
   pitchMult: 1
   preventDoubleSound: 0

Assets/Prefabs/Products/Boxed Torus.prefab

@@ -161,7 +161,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   profile: {fileID: 11400000, guid: bf51e033080470d48950e3d71a14fa18, type: 2}
-  volumeVelocityMult: 0.1
+  volumeVelocityMult: 0.05
   timeout: 0.05
   pitchMult: 1
   preventDoubleSound: 0

Assets/Prefabs/Products/E/Boxed E.prefab

@@ -441,7 +441,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   profile: {fileID: 11400000, guid: bf51e033080470d48950e3d71a14fa18, type: 2}
-  volumeVelocityMult: 0.1
+  volumeVelocityMult: 0.05
   timeout: 0.05
   pitchMult: 1
   preventDoubleSound: 0

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

@@ -66,6 +66,7 @@ GameObject:
   - component: {fileID: 6036007508636776569}
   - component: {fileID: 1892923323752838125}
   - component: {fileID: 7543791872186549401}
+  - component: {fileID: 66548607301639248}
   m_Layer: 0
   m_Name: Original E
   m_TagString: Untagged
@@ -148,6 +149,24 @@ MonoBehaviour:
     name: 
   rb: {fileID: 0}
   rotateAroundPoint: 0
+--- !u!114 &66548607301639248
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3486484010427172590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 075e36d3d3303934bac79dda1017c56c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: 1c204304ac4bfa44099474b89b8c2616, type: 2}
+  volumeVelocityMult: 0.025
+  timeout: 0.05
+  pitchMult: 1
+  preventDoubleSound: 0
+  mixerGroup: {fileID: 0}
 --- !u!1 &6512547544738721002
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Products/E/Produced E.prefab

@@ -67,6 +67,7 @@ GameObject:
   - component: {fileID: 4275785426082247918}
   - component: {fileID: 8393139001085453593}
   - component: {fileID: 1452030678369129413}
+  - component: {fileID: -2597804437596383903}
   m_Layer: 0
   m_Name: Produced E
   m_TagString: Untagged
@@ -169,6 +170,24 @@ MonoBehaviour:
     name: 
   rb: {fileID: 0}
   rotateAroundPoint: 0
+--- !u!114 &-2597804437596383903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3486484010427172590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 075e36d3d3303934bac79dda1017c56c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: 1c204304ac4bfa44099474b89b8c2616, type: 2}
+  volumeVelocityMult: 0.025
+  timeout: 0.05
+  pitchMult: 1
+  preventDoubleSound: 0
+  mixerGroup: {fileID: 0}
 --- !u!1 &5823832367352199241
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Products/Old.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db87726127931154b853c0a7b5c18585
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Game Schedule/Scoreboard.cs

@@ -226,7 +226,7 @@ public class Scoreboard: MonoBehaviour
                 break;
             }
 
-            Debug.Log($"{quota.Type.name}: {TotalCount(quota.Type)}/{quota.Quantity}");
+            sb.Append($"{quota.Type.name}: {TotalCount(quota.Type)}/{quota.Quantity}\n");
 
             if (quota.MaxDefectivePercentage < DefectPercentage(quota.Type))
             {