Skip to content

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

new distance system

parent 936a9011
Hide whitespace changes
Inline Side-by-side
Showing with 2440 additions and 156 deletions
.idea/.idea.car-sim-remaster/.idea/contentModel.xml
View file @ a5b626ae
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<e p="TargetFollowerV2.cs" t="Include" /> <e p="TargetFollowerV2.cs" t="Include" />
<e p="TerafficGraphManager.cs" t="Include" /> <e p="TerafficGraphManager.cs" t="Include" />
<e p="Wall.cs" t="Include" /> <e p="Wall.cs" t="Include" />
<e p="WallSphere.cs" t="Include" />
<e p="Warning.cs" t="Include" /> <e p="Warning.cs" t="Include" />
</e> </e>
<e p="Standard Assets" t="Include"> <e p="Standard Assets" t="Include">
......
.idea/.idea.car-sim-remaster/.idea/workspace.xml
View file @ a5b626ae
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
<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/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/indexLayout.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" 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/CSV/p1.csv" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CSV/p1.csv" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/CSV/p1.csv" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CSV/p1.csv" 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/SampleScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/prefabs/final orginal.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/prefabs/final orginal.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/Wall.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Wall.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/scripts/Wall.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Wall.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -33,34 +35,33 @@ ...@@ -33,34 +35,33 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177"> <state relative-caret-position="189">
<caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" /> <caret line="65" column="29" selection-start-line="65" selection-start-column="29" selection-end-line="65" selection-end-column="29" />
<folding> <folding>
<marker date="1593164590767" expanded="true" signature="7:181" ph="..." /> <marker date="1593186362141" expanded="true" signature="7:181" ph="..." />
<marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="221:6780" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="956:1288" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="938:1270" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1190:1280" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1172:1262" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1314:1528" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1296:1504" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1412:1488" ph="/* timePassed += Time.deltaTime; ... */" /> <marker date="1593186362141" expanded="true" signature="1456:1496" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1594:1656" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1570:1632" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1682:5583" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1658:5512" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1723:1764" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1699:1740" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1875:2216" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1851:2192" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1898:2206" ph="/* Creating First row of titles manually.. ... */" /> <marker date="1593186362141" expanded="true" signature="1874:2182" ph="/* Creating First row of titles manually.. ... */" />
<marker date="1593164590767" expanded="true" signature="2342:5575" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="3035:3329" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="3073:3393" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="3346:3540" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="3410:3604" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4007:4143" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4071:4207" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4161:4431" ph="/* StreamWriter sw = new StreamWriter(filePath); ... */" />
<marker date="1593164590767" expanded="true" signature="4225:4495" ph="/* StreamWriter sw = new StreamWriter(filePath); ... */" /> <marker date="1593186362141" expanded="true" signature="4444:5334" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4508:5398" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4493:5324" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4557:5388" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4542:5248" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4606:5312" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5362:5477" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5426:5541" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5647:5733" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5718:5804" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5764:6778" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5835:6849" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5798:6371" ph="/* while (true) ... */" />
<marker date="1593164590767" expanded="true" signature="5869:6442" ph="/* while (true) ... */" /> <marker date="1593186362141" expanded="true" signature="6510:6771" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="6581:6842" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="6599:6729" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="6670:6800" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -84,22 +85,44 @@ ...@@ -84,22 +85,44 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371"> <state relative-caret-position="345">
<caret line="79" column="17" selection-start-line="79" selection-start-column="8" selection-end-line="79" selection-end-column="17" /> <caret line="23" column="9" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
<folding> <folding>
<marker date="1593182337612" expanded="true" signature="6:111" ph="..." /> <marker date="1593186228381" expanded="true" signature="6:111" ph="..." />
<marker date="1593182337612" expanded="true" signature="205:2815" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="205:2817" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="404:560" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="404:562" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="607:1103" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="469:556" ph="/* DataSaver.sideDistance = distanceToCar; ... */" />
<marker date="1593182337612" expanded="true" signature="1199:1298" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="609:1105" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1382:2632" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1201:1300" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1752:2154" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1384:2634" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1892:2002" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1754:2156" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2054:2144" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1894:2004" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2668:2808" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="2056:2146" ph="{...}" />
<marker date="1593186228381" expanded="true" signature="2670:2810" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/scripts/WallSphere.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="48" column="40" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="40" />
<folding>
<marker date="1593186272773" expanded="true" signature="6:78" ph="..." />
<marker date="1593186272773" expanded="true" signature="119:1970" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="389:505" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="563:617" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="705:1968" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="843:1076" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="976:1066" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="1318:1898" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="1433:1646" ph="{...}" />
<marker date="1593186272773" expanded="true" signature="1663:1789" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -108,7 +131,7 @@ ...@@ -108,7 +131,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="537"> <state relative-caret-position="645">
<caret line="51" column="40" selection-start-line="51" selection-start-column="40" selection-end-line="51" selection-end-column="40" /> <caret line="51" column="40" selection-start-line="51" selection-start-column="40" selection-end-line="51" selection-end-column="40" />
<folding> <folding>
<marker date="1593114881024" expanded="true" signature="6:114" ph="..." /> <marker date="1593114881024" expanded="true" signature="6:114" ph="..." />
...@@ -402,6 +425,7 @@ ...@@ -402,6 +425,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Vehicles/Car/Scripts/CarAudio.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Vehicles/Car/Scripts/CarAudio.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleSelfRighting.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleSelfRighting.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/TargetFollower.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/TargetFollower.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/WallSphere.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/scripts/Editor/MyEditor.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/scripts/Editor/MyEditor.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/Standard Assets/Utility/ForcedReset.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Standard Assets/Utility/ForcedReset.cs" root0="FORCE_HIGHLIGHTING" />
...@@ -441,8 +465,9 @@ ...@@ -441,8 +465,9 @@
<option value="$PROJECT_DIR$/Assets/scripts/CarCustom.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/CarCustom.cs" />
<option value="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" /> <option value="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/menuSystem.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/menuSystem.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Wall.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/Wall.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/WallSphere.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" />
</list> </list>
</option> </option>
</component> </component>
...@@ -464,10 +489,10 @@ ...@@ -464,10 +489,10 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="FileSystemExplorer" />
<pane id="SolutionExplorer"> <pane id="SolutionExplorer">
<option name="show-all-files" value="false" /> <option name="show-all-files" value="false" />
</pane> </pane>
<pane id="FileSystemExplorer" />
<pane id="AssemblyExplorer" /> <pane id="AssemblyExplorer" />
<pane id="UnityExplorer"> <pane id="UnityExplorer">
<option name="show-hidden-items" value="false" /> <option name="show-hidden-items" value="false" />
...@@ -542,11 +567,12 @@ ...@@ -542,11 +567,12 @@
<workItem from="1593109187851" duration="1718000" /> <workItem from="1593109187851" duration="1718000" />
<workItem from="1593113545384" duration="1808000" /> <workItem from="1593113545384" duration="1808000" />
<workItem from="1593157840945" duration="9231000" /> <workItem from="1593157840945" duration="9231000" />
<workItem from="1593185886187" duration="684000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68202000" /> <option name="totallyTimeSpent" value="68886000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -560,7 +586,7 @@ ...@@ -560,7 +586,7 @@
<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" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3286385" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33333334" />
<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" />
...@@ -906,6 +932,50 @@ ...@@ -906,6 +932,50 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/7559BF97-67E7-4FF5-906F-18401F66CD57/5d/8fb0f34f/MonoBehaviour.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="189" column="23" selection-start-line="189" selection-start-column="23" selection-end-line="189" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<folding>
<marker date="1593017340585" expanded="true" signature="52:1148" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="103:1146" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="411:1142" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="566:597" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="606:636" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="724:849" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="911:1037" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="51" column="40" selection-start-line="51" selection-start-column="40" selection-end-line="51" selection-end-column="40" />
<folding>
<marker date="1593114881024" expanded="true" signature="6:114" ph="..." />
<marker date="1593114881024" expanded="true" signature="155:1657" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="654:675" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="703:805" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="755:799" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="843:1260" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="881:1057" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1070:1254" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1285:1325" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1356:1655" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1454:1545" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1558:1649" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Warning.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Warning.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="180">
...@@ -1135,99 +1205,74 @@ ...@@ -1135,99 +1205,74 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/menuSystem.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="537">
<caret line="51" column="40" selection-start-line="51" selection-start-column="40" selection-end-line="51" selection-end-column="40" />
<folding>
<marker date="1593114881024" expanded="true" signature="6:114" ph="..." />
<marker date="1593114881024" expanded="true" signature="155:1657" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="654:675" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="703:805" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="755:799" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="843:1260" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="881:1057" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1070:1254" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1285:1325" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1356:1655" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1454:1545" ph="{...}" />
<marker date="1593114881024" expanded="true" signature="1558:1649" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/7559BF97-67E7-4FF5-906F-18401F66CD57/5d/8fb0f34f/MonoBehaviour.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="642">
<caret line="189" column="23" selection-start-line="189" selection-start-column="23" selection-end-line="189" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="345">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" /> <caret line="23" column="9" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
<folding> <folding>
<marker date="1593017340585" expanded="true" signature="52:1148" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="6:111" ph="..." />
<marker date="1593017340585" expanded="true" signature="103:1146" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="205:2817" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="411:1142" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="404:562" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="566:597" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="469:556" ph="/* DataSaver.sideDistance = distanceToCar; ... */" />
<marker date="1593017340585" expanded="true" signature="606:636" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="609:1105" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="724:849" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1201:1300" ph="{...}" />
<marker date="1593017340585" expanded="true" signature="911:1037" ph="{...}" /> <marker date="1593186228381" expanded="true" signature="1384:2634" ph="{...}" />
<marker date="1593186228381" expanded="true" signature="1754:2156" ph="{...}" />
<marker date="1593186228381" expanded="true" signature="1894:2004" ph="{...}" />
<marker date="1593186228381" expanded="true" signature="2056:2146" ph="{...}" />
<marker date="1593186228381" expanded="true" signature="2670:2810" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177"> <state relative-caret-position="189">
<caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" /> <caret line="65" column="29" selection-start-line="65" selection-start-column="29" selection-end-line="65" selection-end-column="29" />
<folding> <folding>
<marker date="1593164590767" expanded="true" signature="7:181" ph="..." /> <marker date="1593186362141" expanded="true" signature="7:181" ph="..." />
<marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="221:6780" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="956:1288" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="938:1270" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1190:1280" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1172:1262" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1314:1528" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1296:1504" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1412:1488" ph="/* timePassed += Time.deltaTime; ... */" /> <marker date="1593186362141" expanded="true" signature="1456:1496" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1594:1656" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1570:1632" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1682:5583" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1658:5512" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1723:1764" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1699:1740" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1875:2216" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="1851:2192" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="1898:2206" ph="/* Creating First row of titles manually.. ... */" /> <marker date="1593186362141" expanded="true" signature="1874:2182" ph="/* Creating First row of titles manually.. ... */" />
<marker date="1593164590767" expanded="true" signature="2342:5575" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="3035:3329" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="3073:3393" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="3346:3540" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="3410:3604" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4007:4143" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4071:4207" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4161:4431" ph="/* StreamWriter sw = new StreamWriter(filePath); ... */" />
<marker date="1593164590767" expanded="true" signature="4225:4495" ph="/* StreamWriter sw = new StreamWriter(filePath); ... */" /> <marker date="1593186362141" expanded="true" signature="4444:5334" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4508:5398" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4493:5324" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4557:5388" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="4542:5248" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="4606:5312" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5362:5477" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5426:5541" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5647:5733" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5718:5804" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5764:6778" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="5835:6849" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="5798:6371" ph="/* while (true) ... */" />
<marker date="1593164590767" expanded="true" signature="5869:6442" ph="/* while (true) ... */" /> <marker date="1593186362141" expanded="true" signature="6510:6771" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="6581:6842" ph="{...}" /> <marker date="1593186362141" expanded="true" signature="6599:6729" ph="{...}" />
<marker date="1593164590767" expanded="true" signature="6670:6800" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/WallSphere.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371"> <state relative-caret-position="222">
<caret line="79" column="17" selection-start-line="79" selection-start-column="8" selection-end-line="79" selection-end-column="17" /> <caret line="48" column="40" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="40" />
<folding> <folding>
<marker date="1593182337612" expanded="true" signature="6:111" ph="..." /> <marker date="1593186272773" expanded="true" signature="6:78" ph="..." />
<marker date="1593182337612" expanded="true" signature="205:2815" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="119:1970" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="404:560" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="389:505" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="607:1103" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="563:617" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1199:1298" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="705:1968" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1382:2632" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="843:1076" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1752:2154" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="976:1066" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1892:2002" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="1318:1898" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2054:2144" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="1433:1646" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2668:2808" ph="{...}" /> <marker date="1593186272773" expanded="true" signature="1663:1789" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Assembly-CSharp.csproj
View file @ a5b626ae
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
<Compile Include="Assets\scripts\TargetFollowerV2.cs" /> <Compile Include="Assets\scripts\TargetFollowerV2.cs" />
<Compile Include="Assets\scripts\TerafficGraphManager.cs" /> <Compile Include="Assets\scripts\TerafficGraphManager.cs" />
<Compile Include="Assets\scripts\Wall.cs" /> <Compile Include="Assets\scripts\Wall.cs" />
<Compile Include="Assets\scripts\WallSphere.cs" />
<Compile Include="Assets\scripts\Warning.cs" /> <Compile Include="Assets\scripts\Warning.cs" />
<Compile Include="Assets\scripts\menuSystem.cs" /> <Compile Include="Assets\scripts\menuSystem.cs" />
<None Include="Assets\RealisticEngineSound\Assets_For_NWH\ReadMe.txt" /> <None Include="Assets\RealisticEngineSound\Assets_For_NWH\ReadMe.txt" />
......
Assets/CSV/p1.csv
View file @ a5b626ae
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Scenes/SampleScene.unity
View file @ a5b626ae
...@@ -134,7 +134,7 @@ MonoBehaviour: ...@@ -134,7 +134,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125301449} m_GameObject: {fileID: 125301449}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 498ca4c8961158d47bf0a0bcbfd4d63e, type: 3} m_Script: {fileID: 11500000, guid: 498ca4c8961158d47bf0a0bcbfd4d63e, type: 3}
m_Name: m_Name:
...@@ -153,6 +153,90 @@ MeshCollider: ...@@ -153,6 +153,90 @@ MeshCollider:
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: -4058646288771621125, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3} m_Mesh: {fileID: -4058646288771621125, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!1001 &168629609
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6517492368474291616, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_Name
value: final orginal (7)
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291616, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.x
value: -668.79816
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.y
value: 701.68475
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.z
value: 119.57807
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492369421744767, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6517492369421744767, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 93ab9d7bcd8b80744ab77a800f1db95b, type: 3}
--- !u!1 &202245376 --- !u!1 &202245376
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -181,7 +265,7 @@ Transform: ...@@ -181,7 +265,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &281076911 --- !u!1001 &281076911
PrefabInstance: PrefabInstance:
...@@ -270,6 +354,11 @@ PrefabInstance: ...@@ -270,6 +354,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: rah-shane3 value: rah-shane3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5903998474558691662, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!1 &354712830 --- !u!1 &354712830
...@@ -505,7 +594,7 @@ Transform: ...@@ -505,7 +594,7 @@ Transform:
m_LocalScale: {x: 1, y: 1.6230241, z: 7.11823} m_LocalScale: {x: 1, y: 1.6230241, z: 7.11823}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &373719878 --- !u!1 &373719878
GameObject: GameObject:
...@@ -598,7 +687,7 @@ Transform: ...@@ -598,7 +687,7 @@ Transform:
m_LocalScale: {x: 1000.0001, y: 1, z: 999.9999} m_LocalScale: {x: 1000.0001, y: 1, z: 999.9999}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0.611, y: 0.0050000004, z: 0.84700006} m_LocalEulerAnglesHint: {x: 0.611, y: 0.0050000004, z: 0.84700006}
--- !u!224 &378007929 stripped --- !u!224 &378007929 stripped
RectTransform: RectTransform:
...@@ -789,7 +878,7 @@ PrefabInstance: ...@@ -789,7 +878,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7 value: 8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -908,7 +997,7 @@ Transform: ...@@ -908,7 +997,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &709509107 --- !u!1 &709509107
GameObject: GameObject:
...@@ -952,7 +1041,7 @@ Transform: ...@@ -952,7 +1041,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &781198528 --- !u!1001 &781198528
PrefabInstance: PrefabInstance:
...@@ -1009,7 +1098,7 @@ PrefabInstance: ...@@ -1009,7 +1098,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -1103,7 +1192,7 @@ PrefabInstance: ...@@ -1103,7 +1192,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -1286,7 +1375,7 @@ Transform: ...@@ -1286,7 +1375,7 @@ Transform:
m_Children: m_Children:
- {fileID: 1491121497} - {fileID: 1491121497}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1195730325 --- !u!1 &1195730325
GameObject: GameObject:
...@@ -1475,7 +1564,7 @@ PrefabInstance: ...@@ -1475,7 +1564,7 @@ PrefabInstance:
- target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809, - target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 6
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809, - target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809,
type: 3} type: 3}
...@@ -1554,7 +1643,7 @@ PrefabInstance: ...@@ -1554,7 +1643,7 @@ PrefabInstance:
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf, - target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf, - target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3} type: 3}
...@@ -1780,7 +1869,7 @@ PrefabInstance: ...@@ -1780,7 +1869,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -2356,7 +2445,7 @@ PrefabInstance: ...@@ -2356,7 +2445,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -2506,7 +2595,7 @@ Transform: ...@@ -2506,7 +2595,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1971670298 --- !u!1 &1971670298
GameObject: GameObject:
...@@ -2713,7 +2802,7 @@ Transform: ...@@ -2713,7 +2802,7 @@ Transform:
- {fileID: 1614892422} - {fileID: 1614892422}
- {fileID: 1389580375} - {fileID: 1389580375}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2047104779 --- !u!1001 &2047104779
PrefabInstance: PrefabInstance:
...@@ -3055,7 +3144,7 @@ PrefabInstance: ...@@ -3055,7 +3144,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b, - target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3} type: 3}
...@@ -3199,7 +3288,7 @@ PrefabInstance: ...@@ -3199,7 +3288,7 @@ PrefabInstance:
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf, - target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf, - target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3} type: 3}
......
Assets/prefabs/final orginal.prefab
View file @ a5b626ae
...@@ -3734,6 +3734,7 @@ GameObject: ...@@ -3734,6 +3734,7 @@ GameObject:
- component: {fileID: 6517492368474291618} - component: {fileID: 6517492368474291618}
- component: {fileID: 6517492368474291617} - component: {fileID: 6517492368474291617}
- component: {fileID: 4444491943193057865} - component: {fileID: 4444491943193057865}
- component: {fileID: 168629611}
m_Layer: 0 m_Layer: 0
m_Name: final orginal m_Name: final orginal
m_TagString: Player m_TagString: Player
...@@ -4254,6 +4255,22 @@ MonoBehaviour: ...@@ -4254,6 +4255,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2424e0f15872e044d82c5a252d3e20e3, type: 3} m_Script: {fileID: 11500000, guid: 2424e0f15872e044d82c5a252d3e20e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &168629611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6517492368474291616}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ac933ff484ed6842a06a1b5194538b8, type: 3}
m_Name:
m_EditorClassIdentifier:
largeIterationNumbers: 15
iterationNumbers: 100
longestJump: 10
layer: 8
--- !u!1 &6517492368491616081 --- !u!1 &6517492368491616081
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/rah-shane3.FBX.meta 0 → 100644
View file @ a5b626ae
fileFormatVersion: 2
guid: 1e88c95a7a1f988488ee8076c968fcb5
ModelImporter:
serializedVersion: 19300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/scripts/DataSaver.cs
View file @ a5b626ae
...@@ -20,7 +20,7 @@ public class DataSaver : MonoBehaviour ...@@ -20,7 +20,7 @@ public class DataSaver : MonoBehaviour
//delegates //delegates
public static Action<Vector3,Action<Vector3,float>> sideDistance; public static Func<Vector3,float> sideDistance;
// Start is called before the first frame update // Start is called before the first frame update
...@@ -61,12 +61,12 @@ public class DataSaver : MonoBehaviour ...@@ -61,12 +61,12 @@ public class DataSaver : MonoBehaviour
pName = menu.PlayerName; pName = menu.PlayerName;
//timePassed += Time.deltaTime; timePassed += Time.deltaTime;
// if (timePassed > 0.1) if (timePassed > 0.25f)
// { {
Save(); Save();
// } }
} }
...@@ -101,8 +101,7 @@ public class DataSaver : MonoBehaviour ...@@ -101,8 +101,7 @@ public class DataSaver : MonoBehaviour
} }
Vector3 playerPos = myPlayer.transform.position; Vector3 playerPos = myPlayer.transform.position;
sideDistance(playerPos, (wallPos,distanceFloat) => float distanceFloat = sideDistance(playerPos);
{
// You can add up the values in as many cells as you want. // You can add up the values in as many cells as you want.
...@@ -119,9 +118,9 @@ public class DataSaver : MonoBehaviour ...@@ -119,9 +118,9 @@ public class DataSaver : MonoBehaviour
{ {
//distanceComponent hitPoint = sideDistance(myPlayer.transform.position); //distanceComponent hitPoint = sideDistance(myPlayer.transform.position);
rowDataTemp[8] = "" + distanceFloat; rowDataTemp[8] = "" + distanceFloat;
rowDataTemp[9] = "" + wallPos.x; rowDataTemp[9] = "____";
rowDataTemp[10] = "" + wallPos.y; rowDataTemp[10] = "___";
rowDataTemp[11] = "" + wallPos.z; rowDataTemp[11] = "___";
} }
else else
{ {
...@@ -184,7 +183,7 @@ public class DataSaver : MonoBehaviour ...@@ -184,7 +183,7 @@ public class DataSaver : MonoBehaviour
} }
stable = true; stable = true;
});
} }
......
Assets/scripts/Wall.cs
View file @ a5b626ae
...@@ -21,7 +21,7 @@ public class Wall : MonoBehaviour ...@@ -21,7 +21,7 @@ public class Wall : MonoBehaviour
{ {
coll = this.GetComponent<MeshCollider>(); coll = this.GetComponent<MeshCollider>();
//DataSaver.sideDistance = distanceToCar; //DataSaver.sideDistance = distanceToCar;
DataSaver.sideDistance = newMethod; // DataSaver.sideDistance = newMethod;
} }
public Vector3 distanceToCar(Vector3 car) public Vector3 distanceToCar(Vector3 car)
......
Assets/scripts/WallSphere.cs 0 → 100644
View file @ a5b626ae
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class WallSphere : MonoBehaviour
{
public int largeIterationNumbers;
public int iterationNumbers;
public float longestJump;
public int layer;
// [SerializeField] private int layer;
private int layerMask;
// Start is called before the first frame update
void Start()
{
layerMask = 1 << layer;
// layerMask = ~layerMask;
DataSaver.sideDistance = test;
}
// Update is called once per frame
void Update()
{
// test(this.transform.position);
}
public float test(Vector3 carPos) // must change layer mask of wall
{
float firsDistancse =0 ;
for(int i = 0; i < largeIterationNumbers; i++) // set up the worst prediction of collision
{
firsDistancse += longestJump;
if( Physics.OverlapSphere(carPos, firsDistancse, layerMask) != null){
Debug.Log("find :"+ firsDistancse);
break;
}
}
float currentAddetiveDistance = longestJump;
float currentDistance = firsDistancse;
Collider[] hitColliders = Physics.OverlapSphere(carPos, firsDistancse ,layerMask);
for (int i=0;i< iterationNumbers; i++)
{
currentAddetiveDistance = currentAddetiveDistance/2;
if(hitColliders.Length !=0)
{
currentDistance -= currentAddetiveDistance;
// Debug.Log("true : "+ currentDistance + "name collider" +hitColliders[0].name + "--"+ hitColliders.Length);
}
else
{
currentDistance += currentAddetiveDistance;
//Debug.Log("false");
}
hitColliders = Physics.OverlapSphere(carPos, currentDistance, layerMask);
}
print(currentDistance);
return currentDistance;
}
}
Assets/scripts/WallSphere.cs.meta 0 → 100644
View file @ a5b626ae
fileFormatVersion: 2
guid: 3ac933ff484ed6842a06a1b5194538b8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/TagManager.asset
View file @ a5b626ae
...@@ -13,7 +13,7 @@ TagManager: ...@@ -13,7 +13,7 @@ TagManager:
- UI - UI
- -
- -
- - wall
- -
- -
- -
......
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