Update increase font multiple choice in material make material images neatly boxed
This commit is contained in:
parent
be69ceecd5
commit
8621bb219e
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: aa6664977925e2e4d87cc2ceab2b77c5
|
||||||
|
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: 1115e65e9ad856644a07b5904c0750fa
|
||||||
|
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:
|
||||||
|
|
@ -147,3 +147,4 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
agent: {fileID: 0}
|
agent: {fileID: 0}
|
||||||
|
activeMaterial: {fileID: 2100000, guid: aa7583a274de73446aee3acf5f5f4f0f, type: 2}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1414,8 +1414,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 522.758, y: -180}
|
m_AnchoredPosition: {x: 522.758, y: -183}
|
||||||
m_SizeDelta: {x: 417.7296, y: 100}
|
m_SizeDelta: {x: 417.7296, y: 131}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &6656031382942894524
|
--- !u!222 &6656031382942894524
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -2279,8 +2279,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 30
|
m_fontSize: 40
|
||||||
m_fontSizeBase: 30
|
m_fontSizeBase: 40
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -2359,8 +2359,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 45.352783, y: -180}
|
m_AnchoredPosition: {x: 45.352783, y: -185}
|
||||||
m_SizeDelta: {x: 417.7296, y: 100}
|
m_SizeDelta: {x: 417.7296, y: 120}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &6656031384000762737
|
--- !u!222 &6656031384000762737
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -2549,8 +2549,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 30
|
m_fontSize: 40
|
||||||
m_fontSizeBase: 30
|
m_fontSizeBase: 40
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -2684,8 +2684,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 30
|
m_fontSize: 40
|
||||||
m_fontSizeBase: 30
|
m_fontSizeBase: 40
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -2829,8 +2829,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 45.352783, y: -60}
|
m_AnchoredPosition: {x: 45.352783, y: -48.30594}
|
||||||
m_SizeDelta: {x: 417.7296, y: 100}
|
m_SizeDelta: {x: 417.7296, y: 123.3881}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &6656031384507987101
|
--- !u!222 &6656031384507987101
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -3019,8 +3019,8 @@ MonoBehaviour:
|
||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 30
|
m_fontSize: 40
|
||||||
m_fontSizeBase: 30
|
m_fontSizeBase: 40
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
|
@ -3099,8 +3099,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 522.758, y: -60}
|
m_AnchoredPosition: {x: 522.758, y: -48.306}
|
||||||
m_SizeDelta: {x: 417.7296, y: 100}
|
m_SizeDelta: {x: 417.7296, y: 123.39}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &6656031384673122407
|
--- !u!222 &6656031384673122407
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
||||||
|
|
@ -648,7 +648,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -280, y: -52}
|
m_AnchoredPosition: {x: -280, y: -52}
|
||||||
m_SizeDelta: {x: 640.95, y: 412.3808}
|
m_SizeDelta: {x: 512, y: 512}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!222 &2995936269034320265
|
--- !u!222 &2995936269034320265
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
||||||
|
|
@ -1201,7 +1201,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -280, y: -52}
|
m_AnchoredPosition: {x: -280, y: -52}
|
||||||
m_SizeDelta: {x: 640.95, y: 412.3808}
|
m_SizeDelta: {x: 512, y: 512}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!222 &6420183505720006310
|
--- !u!222 &6420183505720006310
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
||||||
|
|
@ -658,7 +658,8 @@ MonoBehaviour:
|
||||||
- {fileID: 8300000, guid: 01b9e53664c9dc149baf9329dfe9e4d1, type: 3}
|
- {fileID: 8300000, guid: 01b9e53664c9dc149baf9329dfe9e4d1, type: 3}
|
||||||
- {fileID: 8300000, guid: dda2665027cb77d4fbd7b9013a99182f, type: 3}
|
- {fileID: 8300000, guid: dda2665027cb77d4fbd7b9013a99182f, type: 3}
|
||||||
- {fileID: 8300000, guid: 10016c7ee6faf2b41834b9be8c91fcc1, type: 3}
|
- {fileID: 8300000, guid: 10016c7ee6faf2b41834b9be8c91fcc1, type: 3}
|
||||||
- {fileID: 8300000, guid: ab4da3cccc8904940ab56eb1b0f49cb1, type: 3}
|
- {fileID: 8300000, guid: aa6664977925e2e4d87cc2ceab2b77c5, type: 3}
|
||||||
|
- {fileID: 8300000, guid: 1115e65e9ad856644a07b5904c0750fa, type: 3}
|
||||||
--- !u!4 &1894816134
|
--- !u!4 &1894816134
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,8 @@ public class Enemy : MonoBehaviour
|
||||||
public float damage;
|
public float damage;
|
||||||
public bool isBosStage2;
|
public bool isBosStage2;
|
||||||
[SerializeField] private GameObject pastaGigi;
|
[SerializeField] private GameObject pastaGigi;
|
||||||
|
|
||||||
private SaveData saveData;
|
private SaveData saveData;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
if (pastaGigi != null)
|
if (pastaGigi != null)
|
||||||
|
|
@ -33,7 +30,6 @@ public class Enemy : MonoBehaviour
|
||||||
health = maxHealth;
|
health = maxHealth;
|
||||||
|
|
||||||
gameObject.tag = "Enemy";
|
gameObject.tag = "Enemy";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
|
|
@ -69,7 +65,6 @@ public class Enemy : MonoBehaviour
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private async Task ExecuteBosDeath()
|
private async Task ExecuteBosDeath()
|
||||||
{
|
{
|
||||||
SaveData saveData = await Cloudsave.LoadData<SaveData>("DataPlayer");
|
SaveData saveData = await Cloudsave.LoadData<SaveData>("DataPlayer");
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ public class GameManager : MonoBehaviour
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
audioController.Instance.StopBGM();
|
audioController.Instance.StopBGM();
|
||||||
audioController.Instance.PlayBGM("BGM Boss Fight");
|
audioController.Instance.PlayBGM("BGM Boss Fight", 0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,8 @@ public class Agent : MonoBehaviour
|
||||||
{
|
{
|
||||||
if (other.CompareTag("Enemy"))
|
if (other.CompareTag("Enemy"))
|
||||||
{
|
{
|
||||||
audioController.Instance.PlaySFX("sfx_Dead");
|
audioController.Instance.StopBGM();
|
||||||
|
audioController.Instance.StopSFX();
|
||||||
GameOver.Open();
|
GameOver.Open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ public class AttackState : State
|
||||||
GameObject bullet = Agent.ObjectPool.GetFromPool();
|
GameObject bullet = Agent.ObjectPool.GetFromPool();
|
||||||
if (bullet != null)
|
if (bullet != null)
|
||||||
{
|
{
|
||||||
audioController.Instance.PlaySFX("sfx_Attack");
|
audioController.Instance.PlaySFX("sfx_Attack", 1);
|
||||||
bullet.gameObject.SetActive(true);
|
bullet.gameObject.SetActive(true);
|
||||||
|
|
||||||
bullet.transform.position = bulletSpawnPos.position;
|
bullet.transform.position = bulletSpawnPos.position;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class IdleState : State
|
public class IdleState : State
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,12 @@ public class PastaGigi : MonoBehaviour
|
||||||
private Enemy enemy;
|
private Enemy enemy;
|
||||||
public Agent agent;
|
public Agent agent;
|
||||||
|
|
||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
enemy = FindObjectOfType<Enemy>();
|
enemy = FindObjectOfType<Enemy>();
|
||||||
StartCoroutine(LifeTimePowerUp());
|
StartCoroutine(LifeTimePowerUp());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerator LifeTimePowerUp()
|
IEnumerator LifeTimePowerUp()
|
||||||
|
|
@ -46,4 +48,5 @@ public class PastaGigi : MonoBehaviour
|
||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
using System;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Serialization;
|
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class QuizPopUp : Menu<QuizPopUp>
|
public class QuizPopUp : Menu<QuizPopUp>
|
||||||
|
|
@ -43,7 +40,6 @@ public class QuizPopUp : Menu<QuizPopUp>
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
gameManager = FindObjectOfType<GameManager>();
|
gameManager = FindObjectOfType<GameManager>();
|
||||||
|
|
||||||
if (gameManager == null) return;
|
if (gameManager == null) return;
|
||||||
|
|
||||||
currentQuestion = gameManager.currentQuestion;
|
currentQuestion = gameManager.currentQuestion;
|
||||||
|
|
@ -57,9 +53,7 @@ public class QuizPopUp : Menu<QuizPopUp>
|
||||||
isComplete = false;
|
isComplete = false;
|
||||||
|
|
||||||
SetButtonState(true);
|
SetButtonState(true);
|
||||||
|
|
||||||
DisplayQuestion();
|
DisplayQuestion();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDisable()
|
private void OnDisable()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue