Skip to content

C
car-sim-remaster
Commit 7db09697 authored by Danial KordModanlou's avatar Danial KordModanlou
Browse files
Options

Car AI system updated

parent 1acb95d7
Hide whitespace changes
Inline Side-by-side
Showing with 50001 additions and 42650 deletions
.idea/.idea.car-sim-remaster/.idea/indexLayout.xml
View file @ 7db09697
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<Path>.vs</Path> <Path>.vs</Path>
<Path>Library</Path> <Path>Library</Path>
<Path>Logs</Path> <Path>Logs</Path>
<Path>Temp</Path>
<Path>obj</Path> <Path>obj</Path>
</explicitExcludes> </explicitExcludes>
</component> </component>
......
.idea/.idea.car-sim-remaster/.idea/workspace.xml
View file @ 7db09697
...@@ -2,12 +2,9 @@ ...@@ -2,12 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="63a78b22-9aa4-4157-97bc-72b63425d4fc" name="Default Changelist" comment=""> <list default="true" id="63a78b22-9aa4-4157-97bc-72b63425d4fc" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scenes/NEW 1.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/NEW 1.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Prefabs/IKD_VehicleController_LeftSteering.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Prefabs/IKD_VehicleController_LeftSteering.prefab" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UTS_PRO/Models/Terrain&amp;Roads for Examples/Terrain Map.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UTS_PRO/Models/Terrain&amp;Roads for Examples/Terrain Map.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/ShoulderVibrate.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/ShoulderVibrate.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/Side.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Side.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/scripts/Side.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Side.cs" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -33,143 +30,161 @@ ...@@ -33,143 +30,161 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/MovePath.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833"> <state relative-caret-position="-41">
<caret line="51" column="56" selection-start-line="51" selection-start-column="55" selection-end-line="51" selection-end-column="56" /> <caret line="43" selection-start-line="43" selection-end-line="43" />
<folding> <folding>
<marker date="1595335069632" expanded="true" signature="57:2165" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="6:92" ph="..." />
<marker date="1595335069632" expanded="true" signature="642:1990" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="127:1574" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="830:1658" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="189:936" ph="/* private void OnCollisionEnter(Collision other) ... */" />
<marker date="1595335069632" expanded="true" signature="890:1250" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="984:1148" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="933:1078" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1041:1142" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1099:1236" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1196:1360" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1267:1647" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1253:1354" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1310:1445" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1408:1572" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1466:1633" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1465:1566" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1671:1983" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1706:1835" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1852:1973" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="2025:2163" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs"> <entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434"> <state relative-caret-position="77">
<caret line="61" column="19" selection-start-line="61" selection-start-column="19" selection-end-line="61" selection-end-column="19" /> <caret line="385" column="20" selection-start-line="385" selection-start-column="20" selection-end-line="385" selection-end-column="20" />
<folding> <folding>
<marker date="1595686648336" expanded="true" signature="6:92" ph="..." /> <marker date="1596431690534" expanded="true" signature="101:14144" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="127:1719" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1444:1525" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="189:936" ph="/* private void OnCollisionEnter(Collision other) ... */" /> <marker date="1596431690534" expanded="true" signature="1552:1641" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="984:1184" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1668:1757" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1077:1178" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1787:1858" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1232:1432" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1883:1966" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1325:1426" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1997:2092" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1480:1717" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="2123:2224" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1610:1711" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="2248:2341" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2368:2437" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2463:2608" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2634:3112" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2796:2843" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2856:2904" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3055:3106" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3139:3643" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3675:3809" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3740:3803" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3837:9087" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4301:5240" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4345:4779" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4430:4568" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4589:4704" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4796:5230" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4856:4994" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5015:5155" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5262:5804" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5394:5794" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5843:6287" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5908:6277" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6189:6263" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6300:6351" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6414:6951" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6460:6941" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6588:6817" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6838:6927" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7039:8028" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7117:7511" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7346:7497" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7584:8017" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7633:7802" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7823:8003" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8117:9081" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8169:8538" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8373:8524" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8586:9071" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8635:8856" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8877:9057" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9113:10428" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9196:9627" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9234:9371" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9388:9513" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9552:9617" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9640:9761" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9808:10271" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9912:10261" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10011:10247" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10327:10422" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10462:11066" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10648:10756" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10692:10746" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10782:10830" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10852:10915" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10928:10977" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11007:11060" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11094:13325" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11477:13160" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11606:12177" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11832:12163" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11936:11986" ph="/* if (MP.w == movePath.w) ... */" />
<marker date="1596431690534" expanded="true" signature="12234:12438" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12504:12721" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12816:12960" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12977:13150" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13022:13102" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13173:13319" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13210:13278" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13331:14142" ph="/* private void OnDrawGizmosSelected() ... */" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/WalkPath.cs"> <entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/ReasonsStoppingCars.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3026"> <state relative-caret-position="85">
<caret line="231" column="44" selection-start-line="231" selection-start-column="32" selection-end-line="231" selection-end-column="44" /> <caret line="10" column="20" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="20" />
<folding> <folding>
<marker date="1595335069654" expanded="false" signature="6:109" ph="..." /> <marker date="1595335069536" expanded="true" signature="68:4425" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="157:24794" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="234:1001" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="183:303" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="379:621" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="1737:1801" ph="/// Радиус сферы-стёрки [м] ... " /> <marker date="1595335069536" expanded="true" signature="420:495" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="1932:2065" ph="/// Минимальное расстояние от курсора до линии при котором можно добавить новую точку в путь [м] ... " /> <marker date="1595335069536" expanded="true" signature="512:580" ph="{...}" />
<marker date="1595335069654" expanded="false" signature="2607:3544" ph="Create And Delete Additional Points" /> <marker date="1595335069536" expanded="true" signature="664:995" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="2656:2733" ph="/// Идёт ли процесс создания новой точки ... " /> <marker date="1595335069536" expanded="true" signature="769:830" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="2799:2887" ph="/// Идёт ли процесс удаления некоторой старой точки ... " /> <marker date="1595335069536" expanded="true" signature="847:985" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="2953:3018" ph="/// Позиция мышки на экране ... " /> <marker date="1595335069536" expanded="true" signature="897:971" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3091:3177" ph="/// Индекс точки из массива которую хотят удалить ... " /> <marker date="1595335069536" expanded="true" signature="1190:3260" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3283:3364" ph="/// Индекс первой точки в массиве всех точек ... " /> <marker date="1595335069536" expanded="true" signature="1235:2397" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3408:3489" ph="/// Индекс второй точки в массиве всех точек ... " /> <marker date="1595335069536" expanded="true" signature="1280:2078" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3595:3640" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1338:1425" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3681:3722" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1446:2064" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3760:3803" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1507:1887" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3829:3945" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1575:1686" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="3886:3939" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1715:1865" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4137:16665" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="1912:2046" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4334:5540" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2095:2387" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4396:4460" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2147:2234" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4518:4583" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2255:2373" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4640:4808" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2410:3254" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="4866:5034" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2455:2739" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="5093:5281" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2513:2586" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="5341:5529" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2607:2725" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="5762:7812" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2756:3244" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="5859:6320" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2808:2881" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="5902:6084" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2902:3230" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="6105:6189" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="2968:3053" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="6375:6808" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3078:3212" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="6538:6691" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3389:3556" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="6712:6794" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3425:3488" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="6825:7089" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3501:3550" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="7506:7587" ph="/* if (i == 0) ... */" /> <marker date="1595335069536" expanded="true" signature="3723:4423" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="7638:7786" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3759:4007" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="7859:7995" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3806:3881" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="8017:8573" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="3898:3966" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="8078:8563" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="4041:4417" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="8121:8312" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="4153:4246" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="8370:8549" ph="{...}" /> <marker date="1595335069536" expanded="true" signature="4263:4407" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="8583:16659" ph="/* расчет точек первой полосы ... */" /> <marker date="1595335069536" expanded="true" signature="4319:4393" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="16714:16871" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="16750:16800" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="16908:17075" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17001:17069" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17112:17280" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17205:17274" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17351:18195" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17403:17534" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="17547:17632" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18043:18152" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18293:18533" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18392:18504" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18540:18686" ph="/// Блокировка разблокировка эдитора ... " />
<marker date="1595335069654" expanded="true" signature="18729:18805" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18811:18910" ph="/// Рисует всё что связанно с добавлением новой точки в массив ... " />
<marker date="1595335069654" expanded="true" signature="18949:19774" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="18986:19026" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19163:19483" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19332:19473" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19507:19567" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19580:19707" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19780:19879" ph="/// Рисует всё что связано с удалением старой точки из массива ... " />
<marker date="1595335069654" expanded="true" signature="19918:20602" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="19955:19995" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20128:20347" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20237:20337" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20371:20433" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20446:20540" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20719:21205" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="20903:20944" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="21313:21567" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="21497:21538" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="21573:21797" ph="/// Проверка на столкновение сферы для стирания точек с точкой ... " />
<marker date="1595335069654" expanded="true" signature="21894:21994" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="22000:22239" ph="/// Проверка на столкновение точки и линии ... " />
<marker date="1595335069654" expanded="true" signature="22354:22461" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="22467:22768" ph="/// Возвращает минимальное расстояние от точки до прямой [м] ... " />
<marker date="1595335069654" expanded="true" signature="22870:23455" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="23461:23555" ph="/// Добавляет новую точку между двумя созданными до этого ... " />
<marker date="1595335069654" expanded="true" signature="23582:24355" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="23597:23696" ph="/* Если индексы точек между которыми нужно создавать точку не выбраны ... */" />
<marker date="1595335069654" expanded="true" signature="23770:23810" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="24147:24210" ph="/* if (dontDrawYoJunkFool) ... */" />
<marker date="1595335069654" expanded="true" signature="24361:24425" ph="/// Удаляет выбранную точку ... " />
<marker date="1595335069654" expanded="true" signature="24455:24792" ph="{...}" />
<marker date="1595335069654" expanded="true" signature="24470:24543" ph="/* Если индекс точек для удаления не выбран ... */" />
<marker date="1595335069654" expanded="true" signature="24579:24619" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -538,6 +553,8 @@ ...@@ -538,6 +553,8 @@
<find>walkpa</find> <find>walkpa</find>
<find>points</find> <find>points</find>
<find>points[</find> <find>points[</find>
<find>speedDecrease</find>
<find>tempStop</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -547,6 +564,7 @@ ...@@ -547,6 +564,7 @@
<setting file="file://$PROJECT_DIR$/Assets/scripts/Respawner.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/Respawner.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/Suspension.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/Suspension.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/ReasonsStoppingCars.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/TerafficGraphManager.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/TerafficGraphManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleController.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs" root0="FORCE_HIGHLIGHTING" />
...@@ -559,6 +577,7 @@ ...@@ -559,6 +577,7 @@
<setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/CarWalkPath.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/CarWalkPath.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Utility/FollowTarget.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Utility/FollowTarget.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_CameraSwitchToggle.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Utility/ForcedReset.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Utility/ForcedReset.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Traffic Light/TLGraphicsControl.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Traffic Light/TLGraphicsControl.cs" root0="FORCE_HIGHLIGHTING" />
...@@ -601,6 +620,7 @@ ...@@ -601,6 +620,7 @@
<option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Suspension.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/Suspension.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Side.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/Side.cs" />
<option value="$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs" />
</list> </list>
</option> </option>
</component> </component>
...@@ -611,7 +631,7 @@ ...@@ -611,7 +631,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="7"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-10" /> <option name="x" value="-10" />
<option name="y" value="-10" /> <option name="y" value="-10" />
<option name="width" value="1935" /> <option name="width" value="1935" />
...@@ -622,15 +642,15 @@ ...@@ -622,15 +642,15 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="UnityExplorer"> <pane id="FileSystemExplorer" />
<option name="show-hidden-items" value="false" />
<option name="show-project-names" value="true" />
</pane>
<pane id="SolutionExplorer"> <pane id="SolutionExplorer">
<option name="show-all-files" value="false" /> <option name="show-all-files" value="false" />
</pane> </pane>
<pane id="AssemblyExplorer" /> <pane id="AssemblyExplorer" />
<pane id="FileSystemExplorer" /> <pane id="UnityExplorer">
<option name="show-hidden-items" value="false" />
<option name="show-project-names" value="true" />
</pane>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -706,12 +726,13 @@ ...@@ -706,12 +726,13 @@
<workItem from="1593701187520" duration="591000" /> <workItem from="1593701187520" duration="591000" />
<workItem from="1594895927874" duration="2684000" /> <workItem from="1594895927874" duration="2684000" />
<workItem from="1595523030624" duration="2623000" /> <workItem from="1595523030624" duration="2623000" />
<workItem from="1595685143892" duration="1503000" /> <workItem from="1595685143892" duration="3140000" />
<workItem from="1596431452429" duration="840000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="79238000" /> <option name="totallyTimeSpent" value="81715000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -724,9 +745,8 @@ ...@@ -724,9 +745,8 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11535882" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1167002" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -1268,92 +1288,6 @@ ...@@ -1268,92 +1288,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<folding>
<marker date="1595335069462" expanded="true" signature="1444:1525" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="1552:1641" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="1668:1757" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="1787:1858" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="1883:1966" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="1997:2092" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2123:2224" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2248:2341" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2368:2437" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2463:2608" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2634:3112" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2796:2843" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="2856:2904" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="3055:3106" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="3139:3643" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="3675:3809" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="3740:3803" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="3837:9087" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4301:5240" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4345:4779" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4430:4568" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4589:4704" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4796:5230" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="4856:4994" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="5015:5155" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="5262:5804" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="5394:5794" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="5843:6287" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="5908:6277" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6189:6263" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6300:6351" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6414:6951" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6460:6941" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6588:6817" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="6838:6927" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7039:8028" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7117:7511" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7346:7497" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7584:8017" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7633:7802" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="7823:8003" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8117:9081" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8169:8538" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8373:8524" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8586:9071" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8635:8856" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="8877:9057" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9113:10428" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9196:9627" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9234:9371" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9388:9513" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9552:9617" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9640:9761" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9808:10271" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="9912:10261" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10011:10247" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10327:10422" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10462:11066" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10648:10756" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10692:10746" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10782:10830" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10852:10915" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="10928:10977" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11007:11060" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11094:13319" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11477:13154" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11606:12171" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11832:12157" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="11960:12139" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="12228:12432" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="12498:12715" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="12810:12954" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="12971:13144" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="13016:13096" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="13167:13313" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="13204:13272" ph="{...}" />
<marker date="1595335069462" expanded="true" signature="13325:14136" ph="/* private void OnDrawGizmosSelected() ... */" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/WalkPath.cs"> <entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/WalkPath.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3026"> <state relative-caret-position="3026">
...@@ -1451,6 +1385,69 @@ ...@@ -1451,6 +1385,69 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_CameraSwitchToggle.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="53">
<caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
<marker date="1595335058459" expanded="true" signature="32:4672" ph="{...}" />
<marker date="1595335058459" expanded="false" signature="42:116" ph="..." />
<marker date="1595335058459" expanded="true" signature="175:480" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="535:4670" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="989:1036" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1053:1092" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1123:1349" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1397:1651" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1483:1623" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1544:1618" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1689:3150" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1795:2005" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="1857:2000" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2112:2326" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2175:2321" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2437:2646" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2502:2641" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2759:2972" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="2825:2967" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3185:4087" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3215:3369" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3403:3557" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3565:3719" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3941:4083" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="3986:4031" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="4031:4078" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="4092:4163" ph="/// Enter the camera 'Look Back' state ... " />
<marker date="1595335058459" expanded="true" signature="4195:4313" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="4317:4387" ph="/// Exit the Camera 'Look Back' state ... " />
<marker date="1595335058459" expanded="true" signature="4420:4500" ph="{...}" />
<marker date="1595335058459" expanded="true" signature="4504:4586" ph="/// Cycles through the configured vehicle cameras ... " />
<marker date="1595335058459" expanded="true" signature="4614:4666" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/MovePath.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833">
<caret line="51" column="56" selection-start-line="51" selection-start-column="55" selection-end-line="51" selection-end-column="56" />
<folding>
<marker date="1595335069632" expanded="true" signature="57:2165" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="642:1990" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="830:1658" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="890:1250" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="933:1078" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1099:1236" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1267:1647" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1310:1445" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1466:1633" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1671:1983" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1706:1835" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1852:1973" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="2025:2163" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Editor/CarWalkPathEditor.cs"> <entry file="file://$PROJECT_DIR$/Assets/Editor/CarWalkPathEditor.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3434"> <state relative-caret-position="3434">
...@@ -1771,42 +1768,157 @@ ...@@ -1771,42 +1768,157 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Paths/MovePath.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833"> <state relative-caret-position="-41">
<caret line="51" column="56" selection-start-line="51" selection-start-column="55" selection-end-line="51" selection-end-column="56" /> <caret line="43" selection-start-line="43" selection-end-line="43" />
<folding> <folding>
<marker date="1595335069632" expanded="true" signature="57:2165" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="6:92" ph="..." />
<marker date="1595335069632" expanded="true" signature="642:1990" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="127:1574" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="830:1658" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="189:936" ph="/* private void OnCollisionEnter(Collision other) ... */" />
<marker date="1595335069632" expanded="true" signature="890:1250" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="984:1148" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="933:1078" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1041:1142" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1099:1236" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1196:1360" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1267:1647" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1253:1354" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1310:1445" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1408:1572" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1466:1633" ph="{...}" /> <marker date="1595687065912" expanded="true" signature="1465:1566" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1671:1983" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1706:1835" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="1852:1973" ph="{...}" />
<marker date="1595335069632" expanded="true" signature="2025:2163" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs"> <entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/ReasonsStoppingCars.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="10" column="20" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="20" />
<folding>
<marker date="1595335069536" expanded="true" signature="68:4425" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="234:1001" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="379:621" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="420:495" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="512:580" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="664:995" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="769:830" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="847:985" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="897:971" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1190:3260" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1235:2397" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1280:2078" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1338:1425" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1446:2064" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1507:1887" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1575:1686" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1715:1865" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="1912:2046" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2095:2387" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2147:2234" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2255:2373" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2410:3254" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2455:2739" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2513:2586" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2607:2725" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2756:3244" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2808:2881" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2902:3230" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="2968:3053" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3078:3212" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3389:3556" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3425:3488" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3501:3550" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3723:4423" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3759:4007" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3806:3881" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="3898:3966" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="4041:4417" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="4153:4246" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="4263:4407" ph="{...}" />
<marker date="1595335069536" expanded="true" signature="4319:4393" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/UTS_PRO/Scripts/Car/CarAIController.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434"> <state relative-caret-position="77">
<caret line="61" column="19" selection-start-line="61" selection-start-column="19" selection-end-line="61" selection-end-column="19" /> <caret line="385" column="20" selection-start-line="385" selection-start-column="20" selection-end-line="385" selection-end-column="20" />
<folding> <folding>
<marker date="1595686648336" expanded="true" signature="6:92" ph="..." /> <marker date="1596431690534" expanded="true" signature="101:14144" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="127:1719" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1444:1525" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="189:936" ph="/* private void OnCollisionEnter(Collision other) ... */" /> <marker date="1596431690534" expanded="true" signature="1552:1641" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="984:1184" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1668:1757" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1077:1178" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1787:1858" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1232:1432" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1883:1966" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1325:1426" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="1997:2092" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1480:1717" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="2123:2224" ph="{...}" />
<marker date="1595686648336" expanded="true" signature="1610:1711" ph="{...}" /> <marker date="1596431690534" expanded="true" signature="2248:2341" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2368:2437" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2463:2608" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2634:3112" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2796:2843" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="2856:2904" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3055:3106" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3139:3643" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3675:3809" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3740:3803" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="3837:9087" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4301:5240" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4345:4779" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4430:4568" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4589:4704" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4796:5230" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="4856:4994" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5015:5155" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5262:5804" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5394:5794" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5843:6287" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="5908:6277" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6189:6263" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6300:6351" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6414:6951" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6460:6941" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6588:6817" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="6838:6927" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7039:8028" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7117:7511" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7346:7497" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7584:8017" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7633:7802" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="7823:8003" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8117:9081" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8169:8538" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8373:8524" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8586:9071" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8635:8856" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="8877:9057" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9113:10428" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9196:9627" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9234:9371" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9388:9513" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9552:9617" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9640:9761" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9808:10271" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="9912:10261" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10011:10247" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10327:10422" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10462:11066" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10648:10756" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10692:10746" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10782:10830" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10852:10915" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="10928:10977" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11007:11060" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11094:13325" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11477:13160" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11606:12177" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11832:12163" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="11936:11986" ph="/* if (MP.w == movePath.w) ... */" />
<marker date="1596431690534" expanded="true" signature="12234:12438" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12504:12721" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12816:12960" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="12977:13150" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13022:13102" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13173:13319" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13210:13278" ph="{...}" />
<marker date="1596431690534" expanded="true" signature="13331:14142" ph="/* private void OnDrawGizmosSelected() ... */" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Assets/Scenes/NEW 1.unity
View file @ 7db09697
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/UTS_PRO/Scripts/Car/CarAIController.cs
View file @ 7db09697
...@@ -380,10 +380,10 @@ public class CarAIController : MonoBehaviour ...@@ -380,10 +380,10 @@ public class CarAIController : MonoBehaviour
{ {
MovePath MP = car.GetComponent<MovePath>(); MovePath MP = car.GetComponent<MovePath>();
if (MP.w == movePath.w) // if (MP.w == movePath.w) @Danial
{ // {
ReasonsStoppingCars.CarInView(car, rigbody, distance, startSpeed, ref moveSpeed, ref tempStop, distanceToCar); ReasonsStoppingCars.CarInView(car, rigbody, distance, startSpeed, ref moveSpeed, ref tempStop, distanceToCar);
} // }
} }
} }
else if (hit.transform.CompareTag("Bcycle")) else if (hit.transform.CompareTag("Bcycle"))
......
Assets/scripts/Side.cs
View file @ 7db09697
...@@ -41,7 +41,7 @@ public class Side : MonoBehaviour ...@@ -41,7 +41,7 @@ public class Side : MonoBehaviour
*/ */
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
print(other.transform.name);
if (other.transform.root.tag == "Player") if (other.transform.root.tag == "Player")
{ {
other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1; other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1;
...@@ -50,7 +50,7 @@ public class Side : MonoBehaviour ...@@ -50,7 +50,7 @@ public class Side : MonoBehaviour
private void OnTriggerExit(Collider other) private void OnTriggerExit(Collider other)
{ {
print(other.transform.name);
if (other.transform.root.tag == "Player") if (other.transform.root.tag == "Player")
{ {
other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 0; other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 0;
...@@ -59,8 +59,7 @@ public class Side : MonoBehaviour ...@@ -59,8 +59,7 @@ public class Side : MonoBehaviour
private void OnTriggerStay(Collider other) private void OnTriggerStay(Collider other)
{ {
print(other.transform.name);
print(other.transform.name);
if (other.transform.root.tag == "Player") if (other.transform.root.tag == "Player")
{ {
other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1; other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1;
......
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