Skip to content

Commit

Permalink
Added Soundeffects, Changed Cloud colors
Browse files Browse the repository at this point in the history
Version 2.0 Ready
  • Loading branch information
gdc3 committed Jul 7, 2020
1 parent 7f6de83 commit 7292262
Show file tree
Hide file tree
Showing 36 changed files with 1,407 additions and 80 deletions.
4 changes: 2 additions & 2 deletions Assets/Materials/CloudMaterial.mat
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ Material:
- Vector1_C7F9BC69: 15
- Vector1_DFA4C9D3: 2
- Vector1_ED18166C: 1000
- Vector1_F0BE3006: 2
- Vector1_F0BE3006: 1.69
- Vector1_F3A863FF: 16
m_Colors:
- Color_4089CE7A: {r: 0.6431373, g: 0.82773715, b: 0.8509804, a: 0.27058825}
- Color_4089CE7A: {r: 0.6431373, g: 0.7553998, b: 0.8509804, a: 0.27058825}
- Color_982234E: {r: 1, g: 1, b: 1, a: 0.80784315}
- Vector4_B6649628: {r: 0, g: 1, b: -0.3, a: 2.7}
- Vector4_F9BF86A4: {r: 1, g: 0, b: 0, a: 90}
Binary file added Assets/Materials/Textures/BFH-cpvrLab-Gelb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions Assets/Materials/Textures/BFH-cpvrLab-Gelb.png.meta

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

4 changes: 2 additions & 2 deletions Assets/Materials/VirtualHandMaterial.mat
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Material:
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _Smoothness: 0.823
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand All @@ -105,7 +105,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.6392157}
- _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.53333336}
- _Color: {r: 0, g: 0.9905014, b: 1, a: 0.62352943}
- _EmissionColor: {r: 0, g: 0.28048778, b: 0.5, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
126 changes: 114 additions & 12 deletions Assets/Perfabs/ControlPanel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,102 @@ MonoBehaviour:
m_EditorClassIdentifier:
panelSizeX: 1
panelSizeY: 0.5
--- !u!82 &1666945224134663437
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885538595227555898}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: c93f6ceb5ed391347adac1456e51d423, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &5638578489636297566
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -273,7 +369,7 @@ PrefabInstance:
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.25000003
value: -0.25000006
objectReference: {fileID: 0}
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
Expand Down Expand Up @@ -383,17 +479,17 @@ PrefabInstance:
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.25
value: 0.10593131
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.000000052154064
value: 0.23083338
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.10000001
value: 0.089412026
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
Expand Down Expand Up @@ -538,7 +634,7 @@ PrefabInstance:
- target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: haveToUpdateRelativeValues
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
Expand Down Expand Up @@ -583,17 +679,17 @@ PrefabInstance:
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.25
value: -0.10593131
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.0000000037252903
value: -0.089412
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.09999997
value: -0.23083341
objectReference: {fileID: 0}
- target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
Expand Down Expand Up @@ -738,7 +834,7 @@ PrefabInstance:
- target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
propertyPath: haveToUpdateRelativeValues
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
Expand All @@ -752,6 +848,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3}
--- !u!1 &1885538595227555898 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5372255891520917641, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
type: 3}
m_PrefabInstance: {fileID: 5810999328181405875}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8904590684627367087 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2,
Expand Down Expand Up @@ -903,17 +1005,17 @@ PrefabInstance:
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.25
value: 0.40312663
objectReference: {fileID: 0}
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.19999996
value: 0.051525727
objectReference: {fileID: 0}
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.009999886
value: -0.12776354
objectReference: {fileID: 0}
- target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec,
type: 3}
Expand Down
Loading

0 comments on commit 7292262

Please sign in to comment.