Skip to content

C
car-sim-remaster
Commit d222d1b2 authored by kash's avatar kash
Browse files
Options

change vibrate shoulder trigger algorithm

parent 5ba655c5
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 213 deletions
.idea/.idea.CarSimulation/.idea/indexLayout.xml
View file @ d222d1b2
......@@ -19,6 +19,7 @@
<Path>.vs</Path>
<Path>Library</Path>
<Path>Logs</Path>
<Path>Temp</Path>
<Path>obj</Path>
</explicitExcludes>
</component>
......
.idea/.idea.CarSimulation/.idea/workspace.xml
View file @ d222d1b2
......@@ -2,17 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f7a1ebf2-6eb8-4c7a-8619-146b91f5e06b" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor-firstpass.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor-firstpass.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp-firstpass.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-firstpass.csproj" 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.CarSimulation/.idea/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.CarSimulation/.idea/indexLayout.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/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleWheelEffects.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleWheelEffects.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/WallSphere.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/WallSphere.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CarSimulation.sln" beforeDir="false" afterPath="$PROJECT_DIR$/CarSimulation.sln" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" 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/Side.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Side.cs" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -21,11 +14,11 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/WallSphere.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8">
<state relative-caret-position="323">
<caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
<folding>
<marker date="1594210813006" expanded="true" signature="6:78" ph="..." />
......@@ -45,7 +38,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleWheelEffects.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<state relative-caret-position="85">
<caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding>
<marker date="1594215575515" expanded="false" signature="6:44" ph="..." />
......@@ -75,7 +68,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/changeSides.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<state relative-caret-position="170">
<caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
<folding>
<marker date="1594211945779" expanded="false" signature="6:92" ph="..." />
......@@ -103,10 +96,10 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/ShoulderVibrate.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<state relative-caret-position="457">
<caret line="34" column="83" selection-start-line="34" selection-start-column="83" selection-end-line="34" selection-end-column="83" />
<folding>
<marker date="1594220763532" expanded="true" signature="6:157" ph="..." />
......@@ -119,21 +112,20 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="34" column="82" selection-start-line="34" selection-start-column="82" selection-end-line="34" selection-end-column="82" />
<state relative-caret-position="400">
<caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding>
<marker date="1594220594543" expanded="true" signature="6:92" ph="..." />
<marker date="1594220594543" expanded="true" signature="127:986" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="235:495" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="294:398" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="408:489" ph="/* Debug.Log(&quot;On shoulder&quot;); ... */" />
<marker date="1594220594543" expanded="true" signature="546:715" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="605:709" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="766:984" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="874:978" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="6:92" ph="..." />
<marker date="1594400796660" expanded="true" signature="127:882" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="240:403" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="296:397" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="457:626" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="516:620" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="683:880" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="770:874" ph="{...}" />
</folding>
</state>
</provider>
......@@ -159,8 +151,8 @@
<option value="$PROJECT_DIR$/Assets/changeSides.cs" />
<option value="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleWheelEffects.cs" />
<option value="$PROJECT_DIR$/Assets/Side.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Side.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/ShoulderVibrate.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Side.cs" />
</list>
</option>
</component>
......@@ -172,7 +164,7 @@
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-10" />
<option name="width" value="980" />
<option name="height" value="1040" />
......@@ -182,15 +174,15 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="FileSystemExplorer" />
<pane id="SolutionExplorer">
<option name="show-all-files" value="false" />
</pane>
<pane id="AssemblyExplorer" />
<pane id="FileSystemExplorer" />
<pane id="UnityExplorer">
<option name="show-hidden-items" value="false" />
<option name="show-project-names" value="true" />
</pane>
<pane id="AssemblyExplorer" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -240,11 +232,12 @@
<option name="presentableId" value="Default" />
<updated>1594210742379</updated>
<workItem from="1594210760104" duration="9979000" />
<workItem from="1594399931016" duration="860000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9979000" />
<option name="totallyTimeSpent" value="10839000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -257,18 +250,11 @@
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24949698" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25285044" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="NuGet" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Unity" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Unit Tests" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" 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="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
......@@ -276,11 +262,19 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Errors In Solution" />
<window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="NuGet" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Unity" order="10" />
<window_info anchor="bottom" id="Database Changes" order="11" />
<window_info anchor="bottom" id="Unit Tests" order="12" />
<window_info anchor="bottom" id="Terminal" order="13" />
<window_info anchor="bottom" id="Event Log" order="14" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Errors In Solution" order="3" />
<window_info anchor="right" id="Database" order="4" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -299,9 +293,10 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Assets/Side.cs" />
<entry file="file://$PROJECT_DIR$/Assets/scripts/WallSphere.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8">
<state relative-caret-position="323">
<caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
<folding>
<marker date="1594210813006" expanded="true" signature="6:78" ph="..." />
......@@ -317,16 +312,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Side.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="23" column="9" lean-forward="true" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/IKD_VehicleWheelEffects.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<state relative-caret-position="85">
<caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding>
<marker date="1594215575515" expanded="false" signature="6:44" ph="..." />
......@@ -354,7 +342,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/Assets/changeSides.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<state relative-caret-position="170">
<caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
<folding>
<marker date="1594211945779" expanded="false" signature="6:92" ph="..." />
......@@ -379,27 +367,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="34" column="82" selection-start-line="34" selection-start-column="82" selection-end-line="34" selection-end-column="82" />
<folding>
<marker date="1594220594543" expanded="true" signature="6:92" ph="..." />
<marker date="1594220594543" expanded="true" signature="127:986" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="235:495" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="294:398" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="408:489" ph="/* Debug.Log(&quot;On shoulder&quot;); ... */" />
<marker date="1594220594543" expanded="true" signature="546:715" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="605:709" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="766:984" ph="{...}" />
<marker date="1594220594543" expanded="true" signature="874:978" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/ShoulderVibrate.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<state relative-caret-position="457">
<caret line="34" column="83" selection-start-line="34" selection-start-column="83" selection-end-line="34" selection-end-column="83" />
<folding>
<marker date="1594220763532" expanded="true" signature="6:157" ph="..." />
......@@ -411,5 +381,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Side.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding>
<marker date="1594400796660" expanded="true" signature="6:92" ph="..." />
<marker date="1594400796660" expanded="true" signature="127:882" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="240:403" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="296:397" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="457:626" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="516:620" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="683:880" ph="{...}" />
<marker date="1594400796660" expanded="true" signature="770:874" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Assets/Scenes/SampleScene.unity
View file @ d222d1b2
......@@ -153,6 +153,18 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -4058646288771621125, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!114 &125301455
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125301449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6389d1ebf5266e48b3a8086662f4aca, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &202245376
GameObject:
m_ObjectHideFlags: 0
......@@ -181,7 +193,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &281076911
PrefabInstance:
......@@ -193,7 +205,7 @@ PrefabInstance:
- target: {fileID: -8370616676172183064, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.y
value: 533
value: 532.5
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
......@@ -270,6 +282,11 @@ PrefabInstance:
propertyPath: m_Name
value: rah-shane3
objectReference: {fileID: 0}
- target: {fileID: 2659090837685034640, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.x
value: -53.2
objectReference: {fileID: 0}
- target: {fileID: 5903998474558691662, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_Layer
......@@ -382,7 +399,7 @@ Transform:
m_LocalScale: {x: 1, y: 1.6230241, z: 7.11823}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &373719878
GameObject:
......@@ -475,97 +492,8 @@ Transform:
m_LocalScale: {x: 1000.0001, y: 1, z: 999.9999}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0.611, y: 0.0050000004, z: 0.84700006}
--- !u!1001 &594140139
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 (3)
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291617, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: naturalFreaquency
value: 9.71
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291617, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: divider
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.x
value: 68.005775
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_LocalPosition.z
value: 79.62
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: 0
objectReference: {fileID: 0}
- target: {fileID: 6517492369421744767, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 93ab9d7bcd8b80744ab77a800f1db95b, type: 3}
--- !u!114 &633646100 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6930703783607240552, guid: 128c80cc77445014fb3f8deb2e41a075,
......@@ -633,7 +561,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
......@@ -752,7 +680,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &709509107
GameObject:
......@@ -796,7 +724,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1040609189
GameObject:
......@@ -920,7 +848,7 @@ Transform:
m_Children:
- {fileID: 1491121497}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1204602373
PrefabInstance:
......@@ -980,7 +908,7 @@ PrefabInstance:
- target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3385489612561274353, guid: 8a33eea58df35424f9723773bb025809,
type: 3}
......@@ -1059,7 +987,7 @@ PrefabInstance:
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3}
......@@ -1092,12 +1020,12 @@ PrefabInstance:
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3}
propertyPath: m_LocalPosition.x
value: -688.62
value: -687.93
objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3}
propertyPath: m_LocalPosition.y
value: 711.35
value: 711.02
objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3}
......@@ -1157,7 +1085,7 @@ PrefabInstance:
- target: {fileID: 2202606020465897630, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6930703782440394830, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3}
......@@ -1314,7 +1242,7 @@ PrefabInstance:
- target: {fileID: 7737523164240504498, guid: 7b08dc1c9024a574e98a662409c45c08,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7737523164240504498, guid: 7b08dc1c9024a574e98a662409c45c08,
type: 3}
......@@ -1615,7 +1543,7 @@ Transform:
m_LocalScale: {x: 43.641422, y: 10.868, z: 53.851746}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1827349684
GameObject:
......@@ -1831,7 +1759,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1971670300 stripped
MonoBehaviour:
......@@ -1845,28 +1773,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1971866547 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6517492368474291616, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
m_PrefabInstance: {fileID: 594140139}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1971866561
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1971866547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bc20e1b6b2e6d7845858bb5c2d12459e, type: 3}
m_Name:
m_EditorClassIdentifier:
power: 19.8
minSpeed: 11.3
speedMultiply: 0.17
shoulderOn: 0
--- !u!1 &1991534405
GameObject:
m_ObjectHideFlags: 0
......@@ -1995,7 +1901,7 @@ Transform:
- {fileID: 1614892422}
- {fileID: 1389580375}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2047026135 stripped
GameObject:
......@@ -2003,6 +1909,32 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 281076911}
m_PrefabAsset: {fileID: 0}
--- !u!64 &2047026136
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2047026135}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -8752242728349345931, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!114 &2047026137
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2047026135}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6389d1ebf5266e48b3a8086662f4aca, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2047104779
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -2343,7 +2275,7 @@ PrefabInstance:
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6517492368474291627, guid: 93ab9d7bcd8b80744ab77a800f1db95b,
type: 3}
......@@ -2487,7 +2419,7 @@ PrefabInstance:
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8768170946503470804, guid: 56244b3d420d5a3459e68449d1f30fbf,
type: 3}
......
Assets/prefabs/final orginal.prefab
View file @ d222d1b2
......@@ -3735,6 +3735,7 @@ GameObject:
- component: {fileID: 6517492368474291617}
- component: {fileID: 4444491943193057865}
- component: {fileID: 168629611}
- component: {fileID: 5824258220074940130}
m_Layer: 0
m_Name: final orginal
m_TagString: Player
......@@ -4243,6 +4244,7 @@ MonoBehaviour:
dampingRatio: 3
forceshift: 0.2
setSus: 1
divider: 10
--- !u!114 &4444491943193057865
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -4271,6 +4273,22 @@ MonoBehaviour:
iterationNumbers: 100
longestJump: 10
layer: 8
--- !u!114 &5824258220074940130
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: bc20e1b6b2e6d7845858bb5c2d12459e, type: 3}
m_Name:
m_EditorClassIdentifier:
power: 15
minSpeed: 10
speedMultiply: 0.5
shoulderOn: 0
--- !u!1 &6517492368491616081
GameObject:
m_ObjectHideFlags: 0
......
Assets/scripts/Side.cs
View file @ d222d1b2
......@@ -8,18 +8,16 @@ public class Side : MonoBehaviour
// Start is called before the first frame update
private void OnTriggerEnter(Collider collider)
private void OnCollisionEnter(Collision other)
{
if (collider.transform.root.tag == "Player")
if (other.transform.root.tag == "Player")
{
collider.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1;
other.transform.root.GetComponent<ShoulderVibrate>().shoulderOn = 1;
}
// Debug.Log("On shoulder");
// wheel.transform.Translate(0, UpForce, 0);
}
private void OnTriggerExit(Collider collider)
private void OnCollisionExit(Collision collider)
{
if (collider.transform.root.tag == "Player")
{
......@@ -27,9 +25,12 @@ public class Side : MonoBehaviour
}
}
private void OnTriggerStay(Collider collider)
private void OnCollisionStay(Collision collider)
{
Debug.Log(collider.transform.root.name);
// Debug.Log("col");
if (collider.transform.root.tag == "Player")
{
collider.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