Browse Source

Added song, main menu

master
NickFowler 4 years ago
parent
commit
51aef76180
13 changed files with 5405 additions and 8 deletions
  1. +8
    -0
      Assets/Audio.meta
  2. +3
    -0
      Assets/Audio/All the kings horses.wav
  3. +22
    -0
      Assets/Audio/All the kings horses.wav.meta
  4. +8
    -0
      Assets/Materials.meta
  5. +1
    -1
      Assets/Materials/HorseMat1.mat
  6. +1
    -1
      Assets/Materials/HorseMat2.mat
  7. +5217
    -0
      Assets/Scenes/MainMenu.unity
  8. +7
    -0
      Assets/Scenes/MainMenu.unity.meta
  9. +129
    -1
      Assets/Scenes/SampleScene.unity
  10. +4
    -0
      Assets/Scripts/Input/HerdController.cs
  11. +1
    -1
      Assets/WorldAssets/Materials.meta
  12. +2
    -2
      Assets/WorldAssets/Materials/MainMaterial.mat
  13. BIN
      ProjectSettings/TagManager.asset

+ 8
- 0
Assets/Audio.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2dcd9d123f1ac164ea6ecafaa4be9a10
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 3
- 0
Assets/Audio/All the kings horses.wav View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:557fc20ee3a89780a51ae6c6174241aee014c005c2059a32c52bd876280689f4
size 15186312

+ 22
- 0
Assets/Audio/All the kings horses.wav.meta View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: c0357151e4382674c9e9a896d9469aee
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:

+ 8
- 0
Assets/Materials.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3b058ef37cff8514ea88dbde5a77d8ac
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 1
- 1
Assets/Materials/HorseMat1.mat View File

@ -73,5 +73,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.7, g: 0.7, b: 0.7, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 1
- 1
Assets/Materials/HorseMat2.mat View File

@ -73,5 +73,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.13, g: 0.13, b: 0.13, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 5217
- 0
Assets/Scenes/MainMenu.unity
File diff suppressed because it is too large
View File


+ 7
- 0
Assets/Scenes/MainMenu.unity.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5ba018444553a8d4d8d1a57d07d1167d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 129
- 1
Assets/Scenes/SampleScene.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994} m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -121,6 +121,133 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &176696154
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 176696156}
- component: {fileID: 176696155}
m_Layer: 0
m_Name: Audio Source
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &176696155
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176696154}
m_Enabled: 0
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: c0357151e4382674c9e9a896d9469aee, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
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!4 &176696156
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176696154}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -97.3588, y: -46.166775, z: 13.605764}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &380641380 --- !u!1 &380641380
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -889,6 +1016,7 @@ MonoBehaviour:
SpawnPoint: {fileID: 0} SpawnPoint: {fileID: 0}
WaitTime: 0.2 WaitTime: 0.2
Centre: {fileID: 984142342} Centre: {fileID: 984142342}
GameState: {fileID: 0}
--- !u!4 &1457452761 --- !u!4 &1457452761
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 4
- 0
Assets/Scripts/Input/HerdController.cs View File

@ -77,6 +77,10 @@ public class HerdController : MonoBehaviour
if (SpawnPositionValid(position, rotation, bound)) if (SpawnPositionValid(position, rotation, bound))
{ {
GameObject newObject = Instantiate(Prefab, position, rotation, transform); GameObject newObject = Instantiate(Prefab, position, rotation, transform);
foreach (MeshRenderer mr in newObject.GetComponentsInChildren<MeshRenderer>())
{
mr.material.color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f), 1);
}
Herd.Add(newObject.GetComponent<PlayerController>()); Herd.Add(newObject.GetComponent<PlayerController>());

+ 1
- 1
Assets/WorldAssets/Materials.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3b058ef37cff8514ea88dbde5a77d8ac
guid: b5b604c9322c8e24c83878df8c2742cd
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 2
- 2
Assets/WorldAssets/Materials/MainMaterial.mat View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: MainMaterial m_Name: MainMaterial
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
@ -40,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 2d288171dd6bba3418a609bc60164987, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

BIN
ProjectSettings/TagManager.asset (Stored with Git LFS) View File

size 378
oid sha256:7d300cc1ca52c24e73d35e079b4df5fd383bf6a7fc3c51e4d8238f88a2a5e41e
size 386

Loading…
Cancel
Save