diff --git a/Assets/Scenes/Bidding.unity b/Assets/Scenes/Bidding.unity index fb6200ea1..e1d193ffa 100644 --- a/Assets/Scenes/Bidding.unity +++ b/Assets/Scenes/Bidding.unity @@ -147,7 +147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 14999209} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -17.8, y: 2.4, z: 1} + m_LocalPosition: {x: -17.8, y: 3.9, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -190,7 +190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.y - value: 1.79 + value: 3.29 objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.z @@ -495,7 +495,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 74372382} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.32755935, y: 1.6268253, z: -0.24171638} + m_LocalPosition: {x: 0.32755935, y: 3.1268253, z: -0.24171638} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -740,7 +740,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3} propertyPath: m_LocalPosition.y - value: 11.28 + value: 12.78 objectReference: {fileID: 0} - target: {fileID: 3788727383259156052, guid: cfa62f17bb065f946ae65b484157238d, type: 3} propertyPath: m_LocalPosition.z @@ -867,7 +867,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 228698050} m_LocalRotation: {x: 0.7094477, y: 0, z: 0, w: 0.7047581} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 11.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1422,7 +1422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3} propertyPath: m_LocalPosition.z @@ -1770,7 +1770,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 652423011} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 16.2, y: 2.4, z: 1} + m_LocalPosition: {x: 16.2, y: 3.9, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2024,7 +2024,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.y - value: 1.79 + value: 3.29 objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.z @@ -2217,7 +2217,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6036499215472260282, guid: 7cbbbf5fba762c949995e2b4b8bcfa0b, type: 3} propertyPath: m_LocalPosition.y - value: 2.47 + value: 3.97 objectReference: {fileID: 0} - target: {fileID: 6036499215472260282, guid: 7cbbbf5fba762c949995e2b4b8bcfa0b, type: 3} propertyPath: m_LocalPosition.z @@ -2631,7 +2631,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e82874ba34dffc64f840e8d7656aac9b, type: 3} propertyPath: m_LocalPosition.z @@ -2762,7 +2762,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f5c669873623fd38b818e36c0068f473, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f5c669873623fd38b818e36c0068f473, type: 3} propertyPath: m_LocalPosition.z @@ -3621,7 +3621,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2655652194932503321, guid: 4fe7fc2b9f07352a1aed9b8eb31729d0, type: 3} propertyPath: m_LocalPosition.y - value: 1.5520239 + value: 3.052024 objectReference: {fileID: 0} - target: {fileID: 2655652194932503321, guid: 4fe7fc2b9f07352a1aed9b8eb31729d0, type: 3} propertyPath: m_LocalPosition.z @@ -3918,7 +3918,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1915324644} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.530047, y: 3.4358048, z: -16.581884} + m_LocalPosition: {x: 3.530047, y: 4.935805, z: -16.581884} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4098,7 +4098,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.y - value: 1.79 + value: 3.29 objectReference: {fileID: 0} - target: {fileID: 7770595616075609816, guid: df667c99d94bd994a89241ccaf715e96, type: 3} propertyPath: m_LocalPosition.z @@ -4542,7 +4542,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4016072281495809983} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0.0000038146973, z: -5.59} + m_LocalPosition: {x: 0, y: 1.5000038, z: -5.59} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4926,7 +4926,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1744104498549808523, guid: ace884b1bf546300a85f4176788f481b, type: 3} propertyPath: m_LocalPosition.y - value: 3.5146039 + value: 5.0146036 objectReference: {fileID: 0} - target: {fileID: 1744104498549808523, guid: ace884b1bf546300a85f4176788f481b, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Auction/AuctionDriver.cs b/Assets/Scripts/Auction/AuctionDriver.cs index 5973ee890..5a9cbdc32 100644 --- a/Assets/Scripts/Auction/AuctionDriver.cs +++ b/Assets/Scripts/Auction/AuctionDriver.cs @@ -126,6 +126,8 @@ private IEnumerator WaitAndStartCameraAnimation() public void ScreenShake() { + if (cameraAnimator.transform.localPosition != cameraStandbyPosition) + return; cameraAnimator.enabled = false; if (LeanTween.isTweening(screenShakeTween)) {