Ratstail91/monsterstalker
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More changes for v1.1

Browse Source
This commit is contained in:
Kayne Ruse
2018-04-13 08:31:41 +10:00
parent 57d4683df8
commit 28c6f8cac2
15 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/ending_opening.anim
+1 -4
View File
@@ -36,10 +36,8 @@ AnimationClip:
value: {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} value: {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3}
- time: 0.6666667 - time: 0.6666667
value: {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} value: {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3}
- time: 0.75
value: {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3}
- time: 0.8333333 - time: 0.8333333
value: {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} value: {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 212 classID: 212
@@ -69,7 +67,6 @@ AnimationClip:
- {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} - {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3}
- {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} - {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3}
- {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} - {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3}
- {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
Assets/Backgrounds/Ending_Opening/1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9817804871c54525538227038ad5b02e20070b37e1a63f7f44709e8c5816175c oid sha256:1538db2ad4eb08f3c2bfcb20d1bf2b799d24a47c5216c6e80e3ca48da0e14571
size 273423 size 1924560
Assets/Backgrounds/Ending_Opening/10.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:574f03ce36d65cfece4b4e1ae1db550c529639bdbd76d24f1ed258fb4404db37 oid sha256:d9f7e68b3d496414a14a0dcc7475efb37cefe46415b31b00550542a6e98cd66d
size 1165226 size 1168888
Assets/Backgrounds/Ending_Opening/2.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9b02d844901376f02b89d5090ecd83caf34b2cb5a8dd6ed33eac5aa7e44a2f99 oid sha256:258ced4937ced22f3fb556cc6333a823cb9dc616f446ada61b8f5d941bbcd797
size 264171 size 1906979
Assets/Backgrounds/Ending_Opening/3.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1ac6bf989474f4ca17190eff7a4aabadea305416acfaa8b9ff77179e8654f74b oid sha256:75a3f072f0d5d57c789c4423867dd24286bd14b46fd1aa8fe987111035b6166a
size 244530 size 1675202
Assets/Backgrounds/Ending_Opening/4.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:591170e193a4d8dc24d99dceea1010603e968b0cff96dc445ba26402a2e8e1e5 oid sha256:b3ad88bcc7dac927e0a5f793a7844553ce52922f18e36401c5ae39edff21b11a
size 237533 size 1617944
Assets/Backgrounds/Ending_Opening/5.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9b6995b0eab09fd3ad24f47f6129473b2611299c2625cab19559a5578e791169 oid sha256:5628bd437d0e9f2aa9bc9e3d614b88c5b4ff542b2c19f0a93ea57d9939bb4c9e
size 220988 size 1506287
Assets/Backgrounds/Ending_Opening/6.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e162512211fd82f120bb74458fcbf75236b78ef7a13bcffb4480fdb81daf7f9a oid sha256:becba20dc4c0aea774c1ef02a760c488a886f563fb76b711fe2d82550f83c8d6
size 220698 size 1520732
Assets/Backgrounds/Ending_Opening/7.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:13c564819b675c8f5fc8b7e6dd6b63e9d8f5be95bceb09d0a137216cd3e994a4 oid sha256:7dcfb0465977a24bceae78fbbad5f9837d4a7aafced093b1b482eb56c3408b71
size 244139 size 1595071
Assets/Backgrounds/Ending_Opening/8.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:afa0d502239f6b7cb9ab50f344cf18c5c33616ca25d02086541cca6d204e7141 oid sha256:c9d3c96e4c726dfc9e9a9de25d04702f9c22c855380c81479ac4b3d37a8dc19c
size 198148 size 1351219
Assets/Backgrounds/Ending_Opening/9.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e41ffea3917571d78821705954614688184ac3cc588c9d3c0e2e21f8e0d45343 oid sha256:dfb19a8db25aa1a547060b7191daffc85ae645a746815ed7320c5a79a9b521e7
size 166461 size 1117341
Assets/Scenes/gameover.unity
Generated
+2 -1
View File
@@ -592,8 +592,8 @@ GameObject:
serializedVersion: 5 serializedVersion: 5
m_Component: m_Component:
- component: {fileID: 1850700147} - component: {fileID: 1850700147}
- component: {fileID: 1850700146}
- component: {fileID: 1850700148} - component: {fileID: 1850700148}
- component: {fileID: 1850700146}
m_Layer: 0 m_Layer: 0
m_Name: GameOverController m_Name: GameOverController
m_TagString: Untagged m_TagString: Untagged
@@ -616,6 +616,7 @@ MonoBehaviour:
creditText: {fileID: 44346591} creditText: {fileID: 44346591}
clickText: {fileID: 1726320369} clickText: {fileID: 1726320369}
background: {fileID: 2135767184} background: {fileID: 2135767184}
albumOpens: {fileID: 8300000, guid: 56ce7c87fe90c75469f9578d2d15cdf9, type: 3}
--- !u!4 &1850700147 --- !u!4 &1850700147
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Assets/Scripts/GameOverController.cs
+4
View File
@@ -9,13 +9,16 @@ public class GameOverController : MonoBehaviour {
public Text creditText; public Text creditText;
public Text clickText; public Text clickText;
public GameObject background; public GameObject background;
public AudioClip albumOpens;
AudioSource audioSource;
Dictionary<string, GameObject> objectSet; Dictionary<string, GameObject> objectSet;
bool open = false; bool open = false;
int page = -1; int page = -1;
void Awake() { void Awake() {
audioSource = GetComponent<AudioSource> ();
objectSet = new Dictionary<string, GameObject> (); objectSet = new Dictionary<string, GameObject> ();
//prune "(clone)" from each monster name //prune "(clone)" from each monster name
@@ -61,6 +64,7 @@ public class GameOverController : MonoBehaviour {
if (mouseX >= 0.5f && page < (objectSet.Count -1)/2) { if (mouseX >= 0.5f && page < (objectSet.Count -1)/2) {
if (open == false) { if (open == false) {
open = true; open = true;
audioSource.PlayOneShot (albumOpens, 1f);
//TODO: animate the background //TODO: animate the background
background.GetComponent<Animator>().speed = 1; background.GetComponent<Animator>().speed = 1;
Assets/Sounds/albumOpens.wav
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee5c0ad4a7117a32907bbb4d4c2e667b363a1d4cc699e204232f236930451ca5
size 412068
Assets/Sounds/albumOpens.wav.meta
Generated
+24
View File
@@ -0,0 +1,24 @@
fileFormatVersion: 2
guid: 56ce7c87fe90c75469f9578d2d15cdf9
timeCreated: 1523571574
licenseType: Free
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: