mirror of
https://github.com/nick7ass/NNMDETGroupProject.git
synced 2025-04-08 23:10:35 +02:00
Canvas for introduction and some coded logic for UI implemented. Nothing yet tested
This commit is contained in:
parent
b1849509f9
commit
03ea200501
Assets
1OurAudioNarrationFiles
1OurImages
1OurScripts
1OurVideoNarrationText.meta1OurVideoNarrationText
Empedocles.mp4Empedocles.mp4.metaScreenshot 2024-03-18 at 15.43.58.pngScreenshot 2024-03-18 at 15.43.58.png.meta
Scenes
ProjectSettings
BIN
Assets/1OurAudioNarrationFiles/.DS_Store
vendored
BIN
Assets/1OurAudioNarrationFiles/.DS_Store
vendored
Binary file not shown.
BIN
Assets/1OurAudioNarrationFiles/Earth/Flower.wav
Normal file
BIN
Assets/1OurAudioNarrationFiles/Earth/Flower.wav
Normal file
Binary file not shown.
23
Assets/1OurAudioNarrationFiles/Earth/Flower.wav.meta
Normal file
23
Assets/1OurAudioNarrationFiles/Earth/Flower.wav.meta
Normal file
@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bf45e15b36fce434c9dbb9ce462fef79
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/1OurImages/water-droplet.png
Normal file
BIN
Assets/1OurImages/water-droplet.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 11 KiB |
153
Assets/1OurImages/water-droplet.png.meta
Normal file
153
Assets/1OurImages/water-droplet.png.meta
Normal file
@ -0,0 +1,153 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d6cffda451a494c83bc8baa59841685f
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -4,11 +4,28 @@ using UnityEngine;
|
||||
|
||||
public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
//Boundries
|
||||
public GameObject airBoundary;
|
||||
public GameObject earthBoundary;
|
||||
public GameObject waterBoundary;
|
||||
public GameObject fireBoundary;
|
||||
|
||||
//Instruction UI's
|
||||
public GameObject airInstructionUI;
|
||||
public GameObject earthInstructionUI;
|
||||
public GameObject waterInstructionUI;
|
||||
public GameObject fireInstructionUI;
|
||||
|
||||
//Collection images
|
||||
public GameObject airNotCollectedImage;
|
||||
public GameObject airCollectedImage;
|
||||
public GameObject earthNotCollectedImage;
|
||||
public GameObject earthCollectedImage;
|
||||
public GameObject waterNotCollectedImage;
|
||||
public GameObject waterCollectedImage;
|
||||
public GameObject fireNotCollectedImage;
|
||||
public GameObject fireCollectedImage;
|
||||
|
||||
private bool airFinished = false;
|
||||
private bool earthFinished = false;
|
||||
private bool waterFinished = false;
|
||||
@ -30,24 +47,29 @@ public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
if (bound == "Air")
|
||||
{
|
||||
//Instructions UI appear
|
||||
airInstructionUI.SetActive(true);
|
||||
earthBoundary.SetActive(false);
|
||||
waterBoundary.SetActive(false);
|
||||
fireBoundary.SetActive(false);
|
||||
}
|
||||
else if (bound == "Earth")
|
||||
{
|
||||
earthInstructionUI.SetActive(true);
|
||||
airBoundary.SetActive(false);
|
||||
waterBoundary.SetActive(false);
|
||||
fireBoundary.SetActive(false);
|
||||
}
|
||||
else if (bound == "Water")
|
||||
{
|
||||
waterInstructionUI.SetActive(true);
|
||||
earthBoundary.SetActive(false);
|
||||
airBoundary.SetActive(false);
|
||||
fireBoundary.SetActive(false);
|
||||
}
|
||||
else if (bound == "Fire")
|
||||
{
|
||||
fireInstructionUI.SetActive(true);
|
||||
earthBoundary.SetActive(false);
|
||||
waterBoundary.SetActive(false);
|
||||
airBoundary.SetActive(false);
|
||||
@ -83,7 +105,9 @@ public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
airFinished = true;
|
||||
collectionCounter++;
|
||||
//PlayCollectionNarration();
|
||||
airInstructionUI.SetActive(false);
|
||||
airNotCollectedImage.SetActive(false);
|
||||
airCollectedImage.SetActive(true);
|
||||
StartCoroutine(PlayCollectionNarration());
|
||||
airHasBeenCollected = true;
|
||||
airBoundary.SetActive(false);
|
||||
@ -92,7 +116,9 @@ public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
earthFinished = true;
|
||||
collectionCounter++;
|
||||
//PlayCollectionNarration();
|
||||
earthInstructionUI.SetActive(false);
|
||||
earthNotCollectedImage.SetActive(false);
|
||||
earthCollectedImage.SetActive(true);
|
||||
StartCoroutine(PlayCollectionNarration());
|
||||
|
||||
earthHasBeenCollected = true;
|
||||
@ -102,7 +128,9 @@ public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
waterFinished = true;
|
||||
collectionCounter++;
|
||||
//PlayCollectionNarration();
|
||||
waterInstructionUI.SetActive(false);
|
||||
waterNotCollectedImage.SetActive(false);
|
||||
waterCollectedImage.SetActive(true);
|
||||
StartCoroutine(PlayCollectionNarration());
|
||||
|
||||
waterHasBeenCollected = true;
|
||||
@ -112,7 +140,9 @@ public class BoundaryControlScript : MonoBehaviour
|
||||
{
|
||||
fireFinished = true;
|
||||
collectionCounter++;
|
||||
//PlayCollectionNarration();
|
||||
fireInstructionUI.SetActive(false);
|
||||
fireNotCollectedImage.SetActive(false);
|
||||
fireCollectedImage.SetActive(true);
|
||||
StartCoroutine(PlayCollectionNarration());
|
||||
|
||||
fireHasBeenCollected = true;
|
||||
|
@ -1,12 +1,17 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Video;
|
||||
|
||||
public class GameManagerScript : MonoBehaviour
|
||||
{
|
||||
public AudioSource audioSource;
|
||||
public AudioClip introductionClip;
|
||||
|
||||
public VideoPlayer videoPlayerObject;
|
||||
|
||||
public GameObject introCanvas;
|
||||
|
||||
public GameObject airBoundary;
|
||||
public GameObject earthBoundary;
|
||||
public GameObject waterBoundary;
|
||||
@ -20,6 +25,9 @@ public class GameManagerScript : MonoBehaviour
|
||||
{
|
||||
Debug.Log("Hello World Hello World");
|
||||
|
||||
videoPlayerObject.Prepare();
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
@ -42,7 +50,8 @@ public class GameManagerScript : MonoBehaviour
|
||||
|
||||
IEnumerator IntroductionNarration()
|
||||
{
|
||||
audioSource.PlayOneShot(introductionClip);
|
||||
//audioSource.PlayOneShot(introductionClip);
|
||||
videoPlayerObject.Play();
|
||||
yield return new WaitForSeconds(introductionClip.length);
|
||||
ActivateBoundries();
|
||||
}
|
||||
@ -54,6 +63,7 @@ public class GameManagerScript : MonoBehaviour
|
||||
waterBoundary.SetActive(true);
|
||||
earthBoundary.SetActive(true);
|
||||
introBound.SetActive(false);
|
||||
introCanvas.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
|
8
Assets/1OurVideoNarrationText.meta
Normal file
8
Assets/1OurVideoNarrationText.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d8e605a2dab20461a96894123cafbf58
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/1OurVideoNarrationText/Empedocles.mp4
Normal file
BIN
Assets/1OurVideoNarrationText/Empedocles.mp4
Normal file
Binary file not shown.
18
Assets/1OurVideoNarrationText/Empedocles.mp4.meta
Normal file
18
Assets/1OurVideoNarrationText/Empedocles.mp4.meta
Normal file
@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3da1420b8fa44481ba71b099bc5e4f32
|
||||
VideoClipImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
frameRange: 0
|
||||
startFrame: -1
|
||||
endFrame: -1
|
||||
colorSpace: 0
|
||||
deinterlace: 0
|
||||
encodeAlpha: 0
|
||||
flipVertical: 0
|
||||
flipHorizontal: 0
|
||||
importAudio: 1
|
||||
targetSettings: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After ![]() (image error) Size: 1.7 MiB |
@ -0,0 +1,153 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e6bd44d6b8c1844648250df944649ae6
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -12,6 +12,8 @@ TagManager:
|
||||
- BoundWater
|
||||
- BoundEarth
|
||||
- BoundHMD
|
||||
- SamplesInfoPanel
|
||||
- VideoPlayerTag
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
Loading…
x
Reference in New Issue
Block a user