Commit 5f2d7fa6 authored by bennet's avatar bennet
Browse files
parents 0436d932 50ffc2b7
Assets/_Game/Graphics/BarBackground.PNG

131 Bytes | W: | H:

Assets/_Game/Graphics/BarBackground.PNG

644 KB | W: | H:

Assets/_Game/Graphics/BarBackground.PNG
Assets/_Game/Graphics/BarBackground.PNG
Assets/_Game/Graphics/BarBackground.PNG
Assets/_Game/Graphics/BarBackground.PNG
  • 2-up
  • Swipe
  • Onion skin
......@@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Floor
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _NORMALMAP
m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
......@@ -60,14 +60,14 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossMapScale: 0.826
- _Glossiness: 0.775
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
......
......@@ -63,7 +63,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.545
- _GlossyReflections: 1
- _Metallic: 0.405
- _Metallic: 1
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
......
......@@ -41,7 +41,7 @@ GameObject:
- component: {fileID: 6220831179473596326}
m_Layer: 0
m_Name: Bierglas_Empty
m_TagString: Untagged
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -73,6 +73,11 @@ PrefabInstance:
propertyPath: m_Name
value: glass_empty
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 10f194c3ba0541846820158812026e2a,
type: 3}
propertyPath: m_TagString
value: Projectile
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 10f194c3ba0541846820158812026e2a,
type: 3}
propertyPath: m_LocalPosition.x
......
......@@ -311,7 +311,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 0.4
m_Volume: 0.3
m_Pitch: 1
Loop: 0
Mute: 0
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 8503905487544684714}
m_Layer: 10
m_Name: Hopfen
m_TagString: Bier
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -97,7 +97,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3}
propertyPath: m_TagString
value: Bier
value: Projectile
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3}
......
......@@ -40,7 +40,7 @@ GameObject:
- component: {fileID: 7500145976692829912}
m_Layer: 0
m_Name: Malzschaufel_LP_1 (1)
m_TagString: Untagged
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -80,7 +80,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: f1aa393640ea7b342ac84790ac74762c,
type: 3}
propertyPath: m_TagString
value: Bier
value: Projectile
objectReference: {fileID: 0}
- target: {fileID: -2351746559087996518, guid: f1aa393640ea7b342ac84790ac74762c,
type: 3}
......
......@@ -182,8 +182,14 @@ public class CustomerBehaviour : MonoBehaviour
// Wrong Beer
_playerActor.AudioSource.PlayOneShot(_customerSounds.GetHappyClip(), 0.2f);
_customerBar.addPercentageOfSlider(-0.3f);
Destroy(other.gameObject);
}
}
}else if (other.collider.gameObject.CompareTag("Projectile"))
{
_playerActor.AudioSource.PlayOneShot(_customerSounds.GetSadClip(), 0.2f);
_customerBar.addPercentageOfSlider(0.3f);
Destroy(other.gameObject);
}
}
}
......@@ -52,6 +52,8 @@ public class CustomerBar : MonoBehaviour
{
_currentTime += durationTime * perc;
customerSlider.value = _currentTime / durationTime * 100.0f;
if (customerSlider.value < 0)
customerSlider.value = 0f;
}
......
fileFormatVersion: 2
guid: 5e8e58f13b8a08e46b1b732b34de3fa0
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
......@@ -16,6 +16,7 @@ TagManager:
- ProgressBar
- StreamEffect
- Customer
- Projectile
layers:
- Default
- TransparentFX
......
Supports Markdown
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