From faf4bd1ca95ef406bb54881cd8e7f927f667b684 Mon Sep 17 00:00:00 2001 From: Brajanowski Date: Thu, 17 Jul 2025 06:36:55 +0200 Subject: [PATCH] refactor --- .../Easy performant outline.meta} | 2 +- .../Plugins/Easy performant outline/Demo.meta | 8 ++ .../Demo/Models for Demo scene.meta | 8 ++ .../CartoonLowPolyCityLite.meta | 8 ++ ...PolyCityLite_HDRP_2018.3.unitypackage.meta | 7 ++ ...PolyCityLite_LWRP_2018.3.unitypackage.meta | 7 ++ ...wPolyCityLite_URP_2019.3.unitypackage.meta | 7 ++ Assets/RebootKit | 2 +- Assets/Settings/PC_RPAsset.asset | 2 +- Assets/Settings/SampleSceneProfile.asset | 26 +++++ Assets/jelycho/Code/ButtonActor.cs | 7 -- Assets/jelycho/Code/Items/ItemActor.cs | 8 -- Assets/jelycho/Code/Items/WorkbenchActor.cs | 8 +- Assets/jelycho/Code/Outlines.meta | 3 - .../Code/Outlines/OutlinesRendererFeature.cs | 25 ---- .../Outlines/OutlinesRendererFeature.cs.meta | 3 - Assets/jelycho/Code/Player/PlayerActor.cs | 10 +- .../VersionOverlay/ui_game_version.uxml | 5 - .../VersionOverlay/ui_game_version.uxml.meta | 10 -- Assets/jelycho/Worlds/dev/scn_map_dev.unity | 108 ------------------ Assets/jelycho/core/Items/item_dagger.prefab | 21 +--- Assets/jelycho/core/Items/item_egg.prefab | 21 +--- .../core/interactables/button_0.prefab | 20 ---- 23 files changed, 86 insertions(+), 240 deletions(-) rename Assets/{jelycho/VersionOverlay.meta => Plugins/Easy performant outline.meta} (77%) create mode 100644 Assets/Plugins/Easy performant outline/Demo.meta create mode 100644 Assets/Plugins/Easy performant outline/Demo/Models for Demo scene.meta create mode 100644 Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite.meta create mode 100644 Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta create mode 100644 Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_LWRP_2018.3.unitypackage.meta create mode 100644 Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_URP_2019.3.unitypackage.meta delete mode 100644 Assets/jelycho/Code/Outlines.meta delete mode 100644 Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs delete mode 100644 Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs.meta delete mode 100644 Assets/jelycho/VersionOverlay/ui_game_version.uxml delete mode 100644 Assets/jelycho/VersionOverlay/ui_game_version.uxml.meta diff --git a/Assets/jelycho/VersionOverlay.meta b/Assets/Plugins/Easy performant outline.meta similarity index 77% rename from Assets/jelycho/VersionOverlay.meta rename to Assets/Plugins/Easy performant outline.meta index df6e829..694295c 100644 --- a/Assets/jelycho/VersionOverlay.meta +++ b/Assets/Plugins/Easy performant outline.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac6e17d52255d5d47a0e00c3a2b836df +guid: f8ab49cee701ae143a6a36217e6d8399 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Easy performant outline/Demo.meta b/Assets/Plugins/Easy performant outline/Demo.meta new file mode 100644 index 0000000..7d97092 --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fad17ab68b248b44694785c146cb2606 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene.meta b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene.meta new file mode 100644 index 0000000..d15626d --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d5f7f910963a114fa770fe9550b73fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite.meta b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite.meta new file mode 100644 index 0000000..827f750 --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d282b23f7738ee44d87c880b3a0a7bac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta new file mode 100644 index 0000000..4dd0a5e --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a6eaddfb3bfecf479d8d3a3f1f30d57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_LWRP_2018.3.unitypackage.meta b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_LWRP_2018.3.unitypackage.meta new file mode 100644 index 0000000..737c028 --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_LWRP_2018.3.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0bf5a4388559b034fa0348f5330303ef +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_URP_2019.3.unitypackage.meta b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_URP_2019.3.unitypackage.meta new file mode 100644 index 0000000..2b87054 --- /dev/null +++ b/Assets/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_URP_2019.3.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c6fdf170c41094947ab93e9608045ab8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RebootKit b/Assets/RebootKit index 4ec3ded..1054061 160000 --- a/Assets/RebootKit +++ b/Assets/RebootKit @@ -1 +1 @@ -Subproject commit 4ec3dedd42f3fc74892c4482df4427e5ac085fea +Subproject commit 1054061d915b717aea7ddab7310ba72b7e0922f2 diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 150f286..3e4ad83 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -57,7 +57,7 @@ MonoBehaviour: m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.12299999, y: 0.2926, z: 0.53599995} + m_Cascade4Split: {x: 0.074529395, y: 0.2531261, z: 0.5754735} m_CascadeBorder: 0.107758604 m_ShadowDepthBias: 0.1 m_ShadowNormalBias: 0.5 diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index dff2ff3..06afce8 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -75,6 +75,31 @@ MonoBehaviour: rounded: m_OverrideState: 0 m_Value: 0 +--- !u!114 &-2290076132428357511 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 9 + intensity: + m_OverrideState: 1 + m_Value: 0.15 + response: + m_OverrideState: 0 + m_Value: 0.8 + texture: + m_OverrideState: 0 + m_Value: {fileID: 0} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92,6 +117,7 @@ MonoBehaviour: - {fileID: -7893295128165547882} - {fileID: 7391319092446245454} - {fileID: -3357603926938260329} + - {fileID: -2290076132428357511} --- !u!114 &849379129802519247 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/jelycho/Code/ButtonActor.cs b/Assets/jelycho/Code/ButtonActor.cs index 419e95b..4657a11 100644 --- a/Assets/jelycho/Code/ButtonActor.cs +++ b/Assets/jelycho/Code/ButtonActor.cs @@ -9,7 +9,6 @@ namespace RebootReality.jelycho { public class ButtonActor : Actor, IInteractable { static readonly Logger s_Logger = new Logger(nameof(ButtonActor)); - [SerializeField] Outline m_Outline; [SerializeField] Transform m_Graphics; [SerializeField] float m_CooldownDuration = 0.5f; @@ -65,12 +64,6 @@ namespace RebootReality.jelycho { // @MARK: IInteractable // public void SetHighlight(bool highlight) { - if (m_Outline == null) { - Debug.LogError("ButtonActor does not have an Outline component."); - return; - } - - m_Outline.enabled = highlight; } public void Interact() { diff --git a/Assets/jelycho/Code/Items/ItemActor.cs b/Assets/jelycho/Code/Items/ItemActor.cs index 99d00af..d84a0f8 100644 --- a/Assets/jelycho/Code/Items/ItemActor.cs +++ b/Assets/jelycho/Code/Items/ItemActor.cs @@ -16,8 +16,6 @@ namespace RebootReality.jelycho.Items { [field: SerializeField] public ItemConfig Config { get; private set; } - [SerializeField] Outline m_Outline; - // // @MARK: Unity callbacks // @@ -38,12 +36,6 @@ namespace RebootReality.jelycho.Items { // @MARK: IInteractable // public void SetHighlight(bool highlight) { - if (m_Outline == null) { - s_Logger.Error("ItemActor does not have an Outline component."); - return; - } - - m_Outline.enabled = highlight; } public void Interact() { } diff --git a/Assets/jelycho/Code/Items/WorkbenchActor.cs b/Assets/jelycho/Code/Items/WorkbenchActor.cs index 9384db6..d21ee10 100644 --- a/Assets/jelycho/Code/Items/WorkbenchActor.cs +++ b/Assets/jelycho/Code/Items/WorkbenchActor.cs @@ -27,12 +27,12 @@ namespace RebootReality.jelycho.Items { [SerializeField] TMP_Text m_TimerText; - public override void ServerTick(float deltaTime) { - base.ServerTick(deltaTime); + public override void OnServerTick(float deltaTime) { + base.OnServerTick(deltaTime); } - public override void ClientTick(float deltaTime) { - base.ClientTick(deltaTime); + public override void OnClientTick(float deltaTime) { + base.OnClientTick(deltaTime); m_TimerText.text = DataAs().SelectedRecipeIndex.ToString(); } diff --git a/Assets/jelycho/Code/Outlines.meta b/Assets/jelycho/Code/Outlines.meta deleted file mode 100644 index 05a785f..0000000 --- a/Assets/jelycho/Code/Outlines.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 16de37dffae64252bb9e33ebe89e9266 -timeCreated: 1752151116 \ No newline at end of file diff --git a/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs b/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs deleted file mode 100644 index f32f855..0000000 --- a/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine.Rendering; -using UnityEngine.Rendering.RenderGraphModule; -using UnityEngine.Rendering.Universal; - -namespace RebootReality.jelycho.Outlines { - public class OutlinesRendererFeature : ScriptableRendererFeature { - class OutlinesRenderPass : ScriptableRenderPass { - public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) { - base.RecordRenderGraph(renderGraph, frameData); - } - } - - OutlinesRenderPass m_RenderPass; - - public override void Create() { - m_RenderPass = new OutlinesRenderPass { - renderPassEvent = RenderPassEvent.AfterRenderingPostProcessing - }; - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { - renderer.EnqueuePass(m_RenderPass); - } - } -} \ No newline at end of file diff --git a/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs.meta b/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs.meta deleted file mode 100644 index a96890d..0000000 --- a/Assets/jelycho/Code/Outlines/OutlinesRendererFeature.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 4926ff5ce47e454fad5255be684a85b7 -timeCreated: 1752151128 \ No newline at end of file diff --git a/Assets/jelycho/Code/Player/PlayerActor.cs b/Assets/jelycho/Code/Player/PlayerActor.cs index 611a39e..b071912 100755 --- a/Assets/jelycho/Code/Player/PlayerActor.cs +++ b/Assets/jelycho/Code/Player/PlayerActor.cs @@ -124,8 +124,8 @@ namespace RebootReality.jelycho.Player { // // @MARK: Actor // - public override void ServerTick(float deltaTime) { - base.ServerTick(deltaTime); + public override void OnServerTick(float deltaTime) { + base.OnServerTick(deltaTime); // Update actor data // PlayerActorData data = DataAs(); @@ -135,8 +135,8 @@ namespace RebootReality.jelycho.Player { SendActorEvent((ushort) PlayerActorEvents.UpdatedRemoteState, remoteStateData); } - public override void ClientTick(float deltaTime) { - base.ClientTick(deltaTime); + public override void OnClientTick(float deltaTime) { + base.OnClientTick(deltaTime); if (m_IsSetupAsOwner) { TickCamera(); @@ -448,6 +448,8 @@ namespace RebootReality.jelycho.Player { if (!RR.IsServer()) { return; } + + // @BUG: Sometimes the item will not update it's physics state and will keep floating in the air. It's rare? UpdateEquippedItem(); diff --git a/Assets/jelycho/VersionOverlay/ui_game_version.uxml b/Assets/jelycho/VersionOverlay/ui_game_version.uxml deleted file mode 100644 index d1de2f8..0000000 --- a/Assets/jelycho/VersionOverlay/ui_game_version.uxml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Assets/jelycho/VersionOverlay/ui_game_version.uxml.meta b/Assets/jelycho/VersionOverlay/ui_game_version.uxml.meta deleted file mode 100644 index 6978c75..0000000 --- a/Assets/jelycho/VersionOverlay/ui_game_version.uxml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c2f32d01bf5f9d644aee3c2a41b14a66 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/jelycho/Worlds/dev/scn_map_dev.unity b/Assets/jelycho/Worlds/dev/scn_map_dev.unity index 7331656..752e818 100644 --- a/Assets/jelycho/Worlds/dev/scn_map_dev.unity +++ b/Assets/jelycho/Worlds/dev/scn_map_dev.unity @@ -3668,51 +3668,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1406482873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1406482875} - - component: {fileID: 1406482874} - m_Layer: 0 - m_Name: scene_context - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1406482874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406482873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8dd28652b58c4d689ab3f2f9354d7589, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Installers: [] ---- !u!4 &1406482875 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406482873} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1443285066 GameObject: m_ObjectHideFlags: 0 @@ -4145,67 +4100,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1601196691} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1637678466 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalPosition.y - value: 5.37 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 711236274234327174, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3623051023707969355, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: k__BackingField - value: 4640091262378877913 - objectReference: {fileID: 0} - - target: {fileID: 7390605608055178527, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} - propertyPath: m_Name - value: item_dagger - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 50a5e87baaedf5b46ba52646e8e88b74, type: 3} --- !u!1 &1665226599 GameObject: m_ObjectHideFlags: 0 @@ -5342,7 +5236,6 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1406482875} - {fileID: 1109886928} - {fileID: 1336405007} - {fileID: 1678453720} @@ -5366,4 +5259,3 @@ SceneRoots: - {fileID: 177390763} - {fileID: 1803449077} - {fileID: 355103136} - - {fileID: 1637678466} diff --git a/Assets/jelycho/core/Items/item_dagger.prefab b/Assets/jelycho/core/Items/item_dagger.prefab index c23ded1..292515b 100644 --- a/Assets/jelycho/core/Items/item_dagger.prefab +++ b/Assets/jelycho/core/Items/item_dagger.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 3623051023707969355} - component: {fileID: 695493513755002537} - component: {fileID: 3445042364824966478} - - component: {fileID: 7914013011722124926} m_Layer: 8 m_Name: item_dagger m_TagString: Untagged @@ -64,7 +63,7 @@ MonoBehaviour: isChargeable: 0 chargeDuration: 0.5 chargeCooldown: 1 - m_Outline: {fileID: 7914013011722124926} + m_Outline: {fileID: 0} --- !u!54 &695493513755002537 Rigidbody: m_ObjectHideFlags: 0 @@ -113,24 +112,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.1929968, y: 1.3103356, z: 0.06497225} m_Center: {x: 0, y: 0.35144886, z: 0} ---- !u!114 &7914013011722124926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7390605608055178527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMode: 0 - outlineColor: {r: 1, g: 1, b: 1, a: 1} - outlineWidth: 2 - precomputeOutline: 0 - bakeKeys: [] - bakeValues: [] --- !u!1001 &8487670479205696809 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/jelycho/core/Items/item_egg.prefab b/Assets/jelycho/core/Items/item_egg.prefab index fa6d6c9..89e5ed9 100644 --- a/Assets/jelycho/core/Items/item_egg.prefab +++ b/Assets/jelycho/core/Items/item_egg.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 7929351721218922398} - component: {fileID: 6762445103522978435} - component: {fileID: 1953172795149118101} - - component: {fileID: 6438309764977597389} m_Layer: 8 m_Name: item_egg m_TagString: Untagged @@ -65,7 +64,7 @@ MonoBehaviour: isChargeable: 0 chargeDuration: 0.5 chargeCooldown: 1 - m_Outline: {fileID: 6438309764977597389} + m_Outline: {fileID: 0} --- !u!54 &6762445103522978435 Rigidbody: m_ObjectHideFlags: 0 @@ -114,24 +113,6 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &6438309764977597389 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8301825931372056919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMode: 0 - outlineColor: {r: 1, g: 1, b: 1, a: 1} - outlineWidth: 2 - precomputeOutline: 0 - bakeKeys: [] - bakeValues: [] --- !u!1001 &9518845739383610 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/jelycho/core/interactables/button_0.prefab b/Assets/jelycho/core/interactables/button_0.prefab index e31ba95..7b3a576 100644 --- a/Assets/jelycho/core/interactables/button_0.prefab +++ b/Assets/jelycho/core/interactables/button_0.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 1922569912310619096} - component: {fileID: 711698021777897586} - component: {fileID: 1698991612548083951} - - component: {fileID: 4363283694752970860} m_Layer: 0 m_Name: button_0 m_TagString: Untagged @@ -56,7 +55,6 @@ MonoBehaviour: m_DisableCollidersOnMount: 1 transformSyncMode: 0 m_AttachmentSockets: [] - m_Outline: {fileID: 4363283694752970860} m_Graphics: {fileID: 5668387886077798210} m_CooldownDuration: 0.5 pressed: @@ -83,24 +81,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.3108216, y: 0.2376185, z: 0.30895576} m_Center: {x: 0, y: 0.111489624, z: 0} ---- !u!114 &4363283694752970860 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4849713159452277179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMode: 0 - outlineColor: {r: 1, g: 1, b: 1, a: 1} - outlineWidth: 2 - precomputeOutline: 0 - bakeKeys: [] - bakeValues: [] --- !u!1001 &5269371828588380329 PrefabInstance: m_ObjectHideFlags: 0