diff --git a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs index 13939e52..50cc6dd1 100644 --- a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs +++ b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs @@ -80,9 +80,9 @@ namespace Fungus foreach (AudioSource a in audioSources) { - if ((a.audio != audioSource) && (a.tag == audioSource.tag)) + if ((a.GetComponent() != audioSource) && (a.tag == audioSource.tag)) { - StopLoop(a.audio); + StopLoop(a.GetComponent()); } } } @@ -92,7 +92,7 @@ namespace Fungus if (fadeDuration > 0) { audioSource.volume = 0; - PlaySoundWithCallback(audioSource.audio.clip, endVolume, AudioFinished); + PlaySoundWithCallback(audioSource.GetComponent().clip, endVolume, AudioFinished); LeanTween.value(audioSource.gameObject,0,endVolume,fadeDuration ).setOnUpdate( (float updateVolume)=>{ @@ -110,7 +110,7 @@ namespace Fungus else { audioSource.volume = 1; - PlaySoundWithCallback(audioSource.audio.clip, endVolume, AudioFinished); + PlaySoundWithCallback(audioSource.GetComponent().clip, endVolume, AudioFinished); } } @@ -120,7 +120,7 @@ namespace Fungus { audioSource.volume = 0; audioSource.loop = true; - audioSource.audio.Play(); + audioSource.GetComponent().Play(); LeanTween.value(audioSource.gameObject,0,endVolume,fadeDuration ).setOnUpdate( (float updateVolume)=>{ @@ -139,7 +139,7 @@ namespace Fungus { audioSource.volume = 1; audioSource.loop = true; - audioSource.audio.Play(); + audioSource.GetComponent().Play(); } } @@ -155,7 +155,7 @@ namespace Fungus ).setOnComplete( ()=>{ - audioSource.audio.Pause(); + audioSource.GetComponent().Pause(); if (waitUntilFinished) { Continue(); @@ -165,7 +165,7 @@ namespace Fungus } else { - audioSource.audio.Pause(); + audioSource.GetComponent().Pause(); } } @@ -181,7 +181,7 @@ namespace Fungus ).setOnComplete( ()=>{ - source.audio.Stop(); + source.GetComponent().Stop(); if (waitUntilFinished) { Continue(); @@ -191,7 +191,7 @@ namespace Fungus } else { - source.audio.Stop(); + source.GetComponent().Stop(); } } @@ -210,7 +210,7 @@ namespace Fungus public void PlaySoundWithCallback(AudioClip clip, float endVolume, AudioCallback callback) { - audioSource.audio.PlayOneShot(audioSource.clip, endVolume); + audioSource.GetComponent().PlayOneShot(audioSource.clip, endVolume); StartCoroutine(DelayedCallback(audioSource.clip.length, callback)); } diff --git a/Assets/Fungus/Audio/Scripts/MusicController.cs b/Assets/Fungus/Audio/Scripts/MusicController.cs index 1ae4d4da..f4b83df8 100644 --- a/Assets/Fungus/Audio/Scripts/MusicController.cs +++ b/Assets/Fungus/Audio/Scripts/MusicController.cs @@ -31,8 +31,8 @@ namespace Fungus protected virtual void Start() { - audio.playOnAwake = false; - audio.loop = true; + GetComponent().playOnAwake = false; + GetComponent().loop = true; } /** @@ -43,9 +43,9 @@ namespace Fungus */ public void PlayMusic(AudioClip musicClip, float atTime = 0) { - audio.clip = musicClip; - audio.time = atTime; // May be inaccurate if the audio source is compressed http://docs.unity3d.com/ScriptReference/AudioSource-time.html BK - audio.Play(); + GetComponent().clip = musicClip; + GetComponent().time = atTime; // May be inaccurate if the audio source is compressed http://docs.unity3d.com/ScriptReference/AudioSource-time.html BK + GetComponent().Play(); } /** @@ -53,7 +53,7 @@ namespace Fungus */ public virtual void StopMusic() { - audio.Stop(); + GetComponent().Stop(); } /** @@ -74,13 +74,13 @@ namespace Fungus */ public virtual void PlaySound(AudioClip soundClip, float volume) { - audio.PlayOneShot(soundClip, volume); + GetComponent().PlayOneShot(soundClip, volume); } public virtual void PlaySoundAtTime(AudioClip soundClip, float volume, float atTime) { - audio.time = atTime; // This may not work BK - audio.PlayOneShot(soundClip, volume); + GetComponent().time = atTime; // This may not work BK + GetComponent().PlayOneShot(soundClip, volume); } } } \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Scripts/Dialog.cs b/Assets/Fungus/Dialog/Scripts/Dialog.cs index 1ffd141b..8480dd69 100644 --- a/Assets/Fungus/Dialog/Scripts/Dialog.cs +++ b/Assets/Fungus/Dialog/Scripts/Dialog.cs @@ -265,17 +265,17 @@ namespace Fungus if (characterTypingSound != null) { - typingAudio.audio.clip = characterTypingSound; + typingAudio.GetComponent().clip = characterTypingSound; } else if (writingSound != null) { - typingAudio.audio.clip = writingSound; + typingAudio.GetComponent().clip = writingSound; } - typingAudio.audio.loop = loopWritingSound; - typingAudio.audio.Play(); + typingAudio.GetComponent().loop = loopWritingSound; + typingAudio.GetComponent().Play(); - dialogText.typingAudio = typingAudio.audio; + dialogText.typingAudio = typingAudio.GetComponent(); } foreach (Token token in parser.tokens) @@ -487,7 +487,7 @@ namespace Fungus return null; } - return go.audio; + return go.GetComponent(); } protected virtual void VerticalPunch(float intensity) diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/ResizeHandle.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/ResizeHandle.png.meta index 958a82e8..3e1acd01 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/ResizeHandle.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/ResizeHandle.png.meta @@ -6,7 +6,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - linearTexture: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,16 +20,20 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 5 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/add.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/add.png.meta index bbc7bd40..9e3f7dfd 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/add.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/add.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/delete.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/delete.png.meta index 37303255..540f1152 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/delete.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/delete.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/down.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/down.png.meta index 93c9b449..86e40469 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/down.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/down.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/duplicate.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/duplicate.png.meta index 1a5fd932..9be12c73 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/duplicate.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/duplicate.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/left.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/left.png.meta index d642ac39..546dd74e 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/left.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/left.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/right.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/right.png.meta index 60f6e482..7c6971a5 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/right.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/right.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/FungusScript/Editor/Resources/Icons/up.png.meta b/Assets/Fungus/FungusScript/Editor/Resources/Icons/up.png.meta index 0ed62966..0a7f9f81 100644 --- a/Assets/Fungus/FungusScript/Editor/Resources/Icons/up.png.meta +++ b/Assets/Fungus/FungusScript/Editor/Resources/Icons/up.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -20,18 +20,22 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: 16 + aniso: 1 mipBias: -1 wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -39,9 +43,11 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 8 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Sprite/Scripts/Draggable2D.cs b/Assets/Fungus/Sprite/Scripts/Draggable2D.cs index b40124fa..8f944591 100644 --- a/Assets/Fungus/Sprite/Scripts/Draggable2D.cs +++ b/Assets/Fungus/Sprite/Scripts/Draggable2D.cs @@ -48,9 +48,9 @@ namespace Fungus Vector3 newPosition = Camera.main.ScreenToWorldPoint(new Vector3(x, y, 10f)); newPosition.z = z; - if (rigidbody2D != null) + if (GetComponent() != null) { - rigidbody2D.MovePosition(newPosition); + GetComponent().MovePosition(newPosition); } else { diff --git a/Assets/Fungus/Sprite/Scripts/SpriteFader.cs b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs index c4db5ad8..416fbdf5 100644 --- a/Assets/Fungus/Sprite/Scripts/SpriteFader.cs +++ b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs @@ -74,7 +74,7 @@ namespace Fungus protected virtual void Start() { - spriteRenderer = renderer as SpriteRenderer; + spriteRenderer = GetComponent() as SpriteRenderer; } protected virtual void Update() diff --git a/Assets/Fungus/Thirdparty/LeanTween/LeanTween.cs b/Assets/Fungus/Thirdparty/LeanTween/LeanTween.cs index 8a5109ed..b1f05b10 100644 --- a/Assets/Fungus/Thirdparty/LeanTween/LeanTween.cs +++ b/Assets/Fungus/Thirdparty/LeanTween/LeanTween.cs @@ -1128,8 +1128,8 @@ public class LTDescr{ SpriteRenderer ren = trans.gameObject.GetComponent(); if(ren!=null){ this.from.x = ren.color.a; - }else if(trans.gameObject.renderer!=null){ - this.from.x = trans.gameObject.renderer.material.color.a; + }else if(trans.gameObject.GetComponent()!=null){ + this.from.x = trans.gameObject.GetComponent().material.color.a; } break; #endif @@ -1214,9 +1214,9 @@ public class LTDescr{ this.from = new Vector3(0.0f, ren2.color.a, 0.0f); this.diff = new Vector3(1.0f,0.0f,0.0f); this.axis = new Vector3( ren2.color.r, ren2.color.g, ren2.color.b ); - }else if(trans.gameObject.renderer!=null){ - if(trans.gameObject.renderer){ - Color col = trans.gameObject.renderer.material.color; + }else if(trans.gameObject.GetComponent()!=null){ + if(trans.gameObject.GetComponent()){ + Color col = trans.gameObject.GetComponent().material.color; this.setFromColor( col ); } } @@ -2108,15 +2108,15 @@ public static void update() { if(ren!=null){ ren.color = new Color( ren.color.r, ren.color.g, ren.color.b, val); }else{ - if(trans.gameObject.renderer!=null){ - foreach(Material mat in trans.gameObject.renderer.materials){ + if(trans.gameObject.GetComponent()!=null){ + foreach(Material mat in trans.gameObject.GetComponent().materials){ mat.color = new Color( mat.color.r, mat.color.g, mat.color.b, val); } } if(trans.childCount>0){ foreach (Transform child in trans) { - if(child.gameObject.renderer!=null){ - foreach(Material mat in child.gameObject.renderer.materials){ + if(child.gameObject.GetComponent()!=null){ + foreach(Material mat in child.gameObject.GetComponent().materials){ mat.color = new Color( mat.color.r, mat.color.g, mat.color.b, val); } } @@ -2139,8 +2139,8 @@ public static void update() { Color toColor = tweenColor(tween, val); // Debug.Log("val:"+val+" tween:"+tween+" tween.diff:"+tween.diff); if(tweenAction==TweenAction.COLOR){ - if(trans.gameObject.renderer!=null){ - foreach(Material mat in trans.gameObject.renderer.materials){ + if(trans.gameObject.GetComponent()!=null){ + foreach(Material mat in trans.gameObject.GetComponent().materials){ mat.color = toColor; } } diff --git a/Assets/Fungus/Thirdparty/iTween/iTween.cs b/Assets/Fungus/Thirdparty/iTween/iTween.cs index 40af2cca..5b5b92a7 100644 --- a/Assets/Fungus/Thirdparty/iTween/iTween.cs +++ b/Assets/Fungus/Thirdparty/iTween/iTween.cs @@ -706,13 +706,13 @@ public class iTween : MonoBehaviour{ //set tempColor and base fromColor: if(target.GetComponent()){ - tempColor=fromColor=target.guiTexture.color; + tempColor=fromColor=target.GetComponent().color; }else if(target.GetComponent()){ - tempColor=fromColor=target.guiText.material.color; - }else if(target.renderer){ - tempColor=fromColor=target.renderer.material.color; - }else if(target.light){ - tempColor=fromColor=target.light.color; + tempColor=fromColor=target.GetComponent().material.color; + }else if(target.GetComponent()){ + tempColor=fromColor=target.GetComponent().material.color; + }else if(target.GetComponent()){ + tempColor=fromColor=target.GetComponent().color; } //set augmented fromColor: @@ -744,13 +744,13 @@ public class iTween : MonoBehaviour{ //apply fromColor: if(target.GetComponent()){ - target.guiTexture.color=fromColor; + target.GetComponent().color=fromColor; }else if(target.GetComponent()){ - target.guiText.material.color=fromColor; - }else if(target.renderer){ - target.renderer.material.color=fromColor; - }else if(target.light){ - target.light.color=fromColor; + target.GetComponent().material.color=fromColor; + }else if(target.GetComponent()){ + target.GetComponent().material.color=fromColor; + }else if(target.GetComponent()){ + target.GetComponent().color=fromColor; } //set new color arg: @@ -948,7 +948,7 @@ public class iTween : MonoBehaviour{ tempAudioSource=(AudioSource)args["audiosource"]; }else{ if(target.GetComponent()){ - tempAudioSource=target.audio; + tempAudioSource=target.GetComponent(); }else{ //throw error if no AudioSource is available: Debug.LogError("iTween Error: AudioFrom requires an AudioSource."); @@ -3334,20 +3334,20 @@ public class iTween : MonoBehaviour{ //from and init to values: if(GetComponent()){ colors = new Color[1,3]; - colors[0,0] = colors[0,1] = guiTexture.color; + colors[0,0] = colors[0,1] = GetComponent().color; }else if(GetComponent()){ colors = new Color[1,3]; - colors[0,0] = colors[0,1] = guiText.material.color; - }else if(renderer){ - colors = new Color[renderer.materials.Length,3]; - for (int i = 0; i < renderer.materials.Length; i++) { - colors[i,0]=renderer.materials[i].GetColor(namedcolorvalue.ToString()); - colors[i,1]=renderer.materials[i].GetColor(namedcolorvalue.ToString()); + colors[0,0] = colors[0,1] = GetComponent().material.color; + }else if(GetComponent()){ + colors = new Color[GetComponent().materials.Length,3]; + for (int i = 0; i < GetComponent().materials.Length; i++) { + colors[i,0]=GetComponent().materials[i].GetColor(namedcolorvalue.ToString()); + colors[i,1]=GetComponent().materials[i].GetColor(namedcolorvalue.ToString()); } //colors[0] = colors[1] = renderer.material.color; - }else if(light){ + }else if(GetComponent()){ colors = new Color[1,3]; - colors[0,0] = colors[0,1] = light.color; + colors[0,0] = colors[0,1] = GetComponent().color; }else{ colors = new Color[1,3]; //empty placeholder incase the GO is perhaps an empty holder or something similar } @@ -3408,7 +3408,7 @@ public class iTween : MonoBehaviour{ audioSource=(AudioSource)tweenArguments["audiosource"]; }else{ if(GetComponent()){ - audioSource=audio; + audioSource=GetComponent(); }else{ //throw error if no AudioSource is available: Debug.LogError("iTween Error: AudioTo requires an AudioSource."); @@ -3434,11 +3434,11 @@ public class iTween : MonoBehaviour{ audioSource=(AudioSource)tweenArguments["audiosource"]; }else{ if(GetComponent()){ - audioSource=audio; + audioSource=GetComponent(); }else{ //add and populate AudioSource if one doesn't exist: gameObject.AddComponent(); - audioSource=audio; + audioSource=GetComponent(); audioSource.playOnAwake=false; } @@ -4110,36 +4110,36 @@ public class iTween : MonoBehaviour{ //apply: if(GetComponent()){ //guiTexture.color=colors[2]; - guiTexture.color=colors[0,2]; + GetComponent().color=colors[0,2]; }else if(GetComponent()){ //guiText.material.color=colors[2]; - guiText.material.color=colors[0,2]; - }else if(renderer){ + GetComponent().material.color=colors[0,2]; + }else if(GetComponent()){ //renderer.material.color=colors[2]; for (int i = 0; i < colors.GetLength(0); i++) { - renderer.materials[i].SetColor(namedcolorvalue.ToString(),colors[i,2]); + GetComponent().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,2]); } - }else if(light){ + }else if(GetComponent()){ //light.color=colors[2]; - light.color=colors[0,2]; + GetComponent().color=colors[0,2]; } //dial in: if(percentage==1){ if(GetComponent()){ //guiTexture.color=colors[1]; - guiTexture.color=colors[0,1]; + GetComponent().color=colors[0,1]; }else if(GetComponent()){ //guiText.material.color=colors[1]; - guiText.material.color=colors[0,1]; - }else if(renderer){ + GetComponent().material.color=colors[0,1]; + }else if(GetComponent()){ //renderer.material.color=colors[1]; for (int i = 0; i < colors.GetLength(0); i++) { - renderer.materials[i].SetColor(namedcolorvalue.ToString(),colors[i,1]); + GetComponent().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,1]); } - }else if(light){ + }else if(GetComponent()){ //light.color=colors[1]; - light.color=colors[0,1]; + GetComponent().color=colors[0,1]; } } } @@ -4198,7 +4198,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.position; if(physics){ thisTransform.position=preUpdate; - rigidbody.MovePosition(postUpdate); + GetComponent().MovePosition(postUpdate); } } @@ -4232,7 +4232,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.position; if(physics){ thisTransform.position=preUpdate; - rigidbody.MovePosition(postUpdate); + GetComponent().MovePosition(postUpdate); } } @@ -4274,7 +4274,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.position; if(physics){ thisTransform.position=preUpdate; - rigidbody.MovePosition(postUpdate); + GetComponent().MovePosition(postUpdate); } } @@ -4335,7 +4335,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.eulerAngles; if(physics){ thisTransform.eulerAngles=preUpdate; - rigidbody.MoveRotation(Quaternion.Euler(postUpdate)); + GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -4357,7 +4357,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.eulerAngles; if(physics){ thisTransform.eulerAngles=preUpdate; - rigidbody.MoveRotation(Quaternion.Euler(postUpdate)); + GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -4413,7 +4413,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.position; if(physics){ thisTransform.position=preUpdate; - rigidbody.MovePosition(postUpdate); + GetComponent().MovePosition(postUpdate); } } @@ -4460,7 +4460,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.eulerAngles; if(physics){ thisTransform.eulerAngles=preUpdate; - rigidbody.MoveRotation(Quaternion.Euler(postUpdate)); + GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -4514,7 +4514,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.position; if(physics){ thisTransform.position=preUpdate; - rigidbody.MovePosition(postUpdate); + GetComponent().MovePosition(postUpdate); } } @@ -4555,7 +4555,7 @@ public class iTween : MonoBehaviour{ postUpdate=thisTransform.eulerAngles; if(physics){ thisTransform.eulerAngles=preUpdate; - rigidbody.MoveRotation(Quaternion.Euler(postUpdate)); + GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -4855,13 +4855,13 @@ public class iTween : MonoBehaviour{ //init values: if(target.GetComponent()){ - colors[0] = colors[1] = target.guiTexture.color; + colors[0] = colors[1] = target.GetComponent().color; }else if(target.GetComponent()){ - colors[0] = colors[1] = target.guiText.material.color; - }else if(target.renderer){ - colors[0] = colors[1] = target.renderer.material.color; - }else if(target.light){ - colors[0] = colors[1] = target.light.color; + colors[0] = colors[1] = target.GetComponent().material.color; + }else if(target.GetComponent()){ + colors[0] = colors[1] = target.GetComponent().material.color; + }else if(target.GetComponent()){ + colors[0] = colors[1] = target.GetComponent().color; } //to values: @@ -4890,13 +4890,13 @@ public class iTween : MonoBehaviour{ //apply: if(target.GetComponent()){ - target.guiTexture.color=colors[3]; + target.GetComponent().color=colors[3]; }else if(target.GetComponent()){ - target.guiText.material.color=colors[3]; - }else if(target.renderer){ - target.renderer.material.color=colors[3]; - }else if(target.light){ - target.light.color=colors[3]; + target.GetComponent().material.color=colors[3]; + }else if(target.GetComponent()){ + target.GetComponent().material.color=colors[3]; + }else if(target.GetComponent()){ + target.GetComponent().color=colors[3]; } } @@ -4951,7 +4951,7 @@ public class iTween : MonoBehaviour{ audioSource=(AudioSource)args["audiosource"]; }else{ if(target.GetComponent()){ - audioSource=target.audio; + audioSource=target.GetComponent(); }else{ //throw error if no AudioSource is available: Debug.LogError("iTween Error: AudioUpdate requires an AudioSource."); @@ -5072,10 +5072,10 @@ public class iTween : MonoBehaviour{ } //need physics? - if(target.rigidbody != null){ + if(target.GetComponent() != null){ Vector3 postUpdate=target.transform.eulerAngles; target.transform.eulerAngles=preUpdate; - target.rigidbody.MoveRotation(Quaternion.Euler(postUpdate)); + target.GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -5281,10 +5281,10 @@ public class iTween : MonoBehaviour{ } //need physics? - if(target.rigidbody != null){ + if(target.GetComponent() != null){ Vector3 postUpdate=target.transform.position; target.transform.position=preUpdate; - target.rigidbody.MovePosition(postUpdate); + target.GetComponent().MovePosition(postUpdate); } } @@ -6018,7 +6018,7 @@ public class iTween : MonoBehaviour{ /// public static void CameraFadeSwap(Texture2D texture){ if(cameraFade){ - cameraFade.guiTexture.texture=texture; + cameraFade.GetComponent().texture=texture; } } @@ -6042,8 +6042,8 @@ public class iTween : MonoBehaviour{ cameraFade = new GameObject("iTween Camera Fade"); cameraFade.transform.position= new Vector3(.5f,.5f,depth); cameraFade.AddComponent(); - cameraFade.guiTexture.texture=texture; - cameraFade.guiTexture.color = new Color(.5f,.5f,.5f,0); + cameraFade.GetComponent().texture=texture; + cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); return cameraFade; } } @@ -6065,8 +6065,8 @@ public class iTween : MonoBehaviour{ cameraFade = new GameObject("iTween Camera Fade"); cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); cameraFade.AddComponent(); - cameraFade.guiTexture.texture=texture; - cameraFade.guiTexture.color = new Color(.5f,.5f,.5f,0); + cameraFade.GetComponent().texture=texture; + cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); return cameraFade; } } @@ -6085,8 +6085,8 @@ public class iTween : MonoBehaviour{ cameraFade = new GameObject("iTween Camera Fade"); cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); cameraFade.AddComponent(); - cameraFade.guiTexture.texture=CameraTexture(Color.black); - cameraFade.guiTexture.color = new Color(.5f,.5f,.5f,0); + cameraFade.GetComponent().texture=CameraTexture(Color.black); + cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); return cameraFade; } } @@ -6828,7 +6828,7 @@ public class iTween : MonoBehaviour{ } //do we need to use physics, is there a rigidbody? - if(rigidbody != null){ + if(GetComponent() != null){ physics=true; } diff --git a/Assets/FungusExamples/Sherlock/Images/background.jpg b/Assets/FungusExamples/Sherlock/Images/background.jpg new file mode 100644 index 00000000..f3f1603b Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Images/background.jpg differ diff --git a/Assets/FungusExamples/Sherlock/Images/background.jpg.meta b/Assets/FungusExamples/Sherlock/Images/background.jpg.meta new file mode 100644 index 00000000..13d22156 --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Images/background.jpg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 0e9767bc88b404362852d1a4d5c0d103 +timeCreated: 1425509366 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FungusExamples/Sherlock/TheExperiment.unity b/Assets/FungusExamples/Sherlock/TheExperiment.unity index 99c69d0a..3d961c21 100644 --- a/Assets/FungusExamples/Sherlock/TheExperiment.unity +++ b/Assets/FungusExamples/Sherlock/TheExperiment.unity @@ -12,57 +12,70 @@ SceneSettings: backfaceThreshold: 100 --- !u!104 &2 RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 m_Fog: 0 m_FogColor: {r: .5, g: .5, b: .5, a: 1} m_FogMode: 3 m_FogDensity: .00999999978 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientLight: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 m_SkyboxMaterial: {fileID: 0} m_HaloStrength: .5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 0} - m_ObjectHideFlags: 0 + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} --- !u!127 &3 LevelGameManager: m_ObjectHideFlags: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - m_LightProbes: {fileID: 0} - m_Lightmaps: [] + serializedVersion: 5 + m_GIWorkflowMode: 1 m_LightmapsMode: 1 - m_BakedColorSpace: 0 - m_UseDualLightmapsInForward: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - m_Resolution: 50 - m_LastUsedResolution: 0 + serializedVersion: 3 + m_Resolution: 1 + m_BakeResolution: 50 m_TextureWidth: 1024 m_TextureHeight: 1024 - m_BounceBoost: 1 - m_BounceIntensity: 1 - m_SkyLightColor: {r: .860000014, g: .930000007, b: 1, a: 1} - m_SkyLightIntensity: 0 - m_Quality: 0 - m_Bounces: 1 - m_FinalGatherRays: 1000 - m_FinalGatherContrastThreshold: .0500000007 - m_FinalGatherGradientThreshold: 0 - m_FinalGatherInterpolationPoints: 15 - m_AOAmount: 0 - m_AOMaxDistance: .100000001 - m_AOContrast: 1 - m_LODSurfaceMappingDistance: 1 - m_Padding: 0 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} m_TextureCompression: 0 - m_LockAtlas: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: + serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: + serializedVersion: 2 agentRadius: .5 agentHeight: 2 agentSlope: 45 @@ -71,9 +84,9 @@ NavMeshSettings: maxJumpAcrossDistance: 0 accuratePlacement: 0 minRegionArea: 2 - widthInaccuracy: 16.666666 - heightInaccuracy: 10 - m_NavMesh: {fileID: 0} + cellSize: .166666657 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} --- !u!1 &31336593 GameObject: m_ObjectHideFlags: 0 @@ -99,17 +112,21 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 4cb7c889915644b22a94212146500698, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!4 &31336595 @@ -176,7 +193,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 44771030} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 61bed2868b732754d8642fd8cf3ea4f1, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -211,7 +229,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -227,6 +245,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &45494602 GameObject: m_ObjectHideFlags: 0 @@ -279,7 +307,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 45494602} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: cf4986a7000bafc498f65f9d71ab28d1, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -314,7 +343,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -330,6 +359,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &96969494 GameObject: m_ObjectHideFlags: 0 @@ -382,7 +421,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 96969494} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 682fe1817a668354d986bb418c9a75fe, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -417,7 +457,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -433,6 +473,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &137130842 GameObject: m_ObjectHideFlags: 0 @@ -609,7 +659,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 192678704} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: be122d5e134d8fb46a8f0d559bf85f08, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -644,7 +695,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -660,6 +711,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &236204400 GameObject: m_ObjectHideFlags: 0 @@ -684,7 +745,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 236204400} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f3c866bbc4639e7409c30c71736d84a6, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -719,7 +781,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -735,6 +797,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!4 &236204402 Transform: m_ObjectHideFlags: 0 @@ -799,7 +871,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 329016564} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 72d43fdfb85cbb04187e145717cfc970, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -834,7 +907,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -850,70 +923,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 ---- !u!1 &356307618 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 356307619} - - 222: {fileID: 356307621} - - 114: {fileID: 356307620} - m_Layer: 0 - m_Name: Middle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &356307619 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 356307618} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 519370006} - m_RootOrder: 0 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 0, y: 200} - m_SizeDelta: {x: 1000, y: 1000} - m_Pivot: {x: .5, y: 0} ---- !u!114 &356307620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 356307618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &356307621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 356307618} + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &370749684 GameObject: m_ObjectHideFlags: 0 @@ -1122,181 +1141,11 @@ Transform: - {fileID: 170680004} m_Father: {fileID: 900000111} m_RootOrder: 1 ---- !u!1 &501235099 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 501235100} - - 222: {fileID: 501235102} - - 114: {fileID: 501235101} - m_Layer: 0 - m_Name: Right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &501235100 RectTransform: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 501235099} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 519370006} - m_RootOrder: 2 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 449.999969, y: 200.000031} - m_SizeDelta: {x: 1000, y: 1000} - m_Pivot: {x: .5, y: 0} ---- !u!114 &501235101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 501235099} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &501235102 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 501235099} ---- !u!1 &519370005 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 519370006} - - 223: {fileID: 519370010} - - 114: {fileID: 519370009} - - 114: {fileID: 519370008} - - 225: {fileID: 519370007} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &519370006 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 519370005} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 356307619} - - {fileID: 1210274190} - - {fileID: 501235100} - - {fileID: 744080994} - - {fileID: 1195464370} - m_Father: {fileID: 876464347} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!225 &519370007 -CanvasGroup: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 519370005} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &519370008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 519370005} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1600, y: 1200} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &519370009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 519370005} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - ignoreReversedGraphics: 1 - blockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!223 &519370010 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 519370005} - m_Enabled: 1 - serializedVersion: 2 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 1 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 --- !u!1 &529798542 GameObject: m_ObjectHideFlags: 0 @@ -1349,7 +1198,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 529798542} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 2c83109679b046a45a12f2ab05210351, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -1384,7 +1234,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1400,6 +1250,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &551306621 GameObject: m_ObjectHideFlags: 0 @@ -1436,7 +1296,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 551306621} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: c467b39701f3e0644b3361508f474021, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -1471,7 +1332,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1487,6 +1348,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &562066060 GameObject: m_ObjectHideFlags: 1 @@ -1579,7 +1450,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 640435491} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 70f3ad5c22ae4f442a18b2784b073d44, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -1614,7 +1486,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1630,6 +1502,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &666196620 GameObject: m_ObjectHideFlags: 0 @@ -1666,7 +1548,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 666196620} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 9e747544e092d9543b6d81b14434358e, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -1701,7 +1584,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1717,6 +1600,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &673632344 GameObject: m_ObjectHideFlags: 0 @@ -1856,7 +1749,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 720879692} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e513fc9af808b8c438338e58bc17a700, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -1891,7 +1785,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1907,6 +1801,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!4 &720879694 Transform: m_ObjectHideFlags: 0 @@ -1919,70 +1823,11 @@ Transform: m_Children: [] m_Father: {fileID: 1094705496} m_RootOrder: 1 ---- !u!1 &744080993 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 744080994} - - 222: {fileID: 744080996} - - 114: {fileID: 744080995} - m_Layer: 0 - m_Name: Offscreen Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &744080994 RectTransform: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 744080993} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 519370006} - m_RootOrder: 3 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: -1000, y: 200} - m_SizeDelta: {x: 1000, y: 1000} - m_Pivot: {x: .5, y: 0} ---- !u!114 &744080995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 744080993} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &744080996 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 744080993} --- !u!1 &766320848 GameObject: m_ObjectHideFlags: 0 @@ -2062,7 +1907,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 855733322} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: bae673dd6cc6a3a4bba065590ad3e41c, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -2097,7 +1943,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2113,62 +1959,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 ---- !u!1 &876464346 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 4: {fileID: 876464347} - - 114: {fileID: 876464348} - m_Layer: 0 - m_Name: Stage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &876464347 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 876464346} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 519370006} - m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!114 &876464348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 876464346} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6f6478b25a400c642b2dee75f022ab12, type: 3} - m_Name: - m_EditorClassIdentifier: - portraitCanvas: {fileID: 519370010} - dimPortraits: 1 - fadeDuration: .5 - moveSpeed: 800 - fadeEaseType: 1 - moveEaseType: 4 - shiftOffset: {x: 0, y: 0} - defaultPosition: {fileID: 356307620} - positions: - - {fileID: 1210274190} - - {fileID: 356307619} - - {fileID: 501235100} - - {fileID: 744080994} - - {fileID: 1195464370} - charactersOnStage: [] + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &884427799 GameObject: m_ObjectHideFlags: 0 @@ -2206,17 +2006,21 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 4b0730798d1d046d19e939e0717e5704, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &898034485 @@ -2271,7 +2075,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 898034485} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 40c43dcdccf69ed46b85dd1dc5566184, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -2306,7 +2111,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2322,6 +2127,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &900000110 GameObject: m_ObjectHideFlags: 0 @@ -2566,7 +2381,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1103817140} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 08ed144a85c2c844ab568517982e0924, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -2601,7 +2417,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2617,6 +2433,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1105015582 GameObject: m_ObjectHideFlags: 0 @@ -2697,7 +2523,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1116253974} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 8b619861be9f614458920a34a125727f, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -2732,7 +2559,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2748,6 +2575,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1167501257 GameObject: m_ObjectHideFlags: 0 @@ -2782,134 +2619,16 @@ Transform: - {fileID: 855733323} m_Father: {fileID: 1094705496} m_RootOrder: 2 ---- !u!1 &1195464369 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1195464370} - - 222: {fileID: 1195464372} - - 114: {fileID: 1195464371} - m_Layer: 0 - m_Name: Offscreen Right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &1195464370 RectTransform: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1195464369} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 519370006} - m_RootOrder: 4 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 1000, y: 200} - m_SizeDelta: {x: 1000, y: 1000} - m_Pivot: {x: .5, y: 0} ---- !u!114 &1195464371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1195464369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1195464372 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1195464369} ---- !u!1 &1210274189 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1297790152} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1210274190} - - 222: {fileID: 1210274192} - - 114: {fileID: 1210274191} - m_Layer: 0 - m_Name: Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &1210274190 RectTransform: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1210274189} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 519370006} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: -450, y: 200} - m_SizeDelta: {x: 1000, y: 1000} - m_Pivot: {x: .5, y: 0} ---- !u!114 &1210274191 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1210274189} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1210274192 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 1297790152} - m_GameObject: {fileID: 1210274189} --- !u!1 &1275731804 GameObject: m_ObjectHideFlags: 0 @@ -3006,7 +2725,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1286984889} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: d64bcc814caf23c41ba706c2d4f06724, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -3041,7 +2761,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -3057,6 +2777,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1001 &1297790152 Prefab: m_ObjectHideFlags: 0 @@ -3106,9 +2836,7 @@ Prefab: objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_RootGameObject: {fileID: 876464346} m_IsPrefabParent: 0 - m_IsExploded: 1 --- !u!1 &1345583021 GameObject: m_ObjectHideFlags: 0 @@ -3161,7 +2889,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1345583021} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e15cd033e8242884fa44bbbffb3635e4, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -3196,7 +2925,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -3212,6 +2941,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1361872517 GameObject: m_ObjectHideFlags: 0 @@ -3248,7 +2987,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1361872517} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 753c104435015c240a34199227ab10be, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -3283,7 +3023,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -3299,6 +3039,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1390555290 GameObject: m_ObjectHideFlags: 0 @@ -3429,7 +3179,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 050fb9e6e72f442b3b883da8a965bdeb, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 73 errorMessage: indentLevel: 0 targetSequence: {fileID: 1390555371} @@ -3444,7 +3193,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 841589fc622bc494aa5405f416fa1301, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 77 errorMessage: indentLevel: 0 text: Don't drink the coffee @@ -3475,7 +3223,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 841589fc622bc494aa5405f416fa1301, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 76 errorMessage: indentLevel: 0 text: Drink the coffee @@ -3504,7 +3251,7 @@ MonoBehaviour: y: -1729.35046 width: 5969.4458 height: 2818.85034 - selectedSequence: {fileID: 0} + selectedSequence: {fileID: 1390555307} selectedCommands: [] variables: [] description: 'Example scene from Sherlock: The Game Is On' @@ -3512,9 +3259,6 @@ MonoBehaviour: colorCommands: 1 hideComponents: 1 saveSelection: 1 - showCommandId: 0 - nextCommandId: 92 - stringsFile: {fileID: 4900000, guid: e9ded407de19f427591c7778cf80b506, type: 3} --- !u!4 &1390555296 Transform: m_ObjectHideFlags: 0 @@ -3539,7 +3283,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 30 errorMessage: indentLevel: 0 storyText: ' Here, I need you to drink this.' @@ -3614,7 +3357,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 64 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -3644,7 +3386,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 75 errorMessage: indentLevel: 0 storyText: '{t}(Do I really want to do this?){/t}' @@ -3669,7 +3410,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 841589fc622bc494aa5405f416fa1301, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 79 errorMessage: indentLevel: 0 text: Leave @@ -3720,7 +3460,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 050fb9e6e72f442b3b883da8a965bdeb, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 17 errorMessage: indentLevel: 0 targetSequence: {fileID: 1390555304} @@ -3763,7 +3502,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 841589fc622bc494aa5405f416fa1301, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 78 errorMessage: indentLevel: 0 text: Talk to Sherlock. @@ -3781,7 +3519,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 80 errorMessage: indentLevel: 0 storyText: (What should I do now?) @@ -3867,7 +3604,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1dc785fd3508440db335f3b5654c96c, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 15 errorMessage: indentLevel: 0 chooseText: '{t}Changed your mind?{/t}' @@ -3888,7 +3624,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a61ea20fbb744ca2a363c33ad65cd89, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 16 errorMessage: indentLevel: 0 variable: {fileID: 0} @@ -3920,7 +3655,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a61ea20fbb744ca2a363c33ad65cd89, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 14 errorMessage: indentLevel: 0 variable: {fileID: 0} @@ -3997,7 +3731,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 23 errorMessage: indentLevel: 0 storyText: "Hmm... I'll have to revise my {clue}hypothesis\u2026" @@ -4023,7 +3756,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 22 errorMessage: indentLevel: 0 storyText: Wait, {question}{flash=0.1}what? @@ -4049,7 +3781,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 21 errorMessage: indentLevel: 0 storyText: 'No, that''s not right. ' @@ -4075,7 +3806,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 20 errorMessage: indentLevel: 0 storyText: '{worried}Like an idiot who should stop encouraging you.' @@ -4101,7 +3831,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 1 errorMessage: indentLevel: 0 storyText: All right. It's been 30 minutes. How do you feel? @@ -4127,7 +3856,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 207aecf668a0345388087ccf522f9957, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 19 errorMessage: indentLevel: 0 duration: 1 @@ -4147,7 +3875,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 207aecf668a0345388087ccf522f9957, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 18 errorMessage: indentLevel: 0 duration: 1 @@ -4167,7 +3894,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 0 errorMessage: indentLevel: 0 storyText: '{answer}Excellent.' @@ -4193,7 +3919,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 5 errorMessage: indentLevel: 0 storyText: Suit yourself. @@ -4219,7 +3944,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 4 errorMessage: indentLevel: 0 storyText: '{shout}Still not ok{wp},{/wp} Sherlock!' @@ -4245,7 +3969,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 3 errorMessage: indentLevel: 0 storyText: The hallucinogen was in the {answer}gas, not the coffee. @@ -4271,7 +3994,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 2 errorMessage: indentLevel: 0 storyText: No thanks. The last time I drank your coffee, I spent the day running @@ -4309,7 +4031,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 74 errorMessage: indentLevel: 0 storyText: Of course. @@ -4335,7 +4056,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 12 errorMessage: indentLevel: 0 storyText: "Why don't you test it yourself?\r" @@ -4361,7 +4081,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 11 errorMessage: indentLevel: 0 storyText: '{clue}Your words inspire such confidence.' @@ -4387,7 +4106,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 10 errorMessage: indentLevel: 0 storyText: It's for an experiment. @@ -4413,7 +4131,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 9 errorMessage: indentLevel: 0 storyText: "{worried}... Why?\r\n" @@ -4439,7 +4156,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 8 errorMessage: indentLevel: 0 storyText: '{answer}{flash=0.1}Well you arrived at just the right time.' @@ -4465,7 +4181,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 7 errorMessage: indentLevel: 0 storyText: '{confused}I do live here, you know.' @@ -4491,7 +4206,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 13 errorMessage: indentLevel: 0 storyText: '{question}I can''t observe the effects of the experiment if I''m the @@ -4518,7 +4232,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 6 errorMessage: indentLevel: 0 storyText: THE EXPERIMENT @@ -4543,7 +4256,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 050fb9e6e72f442b3b883da8a965bdeb, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 86 errorMessage: indentLevel: 0 targetSequence: {fileID: 1390555298} @@ -4559,7 +4271,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 050fb9e6e72f442b3b883da8a965bdeb, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 24 errorMessage: indentLevel: 0 targetSequence: {fileID: 1390555440} @@ -4575,7 +4286,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 29 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4606,7 +4316,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 28 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4637,7 +4346,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 33 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 1789234734} @@ -4656,7 +4364,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 32 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 1789234734} @@ -4675,7 +4382,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 31 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4706,7 +4412,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 27 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4737,7 +4442,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 26 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4767,7 +4471,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 72 errorMessage: indentLevel: 0 control: 2 @@ -4788,7 +4491,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 25 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4819,7 +4521,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 40 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4850,7 +4551,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 39 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4881,7 +4581,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 37 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4912,7 +4611,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 38 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -4943,7 +4641,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 35 errorMessage: indentLevel: 0 storyText: ' Don''t worry. It won''t kill you.' @@ -4969,7 +4666,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 36 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5000,7 +4696,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 34 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5030,7 +4725,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 63 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5060,7 +4754,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 65 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5090,7 +4783,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 66 errorMessage: indentLevel: 0 storyText: Right.... Good luck with that. @@ -5115,7 +4807,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 67 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5145,7 +4836,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 85 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 1612042692} @@ -5163,7 +4853,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 84 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 884427801} @@ -5181,7 +4870,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 83 errorMessage: indentLevel: 0 duration: 2 @@ -5196,7 +4884,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 82 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 1612042692} @@ -5242,7 +4929,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 207aecf668a0345388087ccf522f9957, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 57 errorMessage: indentLevel: 0 duration: 1 @@ -5261,7 +4947,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 56 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5291,7 +4976,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 55 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5321,7 +5005,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 58 errorMessage: indentLevel: 0 storyText: Ah John, {pleased}there you are. @@ -5346,7 +5029,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 207aecf668a0345388087ccf522f9957, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 71 errorMessage: indentLevel: 0 duration: 1 @@ -5365,7 +5047,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 68 errorMessage: indentLevel: 0 control: 2 @@ -5385,7 +5066,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 70 errorMessage: indentLevel: 0 storyText: Your {stat-up}courage{/stat-up} has increased! @@ -5410,7 +5090,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1ff0f540016ff64ab1556db6fe1e10f, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 69 errorMessage: indentLevel: 0 display: 2 @@ -5456,7 +5135,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 54 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5486,7 +5164,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 53 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5516,7 +5193,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 52 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5546,7 +5222,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 51 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5576,7 +5251,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 50 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5606,7 +5280,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 49 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5636,7 +5309,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 48 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5666,7 +5338,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 47 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5696,7 +5367,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 46 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5726,7 +5396,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 45 errorMessage: indentLevel: 0 storyText: '{shout}No nausea? {shout}Dizziness? {shout}Feeling of sudden and impending @@ -5752,7 +5421,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 44 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5782,7 +5450,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 43 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5812,7 +5479,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 42 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5842,7 +5508,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 41 errorMessage: indentLevel: 0 stage: {fileID: 0} @@ -5872,7 +5537,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 81 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 31336594} @@ -5890,7 +5554,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 91 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 884427801} @@ -5908,7 +5571,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accc065c3e9a6457496f075b1bd49adc, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 90 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 31336594} @@ -5926,7 +5588,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 61 errorMessage: indentLevel: 0 control: 1 @@ -5946,7 +5607,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 62 errorMessage: indentLevel: 0 control: 0 @@ -5966,7 +5626,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 59 errorMessage: indentLevel: 0 control: 2 @@ -5986,7 +5645,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc30c92f7ffe3d746ac76cd528d616e5, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 60 errorMessage: indentLevel: 0 control: 1 @@ -6006,7 +5664,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 10cd462c89cb047158ccfb8a8df3f60a, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 88 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 884427801} @@ -6022,7 +5679,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 10cd462c89cb047158ccfb8a8df3f60a, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 89 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 31336594} @@ -6038,7 +5694,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 10cd462c89cb047158ccfb8a8df3f60a, type: 3} m_Name: m_EditorClassIdentifier: - commandId: 87 errorMessage: indentLevel: 0 spriteRenderer: {fileID: 1612042692} @@ -6106,7 +5761,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1403072068} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e794f7f8b387c4242a6e1e61f1c85b17, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -6141,7 +5797,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -6157,6 +5813,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1612042690 GameObject: m_ObjectHideFlags: 0 @@ -6194,17 +5860,21 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: eea3b26b25ca249f58d5659aabf1114c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1632237022 @@ -6243,7 +5913,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1632237022} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f5ffbadf97e0bd24bae41734cf28d2da, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -6278,7 +5949,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -6294,6 +5965,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &1657662358 GameObject: m_ObjectHideFlags: 0 @@ -6367,6 +6048,7 @@ Transform: - {fileID: 1612042691} - {fileID: 884427800} - {fileID: 31336595} + - {fileID: 2016355052} m_Father: {fileID: 0} m_RootOrder: 5 --- !u!1 &1789234733 @@ -6395,17 +6077,21 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: bcd5b5f11de95ec4ba92005e4a404502, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} --- !u!4 &1789234735 @@ -6577,7 +6263,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1986911339} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 476f002f45c7655408b9e7b1fa186f26, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -6612,7 +6299,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -6628,6 +6315,70 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 +--- !u!1 &2016355051 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2016355052} + - 212: {fileID: 2016355053} + m_Layer: 0 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2016355052 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2016355051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1782167289} + m_RootOrder: 4 +--- !u!212 &2016355053 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2016355051} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0e9767bc88b404362852d1a4d5c0d103, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &2021409966 GameObject: m_ObjectHideFlags: 0 @@ -6680,7 +6431,8 @@ AudioSource: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2021409966} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a84a8e1a17e158c48b4d308292df81db, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -6715,7 +6467,7 @@ AudioSource: serializedVersion: 2 m_Curve: - time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -6731,6 +6483,16 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!1 &2072265256 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c0b229ca..3b5ba35d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,4 +6,4 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/FungusExamples/TheHunter/TheHunter.unity + path: Assets/FungusExamples/Sherlock/TheExperiment.unity diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 7bb5d16a..280a9fdc 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,8 +3,27 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 3 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_LightmapStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDirSeparate: 1 + m_LightmapKeepDynamic: 1 + m_FogStripping: 0 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 00000000..79cb3ae9 --- /dev/null +++ b/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshLayers: + m_ObjectHideFlags: 0 + Built-in Layer 0: + name: Default + cost: 1 + editType: 2 + Built-in Layer 1: + name: Not Walkable + cost: 1 + editType: 0 + Built-in Layer 2: + name: Jump + cost: 2 + editType: 2 + User Layer 0: + name: + cost: 1 + editType: 3 + User Layer 1: + name: + cost: 1 + editType: 3 + User Layer 2: + name: + cost: 1 + editType: 3 + User Layer 3: + name: + cost: 1 + editType: 3 + User Layer 4: + name: + cost: 1 + editType: 3 + User Layer 5: + name: + cost: 1 + editType: 3 + User Layer 6: + name: + cost: 1 + editType: 3 + User Layer 7: + name: + cost: 1 + editType: 3 + User Layer 8: + name: + cost: 1 + editType: 3 + User Layer 9: + name: + cost: 1 + editType: 3 + User Layer 10: + name: + cost: 1 + editType: 3 + User Layer 11: + name: + cost: 1 + editType: 3 + User Layer 12: + name: + cost: 1 + editType: 3 + User Layer 13: + name: + cost: 1 + editType: 3 + User Layer 14: + name: + cost: 1 + editType: 3 + User Layer 15: + name: + cost: 1 + editType: 3 + User Layer 16: + name: + cost: 1 + editType: 3 + User Layer 17: + name: + cost: 1 + editType: 3 + User Layer 18: + name: + cost: 1 + editType: 3 + User Layer 19: + name: + cost: 1 + editType: 3 + User Layer 20: + name: + cost: 1 + editType: 3 + User Layer 21: + name: + cost: 1 + editType: 3 + User Layer 22: + name: + cost: 1 + editType: 3 + User Layer 23: + name: + cost: 1 + editType: 3 + User Layer 24: + name: + cost: 1 + editType: 3 + User Layer 25: + name: + cost: 1 + editType: 3 + User Layer 26: + name: + cost: 1 + editType: 3 + User Layer 27: + name: + cost: 1 + editType: 3 + User Layer 28: + name: + cost: 1 + editType: 3 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6e0cad5b..28f888ce 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,15 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 2 targetDevice: 2 targetGlesGraphics: 1 + targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: Fungus - productName: Fungus + productName: Sherlock + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} defaultScreenWidth: 2000 @@ -27,6 +29,7 @@ PlayerSettings: m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 + iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -34,16 +37,16 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 - use24BitDepthBuffer: 1 + disableDepthAndStencilBuffers: 0 defaultIsFullScreen: 0 defaultIsNativeResolution: 1 runInBackground: 0 captureSingleScreen: 0 Override IPod Music: 0 Prepare IOS For Recording: 0 - enableHWStatistics: 1 + submitAnalytics: 1 usePlayerLog: 1 - stripPhysics: 0 + bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 @@ -53,23 +56,31 @@ PlayerSettings: xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 + visibleInBackground: 0 macFullscreenMode: 2 d3d9FullscreenMode: 1 + d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + xboxOneResolution: 0 + ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 + psp2PowerMode: 0 + psp2AcquireBGM: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - iPhoneBundleIdentifier: com.fungus.example + bundleIdentifier: com.fungus.sherlock + bundleVersion: 1.0 + preloadedAssets: [] metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 + xboxOneDisableKinectGpuReservation: 0 productGUID: 47d9f350ed27d4ecaa6699f3ebe641c8 - iPhoneBundleVersion: 1.0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -81,9 +92,10 @@ PlayerSettings: ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 + preloadShaders: 0 StripUnusedMeshComponents: 0 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 16 + iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIStatusBarHidden: 1 @@ -92,14 +104,32 @@ PlayerSettings: iPhoneSplashScreen: {fileID: 0} iPhoneHighResSplashScreen: {fileID: 0} iPhoneTallHighResSplashScreen: {fileID: 0} + iPhone47inSplashScreen: {fileID: 0} + iPhone55inPortraitSplashScreen: {fileID: 0} + iPhone55inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iOSLaunchScreenType: 0 + iOSLaunchScreenPortrait: {fileID: 0} + iOSLaunchScreenLandscape: {fileID: 0} + iOSLaunchScreenBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreenFillPct: 1 + iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 AndroidKeystoreName: AndroidKeyaliasName: + AndroidTVCompatibility: 1 + AndroidIsGame: 1 + androidEnableBanner: 1 + m_AndroidBanners: + - width: 320 + height: 180 + banner: {fileID: 0} resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - m_BuildTarget: @@ -112,6 +142,11 @@ PlayerSettings: m_DynamicBatching: 1 webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + actionOnDotNetUnhandledException: 1 + enableInternalProfiler: 0 + logObjCUncaughtExceptions: 1 + enableCrashReportAPI: 0 + locationUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -127,6 +162,7 @@ PlayerSettings: ps3ThumbnailPath: ps3BackgroundPath: ps3SoundPath: + ps3NPAgeRating: 12 ps3TrophyCommId: ps3NpCommunicationPassphrase: ps3TrophyPackagePath: @@ -134,15 +170,65 @@ PlayerSettings: ps3TrophyCommSig: ps3SaveGameSlots: 1 ps3TrialMode: 0 + ps3VideoMemoryForAudio: 0 + ps3EnableVerboseMemoryStats: 0 + ps3UseSPUForUmbra: 0 + ps3EnableMoveSupport: 1 + ps3DisableDolbyEncoding: 0 + ps4NPAgeRating: 12 + ps4NPTitleSecret: + ps4NPTrophyPackPath: + ps4ParentalLevel: 1 + ps4ContentID: ED1633-NPXX51362_00-0000000000000000 + ps4Category: 0 + ps4MasterVersion: 01.00 + ps4AppVersion: 01.00 + ps4AppType: 0 + ps4ParamSfxPath: + ps4VideoOutPixelFormat: 0 + ps4VideoOutResolution: 4 + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4SaveDataImagePath: + ps4BGMPath: + ps4ShareFilePath: + ps4NPtitleDatPath: + ps4RemotePlayKeyAssignment: -1 + ps4EnterButtonAssignment: 1 + ps4ApplicationParam1: 0 + ps4ApplicationParam2: 0 + ps4ApplicationParam3: 0 + ps4ApplicationParam4: 0 + ps4Passcode: 5PN2qmWqBlQ9wQj99nsQzldVI5ZuGXbE + ps4pnSessions: 1 + ps4pnPresence: 1 + ps4pnFriends: 1 + ps4pnGameCustomData: 1 + playerPrefsSupport: 0 + monoEnv: psp2Splashimage: {fileID: 0} - psp2LiveAreaGate: {fileID: 0} - psp2LiveAreaBackround: {fileID: 0} psp2NPTrophyPackPath: + psp2NPSupportGBMorGJP: 0 + psp2NPAgeRating: 12 psp2NPCommsID: + psp2NPCommunicationsID: psp2NPCommsPassphrase: psp2NPCommsSig: psp2ParamSfxPath: + psp2ManualPath: + psp2LiveAreaGatePath: + psp2LiveAreaBackroundPath: + psp2LiveAreaPath: + psp2LiveAreaTrialPath: + psp2PatchChangeInfoPath: + psp2PatchOriginalPackage: psp2PackagePassword: + psp2KeystoneFile: + psp2DRMType: 0 + psp2StorageType: 0 + psp2MediaCapacity: 0 psp2DLCConfigPath: psp2ThumbnailPath: psp2BackgroundPath: @@ -150,7 +236,23 @@ PlayerSettings: psp2TrophyCommId: psp2TrophyPackagePath: psp2PackagedResourcesPath: - flashStrippingLevel: 2 + psp2SaveDataQuota: 10240 + psp2ParentalLevel: 1 + psp2ShortTitle: Not Set + psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF + psp2Category: 0 + psp2MasterVersion: 01.00 + psp2AppVersion: 01.00 + psp2TVBootMode: 0 + psp2EnterButtonAssignment: 2 + psp2TVDisableEmu: 0 + psp2AllowTwitterDialog: 1 + psp2Upgradable: 0 + psp2HealthWarning: 0 + psp2UseLibLocation: 0 + psp2InfoBarOnStartup: 0 + psp2InfoBarColor: 0 + psmSplashimage: {fileID: 0} spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: Fungus @@ -214,8 +316,10 @@ PlayerSettings: metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 - metroCapabilities: {} - metroUnprocessedPlugins: [] + platformCapabilities: {} + metroFTAName: + metroFTAFileTypes: [] + metroProtocolName: metroCompilationOverrides: 1 blackberryDeviceAddress: blackberryDevicePassword: @@ -223,10 +327,8 @@ PlayerSettings: blackberryTokenExires: blackberryTokenAuthor: blackberryTokenAuthorId: - blackberryAuthorId: blackberryCskPassword: blackberrySaveLogPath: - blackberryAuthorIdOveride: 0 blackberrySharedPermissions: 0 blackberryCameraPermissions: 0 blackberryGPSPermissions: 0 @@ -244,7 +346,47 @@ PlayerSettings: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 stvDeviceAddress: + stvProductDescription: + stvProductAuthor: + stvProductAuthorEmail: + stvProductLink: + stvProductCategory: 0 + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: + XboxOnePackageEncryption: 0 + XboxOneDescription: + XboxOneIsContentPackage: 0 + XboxOneEnableGPUVariability: 0 + XboxOneSockets: {} + XboxOneSplashScreen: {fileID: 0} + XboxOneAllowedProductIds: [] + XboxOnePersistentLocalStorageSize: 0 + intPropertyNames: + - WebGL::ScriptingBackend + - WebGL::audioCompressionFormat + - WebGL::exceptionSupport + - WebGL::memorySize + - iOS::Architecture + - iOS::ScriptingBackend + WebGL::ScriptingBackend: 1 + WebGL::audioCompressionFormat: 4 + WebGL::exceptionSupport: 0 + WebGL::memorySize: 256 + iOS::Architecture: 2 + iOS::ScriptingBackend: 0 + boolPropertyNames: + - WebGL::dataCaching + WebGL::dataCaching: 0 + stringPropertyNames: + - WebGL::emscriptenArgs + - WebGL::template + WebGL::emscriptenArgs: + WebGL::template: APPLICATION:Default firstStreamedLevelWithResources: 0 - unityRebuildLibraryVersion: 9 - unityForwardCompatibleVersion: 39 - unityStandardAssetsVersion: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt new file mode 100644 index 00000000..b0ac5107 --- /dev/null +++ b/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 5.0.0f4 +m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index cfd65fa4..32a2f6e8 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -14,12 +14,16 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 vSyncCount: 0 lodBias: .300000012 maximumLODLevel: 0 @@ -33,12 +37,16 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 vSyncCount: 0 lodBias: .400000006 maximumLODLevel: 0 @@ -52,12 +60,16 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 vSyncCount: 0 lodBias: .699999988 maximumLODLevel: 0 @@ -71,12 +83,16 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 @@ -90,12 +106,16 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 70 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 @@ -109,28 +129,19 @@ QualitySettings: shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 + shadowCascade2Split: .333333343 + shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 particleRaycastBudget: 4096 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - BlackBerry: 2 - FlashPlayer: 3 - GLES Emulation: 3 - PS3: 3 - Standalone: 3 - Tizen: 2 - WP8: 3 - Web: 3 - Wii: 3 - Windows Store Apps: 3 - XBOX360: 3 - iPhone: 2 + m_PerPlatformDefaultQuality: {}