Skip to content

S
SSBookMinigames
Commit d2a2b634 authored by Mahmoud Mostafa's avatar Mahmoud Mostafa
Browse files
Options

Fixed the competitors

parent 5f34f841
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 137 deletions
My project/Assets/ScienceStreet/MCQ/Scripts/McqCompetitor.cs
View file @ d2a2b634
......@@ -7,15 +7,25 @@ public class McqCompetitor : MonoBehaviour
private McqGameManager _manager;
private float[] _lanes = new float[4] { -5.8f, -1.8f, 2.2f, 6.2f };
private Transform[] _runners = new Transform[2];
private float _initialSpeed;
private float _currentSpeed;
private bool _isRunning;
private Vector3 _startPosition;
private float timer = 1;
private float timer = 1.5f;
private void Awake()
{
_startPosition = transform.position;
for (int i = 0; i < 2; i++)
{
_runners[i] = transform.GetChild(i);
_runners[i].localPosition =
new Vector3(_runners[i].localPosition.x, 0, Random.Range(2f,4f));
}
Invoke(nameof(SwitchLane), 4);
}
public void SetupManager(McqGameManager manager)
......@@ -27,13 +37,29 @@ public class McqCompetitor : MonoBehaviour
private void ChangeZLevel(bool correct)
{
Stop();
transform.DOKill();
transform.DOMoveZ(transform.position.z + (correct ? -10f : 10f) + _initialSpeed * timer, timer)
foreach (Transform runner in _runners)
{
runner.DOKill();
float targetZ = runner.position.z + Random.Range(4f, 10f) * (correct ? -1.5f : 1);
runner.DOMoveZ(targetZ + _initialSpeed * timer, timer)
.SetEase(Ease.OutQuad).OnComplete(() =>
{
RunForward(_initialSpeed);
});
}
Invoke(nameof(SwitchLane), 5);
}
public void SwitchLane()
{
foreach (Transform runner in _runners)
{
runner.DOKill();
runner.DOLocalMoveX(_lanes[Random.Range(0, _lanes.Length)], 0.8f).SetEase(Ease.OutQuad);
}
}
public void RunForward(float speed)
{
_initialSpeed = speed;
......@@ -53,6 +79,12 @@ public class McqCompetitor : MonoBehaviour
transform.position = _startPosition;
transform.rotation = Quaternion.identity;
transform.localScale = Vector3.one;
foreach (Transform runner in _runners)
{
runner.DOKill();
runner.transform.localPosition = new Vector3(runner.localPosition.x, 0, Random.Range(2f, 4f));
}
Invoke(nameof(SwitchLane), 4);
}
private void Update()
{
......
My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View file @ d2a2b634
......@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 112}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 47848
controlID: 270
draggingID: 0
--- !u!114 &2
MonoBehaviour:
......@@ -47,9 +47,9 @@ MonoBehaviour:
m_TextWithWhitespace: "Game\u200B"
m_Pos:
serializedVersion: 2
x: 289.6
x: 288.80002
y: 79.200005
width: 882
width: 882.00006
height: 398
m_SerializedDataModeController:
m_DataMode: 0
......@@ -70,7 +70,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 882, y: 377}
m_TargetSize: {x: 882.00006, y: 377}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
......@@ -94,7 +94,7 @@ MonoBehaviour:
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 1
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
......@@ -106,23 +106,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 882
width: 882.00006
height: 377
m_Scale: {x: 1.25, y: 1.25}
m_Translation: {x: 441, y: 188.5}
m_Translation: {x: 441.00003, y: 188.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -352.8
x: -352.80002
y: -150.8
width: 705.6
width: 705.60004
height: 301.6
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1102.5, y: 497.5}
m_LastWindowPixelSize: {x: 1102.5001, y: 497.5}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
......@@ -148,12 +148,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1173.6
width: 1172.8
height: 716.8
m_MinSize: {x: 200, y: 112}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 47849
controlID: 271
draggingID: 0
--- !u!114 &4
MonoBehaviour:
......@@ -174,12 +174,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1173.6
width: 1172.8
height: 424
m_MinSize: {x: 200, y: 56}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 47850
controlID: 272
draggingID: 0
--- !u!114 &5
MonoBehaviour:
......@@ -198,10 +198,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 289.6
width: 288.8
height: 424
m_MinSize: {x: 201, y: 226}
m_MaxSize: {x: 4001, y: 4026}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
......@@ -230,7 +230,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 79.200005
width: 288.6
width: 287.8
height: 398
m_SerializedDataModeController:
m_DataMode: 0
......@@ -252,17 +252,6 @@ MonoBehaviour:
m_LastClickedID:
m_Data: 0
m_ExpandedIDs:
- m_Data: -432486
- m_Data: -178208
- m_Data: -90336
- m_Data: -70030
- m_Data: -53742
- m_Data: -52452
- m_Data: -51374
- m_Data: -50920
- m_Data: -48444
- m_Data: -31282
- m_Data: -29936
- m_Data: -1296
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -304,9 +293,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 289.6
x: 288.8
y: 0
width: 884
width: 884.00006
height: 424
m_MinSize: {x: 202, y: 226}
m_MaxSize: {x: 4002, y: 4026}
......@@ -338,9 +327,9 @@ MonoBehaviour:
m_TextWithWhitespace: "Scene\u200B"
m_Pos:
serializedVersion: 2
x: 289.6
x: 288.80002
y: 79.200005
width: 882
width: 882.00006
height: 398
m_SerializedDataModeController:
m_DataMode: 0
......@@ -898,9 +887,9 @@ MonoBehaviour:
m_AudioPlay: 0
m_DebugDrawModesUseInteractiveLightBakingData: 0
m_Position:
m_Target: {x: 54.725742, y: 8.979159, z: -110.930695}
m_Target: {x: 3.31688, y: -8.319372, z: 7.2464542}
speed: 2
m_Value: {x: 54.725742, y: 8.979159, z: -110.930695}
m_Value: {x: 3.31688, y: -8.319372, z: 7.2464542}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -946,9 +935,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.00058327726, y: -0.2854674, z: 0.0001793684, w: -0.95840967}
m_Target: {x: -0.42709705, y: -0.22301169, z: 0.1095529, w: -0.86943793}
speed: 2
m_Value: {x: -0.00058327726, y: -0.28546742, z: 0.0001793684, w: -0.95840967}
m_Value: {x: -0.42708203, y: -0.22300385, z: 0.109549046, w: -0.86940736}
m_Size:
m_Target: 10
speed: 2
......@@ -1094,7 +1083,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 424
width: 1173.6
width: 1172.8
height: 292.8
m_MinSize: {x: 231, y: 276}
m_MaxSize: {x: 10001, y: 10026}
......@@ -1128,7 +1117,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 503.2
width: 1172.6
width: 1171.8
height: 266.8
m_SerializedDataModeController:
m_DataMode: 0
......@@ -1154,7 +1143,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Prefabs/MCQ
- Assets/ScienceStreet/MCQ/Scripts
m_Globs: []
m_ProductIds:
m_AnyWithAssetOrigin: 0
......@@ -1164,34 +1153,34 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs/MCQ
- Assets/ScienceStreet/MCQ/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Unity\AL-Arcade\SSBook\My project
m_LockTracker:
m_IsLocked: 0
m_LastLocalAssetsSearchArea: 1
m_FolderTreeState:
scrollPos: {x: 0, y: 393.2}
scrollPos: {x: 0, y: 745.2}
m_SelectedIDs:
- m_Data: 60650
- m_Data: 62894
m_LastClickedID:
m_Data: 60650
m_Data: 62894
m_ExpandedIDs:
- m_Data: 0
- m_Data: 60632
- m_Data: 60634
- m_Data: 60636
- m_Data: 60638
- m_Data: 60640
- m_Data: 60642
- m_Data: 60644
- m_Data: 60646
- m_Data: 60648
- m_Data: 60650
- m_Data: 60946
- m_Data: 169024
- m_Data: 169126
- m_Data: 169228
- m_Data: 62480
- m_Data: 62482
- m_Data: 62484
- m_Data: 62486
- m_Data: 62488
- m_Data: 62490
- m_Data: 62492
- m_Data: 62494
- m_Data: 62496
- m_Data: 62498
- m_Data: 62500
- m_Data: 62502
- m_Data: 62504
- m_Data: 62812
- m_Data: 1000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -1225,19 +1214,19 @@ MonoBehaviour:
m_Data: 0
m_ExpandedIDs:
- m_Data: 0
- m_Data: 60632
- m_Data: 60634
- m_Data: 60636
- m_Data: 60638
- m_Data: 60640
- m_Data: 60642
- m_Data: 60644
- m_Data: 60646
- m_Data: 60648
- m_Data: 60650
- m_Data: 169024
- m_Data: 169126
- m_Data: 169228
- m_Data: 62480
- m_Data: 62482
- m_Data: 62484
- m_Data: 62486
- m_Data: 62488
- m_Data: 62490
- m_Data: 62492
- m_Data: 62494
- m_Data: 62496
- m_Data: 62498
- m_Data: 62500
- m_Data: 62502
- m_Data: 62504
- m_Data: 1000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -1267,7 +1256,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs: []
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: []
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -1321,7 +1310,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 503.2
width: 1172.6
width: 1171.8
height: 266.8
m_SerializedDataModeController:
m_DataMode: 0
......@@ -1392,12 +1381,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1173.6
x: 1172.8
y: 0
width: 362.40002
width: 363.19995
height: 716.8
m_MinSize: {x: 276, y: 76}
m_MaxSize: {x: 4001, y: 4026}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
......@@ -1424,9 +1413,9 @@ MonoBehaviour:
m_TextWithWhitespace: "Inspector\u200B"
m_Pos:
serializedVersion: 2
x: 1173.6
x: 1172.8
y: 79.200005
width: 361.40002
width: 362.19995
height: 690.8
m_SerializedDataModeController:
m_DataMode: 0
......
My project/UserSettings/Layouts/default-6000.dwlt
View file @ d2a2b634
......@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 112}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 48011
controlID: 15124
draggingID: 0
--- !u!114 &6
MonoBehaviour:
......@@ -145,7 +145,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 112}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 48012
controlID: 15125
draggingID: 0
--- !u!114 &7
MonoBehaviour:
......@@ -171,7 +171,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 56}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 48013
controlID: 15126
draggingID: 0
--- !u!114 &8
MonoBehaviour:
......@@ -618,7 +618,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
......@@ -695,17 +695,7 @@ MonoBehaviour:
m_LastClickedID:
m_Data: 0
m_ExpandedIDs:
- m_Data: -432486
- m_Data: -178208
- m_Data: -90336
- m_Data: -70030
- m_Data: -53742
- m_Data: -52452
- m_Data: -51374
- m_Data: -50920
- m_Data: -48444
- m_Data: -31282
- m_Data: -29936
- m_Data: -34716
- m_Data: -1296
m_RenameOverlay:
m_UserAcceptedRename: 0
......@@ -1313,9 +1303,9 @@ MonoBehaviour:
m_AudioPlay: 0
m_DebugDrawModesUseInteractiveLightBakingData: 0
m_Position:
m_Target: {x: -2.8574374, y: 1.837275, z: 51.51299}
m_Target: {x: -0.09913478, y: 4.2274013, z: 205.20862}
speed: 2
m_Value: {x: -2.8574374, y: 1.837275, z: 51.51299}
m_Value: {x: -0.09913478, y: 4.2274013, z: 205.20862}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -1361,9 +1351,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.055758126, y: 0.029662695, z: -0.001650402, w: -0.9980285}
m_Target: {x: 0.00058980595, y: -0.007488523, z: -0.0000037523164, w: -1.0000063}
speed: 2
m_Value: {x: -0.055758122, y: 0.029662693, z: -0.0016504019, w: -0.99802846}
m_Value: {x: 0.00058980595, y: -0.007488523, z: -0.0000037523164, w: -1.0000063}
m_Size:
m_Target: 10
speed: 2
......@@ -1541,7 +1531,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/Prefabs/MCQ/Materials
m_Globs: []
m_ProductIds:
m_AnyWithAssetOrigin: 0
......@@ -1551,33 +1541,33 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets
- Assets/Prefabs/MCQ/Materials
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Unity\AL-Arcade\SSBook\My project
m_LockTracker:
m_IsLocked: 0
m_LastLocalAssetsSearchArea: 1
m_FolderTreeState:
scrollPos: {x: 0, y: 127}
scrollPos: {x: 0, y: 393.2}
m_SelectedIDs:
- m_Data: 60946
- m_Data: 62106
m_LastClickedID:
m_Data: 60946
m_Data: 62106
m_ExpandedIDs:
- m_Data: 0
- m_Data: 61652
- m_Data: 61654
- m_Data: 61656
- m_Data: 61658
- m_Data: 61660
- m_Data: 61662
- m_Data: 61664
- m_Data: 61666
- m_Data: 61668
- m_Data: 61670
- m_Data: 61672
- m_Data: 61674
- m_Data: 61676
- m_Data: 62480
- m_Data: 62482
- m_Data: 62484
- m_Data: 62486
- m_Data: 62488
- m_Data: 62490
- m_Data: 62492
- m_Data: 62494
- m_Data: 62496
- m_Data: 62498
- m_Data: 62500
- m_Data: 62502
- m_Data: 62504
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1610,19 +1600,19 @@ MonoBehaviour:
m_Data: 0
m_ExpandedIDs:
- m_Data: 0
- m_Data: 61652
- m_Data: 61654
- m_Data: 61656
- m_Data: 61658
- m_Data: 61660
- m_Data: 61662
- m_Data: 61664
- m_Data: 61666
- m_Data: 61668
- m_Data: 61670
- m_Data: 61672
- m_Data: 61674
- m_Data: 61676
- m_Data: 62480
- m_Data: 62482
- m_Data: 62484
- m_Data: 62486
- m_Data: 62488
- m_Data: 62490
- m_Data: 62492
- m_Data: 62494
- m_Data: 62496
- m_Data: 62498
- m_Data: 62500
- m_Data: 62502
- m_Data: 62504
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1651,7 +1641,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs: []
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: []
m_RenameOverlay:
m_UserAcceptedRename: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment