From 14e6e5540392eaabdabc544bb057d79222c0acd8 Mon Sep 17 00:00:00 2001 From: Sagittaeri Date: Sun, 22 Jan 2017 13:28:32 +1100 Subject: [PATCH 1/2] Pre pull commit --- .../Assets/Art/Models/lightHouse_LOW.obj.meta | 82 ------------------ .../Assets/Art/Models/pier.obj.meta | 82 ------------------ ...a~4053ea0ea1489f4604c1626fb0538989dd66037b | 9 -- ...3ea0ea1489f4604c1626fb0538989dd66037b.meta | 8 -- ...a~927ced4c4317bc1f86f167c9b1594cec30b8e540 | 8 -- IronToad_UnityProject/Assets/Sound.meta~HEAD | 7 -- .../Assets/Sound.meta~HEAD.meta | 14 --- IronToad_UnityProject/Assets/Sound/Music.meta | 9 -- IronToad_UnityProject/Assets/Sound/SFX.meta | 9 -- IronToad_UnityProject/Assets/Textures.meta | 9 -- .../Assets/_Scenes/GreyBox_Prototype.meta | 9 -- .../Assets/_Scenes/LighthouseTestScene.unity | Bin 115656 -> 136944 bytes 12 files changed, 246 deletions(-) delete mode 100644 IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta delete mode 100644 IronToad_UnityProject/Assets/Art/Models/pier.obj.meta delete mode 100644 IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b delete mode 100644 IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta delete mode 100644 IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 delete mode 100644 IronToad_UnityProject/Assets/Sound.meta~HEAD delete mode 100644 IronToad_UnityProject/Assets/Sound.meta~HEAD.meta delete mode 100644 IronToad_UnityProject/Assets/Sound/Music.meta delete mode 100644 IronToad_UnityProject/Assets/Sound/SFX.meta delete mode 100644 IronToad_UnityProject/Assets/Textures.meta delete mode 100644 IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta diff --git a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta b/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta deleted file mode 100644 index d94fc60..0000000 --- a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta +++ /dev/null @@ -1,82 +0,0 @@ -fileFormatVersion: 2 -guid: 919eb0dba9aa0da44aec3a80f1cf98ea -timeCreated: 1485000000 -licenseType: Free -ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: lighthouse - 100002: //RootNode - 400000: lighthouse - 400002: //RootNode - 2300000: lighthouse - 3300000: lighthouse - 4300000: lighthouse - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - importBlendShapes: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - keepQuads: 0 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - importAnimation: 1 - copyAvatar: 0 - humanDescription: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta deleted file mode 100644 index 92a0183..0000000 --- a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta +++ /dev/null @@ -1,82 +0,0 @@ -fileFormatVersion: 2 -guid: 37549450629db464abffe54861590cf3 -timeCreated: 1485008673 -licenseType: Free -ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: pCylinder3 - 100002: //RootNode - 400000: pCylinder3 - 400002: //RootNode - 2300000: pCylinder3 - 3300000: pCylinder3 - 4300000: pCylinder3 - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - importBlendShapes: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - keepQuads: 0 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - importAnimation: 1 - copyAvatar: 0 - humanDescription: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b deleted file mode 100644 index f8e9b50..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 844c4f25011b45348a5db5bc5b4f956e -folderAsset: yes -timeCreated: 1485037848 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta deleted file mode 100644 index 97e3f7f..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3c7e12539b1e2c048bbfe0734108abba -timeCreated: 1485039339 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 deleted file mode 100644 index a809e82..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a2ebb0518fbb4d46a3aa17dac934dce -timeCreated: 1485038927 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD b/IronToad_UnityProject/Assets/Sound.meta~HEAD deleted file mode 100644 index 0ebd43e..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~HEAD +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 73fb9ee280b0c75439600b4d5c3a6a7d -folderAsset: yes -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta deleted file mode 100644 index dc8b858..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: 7562c5d08f15d254c92f6dbd50cd18c9 -timeCreated: 1485039339 -licenseType: Pro -======= -guid: 0fb49e3e0a97c2c4cb531c04d67f2615 -timeCreated: 1485038927 -licenseType: Free ->>>>>>> 927ced4c4317bc1f86f167c9b1594cec30b8e540 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta deleted file mode 100644 index b3ddd5b..0000000 --- a/IronToad_UnityProject/Assets/Sound/Music.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1715d56e0d2b68246a82993db31014ab -folderAsset: yes -timeCreated: 1485038927 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta deleted file mode 100644 index 795aecf..0000000 --- a/IronToad_UnityProject/Assets/Sound/SFX.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: de5a3adcedb96f64183518ac89622ade -folderAsset: yes -timeCreated: 1485038927 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta deleted file mode 100644 index ffdd440..0000000 --- a/IronToad_UnityProject/Assets/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2a6e699820a38a544acfc0015eb679a2 -folderAsset: yes -timeCreated: 1484972317 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta deleted file mode 100644 index 47507ca..0000000 --- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 338533d5d159c00478a9fb5321b7d922 -folderAsset: yes -timeCreated: 1485007190 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity b/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity index 8303cde46115eb4b302e2031d40913a24f77dc50..bf45fe9f6f096713ad6ddea96de5727a558f3bb0 100644 GIT binary patch delta 13805 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 From f5f0541a1b903c9c6243bee824db5baad077e9e3 Mon Sep 17 00:00:00 2001 From: Sagittaeri Date: Sun, 22 Jan 2017 14:07:50 +1100 Subject: [PATCH 2/2] amb and bgm and fixed camera --- .../Assets/Scripts/AudioController.cs | 233 ++++++++++++++++++ .../Assets/Scripts/AudioController.cs.meta | 12 + .../Assets/Scripts/CustomSmoothFollow.cs | 5 +- .../Assets/Scripts/TestMoveController.cs | 8 +- .../Assets/Scripts/UIPanel.cs | 1 + ...f167c9b1594cec30b8e540.meta => Sound.meta} | 5 +- IronToad_UnityProject/Assets/Sound/Music.meta | 9 + ...22-1245ironToad(attack).wav => attack.wav} | Bin ...nToad(attack).wav.meta => attack.wav.meta} | 4 +- ...-1245ironToad(spotted).wav => spotted.wav} | Bin ...oad(spotted).wav.meta => spotted.wav.meta} | 4 +- .../{22-1245ironToad(tense).wav => tense.wav} | Bin ...ronToad(tense).wav.meta => tense.wav.meta} | 4 +- IronToad_UnityProject/Assets/Sound/SFX.meta | 9 + .../Assets/Sound/SFX/assassination.wav.meta | 4 +- .../Assets/Sound/SFX/createWave.wav.meta | 4 +- .../Assets/Sound/SFX/createWave_2.wav.meta | 4 +- .../Assets/Sound/SFX/createWave_3.wav.meta | 4 +- .../Assets/Sound/SFX/oceanAmbience.wav.meta | 4 +- .../Assets/Sound/SFX/rockWater_1.wav.meta | 4 +- .../Assets/Sound/SFX/rockWater_2.wav.meta | 4 +- .../Assets/Sound/SFX/rockWater_3.wav.meta | 4 +- .../Assets/Sound/SFX/runAground.wav.meta | 4 +- .../Assets/Sound/SFX/shipSpotted.wav.meta | 4 +- .../Assets/Sound/SFX/sinkingShip.wav.meta | 4 +- .../Assets/Sound/SFX/spottedDialogue.wav.meta | 4 +- .../Assets/_Scenes/LighthouseTestScene.unity | Bin 136944 -> 137496 bytes 27 files changed, 303 insertions(+), 39 deletions(-) create mode 100644 IronToad_UnityProject/Assets/Scripts/AudioController.cs create mode 100644 IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta rename IronToad_UnityProject/Assets/{Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta => Sound.meta} (54%) create mode 100644 IronToad_UnityProject/Assets/Sound/Music.meta rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(attack).wav => attack.wav} (100%) rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(attack).wav.meta => attack.wav.meta} (92%) rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(spotted).wav => spotted.wav} (100%) rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(spotted).wav.meta => spotted.wav.meta} (92%) rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(tense).wav => tense.wav} (100%) rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(tense).wav.meta => tense.wav.meta} (92%) create mode 100644 IronToad_UnityProject/Assets/Sound/SFX.meta diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs b/IronToad_UnityProject/Assets/Scripts/AudioController.cs new file mode 100644 index 0000000..2502665 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs @@ -0,0 +1,233 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AudioController : MonoBehaviour +{ + public AudioSource[] bgmSources; + public AudioSource[] ambSources; + public AudioSource[] sfxSources; + + public AudioClip[] bgmClips; + public AudioClip[] ambClips; + public AudioClip[] sfxClips; + + void Awake() + { + NotificationServer.register("play bgm", playBgm); + NotificationServer.register("play amb", playAmb); + NotificationServer.register("play sfx", playSfx); + + NotificationServer.register("fade bgm", fadeBgm); + NotificationServer.register("fade amb", fadeAmb); + } + + void Start() + { + foreach (AudioSource s in bgmSources) + s.volume = 0f; + foreach (AudioSource s in ambSources) + s.volume = 0f; + foreach (AudioSource s in sfxSources) + s.volume = 0f; + + NotificationServer.notify("play amb", "oceanAmbience:0.5"); + } + + public void playAmb(object audioNameObj) + { + string audioName = audioNameObj as string; + if (audioName == null || audioName == "") + return; + + string[] tokens = audioName.ToLower().Split(':'); + audioName = tokens[0]; + float volume = 1f; + if (tokens.Length > 1) + float.TryParse(tokens[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in ambClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + bool foundEmpty = false; + foreach (AudioSource s in ambSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + else if (!foundEmpty) + { + LeanTween.cancel(s.gameObject); + foundEmpty = true; + s.clip = clip; + s.Play(); + LeanTween.value(s.gameObject, s.volume, volume, 0.5f).setOnUpdate((float val)=>{ + s.volume = val; + }).setIgnoreTimeScale(true); + } + } + } + + public void playSfx(object audioNameObj) + { + string audioName = audioNameObj as string; + if (audioName == null || audioName == "") + return; + + string[] tokens = audioName.ToLower().Split(':'); + audioName = tokens[0]; + float volume = 1f; + if (tokens.Length > 1) + float.TryParse(tokens[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in sfxClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + foreach (AudioSource s in sfxSources) + { + if (!s.isPlaying) + { + LeanTween.cancel(s.gameObject); + s.clip = clip; + s.volume = volume; + s.Play(); + } + } + } + + public void playBgm(object audioNameObj) + { + string audioNames = audioNameObj as string; + if (audioNames == null || audioNames == "") + return; + + audioNames = audioNames.ToLower(); + string[] tokens = audioNames.Split('/'); + if (tokens.Length > 1) + { + foreach (string t in tokens) + playBgm(t.Trim()); + return; + } + string[] tokens2 = audioNames.Split(':'); + string audioName = tokens2[0]; + float volume = 1f; + if (tokens2.Length > 1) + float.TryParse(tokens2[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in bgmClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + AudioSource foundEmpty = null; + foreach (AudioSource s in bgmSources) + { + if (s.clip != null && s.clip == clip) + { + LeanTween.cancel(s.gameObject); + foundEmpty = s; + } + else if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + else if (foundEmpty == null) + { + LeanTween.cancel(s.gameObject); + foundEmpty = s; + } + } + if (foundEmpty != null && !foundEmpty.isPlaying) + { + LeanTween.cancel(foundEmpty.gameObject); + foundEmpty.clip = clip; + foundEmpty.Play(); + LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{ + foundEmpty.volume = val; + }).setIgnoreTimeScale(true); + } + else if (foundEmpty != null && foundEmpty.isPlaying) + { + LeanTween.cancel(foundEmpty.gameObject); + LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{ + foundEmpty.volume = val; + }).setIgnoreTimeScale(true); + } + } + + public void fadeBgm() + { + foreach (AudioSource s in bgmSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + } + } + + public void fadeAmb() + { + foreach (AudioSource s in ambSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + } + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta new file mode 100644 index 0000000..b4a3ecb --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 66e9541bf46304a888e3e492fda8055d +timeCreated: 1485043076 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs index 76a0265..ee23660 100644 --- a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs +++ b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs @@ -42,7 +42,7 @@ public class CustomSmoothFollow : MonoBehaviour RaycastHit hitInfo; if (Physics.Raycast(wantedPos, target.position-wantedPos, out hitInfo, (target.position-wantedPos).magnitude * 2f)) { - Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask); +// Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask); if (hitInfo.collider.gameObject.layer == layerMask) isBlocked = true; } @@ -51,6 +51,8 @@ public class CustomSmoothFollow : MonoBehaviour { wantedPos.y = target.position.y + altHeight; wantedPos.z = target.position.z + altDistance; + wantedPos.x = target.position.x; + wantedPos = RotatePointAroundPivot(wantedPos, target.transform.position, offsetAngle); } float currentHeight = transform.position.y; @@ -73,7 +75,6 @@ public class CustomSmoothFollow : MonoBehaviour // Set the height of the camera transform.position = new Vector3(currentSide, currentHeight, currentDistance); - // Always look at the target Vector3 lookTarget = target.position; lookTarget.z = transform.position.z; diff --git a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs index adf5328..94168c6 100644 --- a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs +++ b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs @@ -9,12 +9,12 @@ public class TestMoveController : MonoBehaviour void Update () { if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) - transform.Translate(Vector3.back * Time.deltaTime * speed); + transform.Translate(Vector3.right * Time.deltaTime * speed); if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) - transform.Translate(Vector3.left * Time.deltaTime * speed); + transform.Translate(Vector3.back * Time.deltaTime * speed); if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) - transform.Translate(Vector3.forward * Time.deltaTime * speed); + transform.Translate(Vector3.left * Time.deltaTime * speed); if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow)) - transform.Translate(Vector3.right * Time.deltaTime * speed); + transform.Translate(Vector3.forward * Time.deltaTime * speed); } } diff --git a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs index 3135ea3..8df274b 100644 --- a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs +++ b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs @@ -162,6 +162,7 @@ public class UIPanel : MonoBehaviour public void startGame() { NotificationServer.notify("show GameUI"); + NotificationServer.notify("play bgm", "tense:0.75"); unpauseGame(); } diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta b/IronToad_UnityProject/Assets/Sound.meta similarity index 54% rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta rename to IronToad_UnityProject/Assets/Sound.meta index a8292de..f9c1bfe 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta +++ b/IronToad_UnityProject/Assets/Sound.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 599e1530282487c46b63fa0f00f5c846 -timeCreated: 1485039717 -licenseType: Pro +guid: 0fbabcae9313543ffbf1429aeac3664d +folderAsset: yes DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta new file mode 100644 index 0000000..44ebcac --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/Music.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: be2c14b0c562c483bbe057367939b479 +folderAsset: yes +timeCreated: 1485052376 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav b/IronToad_UnityProject/Assets/Sound/Music/attack.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta index b58e257..a556686 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta index 8a9a1eb..a4aa32b 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav b/IronToad_UnityProject/Assets/Sound/Music/tense.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta index 7a09aec..be52b85 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta new file mode 100644 index 0000000..2d35fa0 --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/SFX.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: bb5698073b8d847298f0287fcfbdd0de +folderAsset: yes +timeCreated: 1485052376 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta index efbf86b..d6e8833 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta index ba6ea07..c28f259 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta index 90bcef1..5e664e8 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta index 35d4d69..25a6976 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta index 465f525..3846181 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta index 9472e49..00b8793 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta index a3e20ce..2d79e6c 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta index 44f4631..79c3a48 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta index 61d8e34..0d018fd 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta index d4ebbdd..15eed3e 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta index 148c11c..e6eafc3 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta index cf7471b..fa08255 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity b/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity index bf45fe9f6f096713ad6ddea96de5727a558f3bb0..e7d48fee00e970c5de43b6cb2cc295fd82917dac 100644 GIT binary patch delta 3725 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