Merge branch 'feature/blink-rework' into 'main'

Blink Rework

See merge request kernel-panic/revival!89

game/Assets/Prefabs/Environment/Entrance Courtyard.prefab

@@ -1065,6 +1065,20 @@ Transform:
   m_Father: {fileID: 5390718527995891586}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &5028543942449267792
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5374444887580352796}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8433832427835393222, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
 --- !u!1 &5390718527497362304
 GameObject:
   m_ObjectHideFlags: 0
@@ -2087,16 +2101,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
---- !u!4 &7451918716768069829 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
-  m_PrefabInstance: {fileID: 6980634304434327342}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5711431803845258964 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -5790743888752385542, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
   m_PrefabInstance: {fileID: 6980634304434327342}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &7451918716768069829 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
+  m_PrefabInstance: {fileID: 6980634304434327342}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7293289580210569446
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2166,6 +2180,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
+--- !u!1 &5374444887580352796 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -5790743888752385542, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}
+  m_PrefabInstance: {fileID: 7293289580210569446}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &7114633281017947917 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3}

game/Assets/Scenes/BlinkTest.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6f53a2e88cd49eb42bb9b0a6e9255551
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Scenes/BlinkTest.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6a92d99eb587edd40bea1f42dd2a4fb1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Scenes/BlinkTest/LightingData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1823f71b3b4ed2f44883ba5d30ccdf06
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 112000000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Scenes/BlinkTest/ReflectionProbe-0.exr.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 79121d9c41608a148997d0eb6d3842c3
+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
+  vTOnly: 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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    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: 

game/Assets/Scripts/Dialogue/ScriptedDialogueTrigger.cs

@@ -13,6 +13,9 @@ public class ScriptedDialogueTrigger : MonoBehaviour
     
     private void OnTriggerEnter(Collider other)
     {
+        if ( !other.CompareTag( "Player" ) )
+            return;
+        
         if (_log)
         {
             Debug.Log($"{other} triggered dialogue {_key}");