Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ground material detector #476

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Ground material detector #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
68308f5
Camera shake on hit for PigChef
HosseinPan Jun 28, 2021
e120ecf
Revert "Camera shake on hit for PigChef"
HosseinPan Jun 29, 2021
aeb2404
Merge branch 'UnityTechnologies:main' into main
HosseinPan Jun 29, 2021
d49c4b3
Merge branch 'UnityTechnologies:main' into main
HosseinPan Jul 2, 2021
0aa35b8
Merge branch 'UnityTechnologies:main' into main
HosseinPan Jul 6, 2021
81c548c
Merge branch 'UnityTechnologies:main' into main
HosseinPan Jul 9, 2021
eccc8ff
Ground material detector
HosseinPan Jul 9, 2021
536b44d
Merge branch 'main' into main
HosseinPan Jul 13, 2021
401fde4
Merge branch 'UnityTechnologies:main' into main
HosseinPan Aug 5, 2021
4c8cd49
Merge branch 'UnityTechnologies:main' into main
HosseinPan Aug 17, 2021
958f1d7
Merge branch 'UnityTechnologies:main' into main
HosseinPan Aug 21, 2021
c7a139d
Merge branch 'UnityTechnologies:main' into main
HosseinPan Sep 7, 2021
1b2c831
Merge branch 'main' into main
HosseinPan Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,21 @@ MonoBehaviour:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0}
m_Visible: 1
--- !u!114 &6650101099884577384
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 309633228405838073}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 19a86e2a21c71164d9614311b5e778a4, type: 3}
m_Name:
m_EditorClassIdentifier:
_groundTypeList: {fileID: 11400000, guid: beee5d325e80d2b458985741de411757, type: 2}
_debugMode: 1
_groundTypeTitle:
--- !u!114 &8300318066946783926
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5298,9 +5313,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1414160192716409753 stripped
--- !u!4 &8291487101514034000 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1958356815571363377, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
Expand Down Expand Up @@ -5400,9 +5415,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1083073290189785667 stripped
--- !u!4 &5700738674217691736 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
Expand All @@ -5412,9 +5427,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2518796056843120514 stripped
--- !u!4 &1414160192716409753 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: 1958356815571363377, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
Expand All @@ -5424,7 +5439,13 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5337852870612368657 stripped
--- !u!4 &4150588075678938521 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2553538599320838613 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
Expand Down Expand Up @@ -5586,15 +5607,15 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3597017886523096375 stripped
--- !u!4 &5944104996185666453 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1780510391696116336 stripped
--- !u!4 &6251068571708505270 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
Expand Down Expand Up @@ -5634,13 +5655,7 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4323982477642669181 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
m_PrefabInstance: {fileID: 616254372594363816}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2961255287932742051 stripped
--- !u!4 &7450739070704029045 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
type: 3}
Expand Down
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b5ef327e9d2ae14d84ae2fb2663e81f, type: 3}
m_Name: GroundTypeList
m_EditorClassIdentifier:
groundTypes:
- {fileID: 11400000, guid: 1fb9340ef508e9d4182cbf9a81b63220, type: 2}
- {fileID: 11400000, guid: f2aaed1f1a7a3444b850291a1d1194f5, type: 2}
- {fileID: 11400000, guid: 496d01896c7fcba4e930dcbb33a19369, type: 2}
- {fileID: 11400000, guid: 076ad4d5d656b414a97c1298f2c8402a, type: 2}
- {fileID: 11400000, guid: 1a083b13e087bf5459b1dd0f38422867, type: 2}
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3}
m_Name: GroundType_Cobblestone
m_EditorClassIdentifier:
Title: Cobblestone
hasGroundTag: 1
vertexColorRGB: {x: 0, y: 1, z: 0}
gameObjectTag:
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3}
m_Name: GroundType_Dirt
m_EditorClassIdentifier:
Title: Dirt
hasGroundTag: 1
vertexColorRGB: {x: 1, y: 0, z: 0}
gameObjectTag:
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3}
m_Name: GroundType_Grass
m_EditorClassIdentifier:
Title: Grass
hasGroundTag: 1
vertexColorRGB: {x: 0, y: 0, z: 0}
gameObjectTag:
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3}
m_Name: GroundType_Rock
m_EditorClassIdentifier:
Title: Rock
hasGroundTag: 0
vertexColorRGB: {x: 0, y: 0, z: 0}
gameObjectTag: Rock
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3}
m_Name: GroundType_Sand
m_EditorClassIdentifier:
Title: Sand
hasGroundTag: 1
vertexColorRGB: {x: 0, y: 0, z: 1}
gameObjectTag:
8 changes: 8 additions & 0 deletions UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading