diff --git a/Assets/Prefabs/Car.prefab b/Assets/Prefabs/Car.prefab index b427d37..7f1ae1c 100644 --- a/Assets/Prefabs/Car.prefab +++ b/Assets/Prefabs/Car.prefab @@ -161,6 +161,7 @@ MonoBehaviour: m_Groups: m_Action: Steering m_Flags: 8 + m_Flags: 0 accelerationAction: m_Name: Acceleration m_Type: 0 @@ -185,6 +186,7 @@ MonoBehaviour: m_Groups: m_Action: Acceleration m_Flags: 0 + m_Flags: 0 brakeAction: m_Name: Brake m_Type: 0 @@ -217,9 +219,11 @@ MonoBehaviour: m_Groups: m_Action: Brake m_Flags: 0 + m_Flags: 0 accelerationAmount: 1 steeringAnglePerSecond: 55 maxAcceleration: 10 + brakingAmount: 0 --- !u!1 &4347140594571366790 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/iteration_1.unity b/Assets/Scenes/iteration_1.unity index b641641..8f06cca 100644 --- a/Assets/Scenes/iteration_1.unity +++ b/Assets/Scenes/iteration_1.unity @@ -201,6 +201,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} @@ -214,6 +215,7 @@ MonoBehaviour: m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!114 &138279544 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17924,6 +17926,10 @@ PrefabInstance: propertyPath: accelerationAmount value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 2407173318615250605, guid: 91c50235569390c4aabd5710802a7730, type: 3} + propertyPath: wheelAccelerationFactor + value: 6 + objectReference: {fileID: 0} - target: {fileID: 2407173318615250642, guid: 91c50235569390c4aabd5710802a7730, type: 3} propertyPath: m_Name value: Car diff --git a/Assets/Scripts/CarLogic.cs b/Assets/Scripts/CarLogic.cs index 1aaec16..535fa9d 100644 --- a/Assets/Scripts/CarLogic.cs +++ b/Assets/Scripts/CarLogic.cs @@ -1,4 +1,3 @@ -using Unity.Mathematics; using UnityEngine; using UnityEngine.InputSystem; @@ -15,12 +14,14 @@ public class CarLogic : MonoBehaviour public float maxAcceleration = 100; public float brakingAmount; + public float wheelAccelerationFactor = 6.0f; private Rigidbody2D _rigidbody; private Transform _transform; private float _currentAcceleration; - private float _wheelAccelerationAmount; - private int _wheelOffroadCount = 0; + private int _wheelOnRoadCount = 0; + private float _maxAcceleration; + private float _wheelAccelerationOffset; public float CurrentAccelerationRatio() { @@ -31,9 +32,11 @@ public class CarLogic : MonoBehaviour { _rigidbody = GetComponent(); _transform = transform; + _maxAcceleration = maxAcceleration; + _wheelAccelerationOffset = wheelAccelerationFactor - 4; } - private void Start() + private void OnEnable() { steeringAction.Enable(); accelerationAction.Enable(); @@ -46,18 +49,26 @@ public class CarLogic : MonoBehaviour wheel.wheelOnRoad = WheelOnRoad; } - _wheelAccelerationAmount = maxAcceleration / 5f; - _wheelOffroadCount = 4; + _wheelOnRoadCount = 0; + } + + private void OnDisable() + { + steeringAction.Disable(); + accelerationAction.Disable(); + brakeAction.Disable(); } private void WheelOffRoad() { - _wheelOffroadCount++; + _wheelOnRoadCount--; + _maxAcceleration = ((_wheelOnRoadCount + _wheelAccelerationOffset) / wheelAccelerationFactor) * maxAcceleration; } private void WheelOnRoad() { - _wheelOffroadCount--; + _wheelOnRoadCount++; + _maxAcceleration = ((_wheelOnRoadCount + _wheelAccelerationOffset) / wheelAccelerationFactor) * maxAcceleration; } private void Update() @@ -75,13 +86,8 @@ public class CarLogic : MonoBehaviour _currentAcceleration -= brakeValue * brakingAmount * Time.deltaTime; - if (_currentAcceleration > maxAcceleration / 3f) - { - _currentAcceleration -= _wheelOffroadCount * _wheelAccelerationAmount * Time.deltaTime; - } - // TODO: reverse logic. - _currentAcceleration = Mathf.Clamp(_currentAcceleration, 0, maxAcceleration); + _currentAcceleration = Mathf.Clamp(_currentAcceleration, 0, _maxAcceleration); if (_currentAcceleration > 0.01) { diff --git a/Assets/Scripts/LapTime.cs b/Assets/Scripts/LapTime.cs index 9b766ba..30bfbce 100644 --- a/Assets/Scripts/LapTime.cs +++ b/Assets/Scripts/LapTime.cs @@ -17,10 +17,9 @@ public class LapTime : MonoBehaviour public string GetTimeString() { return - $"Sector 1: {_checkPoint1Time:F}\nSector 2: {_checkPoint2Time:F}\nSector 3: {_checkPoint3Time:F}\nLast Lap Time: {_finishTime:F}\nBest Lap: {_bestTime:F}"; + $"Sector 1: {_checkPoint1Time:0.000}\nSector 2: {_checkPoint2Time:0.000}\nSector 3: {_checkPoint3Time:0.000}\nLast Lap Time: {_finishTime:0.0000}\nBest Lap: {_bestTime:0.000}"; } - // Start is called before the first frame update private void Start() { finishLine.CarPassed += FinishedLine; @@ -69,6 +68,7 @@ public class LapTime : MonoBehaviour } else { + _finishTime = float.MaxValue; ResetTimers(); } } diff --git a/Assets/Spritesheets/spritesheet_tiles.png.meta b/Assets/Spritesheets/spritesheet_tiles.png.meta index 7c61e56..aed8e34 100644 --- a/Assets/Spritesheets/spritesheet_tiles.png.meta +++ b/Assets/Spritesheets/spritesheet_tiles.png.meta @@ -956,12 +956,10 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -1000,7 +998,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -7640,321 +7637,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: - land_dirt01.png: 4786832757681933155 - land_dirt02.png: -4834024837691419245 - land_dirt03.png: -4010372150803194718 - land_dirt04.png: 3604179542684470606 - land_dirt05.png: -6785363752229009584 - land_dirt06.png: 2508899558975295778 - land_dirt07.png: -4587834741747951997 - land_dirt08.png: -2482233257618752907 - land_dirt09.png: -662669690530072508 - land_dirt10.png: 4905636903411046463 - land_dirt11.png: -8062914936874996363 - land_dirt12.png: -349667595727915869 - land_dirt13.png: -1237956943426261173 - land_dirt14.png: 8599929229683148095 - land_grass01.png: 6934249857345672084 - land_grass02.png: 3893835003921524498 - land_grass03.png: -3852663985277438833 - land_grass04.png: 6414947802470564414 - land_grass05.png: 6567649456497968791 - land_grass06.png: -5353836514939877190 - land_grass07.png: -4591339166916937367 - land_grass08.png: -4673696255472784501 - land_grass09.png: 8336932635170907551 - land_grass10.png: 8529129626405262810 - land_grass11.png: 951926111126228003 - land_grass12.png: 2331238037495091531 - land_grass13.png: 6929103060042486875 - land_grass14.png: 7552490165896715259 - land_sand01.png: 848732102700097975 - land_sand02.png: 7336679046299466970 - land_sand03.png: 5033058348286153549 - land_sand04.png: 882372684706138362 - land_sand05.png: -9019534518393539706 - land_sand06.png: -9163489306904235675 - land_sand07.png: 6289044590718328082 - land_sand08.png: -1762988832503139816 - land_sand09.png: -7322078700251854018 - land_sand10.png: 3586636018514728850 - land_sand11.png: 8097720113326190335 - land_sand12.png: -7179300155377069544 - land_sand13.png: 5119072198839088567 - land_sand14.png: -2610614078516617073 - road_asphalt01.png: -3379712468110919260 - road_asphalt02.png: -928048530684443914 - road_asphalt03.png: -6362561705579217155 - road_asphalt04.png: 7151972192644986114 - road_asphalt05.png: 572436684405366926 - road_asphalt06.png: 4962818579614150397 - road_asphalt07.png: 663729811401105264 - road_asphalt08.png: 6946006602273976149 - road_asphalt09.png: 8805851501193689038 - road_asphalt10.png: 3440164912236401058 - road_asphalt11.png: 8200491073677560007 - road_asphalt12.png: 5261599245294155501 - road_asphalt13.png: -843933207200677939 - road_asphalt14.png: 9175819461063321162 - road_asphalt15.png: 3869414019790854105 - road_asphalt16.png: 8467531153759191338 - road_asphalt17.png: -6044998562469044979 - road_asphalt18.png: -7738440194515454182 - road_asphalt19.png: -7270349257048051864 - road_asphalt20.png: -4573533394278663697 - road_asphalt21.png: -6947018968151672589 - road_asphalt22.png: 2445662737538909550 - road_asphalt23.png: -6745524856270189669 - road_asphalt24.png: 4754229158857056384 - road_asphalt25.png: 6656530448882807610 - road_asphalt26.png: 1445557395436915713 - road_asphalt27.png: 1681063209060414046 - road_asphalt28.png: -6752629505182274192 - road_asphalt29.png: 7864137392391100396 - road_asphalt30.png: 2098695219904298335 - road_asphalt31.png: 5459211899779094330 - road_asphalt32.png: -1751430070380533981 - road_asphalt33.png: 2084421362352344168 - road_asphalt34.png: -3688243491104210527 - road_asphalt35.png: -7123928403060626076 - road_asphalt36.png: -2038724036707275006 - road_asphalt37.png: 488119040464471136 - road_asphalt38.png: 4268534517838131915 - road_asphalt39.png: -7457420327693180645 - road_asphalt40.png: 7516394481867045009 - road_asphalt41.png: 6995321816792178874 - road_asphalt42.png: 4214508078472914353 - road_asphalt43.png: 8620695348300893849 - road_asphalt44.png: -4577006156296725628 - road_asphalt45.png: -6111733487362138586 - road_asphalt46.png: -7155832236050112113 - road_asphalt47.png: 2629803284648247474 - road_asphalt48.png: 4632150576727671969 - road_asphalt49.png: 2676663343607708989 - road_asphalt50.png: -6951986841314137301 - road_asphalt51.png: -4093374440795974610 - road_asphalt52.png: 75155051709101000 - road_asphalt53.png: -3255575740274669328 - road_asphalt54.png: -6421320608722116523 - road_asphalt55.png: 7068571634786354558 - road_asphalt56.png: 8905690349652747724 - road_asphalt57.png: -8517748418307439590 - road_asphalt58.png: -5247216437641897072 - road_asphalt59.png: -3124679581959444107 - road_asphalt60.png: 8258240476729549586 - road_asphalt61.png: -7805986656493566823 - road_asphalt62.png: 3297497793100228005 - road_asphalt63.png: -2679531101817006529 - road_asphalt64.png: 8035442828280782693 - road_asphalt65.png: -5232875839697839826 - road_asphalt66.png: -6001564990320334399 - road_asphalt67.png: -9083003313222871005 - road_asphalt68.png: -7450547537794083761 - road_asphalt69.png: -224758035730949135 - road_asphalt70.png: -3937792416293108880 - road_asphalt71.png: 2118744051026635315 - road_asphalt72.png: 9058861650656833783 - road_asphalt73.png: -3329327455357897335 - road_asphalt74.png: -5624375048945164343 - road_asphalt75.png: 1022248321689462480 - road_asphalt76.png: -4918021399976422530 - road_asphalt77.png: 1089215385588061056 - road_asphalt78.png: -8461683958474096427 - road_asphalt79.png: -5462193736986183493 - road_asphalt80.png: 8548377064536991588 - road_asphalt81.png: -7887246535288106105 - road_asphalt82.png: 5989343553931161995 - road_asphalt83.png: -2051242171998482622 - road_asphalt84.png: 3571245623422273196 - road_asphalt85.png: -8763898745603192321 - road_asphalt86.png: 7126264585908961347 - road_asphalt87.png: -2696239979300778355 - road_asphalt88.png: -1421260669395817660 - road_asphalt89.png: -1576864178639160453 - road_asphalt90.png: 6278779421360027594 - road_dirt01.png: -7011523237832010766 - road_dirt02.png: 8766294041999928493 - road_dirt03.png: 5367103053656106182 - road_dirt04.png: -6920863322543951502 - road_dirt05.png: -2743940398024254655 - road_dirt06.png: 4704481670612481722 - road_dirt07.png: 4443551564048470518 - road_dirt08.png: 679110910637981342 - road_dirt09.png: 4683722326845816639 - road_dirt10.png: -5450407372227771892 - road_dirt11.png: 6228258891635333606 - road_dirt12.png: -2540684919342461705 - road_dirt13.png: -7323158597400550100 - road_dirt14.png: 4314275408426330216 - road_dirt15.png: -171658658124971193 - road_dirt16.png: -1449703300304143262 - road_dirt17.png: -7418886968046134370 - road_dirt18.png: 9218492422252191249 - road_dirt19.png: -8056090264954551604 - road_dirt20.png: 1988381234976467716 - road_dirt21.png: -1542062506460025011 - road_dirt22.png: -6768547727917518536 - road_dirt23.png: 6218449686253068851 - road_dirt24.png: 5024456329554373863 - road_dirt25.png: -1743430774389737041 - road_dirt26.png: 4679546587635080890 - road_dirt27.png: -6372732882358945726 - road_dirt28.png: 8274983803448063211 - road_dirt29.png: 2290540770664570932 - road_dirt30.png: 1725323366804832222 - road_dirt31.png: -512722455522285027 - road_dirt32.png: 529214402242435738 - road_dirt33.png: -1117710186148955268 - road_dirt34.png: 8604745283316423052 - road_dirt35.png: -1148184301592213835 - road_dirt36.png: -4347881803675866238 - road_dirt37.png: 7289741524398701013 - road_dirt38.png: -7942552071802961304 - road_dirt39.png: 7304668284178591434 - road_dirt40.png: -4011735934018195021 - road_dirt41.png: 5818924045993750410 - road_dirt42.png: 2795515922845416545 - road_dirt43.png: -2438838852437875635 - road_dirt44.png: -501236684984033221 - road_dirt45.png: -7527020565150135530 - road_dirt46.png: 1319381538278991273 - road_dirt47.png: -7921832635407016065 - road_dirt48.png: 8272652443059692192 - road_dirt49.png: 2268338762287553533 - road_dirt50.png: -3076416074612127732 - road_dirt51.png: -354290056935090010 - road_dirt52.png: -3786067475952186153 - road_dirt53.png: -8079469061686722815 - road_dirt54.png: 3734302580324514087 - road_dirt55.png: 3748686676164161708 - road_dirt56.png: 4442109814993102221 - road_dirt57.png: -3071375724733712195 - road_dirt58.png: 1650630721270681047 - road_dirt59.png: 5485702538527356905 - road_dirt60.png: 6796550608562251797 - road_dirt61.png: -4481298297218734095 - road_dirt62.png: 8351511023401652269 - road_dirt63.png: 3414327210710929884 - road_dirt64.png: 3975783013871749752 - road_dirt65.png: -2041387449621548759 - road_dirt66.png: -3346946808931314077 - road_dirt67.png: -7664646813484178930 - road_dirt68.png: 3508527913930600880 - road_dirt69.png: -2242071811168450599 - road_dirt70.png: 246520297748179096 - road_dirt71.png: 8060694083883796590 - road_dirt72.png: -2260247672668067343 - road_dirt73.png: 614188445450603168 - road_dirt74.png: 6209807547179756399 - road_dirt75.png: -1406181152731860013 - road_dirt76.png: 4731279733897666676 - road_dirt77.png: 4918325303200132735 - road_dirt78.png: 9116607593256222910 - road_dirt79.png: 9166082939678462734 - road_dirt80.png: 6416483096411643210 - road_dirt81.png: -4767649438469186205 - road_dirt82.png: -4355295349395582462 - road_dirt83.png: 7678141639116185626 - road_dirt84.png: 5029771838881066366 - road_dirt85.png: -7222479512158379425 - road_dirt86.png: -6435714164500895740 - road_dirt87.png: 3710729055174618152 - road_dirt88.png: 4513070314096954610 - road_dirt89.png: -3623502617856210816 - road_dirt90.png: -7546289229501291329 - road_sand01.png: -6106514123819350684 - road_sand02.png: 6678683649287926796 - road_sand03.png: 6091057125436954764 - road_sand04.png: 1106625069100429610 - road_sand05.png: 2106423708312357990 - road_sand06.png: -2445135403914457662 - road_sand07.png: -9079010603040895824 - road_sand08.png: 3068907790379664973 - road_sand09.png: 5347509691952947434 - road_sand10.png: -2978272143895338446 - road_sand11.png: 5590702310731905104 - road_sand12.png: 4200672646949283933 - road_sand13.png: 6815002714334381869 - road_sand14.png: -5745237409323196025 - road_sand15.png: 6377963545911527384 - road_sand16.png: 5561271501397248387 - road_sand17.png: -6807321833125122192 - road_sand18.png: -1302674181565709755 - road_sand19.png: -410033453842681112 - road_sand20.png: -4243796564327697444 - road_sand21.png: -4369540480671014374 - road_sand22.png: -4245725989678601388 - road_sand23.png: 2110840140555892288 - road_sand24.png: -7724729561074025820 - road_sand25.png: 4743438770109845387 - road_sand26.png: -6712065937101772617 - road_sand27.png: 3032836919567700779 - road_sand28.png: 590942846825749687 - road_sand29.png: 3243239830380805697 - road_sand30.png: -6224242870521745048 - road_sand31.png: 7313505831955460094 - road_sand32.png: -6164388836049357364 - road_sand33.png: -2786409637974538579 - road_sand34.png: 21395898463632016 - road_sand35.png: -4109368638823969185 - road_sand36.png: 8107429216834230202 - road_sand37.png: -4337220116541970435 - road_sand38.png: -7265118734964182018 - road_sand39.png: -5828699806171256968 - road_sand40.png: 301056004110250372 - road_sand41.png: -4299584777768104257 - road_sand42.png: 5976547218310375758 - road_sand43.png: -5562084577747470992 - road_sand44.png: -1756013819365364849 - road_sand45.png: -1813585048116855140 - road_sand46.png: 1269468606137373061 - road_sand47.png: 6856411165678850711 - road_sand48.png: 7305779551329357984 - road_sand49.png: 7000576576978854257 - road_sand50.png: 6604832999379251228 - road_sand51.png: 7427530680998007036 - road_sand52.png: 1900703204739128010 - road_sand53.png: -5973329544842715253 - road_sand54.png: -8927894618349656781 - road_sand55.png: -2102398769523228289 - road_sand56.png: -1406319460729450542 - road_sand57.png: 5782370209703560909 - road_sand58.png: 7845357811739616088 - road_sand59.png: -6368098041519637534 - road_sand60.png: 328964649781132623 - road_sand61.png: -764333487577964370 - road_sand62.png: 5745700291054992384 - road_sand63.png: -4593818696444378945 - road_sand64.png: 6680707342746984156 - road_sand65.png: 4632986385283095064 - road_sand66.png: -9109621183007703097 - road_sand67.png: 1361146139987640539 - road_sand68.png: -7619662411554954256 - road_sand69.png: 2301580685622909383 - road_sand70.png: -8783562222701665335 - road_sand71.png: 5828608744118826406 - road_sand72.png: -3959807427094851147 - road_sand73.png: 1535824691067267873 - road_sand74.png: 1400571231548534249 - road_sand75.png: -3161141814581354868 - road_sand76.png: 4209793257695959888 - road_sand77.png: -2734846335164478453 - road_sand78.png: 192659418157790980 - road_sand79.png: 7294636589426837682 - road_sand80.png: 1100674078252198622 - road_sand81.png: 7530850659019088791 - road_sand82.png: 4135026206927149101 - road_sand83.png: -6750683048786751835 - road_sand84.png: 346159285877010733 - road_sand85.png: 3207104716493331971 - road_sand86.png: 1552473152954324524 - road_sand87.png: 1739046679744116959 - road_sand88.png: 3638348380030776119 - road_sand89.png: 7351771054793753370 - road_sand90.png: 5711295839685872444 - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/level_palettes/Road.prefab b/Assets/level_palettes/Road.prefab index d24b007..796619e 100644 --- a/Assets/level_palettes/Road.prefab +++ b/Assets/level_palettes/Road.prefab @@ -40,7 +40,7 @@ Grid: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1656760500508760349} m_Enabled: 1 - m_CellSize: {x: 1.28, y: 1.28, z: 0} + m_CellSize: {x: 1.007874, y: 1.007874, z: 0} m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 @@ -1827,14 +1827,14 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.13999999, y: 0.13999999, z: 0} + m_ChunkCullingBounds: {x: 0.003937006, y: 0.003937006, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &5783895289497462341 +--- !u!114 &6837569382650822553 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0}