Skip to content

Commit 2535f7a

Browse files
committed
update microverse floor color, update microverse player spawnpoint, add victorysound to microverse minigameManager
1 parent 33ae8ad commit 2535f7a

File tree

7 files changed

+309
-12
lines changed

7 files changed

+309
-12
lines changed
643 KB
Binary file not shown.

Assets/Resources/Audio/victorysound.wav.meta

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scenes/Microverse.unity

+272-3
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ MonoBehaviour:
685685
chemTextPrefab: {fileID: 0}
686686
Name:
687687
Formula:
688-
nameTimer: 0
689688
--- !u!1 &326117044
690689
GameObject:
691690
m_ObjectHideFlags: 0
@@ -1001,7 +1000,7 @@ Transform:
10011000
m_PrefabAsset: {fileID: 0}
10021001
m_GameObject: {fileID: 497251412}
10031002
m_LocalRotation: {x: -0, y: 0.9858564, z: -0, w: 0.16759214}
1004-
m_LocalPosition: {x: -0.4, y: 1.177, z: 1.15}
1003+
m_LocalPosition: {x: -1.39, y: 1.177, z: 5.63}
10051004
m_LocalScale: {x: 1, y: 1, z: 1}
10061005
m_Children: []
10071006
m_Father: {fileID: 0}
@@ -1569,6 +1568,7 @@ Transform:
15691568
- {fileID: 423114521}
15701569
- {fileID: 124960815}
15711570
- {fileID: 363492131}
1571+
- {fileID: 1907400115}
15721572
m_Father: {fileID: 0}
15731573
m_RootOrder: 11
15741574
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1714,6 +1714,92 @@ Transform:
17141714
m_Father: {fileID: 395083492}
17151715
m_RootOrder: 2
17161716
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1717+
--- !u!1 &1030679265
1718+
GameObject:
1719+
m_ObjectHideFlags: 0
1720+
m_CorrespondingSourceObject: {fileID: 0}
1721+
m_PrefabInstance: {fileID: 0}
1722+
m_PrefabAsset: {fileID: 0}
1723+
serializedVersion: 6
1724+
m_Component:
1725+
- component: {fileID: 1030679270}
1726+
- component: {fileID: 1030679269}
1727+
- component: {fileID: 1030679268}
1728+
- component: {fileID: 1030679267}
1729+
- component: {fileID: 1030679266}
1730+
m_Layer: 0
1731+
m_Name: InvisiWalls
1732+
m_TagString: Untagged
1733+
m_Icon: {fileID: 0}
1734+
m_NavMeshLayer: 0
1735+
m_StaticEditorFlags: 0
1736+
m_IsActive: 1
1737+
--- !u!65 &1030679266
1738+
BoxCollider:
1739+
m_ObjectHideFlags: 0
1740+
m_CorrespondingSourceObject: {fileID: 0}
1741+
m_PrefabInstance: {fileID: 0}
1742+
m_PrefabAsset: {fileID: 0}
1743+
m_GameObject: {fileID: 1030679265}
1744+
m_Material: {fileID: 0}
1745+
m_IsTrigger: 0
1746+
m_Enabled: 1
1747+
serializedVersion: 2
1748+
m_Size: {x: 35.4, y: 23.91, z: 1}
1749+
m_Center: {x: 0, y: 0, z: -17}
1750+
--- !u!65 &1030679267
1751+
BoxCollider:
1752+
m_ObjectHideFlags: 0
1753+
m_CorrespondingSourceObject: {fileID: 0}
1754+
m_PrefabInstance: {fileID: 0}
1755+
m_PrefabAsset: {fileID: 0}
1756+
m_GameObject: {fileID: 1030679265}
1757+
m_Material: {fileID: 0}
1758+
m_IsTrigger: 0
1759+
m_Enabled: 1
1760+
serializedVersion: 2
1761+
m_Size: {x: 37.7, y: 23.9, z: 1}
1762+
m_Center: {x: 0, y: 0, z: 17}
1763+
--- !u!65 &1030679268
1764+
BoxCollider:
1765+
m_ObjectHideFlags: 0
1766+
m_CorrespondingSourceObject: {fileID: 0}
1767+
m_PrefabInstance: {fileID: 0}
1768+
m_PrefabAsset: {fileID: 0}
1769+
m_GameObject: {fileID: 1030679265}
1770+
m_Material: {fileID: 0}
1771+
m_IsTrigger: 0
1772+
m_Enabled: 1
1773+
serializedVersion: 2
1774+
m_Size: {x: 1, y: 23, z: 37.9}
1775+
m_Center: {x: -17, y: 0, z: 0}
1776+
--- !u!65 &1030679269
1777+
BoxCollider:
1778+
m_ObjectHideFlags: 0
1779+
m_CorrespondingSourceObject: {fileID: 0}
1780+
m_PrefabInstance: {fileID: 0}
1781+
m_PrefabAsset: {fileID: 0}
1782+
m_GameObject: {fileID: 1030679265}
1783+
m_Material: {fileID: 0}
1784+
m_IsTrigger: 0
1785+
m_Enabled: 1
1786+
serializedVersion: 2
1787+
m_Size: {x: 1, y: 23.03, z: 35.9}
1788+
m_Center: {x: 17, y: 0, z: 0}
1789+
--- !u!4 &1030679270
1790+
Transform:
1791+
m_ObjectHideFlags: 0
1792+
m_CorrespondingSourceObject: {fileID: 0}
1793+
m_PrefabInstance: {fileID: 0}
1794+
m_PrefabAsset: {fileID: 0}
1795+
m_GameObject: {fileID: 1030679265}
1796+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1797+
m_LocalPosition: {x: 1.63, y: -1.2614679, z: 0.85}
1798+
m_LocalScale: {x: 1, y: 1, z: 1}
1799+
m_Children: []
1800+
m_Father: {fileID: 967610687}
1801+
m_RootOrder: 5
1802+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17171803
--- !u!1 &1109757718
17181804
GameObject:
17191805
m_ObjectHideFlags: 0
@@ -1724,6 +1810,7 @@ GameObject:
17241810
m_Component:
17251811
- component: {fileID: 1109757719}
17261812
- component: {fileID: 1109757720}
1813+
- component: {fileID: 1109757721}
17271814
m_Layer: 0
17281815
m_Name: MinigameManager
17291816
m_TagString: Untagged
@@ -1763,6 +1850,102 @@ MonoBehaviour:
17631850
- {fileID: 1959555420}
17641851
- {fileID: 99917089}
17651852
- {fileID: 915284509}
1853+
--- !u!82 &1109757721
1854+
AudioSource:
1855+
m_ObjectHideFlags: 0
1856+
m_CorrespondingSourceObject: {fileID: 0}
1857+
m_PrefabInstance: {fileID: 0}
1858+
m_PrefabAsset: {fileID: 0}
1859+
m_GameObject: {fileID: 1109757718}
1860+
m_Enabled: 1
1861+
serializedVersion: 4
1862+
OutputAudioMixerGroup: {fileID: 0}
1863+
m_audioClip: {fileID: 8300000, guid: 6c521552cd4c67140a1985c02a199f99, type: 3}
1864+
m_PlayOnAwake: 0
1865+
m_Volume: 0.341
1866+
m_Pitch: 1
1867+
Loop: 0
1868+
Mute: 0
1869+
Spatialize: 0
1870+
SpatializePostEffects: 0
1871+
Priority: 128
1872+
DopplerLevel: 1
1873+
MinDistance: 1
1874+
MaxDistance: 500
1875+
Pan2D: 0
1876+
rolloffMode: 0
1877+
BypassEffects: 0
1878+
BypassListenerEffects: 0
1879+
BypassReverbZones: 0
1880+
rolloffCustomCurve:
1881+
serializedVersion: 2
1882+
m_Curve:
1883+
- serializedVersion: 3
1884+
time: 0
1885+
value: 1
1886+
inSlope: 0
1887+
outSlope: 0
1888+
tangentMode: 0
1889+
weightedMode: 0
1890+
inWeight: 0.33333334
1891+
outWeight: 0.33333334
1892+
- serializedVersion: 3
1893+
time: 1
1894+
value: 0
1895+
inSlope: 0
1896+
outSlope: 0
1897+
tangentMode: 0
1898+
weightedMode: 0
1899+
inWeight: 0.33333334
1900+
outWeight: 0.33333334
1901+
m_PreInfinity: 2
1902+
m_PostInfinity: 2
1903+
m_RotationOrder: 4
1904+
panLevelCustomCurve:
1905+
serializedVersion: 2
1906+
m_Curve:
1907+
- serializedVersion: 3
1908+
time: 0
1909+
value: 0
1910+
inSlope: 0
1911+
outSlope: 0
1912+
tangentMode: 0
1913+
weightedMode: 0
1914+
inWeight: 0.33333334
1915+
outWeight: 0.33333334
1916+
m_PreInfinity: 2
1917+
m_PostInfinity: 2
1918+
m_RotationOrder: 4
1919+
spreadCustomCurve:
1920+
serializedVersion: 2
1921+
m_Curve:
1922+
- serializedVersion: 3
1923+
time: 0
1924+
value: 0
1925+
inSlope: 0
1926+
outSlope: 0
1927+
tangentMode: 0
1928+
weightedMode: 0
1929+
inWeight: 0.33333334
1930+
outWeight: 0.33333334
1931+
m_PreInfinity: 2
1932+
m_PostInfinity: 2
1933+
m_RotationOrder: 4
1934+
reverbZoneMixCustomCurve:
1935+
serializedVersion: 2
1936+
m_Curve:
1937+
- serializedVersion: 3
1938+
time: 0
1939+
value: 1
1940+
inSlope: 0
1941+
outSlope: 0
1942+
tangentMode: 0
1943+
weightedMode: 0
1944+
inWeight: 0.33333334
1945+
outWeight: 0.33333334
1946+
m_PreInfinity: 2
1947+
m_PostInfinity: 2
1948+
m_RotationOrder: 4
17661949
--- !u!1 &1130849211
17671950
GameObject:
17681951
m_ObjectHideFlags: 0
@@ -2591,7 +2774,7 @@ AudioSource:
25912774
serializedVersion: 4
25922775
OutputAudioMixerGroup: {fileID: 0}
25932776
m_audioClip: {fileID: 0}
2594-
m_PlayOnAwake: 1
2777+
m_PlayOnAwake: 0
25952778
m_Volume: 0.318
25962779
m_Pitch: 1
25972780
Loop: 0
@@ -3238,6 +3421,92 @@ MonoBehaviour:
32383421
spawnTime: 10
32393422
snakeSpeed: 10
32403423
snakeDuration: 60
3424+
--- !u!1 &1907400114
3425+
GameObject:
3426+
m_ObjectHideFlags: 0
3427+
m_CorrespondingSourceObject: {fileID: 0}
3428+
m_PrefabInstance: {fileID: 0}
3429+
m_PrefabAsset: {fileID: 0}
3430+
serializedVersion: 6
3431+
m_Component:
3432+
- component: {fileID: 1907400115}
3433+
- component: {fileID: 1907400119}
3434+
- component: {fileID: 1907400118}
3435+
- component: {fileID: 1907400117}
3436+
- component: {fileID: 1907400116}
3437+
m_Layer: 0
3438+
m_Name: InvisiWalls (1)
3439+
m_TagString: Untagged
3440+
m_Icon: {fileID: 0}
3441+
m_NavMeshLayer: 0
3442+
m_StaticEditorFlags: 0
3443+
m_IsActive: 1
3444+
--- !u!4 &1907400115
3445+
Transform:
3446+
m_ObjectHideFlags: 0
3447+
m_CorrespondingSourceObject: {fileID: 0}
3448+
m_PrefabInstance: {fileID: 0}
3449+
m_PrefabAsset: {fileID: 0}
3450+
m_GameObject: {fileID: 1907400114}
3451+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3452+
m_LocalPosition: {x: 24.744192, y: 34.9708, z: -39.83819}
3453+
m_LocalScale: {x: 1, y: 1, z: 1}
3454+
m_Children: []
3455+
m_Father: {fileID: 915284510}
3456+
m_RootOrder: 3
3457+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3458+
--- !u!65 &1907400116
3459+
BoxCollider:
3460+
m_ObjectHideFlags: 0
3461+
m_CorrespondingSourceObject: {fileID: 0}
3462+
m_PrefabInstance: {fileID: 0}
3463+
m_PrefabAsset: {fileID: 0}
3464+
m_GameObject: {fileID: 1907400114}
3465+
m_Material: {fileID: 0}
3466+
m_IsTrigger: 0
3467+
m_Enabled: 1
3468+
serializedVersion: 2
3469+
m_Size: {x: 35.4, y: 23.91, z: 1}
3470+
m_Center: {x: 0, y: 0, z: -17}
3471+
--- !u!65 &1907400117
3472+
BoxCollider:
3473+
m_ObjectHideFlags: 0
3474+
m_CorrespondingSourceObject: {fileID: 0}
3475+
m_PrefabInstance: {fileID: 0}
3476+
m_PrefabAsset: {fileID: 0}
3477+
m_GameObject: {fileID: 1907400114}
3478+
m_Material: {fileID: 0}
3479+
m_IsTrigger: 0
3480+
m_Enabled: 1
3481+
serializedVersion: 2
3482+
m_Size: {x: 37.7, y: 23.9, z: 1}
3483+
m_Center: {x: 0, y: 0, z: 17}
3484+
--- !u!65 &1907400118
3485+
BoxCollider:
3486+
m_ObjectHideFlags: 0
3487+
m_CorrespondingSourceObject: {fileID: 0}
3488+
m_PrefabInstance: {fileID: 0}
3489+
m_PrefabAsset: {fileID: 0}
3490+
m_GameObject: {fileID: 1907400114}
3491+
m_Material: {fileID: 0}
3492+
m_IsTrigger: 0
3493+
m_Enabled: 1
3494+
serializedVersion: 2
3495+
m_Size: {x: 1, y: 23, z: 37.9}
3496+
m_Center: {x: -17, y: 0, z: 0}
3497+
--- !u!65 &1907400119
3498+
BoxCollider:
3499+
m_ObjectHideFlags: 0
3500+
m_CorrespondingSourceObject: {fileID: 0}
3501+
m_PrefabInstance: {fileID: 0}
3502+
m_PrefabAsset: {fileID: 0}
3503+
m_GameObject: {fileID: 1907400114}
3504+
m_Material: {fileID: 0}
3505+
m_IsTrigger: 0
3506+
m_Enabled: 1
3507+
serializedVersion: 2
3508+
m_Size: {x: 1, y: 23.03, z: 35.9}
3509+
m_Center: {x: 17, y: 0, z: 0}
32413510
--- !u!1 &1959555420 stripped
32423511
GameObject:
32433512
m_CorrespondingSourceObject: {fileID: 5247745789227845461, guid: 2762e76a2e51a6e419e80058c73a22b9, type: 3}

Assets/Scripts/IntroOutro.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@ IEnumerator DelayedCallback()
4343
}
4444
}
4545

46-
public void fadeOut()
46+
public void fadeOut(float delay)
4747
{
4848
text.text = "Day " + (GameObject.Find("MinigameManager").GetComponent<MinigameManagerScript>().currentLevel + 1);
4949
anim = "FOut";
50-
animator.SetTrigger(anim);
50+
Invoke("playFadoOut",delay);
51+
52+
}
5153

54+
void playFadoOut()
55+
{
56+
animator.SetTrigger(anim);
5257
}
5358

5459
public void finishGame()

Assets/Scripts/MinigameManagerScript.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ public void GoalUpdate(GameObject updateSourceObject) {
6060
}
6161

6262
if(goalCounter[currentLevel-1] == goalMax[currentLevel-1]) {
63-
GameObject.Find("TransitionManager").GetComponent<IntroOutro>().fadeOut();
64-
Invoke("completeGame", 2f);
63+
gameObject.GetComponent<AudioSource>().Play();
64+
GameObject.Find("TransitionManager").GetComponent<IntroOutro>().fadeOut(1.5f);
65+
Invoke("completeGame", 3.5f);
6566
}
6667
}
6768

0 commit comments

Comments
 (0)