Outlines added to quarry

2025-12-12 14:36:39 +01:00
parent b9cf96367a
commit 8ce4627e97
30 changed files with 2290 additions and 4376 deletions
--- a/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab
+++ b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab
@@ -19,7 +19,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &68470730839161369
 Transform:
  m_ObjectHideFlags: 0
@@ -282,6 +282,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &6407014757843176454
 MonoBehaviour:
@@ -541,6 +542,7 @@ Animator:
  m_WriteDefaultValuesOnDisable: 0
 --- !u!212 &2397974294601466633
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -586,6 +588,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -8189809603051793254, guid: 64965726962afa94b88cefeb179bc573, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -595,7 +598,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1 &2882415700974115882
 GameObject:
@@ -1049,6 +1051,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &7793638615220209122
 MonoBehaviour:
@@ -1183,6 +1186,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &9040376305951000489
 MonoBehaviour:
@@ -1288,6 +1292,7 @@ SkinnedMeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  serializedVersion: 2
  m_Quality: 0
  m_UpdateWhenOffscreen: 0
@@ -1407,6 +1412,7 @@ SkinnedMeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  serializedVersion: 2
  m_Quality: 0
  m_UpdateWhenOffscreen: 0
@@ -1585,6 +1591,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &4362079983360807751
 MonoBehaviour:
@@ -1598,6 +1605,92 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5980d28f81eb545d78e1d84e1449a10f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1001 &7663727731875931215
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 106062057957134378}
+    m_Modifications:
+    - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
+    - target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_Name
+      value: GlowOutline
+      objectReference: {fileID: 0}
+    - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
+    - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3}
+    - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: itemSprite
+      value: 
+      objectReference: {fileID: 3156508682930277421}
+    - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+      propertyPath: interactionType
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+--- !u!4 &2480480958425800128 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
+  m_PrefabInstance: {fileID: 7663727731875931215}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7984152337586070562
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1716,7 +1809,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
      propertyPath: m_Sprite
@@ -1784,6 +1877,9 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
      insertIndex: 0
      addedObject: {fileID: 2901638171899200938}
+    - targetCorrespondingSourceObject: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2480480958425800128}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
      insertIndex: -1
@@ -1811,6 +1907,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
  m_Name: 
  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.SaveableState
+--- !u!212 &3156508682930277421 stripped
+SpriteRenderer:
+  m_CorrespondingSourceObject: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3}
+  m_PrefabInstance: {fileID: 7984152337586070562}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8911052060583241195
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Interactions/GlowOutline.cs
+++ b/Assets/Scripts/Interactions/GlowOutline.cs
@@ -2,6 +2,7 @@ using AppleHills;
 using System.Collections.Generic;
 using UnityEngine;
 using Core.Lifecycle;
+using JetBrains.Annotations;

 public class GlowOutline : ManagedBehaviour
 {
@@ -15,6 +16,7 @@ public class GlowOutline : ManagedBehaviour
    public SpriteRenderer itemSprite;
    public float thiccness;
    public GlowOutlineData.InteractionType interactionType;
+    public bool animatedSprite;



@@ -35,7 +37,7 @@ public class GlowOutline : ManagedBehaviour
        childrenSprites = GetComponentsInChildren<SpriteRenderer>();
        // childrenMaterials = GetComponentsInChildren<Material>();

-        // Set the color overlay of the sprites to colour our outline with the colors set in Interaction Settings
+        // Set the color to use in this outline from the colors set in Interaction Settings
        foreach (GlowOutlineData data in outlineColors)
        {
            if (data.interaction == interactionType)
@@ -44,8 +46,6 @@ public class GlowOutline : ManagedBehaviour
            }
        }

-
-        // Find the spriterenderer in parent gameobject, but ignore our own spriterenderer
        

        // Set the scale and sprite of each child. Skip first child because that's the outline object.
@@ -56,11 +56,41 @@ public class GlowOutline : ManagedBehaviour

        foreach (SpriteRenderer childSprite in childrenSprites)
        {
-            childSprite.sprite = itemSprite.sprite;
-            childSprite.sharedMaterial.color = outlineColor;
+            if (itemSprite.sprite != null)
+            {
+                childSprite.sprite = itemSprite.sprite;
+
+            }
+            if (childSprite.sharedMaterial != null)
+            {
+                childSprite.sharedMaterial.color = outlineColor;
+            }
+            if (itemSprite == null)
+            {
+                Debug.Log($"Outline {name} is missing an item sprite!");
+            }
+            
+
        }
    }

+    public void Update()
+     {
+        if (animatedSprite)
+        {
+            foreach (SpriteRenderer childSprite in childrenSprites)
+            {
+                if (itemSprite.sprite != null)
+                {
+                    childSprite.sprite = itemSprite.sprite;
+
+                }
+            }
+        }
+        
+     }
+
+
        #if UNITY_EDITOR
        // Update outline in editor
        private void OnValidate()
--- a/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs
+++ b/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs
@@ -20,6 +20,15 @@ namespace StateMachines.Quarry.AnneLise
        {
            dialogueCanvas?.SetActive(false);
            _anneLiseBushStateMachine.ChangeState("TakePhoto");
+
+            foreach (GlowOutline outline in GetComponentsInChildren<GlowOutline>())
+            {
+                if (outline != null)
+                {
+                    outline.gameObject.SetActive(false);
+                }
+            }
+            
        }
    }
 }