From 28c6f8cac2510c81cd8c3d5859f8cdb129a3533b Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 13 Apr 2018 08:31:41 +1000 Subject: [PATCH] More changes for v1.1 --- Assets/Animations/ending_opening.anim | 5 +---- Assets/Backgrounds/Ending_Opening/1.png | 4 ++-- Assets/Backgrounds/Ending_Opening/10.png | 4 ++-- Assets/Backgrounds/Ending_Opening/2.png | 4 ++-- Assets/Backgrounds/Ending_Opening/3.png | 4 ++-- Assets/Backgrounds/Ending_Opening/4.png | 4 ++-- Assets/Backgrounds/Ending_Opening/5.png | 4 ++-- Assets/Backgrounds/Ending_Opening/6.png | 4 ++-- Assets/Backgrounds/Ending_Opening/7.png | 4 ++-- Assets/Backgrounds/Ending_Opening/8.png | 4 ++-- Assets/Backgrounds/Ending_Opening/9.png | 4 ++-- Assets/Scenes/gameover.unity | 3 ++- Assets/Scripts/GameOverController.cs | 4 ++++ Assets/Sounds/albumOpens.wav | 3 +++ Assets/Sounds/albumOpens.wav.meta | 24 ++++++++++++++++++++++++ 15 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 Assets/Sounds/albumOpens.wav create mode 100644 Assets/Sounds/albumOpens.wav.meta diff --git a/Assets/Animations/ending_opening.anim b/Assets/Animations/ending_opening.anim index 76442a5..0040a45 100644 --- a/Assets/Animations/ending_opening.anim +++ b/Assets/Animations/ending_opening.anim @@ -36,10 +36,8 @@ AnimationClip: value: {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} - time: 0.6666667 value: {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} - time: 0.8333333 - value: {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} + value: {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} attribute: m_Sprite path: classID: 212 @@ -69,7 +67,6 @@ AnimationClip: - {fileID: 21300000, guid: 2e3f61f293c102a4d83e41a69dc804ed, type: 3} - {fileID: 21300000, guid: a1765fe94d706134cb414e119f60e486, type: 3} - {fileID: 21300000, guid: cee3c03fa520b2b459d8b445edc7fb12, type: 3} - - {fileID: 21300000, guid: 1c5bbe3b4ca1f6d4eb218bd6babc9781, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Backgrounds/Ending_Opening/1.png b/Assets/Backgrounds/Ending_Opening/1.png index d40c8e8..40f4be0 100644 --- a/Assets/Backgrounds/Ending_Opening/1.png +++ b/Assets/Backgrounds/Ending_Opening/1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9817804871c54525538227038ad5b02e20070b37e1a63f7f44709e8c5816175c -size 273423 +oid sha256:1538db2ad4eb08f3c2bfcb20d1bf2b799d24a47c5216c6e80e3ca48da0e14571 +size 1924560 diff --git a/Assets/Backgrounds/Ending_Opening/10.png b/Assets/Backgrounds/Ending_Opening/10.png index a0b3cb8..1965b72 100644 --- a/Assets/Backgrounds/Ending_Opening/10.png +++ b/Assets/Backgrounds/Ending_Opening/10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:574f03ce36d65cfece4b4e1ae1db550c529639bdbd76d24f1ed258fb4404db37 -size 1165226 +oid sha256:d9f7e68b3d496414a14a0dcc7475efb37cefe46415b31b00550542a6e98cd66d +size 1168888 diff --git a/Assets/Backgrounds/Ending_Opening/2.png b/Assets/Backgrounds/Ending_Opening/2.png index 862c993..e7207d2 100644 --- a/Assets/Backgrounds/Ending_Opening/2.png +++ b/Assets/Backgrounds/Ending_Opening/2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b02d844901376f02b89d5090ecd83caf34b2cb5a8dd6ed33eac5aa7e44a2f99 -size 264171 +oid sha256:258ced4937ced22f3fb556cc6333a823cb9dc616f446ada61b8f5d941bbcd797 +size 1906979 diff --git a/Assets/Backgrounds/Ending_Opening/3.png b/Assets/Backgrounds/Ending_Opening/3.png index 64aa807..d1bf20a 100644 --- a/Assets/Backgrounds/Ending_Opening/3.png +++ b/Assets/Backgrounds/Ending_Opening/3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ac6bf989474f4ca17190eff7a4aabadea305416acfaa8b9ff77179e8654f74b -size 244530 +oid sha256:75a3f072f0d5d57c789c4423867dd24286bd14b46fd1aa8fe987111035b6166a +size 1675202 diff --git a/Assets/Backgrounds/Ending_Opening/4.png b/Assets/Backgrounds/Ending_Opening/4.png index bfa40fa..bbd03a4 100644 --- a/Assets/Backgrounds/Ending_Opening/4.png +++ b/Assets/Backgrounds/Ending_Opening/4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:591170e193a4d8dc24d99dceea1010603e968b0cff96dc445ba26402a2e8e1e5 -size 237533 +oid sha256:b3ad88bcc7dac927e0a5f793a7844553ce52922f18e36401c5ae39edff21b11a +size 1617944 diff --git a/Assets/Backgrounds/Ending_Opening/5.png b/Assets/Backgrounds/Ending_Opening/5.png index 8fbb36b..b600ce0 100644 --- a/Assets/Backgrounds/Ending_Opening/5.png +++ b/Assets/Backgrounds/Ending_Opening/5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6995b0eab09fd3ad24f47f6129473b2611299c2625cab19559a5578e791169 -size 220988 +oid sha256:5628bd437d0e9f2aa9bc9e3d614b88c5b4ff542b2c19f0a93ea57d9939bb4c9e +size 1506287 diff --git a/Assets/Backgrounds/Ending_Opening/6.png b/Assets/Backgrounds/Ending_Opening/6.png index d8e9125..8eb7683 100644 --- a/Assets/Backgrounds/Ending_Opening/6.png +++ b/Assets/Backgrounds/Ending_Opening/6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e162512211fd82f120bb74458fcbf75236b78ef7a13bcffb4480fdb81daf7f9a -size 220698 +oid sha256:becba20dc4c0aea774c1ef02a760c488a886f563fb76b711fe2d82550f83c8d6 +size 1520732 diff --git a/Assets/Backgrounds/Ending_Opening/7.png b/Assets/Backgrounds/Ending_Opening/7.png index 01ef8ca..832cfa3 100644 --- a/Assets/Backgrounds/Ending_Opening/7.png +++ b/Assets/Backgrounds/Ending_Opening/7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13c564819b675c8f5fc8b7e6dd6b63e9d8f5be95bceb09d0a137216cd3e994a4 -size 244139 +oid sha256:7dcfb0465977a24bceae78fbbad5f9837d4a7aafced093b1b482eb56c3408b71 +size 1595071 diff --git a/Assets/Backgrounds/Ending_Opening/8.png b/Assets/Backgrounds/Ending_Opening/8.png index 6ad9901..c4b21aa 100644 --- a/Assets/Backgrounds/Ending_Opening/8.png +++ b/Assets/Backgrounds/Ending_Opening/8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afa0d502239f6b7cb9ab50f344cf18c5c33616ca25d02086541cca6d204e7141 -size 198148 +oid sha256:c9d3c96e4c726dfc9e9a9de25d04702f9c22c855380c81479ac4b3d37a8dc19c +size 1351219 diff --git a/Assets/Backgrounds/Ending_Opening/9.png b/Assets/Backgrounds/Ending_Opening/9.png index a69206c..52de875 100644 --- a/Assets/Backgrounds/Ending_Opening/9.png +++ b/Assets/Backgrounds/Ending_Opening/9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e41ffea3917571d78821705954614688184ac3cc588c9d3c0e2e21f8e0d45343 -size 166461 +oid sha256:dfb19a8db25aa1a547060b7191daffc85ae645a746815ed7320c5a79a9b521e7 +size 1117341 diff --git a/Assets/Scenes/gameover.unity b/Assets/Scenes/gameover.unity index 77b2d6b..0d190d7 100644 --- a/Assets/Scenes/gameover.unity +++ b/Assets/Scenes/gameover.unity @@ -592,8 +592,8 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1850700147} - - component: {fileID: 1850700146} - component: {fileID: 1850700148} + - component: {fileID: 1850700146} m_Layer: 0 m_Name: GameOverController m_TagString: Untagged @@ -616,6 +616,7 @@ MonoBehaviour: creditText: {fileID: 44346591} clickText: {fileID: 1726320369} background: {fileID: 2135767184} + albumOpens: {fileID: 8300000, guid: 56ce7c87fe90c75469f9578d2d15cdf9, type: 3} --- !u!4 &1850700147 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameOverController.cs b/Assets/Scripts/GameOverController.cs index 6949107..c351f02 100644 --- a/Assets/Scripts/GameOverController.cs +++ b/Assets/Scripts/GameOverController.cs @@ -9,13 +9,16 @@ public class GameOverController : MonoBehaviour { public Text creditText; public Text clickText; public GameObject background; + public AudioClip albumOpens; + AudioSource audioSource; Dictionary objectSet; bool open = false; int page = -1; void Awake() { + audioSource = GetComponent (); objectSet = new Dictionary (); //prune "(clone)" from each monster name @@ -61,6 +64,7 @@ public class GameOverController : MonoBehaviour { if (mouseX >= 0.5f && page < (objectSet.Count -1)/2) { if (open == false) { open = true; + audioSource.PlayOneShot (albumOpens, 1f); //TODO: animate the background background.GetComponent().speed = 1; diff --git a/Assets/Sounds/albumOpens.wav b/Assets/Sounds/albumOpens.wav new file mode 100644 index 0000000..9c910e0 --- /dev/null +++ b/Assets/Sounds/albumOpens.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee5c0ad4a7117a32907bbb4d4c2e667b363a1d4cc699e204232f236930451ca5 +size 412068 diff --git a/Assets/Sounds/albumOpens.wav.meta b/Assets/Sounds/albumOpens.wav.meta new file mode 100644 index 0000000..57588fd --- /dev/null +++ b/Assets/Sounds/albumOpens.wav.meta @@ -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: