Add extra props to bidding for better visuals

hackerspace-ntnu · Jun 26, 2024 · 63a6d40 · 63a6d40
1 parent f38cd8e
commit 63a6d40
Show file tree

Hide file tree

Showing 2 changed files with 234 additions and 23 deletions.
diff --git a/Assets/Scenes/Bidding.unity b/Assets/Scenes/Bidding.unity
@@ -166,7 +166,7 @@ Transform:
   - {fileID: 1169273135}
   - {fileID: 1910443843}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &16894245
 PrefabInstance:
@@ -182,7 +182,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_LocalPosition.x
@@ -453,6 +453,83 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
   m_PrefabInstance: {fileID: 30106953}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &72372336
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 379760550556828784, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_Name
+      value: McMartysSign (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.71
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 9.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 8.14
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
 --- !u!1 &74372382
 GameObject:
   m_ObjectHideFlags: 0
@@ -501,7 +578,7 @@ Transform:
   m_Children:
   - {fileID: 325376351}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &77298577
 GameObject:
@@ -732,7 +809,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -872,7 +949,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 90.38, y: 0, z: 0}
 --- !u!114 &228698053
 MonoBehaviour:
@@ -1095,6 +1172,75 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
   m_PrefabInstance: {fileID: 297157268}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &305148318
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -12.353732
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.83
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 7.698371
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.96228695
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.27203652
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -31.570984
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: dc6ef349e6cd7198aa68d512a0cc2cfe, type: 2}
+    - target: {fileID: 919132149155446097, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_Name
+      value: ExplosiveBarrelSimple (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
 --- !u!1001 &318000279
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1402,7 +1548,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3}
       propertyPath: m_LocalScale.x
@@ -1789,7 +1935,7 @@ Transform:
   - {fileID: 492218114}
   - {fileID: 297157269}
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &675056334
 PrefabInstance:
@@ -2016,7 +2162,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2197,7 +2343,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6036499215472260282, guid: 7cbbbf5fba762c949995e2b4b8bcfa0b, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 6036499215472260282, guid: 7cbbbf5fba762c949995e2b4b8bcfa0b, type: 3}
       propertyPath: m_LocalScale.x
@@ -2611,7 +2757,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3}
       propertyPath: m_LocalScale.x
@@ -2742,7 +2888,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: f5c669873623fd38b818e36c0068f473, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: f5c669873623fd38b818e36c0068f473, type: 3}
       propertyPath: m_LocalScale.x
@@ -3613,7 +3759,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 2655652194932503321, guid: 4fe7fc2b9f07352a1aed9b8eb31729d0, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 2655652194932503321, guid: 4fe7fc2b9f07352a1aed9b8eb31729d0, type: 3}
       propertyPath: m_LocalPosition.x
@@ -3796,6 +3942,75 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
   m_PrefabInstance: {fileID: 1880546166}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1891141494
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -10.54
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.37
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 7.07
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: dc6ef349e6cd7198aa68d512a0cc2cfe, type: 2}
+    - target: {fileID: 919132149155446097, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
+      propertyPath: m_Name
+      value: ExplosiveBarrelSimple
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 66c6c90f490d5144496874ccdca25343, type: 3}
 --- !u!1001 &1910443842
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3923,7 +4138,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1947421788
 GameObject:
@@ -4090,7 +4305,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_RootOrder
-      value: 13
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3}
       propertyPath: m_LocalPosition.x
@@ -4557,7 +4772,7 @@ Transform:
   - {fileID: 2007894457}
   - {fileID: 1277499580}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!4 &4569981499119405157
 Transform:
@@ -4880,6 +5095,10 @@ PrefabInstance:
       propertyPath: cameraAnimator
       value: 
       objectReference: {fileID: 21876773}
+    - target: {fileID: 320780411405276928, guid: ace884b1bf546300a85f4176788f481b, type: 3}
+      propertyPath: biddingBeginDelay
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 320780411405276928, guid: ace884b1bf546300a85f4176788f481b, type: 3}
       propertyPath: biddingPlatforms.Array.data[0]
       value: