add sfx and bgm fix timer minus bug in quiz fix answer button color add tooth topic item to data
This commit is contained in:
parent
598b9c5eeb
commit
a5507b8de3
Binary file not shown.
After Width: | Height: | Size: 340 KiB |
|
@ -0,0 +1,135 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a5318f6213d36cb4e8cc5291510e9ca3
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 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
|
||||
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
|
||||
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
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 82cdcb377894ceb44807d82edd9162b7
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 74db5fcd275d3724688c8bcd8ae7ae1a
|
||||
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:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 01b9e53664c9dc149baf9329dfe9e4d1
|
||||
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:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0c5da0a1038f2954bb9b5950665455f1
|
||||
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:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 10016c7ee6faf2b41834b9be8c91fcc1
|
||||
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:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dda2665027cb77d4fbd7b9013a99182f
|
||||
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:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ab4da3cccc8904940ab56eb1b0f49cb1
|
||||
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:
|
|
@ -1222,6 +1222,9 @@ MonoBehaviour:
|
|||
- {fileID: 8123679874919660369}
|
||||
- {fileID: 8123679876009763238}
|
||||
timerText: {fileID: 2768916774803909187}
|
||||
normalButttonSprite: {fileID: 21300000, guid: ef4a2477c77fd44f7bc698b115d9b619, type: 3}
|
||||
trueAnswerSprite: {fileID: 21300000, guid: b32a6d84afc984b61b05b20c3d44569b, type: 3}
|
||||
falseAnswerSprite: {fileID: 21300000, guid: e6404ce3667f546569c1c59a6de9495d, type: 3}
|
||||
timeToComplete: 30
|
||||
timeToShowAnswer: 1
|
||||
--- !u!1 &7246659531667727621
|
||||
|
|
|
@ -133,6 +133,7 @@ GameObject:
|
|||
- component: {fileID: 519420032}
|
||||
- component: {fileID: 519420031}
|
||||
- component: {fileID: 519420029}
|
||||
- component: {fileID: 519420033}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
|
@ -206,6 +207,18 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &519420033
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 116e6e2beb8d1f24cbac8ae4137c5f06, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &752690800
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -638,9 +651,14 @@ MonoBehaviour:
|
|||
sfxSource: {fileID: 1504931680}
|
||||
bgmClips:
|
||||
- {fileID: 8300000, guid: f646d488337c94084b47e56752970960, type: 3}
|
||||
- {fileID: 8300000, guid: 74db5fcd275d3724688c8bcd8ae7ae1a, type: 3}
|
||||
sfxClips:
|
||||
- {fileID: 8300000, guid: dbde9f7b19c4944b298da7a0bdf1b292, type: 3}
|
||||
- {fileID: 8300000, guid: 9cb19eb032d304b07acec596ae2ce4a4, type: 3}
|
||||
- {fileID: 8300000, guid: 01b9e53664c9dc149baf9329dfe9e4d1, type: 3}
|
||||
- {fileID: 8300000, guid: dda2665027cb77d4fbd7b9013a99182f, type: 3}
|
||||
- {fileID: 8300000, guid: 10016c7ee6faf2b41834b9be8c91fcc1, type: 3}
|
||||
- {fileID: 8300000, guid: ab4da3cccc8904940ab56eb1b0f49cb1, type: 3}
|
||||
--- !u!4 &1894816134
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class AudioMainMenu : MonoBehaviour
|
||||
{
|
||||
void Start()
|
||||
{
|
||||
audioController.Instance.StopBGM();
|
||||
audioController.Instance.PlayBGM("Background Music");
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 116e6e2beb8d1f24cbac8ae4137c5f06
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -91,6 +91,8 @@ public class Enemy : MonoBehaviour
|
|||
QuizPopUp.Open();
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
audioController.Instance.PlaySFX("sfx_Dead");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -13,5 +13,9 @@ public class GameManager : MonoBehaviour
|
|||
|
||||
public int indexPreTest;
|
||||
|
||||
|
||||
private void Start()
|
||||
{
|
||||
audioController.Instance.StopBGM();
|
||||
audioController.Instance.PlayBGM("BGM Boss Fight");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@ public class GameOver : Menu<GameOver>
|
|||
private void OnEnable()
|
||||
{
|
||||
StartCoroutine(DelayPause());
|
||||
audioController.Instance.StopBGM();
|
||||
audioController.Instance.PlaySFX("sfx_Lose");
|
||||
}
|
||||
|
||||
IEnumerator DelayPause()
|
||||
|
|
|
@ -59,6 +59,7 @@ public class Agent : MonoBehaviour
|
|||
{
|
||||
if (other.CompareTag("Enemy"))
|
||||
{
|
||||
audioController.Instance.PlaySFX("sfx_Dead");
|
||||
GameOver.Open();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,9 @@ public class AttackState : State
|
|||
GameObject bullet = Agent.ObjectPool.GetFromPool();
|
||||
if (bullet != null)
|
||||
{
|
||||
audioController.Instance.PlaySFX("sfx_Attack");
|
||||
bullet.gameObject.SetActive(true);
|
||||
|
||||
bullet.transform.position = bulletSpawnPos.position;
|
||||
Rigidbody2D bulletRb = bullet.GetComponent<Rigidbody2D>();
|
||||
bulletRb.velocity = new Vector2(10,bulletRb.velocity.y);
|
||||
|
|
|
@ -15,7 +15,25 @@ public class PastaGigi : MonoBehaviour
|
|||
IEnumerator LifeTimePowerUp()
|
||||
{
|
||||
yield return new WaitForSeconds(2f);
|
||||
AddDamage();
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (Input.GetMouseButtonDown(0))
|
||||
{
|
||||
Vector2 worldPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
RaycastHit2D hit = Physics2D.Raycast(worldPoint, Vector2.zero);
|
||||
|
||||
if (hit.collider != null)
|
||||
{
|
||||
PastaGigi pasta = hit.collider.GetComponent<PastaGigi>();
|
||||
if (pasta != null)
|
||||
{
|
||||
pasta.AddDamage();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public void AddDamage()
|
||||
{
|
||||
|
|
|
@ -53,6 +53,11 @@ public class PostTestMenu : Menu<PostTestMenu>
|
|||
|
||||
timer -= Time.deltaTime;
|
||||
|
||||
if (timer < 0f)
|
||||
{
|
||||
timer = 0f;
|
||||
}
|
||||
|
||||
int minutes = Mathf.FloorToInt(timer / 60);
|
||||
int seconds = Mathf.FloorToInt(timer % 60);
|
||||
timerText.text = string.Format("{0:00}:{1:00}", minutes, seconds);
|
||||
|
@ -68,6 +73,7 @@ public class PostTestMenu : Menu<PostTestMenu>
|
|||
}
|
||||
|
||||
|
||||
|
||||
async void LoadRandomQuestion()
|
||||
{
|
||||
if (questions.Count == 0)
|
||||
|
|
|
@ -55,6 +55,11 @@ public class PreTestMenu : Menu<PreTestMenu>
|
|||
|
||||
timer -= Time.deltaTime;
|
||||
|
||||
if (timer < 0f)
|
||||
{
|
||||
timer = 0f;
|
||||
}
|
||||
|
||||
int minutes = Mathf.FloorToInt(timer / 60);
|
||||
int seconds = Mathf.FloorToInt(timer % 60);
|
||||
timerText.text = string.Format("{0:00}:{1:00}", minutes, seconds);
|
||||
|
@ -69,6 +74,7 @@ public class PreTestMenu : Menu<PreTestMenu>
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
async void LoadRandomQuestion()
|
||||
{
|
||||
if (questions.Count == 0)
|
||||
|
|
|
@ -110,9 +110,12 @@ public class QuizPopUp : Menu<QuizPopUp>
|
|||
|
||||
public void UpdateTimer()
|
||||
{
|
||||
|
||||
timerValue -= Time.deltaTime;
|
||||
timerValue = Mathf.Max(timerValue, 0);
|
||||
|
||||
if (timerValue < 0)
|
||||
{
|
||||
timerValue = 0;
|
||||
}
|
||||
|
||||
int hours = Mathf.FloorToInt(timerValue / 3600);
|
||||
int minutes = Mathf.FloorToInt((timerValue % 3600) / 60);
|
||||
|
@ -126,6 +129,7 @@ public class QuizPopUp : Menu<QuizPopUp>
|
|||
{
|
||||
timerText.text = string.Format("{0:00}:{1:00}", minutes, seconds);
|
||||
}
|
||||
|
||||
if (isAnsweringQuestion)
|
||||
{
|
||||
if (timerValue > 0)
|
||||
|
@ -152,6 +156,7 @@ public class QuizPopUp : Menu<QuizPopUp>
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void StateLoadQuestion()
|
||||
{
|
||||
timerImage.fillAmount = fillFraction;
|
||||
|
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
Loading…
Reference in New Issue