From 77fd02237a8d1ce6c0cef31a6e77946ff8b37ad9 Mon Sep 17 00:00:00 2001 From: freezy Date: Wed, 1 Dec 2021 18:59:54 +0100 Subject: [PATCH 1/2] inserts: Add light source. --- .../Inserts/Insert Rectangle Grid.prefab | 24 +++++++++++++++++++ .../Insert Rectangle Starburst Large.prefab | 24 +++++++++++++++++++ .../Inserts/Insert Round Starburst Big.prefab | 24 +++++++++++++++++++ ...Insert Triangle Arrow Starburst 2in.prefab | 24 +++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab index 3ec5b43..09552ba 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab @@ -407,6 +407,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2380770222198670334} + - component: {fileID: 4138793352597118393} m_Layer: 0 m_Name: Insert Rectangle Grid m_TagString: Untagged @@ -432,6 +433,29 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4138793352597118393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3044962538057537860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e53d77b7d585c94b89513d95571354e, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + _surface: {fileID: 0} + BulbSize: 20 + State: 0 + BlinkPattern: + BlinkInterval: 0 + FadeSpeedUp: 0 + FadeSpeedDown: 0 --- !u!1 &8021275243254422190 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab index c2fa13d..7e6f601 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab @@ -407,6 +407,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8979637553505604909} + - component: {fileID: 4872497207426673192} m_Layer: 0 m_Name: Insert Rectangle Starburst Large m_TagString: Untagged @@ -432,6 +433,29 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4872497207426673192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6236350996912469705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e53d77b7d585c94b89513d95571354e, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + _surface: {fileID: 0} + BulbSize: 20 + State: 0 + BlinkPattern: + BlinkInterval: 0 + FadeSpeedUp: 0 + FadeSpeedDown: 0 --- !u!1 &8826137226957307700 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab b/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab index 6bc1ff6..85db63c 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab @@ -490,6 +490,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6695020734738287843} + - component: {fileID: -9074451629106719186} m_Layer: 0 m_Name: Insert Round Starburst Big m_TagString: Untagged @@ -515,3 +516,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-9074451629106719186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7023088800166396267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e53d77b7d585c94b89513d95571354e, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + _surface: {fileID: 0} + BulbSize: 20 + State: 0 + BlinkPattern: + BlinkInterval: 0 + FadeSpeedUp: 0 + FadeSpeedDown: 0 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab b/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab index 3c36722..97c6db6 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab @@ -310,6 +310,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4681404690836092093} + - component: {fileID: -7324702522628609685} m_Layer: 0 m_Name: Insert Triangle Arrow Starburst 2in m_TagString: Untagged @@ -335,6 +336,29 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-7324702522628609685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3565607443949717086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e53d77b7d585c94b89513d95571354e, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + _surface: {fileID: 0} + BulbSize: 20 + State: 0 + BlinkPattern: + BlinkInterval: 0 + FadeSpeedUp: 0 + FadeSpeedDown: 0 --- !u!1 &3611633431104214803 GameObject: m_ObjectHideFlags: 0 From b9317409e1f7490dde70d71d3609c2affd680dc3 Mon Sep 17 00:00:00 2001 From: freezy Date: Wed, 1 Dec 2021 20:59:59 +0100 Subject: [PATCH 2/2] Remove collider from fake bulb. --- .../Inserts/Insert Rectangle Grid.prefab | 18 ++---------------- .../Insert Rectangle Starburst Large.prefab | 18 ++---------------- .../Inserts/Insert Round Starburst Big.prefab | 18 ++---------------- .../Insert Triangle Arrow Starburst 2in.prefab | 18 ++---------------- 4 files changed, 8 insertions(+), 64 deletions(-) diff --git a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab index 09552ba..101ab4a 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Grid.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 6167200858073098916} - component: {fileID: 6089696224990132775} - component: {fileID: 6847542849078866430} - - component: {fileID: 4381673771831018344} m_Layer: 0 m_Name: FauxBulb m_TagString: Untagged @@ -84,19 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &4381673771831018344 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 892101212546870842} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1732571689485530858 GameObject: m_ObjectHideFlags: 0 @@ -454,8 +440,8 @@ MonoBehaviour: State: 0 BlinkPattern: BlinkInterval: 0 - FadeSpeedUp: 0 - FadeSpeedDown: 0 + FadeSpeedUp: 0.2 + FadeSpeedDown: 0.2 --- !u!1 &8021275243254422190 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab index 7e6f601..9a4c19b 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Rectangle Starburst Large.prefab @@ -229,7 +229,6 @@ GameObject: - component: {fileID: 1154685457} - component: {fileID: 1154685460} - component: {fileID: 1154685459} - - component: {fileID: 1154685458} m_Layer: 0 m_Name: FauxBulb m_TagString: Untagged @@ -302,19 +301,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &1154685458 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154685456} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4423024720403102520 GameObject: m_ObjectHideFlags: 0 @@ -454,8 +440,8 @@ MonoBehaviour: State: 0 BlinkPattern: BlinkInterval: 0 - FadeSpeedUp: 0 - FadeSpeedDown: 0 + FadeSpeedUp: 0.2 + FadeSpeedDown: 0.2 --- !u!1 &8826137226957307700 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab b/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab index 85db63c..5bc4e62 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Round Starburst Big.prefab @@ -229,7 +229,6 @@ GameObject: - component: {fileID: 954714017} - component: {fileID: 954714020} - component: {fileID: 954714019} - - component: {fileID: 954714018} m_Layer: 0 m_Name: FauxBulb m_TagString: Untagged @@ -302,19 +301,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &954714018 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954714016} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5165245959274740145 GameObject: m_ObjectHideFlags: 0 @@ -537,5 +523,5 @@ MonoBehaviour: State: 0 BlinkPattern: BlinkInterval: 0 - FadeSpeedUp: 0 - FadeSpeedDown: 0 + FadeSpeedUp: 0.2 + FadeSpeedDown: 0.2 diff --git a/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab b/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab index 97c6db6..26bd233 100644 --- a/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab +++ b/Assets/Resources/Prefabs/Inserts/Insert Triangle Arrow Starburst 2in.prefab @@ -357,8 +357,8 @@ MonoBehaviour: State: 0 BlinkPattern: BlinkInterval: 0 - FadeSpeedUp: 0 - FadeSpeedDown: 0 + FadeSpeedUp: 0.2 + FadeSpeedDown: 0.2 --- !u!1 &3611633431104214803 GameObject: m_ObjectHideFlags: 0 @@ -453,7 +453,6 @@ GameObject: - component: {fileID: 7362992217582146745} - component: {fileID: 4268941671159859249} - component: {fileID: 1600931816142094242} - - component: {fileID: 8911606426329506960} m_Layer: 0 m_Name: FauxBulb m_TagString: Untagged @@ -526,16 +525,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &8911606426329506960 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5591582294615897350} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0}