Adjusted models scaling (YARC-Official#501)

* Updated some Vocal graphics - Harmonies Multipliers - Combo Meter - Overdrive * Updated Vocal Track visuals - Changed track opacity to make it easier to visualizer background a bit * Adjusted models scaling Adjusted some models to fit the original models made in blender - Still working on a better multiplier texture for tracks
alexdlli · Jun 28, 2023 · c9193ff · c9193ff
1 parent 5ff25cd
commit c9193ff
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 51 deletions.
diff --git a/Assets/Art/Textures/PlayMode/Track/SmallPattern_Default.png b/Assets/Art/Textures/PlayMode/Track/SmallPattern_Default.png
diff --git a/Assets/Prefabs/AbstractTrack.prefab b/Assets/Prefabs/AbstractTrack.prefab
@@ -414,16 +414,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688248186929615921}
   m_LocalRotation: {x: 0.5486918, y: -0, z: -0, w: 0.83602476}
-  m_LocalPosition: {x: 0, y: 0, z: -10.338}
-  m_LocalScale: {x: 0.9814854, y: 0.8984017, z: 0.86246085}
-  m_ConstrainProportionsScale: 0
+  m_LocalPosition: {x: 0, y: 0, z: -10.39}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 66.555, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.996, y: 1.145}
+  m_AnchoredPosition: {x: -1.02, y: 1.05}
   m_SizeDelta: {x: 1.3, y: 1.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!23 &8973305543521141988
@@ -587,7 +587,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1811260302183972900}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.034, y: 0.46, z: -2.055}
+  m_LocalPosition: {x: -0.034, y: 0.46, z: -2.19}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -817,8 +817,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2182797248041008600}
   m_LocalRotation: {x: -0.47707716, y: 0.52191705, z: -0.47707716, w: 0.52191705}
-  m_LocalPosition: {x: -0.9471597, y: 0.11, z: -8.711}
-  m_LocalScale: {x: 26.953018, y: 25.59035, z: 706.3}
+  m_LocalPosition: {x: -0.9471597, y: -0.16, z: -8.39}
+  m_LocalScale: {x: 26.5, y: 18.98, z: 750.2451}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
@@ -940,7 +940,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3179492991849276935}
   m_LocalRotation: {x: 0.2705976, y: 0.6532817, z: -0.6532817, w: -0.2705976}
-  m_LocalPosition: {x: 1, y: 0, z: -0.066}
+  m_LocalPosition: {x: 1.03, y: 0, z: -0.066}
   m_LocalScale: {x: 0.04, y: 3, z: 0.04}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1431,7 +1431,7 @@ Transform:
   m_GameObject: {fileID: 3468215309777557950}
   m_LocalRotation: {x: -0.0000020191073, y: 0.7071068, z: 0.7071068, w: 0.0000020191073}
   m_LocalPosition: {x: 0, y: 0, z: -0.066}
-  m_LocalScale: {x: 100, y: 100, z: 100}
+  m_LocalScale: {x: 101, y: 100, z: 100}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2354278908002001216}
@@ -6687,14 +6687,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5646067488009670008}
-  m_LocalRotation: {x: 0.52333325, y: -0, z: -0, w: 0.85212815}
-  m_LocalPosition: {x: -0.98899984, y: 1.048, z: -10.349}
-  m_LocalScale: {x: 1.8120087, y: 1.5584435, z: 1.6738412}
+  m_LocalRotation: {x: 0.563526, y: 0, z: 0, w: 0.8260983}
+  m_LocalPosition: {x: -0.99, y: 0.75, z: -10.15}
+  m_LocalScale: {x: 2.19, y: 1.779375, z: 2.19}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
   m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 63.112, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 68.6, y: 0, z: 0}
 --- !u!33 &3890277251608660038
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -7015,9 +7015,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6314212930922148854}
   m_LocalRotation: {x: -0.7002932, y: -0.000000031203605, z: 0.000000030610796, w: 0.7138554}
-  m_LocalPosition: {x: -0.9652335, y: -0.058558624, z: -8.654798}
-  m_LocalScale: {x: 6.959714, y: 0.3294955, z: 0.30559132}
-  m_ConstrainProportionsScale: 0
+  m_LocalPosition: {x: -0.9652335, y: -0.28, z: -8.36}
+  m_LocalScale: {x: 7.3, y: 0.34560573, z: 0.3205328}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
   m_RootOrder: 0
@@ -12253,14 +12253,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8138879633420355844}
-  m_LocalRotation: {x: -4.3711033e-17, y: 0.7002932, z: 0.7138554, w: -4.2880596e-17}
-  m_LocalPosition: {x: -0.9, y: -0.42, z: -7.78}
-  m_LocalScale: {x: -1.7567418, y: -2.2104971, z: -0.07391046}
+  m_LocalRotation: {x: -0, y: -0.5689925, z: -0.82234275, w: 0}
+  m_LocalPosition: {x: -0.82, y: -0.7, z: -7.74}
+  m_LocalScale: {x: -2.46, y: -2.428507, z: -0.08119985}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
   m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -69.36, y: 0, z: -180}
 --- !u!33 &923827757172606532
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -12335,14 +12335,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8360053433170138951}
-  m_LocalRotation: {x: -0.007191799, y: -0.6938537, z: 0.719776, w: -0.020929854}
-  m_LocalPosition: {x: -0.95, y: -0.18, z: -9.73}
-  m_LocalScale: {x: 0.705771, y: 0.6761601, z: 0.66780424}
+  m_LocalRotation: {x: 0.8332085, y: 0.101818115, z: -0.06592583, w: 0.539491}
+  m_LocalPosition: {x: -1, y: -0.3, z: -10.03}
+  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3245959530613694372}
   m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 87.623, y: 26.783, z: 209.062}
+  m_LocalEulerAnglesHint: {x: 114.155, y: 0, z: -13.93402}
 --- !u!212 &9951896421710430
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -12422,7 +12422,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8786890339308513348}
   m_LocalRotation: {x: -0.2705976, y: 0.6532817, z: 0.6532817, w: -0.2705976}
-  m_LocalPosition: {x: -1, y: 0, z: -0.066}
+  m_LocalPosition: {x: -1.03, y: 0, z: -0.066}
   m_LocalScale: {x: 0.04, y: 3, z: 0.04}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -12606,57 +12606,57 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.8519104
+      value: 0.9829507
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.7306355
+      value: 0.8430214
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.7725993
+      value: 0.89144
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.0003228
+      value: -1
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.0570008
+      value: 0.86
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -10.346997
+      value: -10.25
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.5273061
+      value: 0.5757191
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.8496754
+      value: -0.8176476
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.000000040398746
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.000000016692512
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -116.353
+      value: -109.7
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
@@ -12668,6 +12668,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f95da8a9c79d3854ea44468f7f7ecc58,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -7511558181221131132, guid: f95da8a9c79d3854ea44468f7f7ecc58,
         type: 3}
       propertyPath: m_CastShadows
@@ -12722,57 +12727,57 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.7837574
+      value: 0.96999997
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.78375727
+      value: 0.96999997
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.78375727
+      value: 0.96999997
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.004
+      value: -1
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.191
+      value: -0.09
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -10.012
+      value: -9.81
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.6669153
+      value: 0.687658
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.74513364
+      value: -0.72603476
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.00000003312393
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.000000028521766
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -97.44
+      value: -93.11
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
@@ -12784,6 +12789,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d6eb3df7084ac13428efa008cc5613a9,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -7511558181221131132, guid: d6eb3df7084ac13428efa008cc5613a9,
         type: 3}
       propertyPath: m_CastShadows

diff --git a/Assets/Prefabs/DrumsTrack.prefab b/Assets/Prefabs/DrumsTrack.prefab
@@ -199,6 +199,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Kick_Fret_Drums
       objectReference: {fileID: 0}
+    - target: {fileID: 964514076419344267, guid: c2d6805c230b3e24892518b26ce3bf53,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c2d6805c230b3e24892518b26ce3bf53, type: 3}
 --- !u!23 &7646940955347713414 stripped
@@ -474,7 +479,7 @@ PrefabInstance:
     - target: {fileID: 6314393092021672358, guid: ba68df35237e09f4abcf788160c15375,
         type: 3}
       propertyPath: m_RootOrder
-      value: 14
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 6916089516438199787, guid: ba68df35237e09f4abcf788160c15375,
         type: 3}
@@ -519,7 +524,7 @@ PrefabInstance:
     - target: {fileID: 7417495158134921613, guid: ba68df35237e09f4abcf788160c15375,
         type: 3}
       propertyPath: m_RootOrder
-      value: 15
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 7809402107982387610, guid: ba68df35237e09f4abcf788160c15375,
         type: 3}