Tweak visuals, clean up scenes

2020-04-21 01:54:30 +03:00 · 2020-04-21 01:54:30 +03:00 · 866e3c7d92
commit 866e3c7d92
parent deacdd8d3f
25 changed files with 17232 additions and 19900 deletions
--- a/Assets/Scenes/MainScene.meta
+++ b/Assets/Scenes/MainScene.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 78195a226bad19448af98964166e74fa
+guid: fbcce026495ea4946b8cdf93f437e88a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Processing/Camp
+++ b/Processing/Camp
--- a/Assets/Scenes/MainScene/LightingData.asset.meta
+++ b/Assets/Scenes/MainScene/LightingData.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4c54bfc6cb6f54a40b9a005e6c39375c
+guid: 75c13987a1f059b4c9a659cb090dac8c
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Scenes/MainScene_Profiles/Global
+++ b/Assets/Scenes/MainScene_Profiles/Global
@ -54,7 +54,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
-  m_Name: Global Post-process Volume Profile
+  m_Name: Global Profile
  m_EditorClassIdentifier: 
  settings:
  - {fileID: 4497101660291343525}
--- a/Assets/Scenes/MainScene_Profiles/Global
+++ b/Assets/Scenes/MainScene_Profiles/Global
--- a/Assets/Prefabs/Environment/BurningStick.prefab
+++ b/Assets/Prefabs/Environment/BurningStick.prefab
@ -190,6 +190,8 @@ MonoBehaviour:
  PanicLifetimeThreshold: 10
  PassTorchAnimationDuration: 0.5
  IgniteDuration: 2
+  NoEffectReferencePoint: {fileID: 0}
+  NoEffectRadius: 20
  TorchSound: {fileID: 2118652764677376848}
  FireClips:
  - {fileID: 8300000, guid: 280c9d9eb97f5ce4d857fb945bfddb1e, type: 3}
@ -300,8 +302,8 @@ Light:
  m_Type: 2
  m_Shape: 0
  m_Color: {r: 1, g: 0.96851534, b: 0.8820755, a: 1}
-  m_Intensity: 1
-  m_Range: 20
+  m_Intensity: 0.75
+  m_Range: 30
  m_SpotAngle: 30
  m_InnerSpotAngle: 21.80208
  m_CookieSize: 10
--- a/Assets/Prefabs/Environment/Campfire.prefab
+++ b/Assets/Prefabs/Environment/Campfire.prefab
@ -15,7 +15,7 @@ GameObject:
  - component: {fileID: 7293540718676611162}
  m_Layer: 9
  m_Name: Campfire
-  m_TagString: Untagged
+  m_TagString: Campfire
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
--- a/Assets/Scenes/MainScene.unity.meta
+++ b/Assets/Scenes/MainScene.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9fc0d4010bbf28b4594072e72b8655ab
+guid: da0d8a3317cad8942b632390dd158c6d
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/MainScene/LightingData.asset
+++ b/Assets/Scenes/MainScene/LightingData.asset
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png.meta
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png.meta
@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: e483be73159f0aa45a36f8da954ef111
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr.meta
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr.meta
@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: f8e96f9f2f6bee14b83bfa6766d23645
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 6
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png
--- a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png.meta
+++ b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png.meta
@ -1,104 +0,0 @@
-fileFormatVersion: 2
-guid: cbe9964f930fcb64983ae1cf44fd4bce
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Win
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 2
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MainScene/ReflectionProbe-0.exr
+++ b/Assets/Scenes/MainScene/ReflectionProbe-0.exr
--- a/Assets/Scenes/MainScene/ReflectionProbe-0.exr.meta
+++ b/Assets/Scenes/MainScene/ReflectionProbe-0.exr.meta
@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 75778776b22568f41bf3b71824c763a3
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MainScene/ReflectionProbe-1.exr
+++ b/Assets/Scenes/MainScene/ReflectionProbe-1.exr
--- a/Assets/Scenes/MainScene/ReflectionProbe-1.exr.meta
+++ b/Assets/Scenes/MainScene/ReflectionProbe-1.exr.meta
@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 2c836a0e69fba50479860aaba54951f0
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MainScene_Profiles.meta
+++ b/Assets/Scenes/MainScene_Profiles.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d096abb9cd99ef4a85c17a27238d4db
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/Yee.unity
+++ b/Assets/Scenes/Yee.unity
--- a/Assets/Scenes/Yee.unity.meta
+++ b/Assets/Scenes/Yee.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: da0d8a3317cad8942b632390dd158c6d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Torch.cs
+++ b/Assets/Scripts/Torch.cs
@ -14,6 +14,10 @@ public class Torch : MonoBehaviour {
    public float PassTorchAnimationDuration;
    public float IgniteDuration;

+    [Header("No lights in camp -effect")]
+    public Transform NoEffectReferencePoint;
+    public float NoEffectRadius;
+
    [Header("Sound effects")]
    public AudioSource TorchSound;
    public AudioClip[] FireClips;
@ -35,11 +39,15 @@ public class Torch : MonoBehaviour {

    private Vector3 BaseScale;
    private float StartLifetime;
+    private float BaseIntensity;

    private void Awake() {
        Body = GetComponent<Rigidbody>();
        BaseScale = transform.localScale;
        StartLifetime = Lifetime;
+        BaseIntensity = Light.intensity;
+        Light.intensity = 0;
+        NoEffectReferencePoint = GameObject.FindGameObjectWithTag("Campfire").transform;
    }

    private void Update() {
@ -78,6 +86,7 @@ public class Torch : MonoBehaviour {
        } else {
            bool Panic = Lifetime <= PanicLifetimeThreshold;
            Light.color = Color.Lerp(Light.color, Panic ? PanicColor : NormalColor, 4f * Time.deltaTime);
+            Light.intensity = BaseIntensity * Mathf.Clamp((transform.position - NoEffectReferencePoint.position).magnitude / NoEffectRadius, 0.4f, 1);

            if ((TorchSound.clip.length - TorchSound.time) <= Time.deltaTime || !TorchSound.isPlaying) {
                TorchSound.clip = FireClips[Random.Range(0, FireClips.Length)];
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -7,6 +7,7 @@ TagManager:
  - Pause Menu
  - World
  - Generator
+  - Campfire
  layers:
  - Default
  - TransparentFX