From c4ffdeeb81e6de4f2904fe1d5f6a741a5e93901f Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 10 Feb 2022 10:06:39 -0800 Subject: [PATCH 01/14] Base render feature --- .../FMOD/Resources/FMODStudioSettings.asset | 263 +++++++++--------- Assets/Scripts/Graphics.meta | 8 + Assets/Scripts/Graphics/OutlineEffect.cs | 43 +++ Assets/Scripts/Graphics/OutlineEffect.cs.meta | 11 + Assets/Scripts/Graphics/OutlineFeature.cs | 30 ++ .../Scripts/Graphics/OutlineFeature.cs.meta | 11 + Assets/Scripts/Graphics/OutlineRenderPass.cs | 42 +++ .../Graphics/OutlineRenderPass.cs.meta | 3 + Assets/Scripts/Graphics/OutlineSelector.mat | 123 ++++++++ .../Scripts/Graphics/OutlineSelector.mat.meta | 8 + .../Scripts/Graphics/OutlineSelector.shader | 51 ++++ .../Graphics/OutlineSelector.shader.meta | 10 + .../URP Settings/ForwardRenderer.asset | 22 +- ProjectSettings/TagManager.asset | 2 +- 14 files changed, 493 insertions(+), 134 deletions(-) create mode 100644 Assets/Scripts/Graphics.meta create mode 100644 Assets/Scripts/Graphics/OutlineEffect.cs create mode 100644 Assets/Scripts/Graphics/OutlineEffect.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs create mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs create mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineSelector.mat create mode 100644 Assets/Scripts/Graphics/OutlineSelector.mat.meta create mode 100644 Assets/Scripts/Graphics/OutlineSelector.shader create mode 100644 Assets/Scripts/Graphics/OutlineSelector.shader.meta diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 21285487..81021019 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8996105879275317745 +--- !u!114 &-6839538693101453803 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,20 +9,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default - parentIdentifier: + identifier: b7716510a1f36934c87976f3a81dbf3d + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: Value: 0 HasValue: 0 LiveUpdatePort: - Value: 9264 - HasValue: 1 + Value: 0 + HasValue: 0 Overlay: Value: 0 HasValue: 0 @@ -52,10 +52,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 1 + HasValue: 0 StaticPlugins: Value: [] - HasValue: 1 + HasValue: 0 CallbackHandler: Value: {fileID: 0} HasValue: 0 @@ -63,7 +63,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-8561231834635165734 +--- !u!114 &-6514307184278897654 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -72,10 +72,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d + identifier: c88d16e5272a4e241b0ef0ac2e53b73d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -126,7 +126,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-8028062530867250058 +--- !u!114 &-5377599697116212355 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -135,61 +135,62 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 52eb9df5db46521439908db3a29a1bbb - parentIdentifier: default + identifier: default + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: Value: 0 - HasValue: 0 + HasValue: 1 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: Value: 0 - HasValue: 0 + HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: Value: 0 - HasValue: 0 + HasValue: 1 BuildDirectory: - Value: - HasValue: 0 + Value: Desktop + HasValue: 1 SpeakerMode: - Value: 0 - HasValue: 0 + Value: 3 + HasValue: 1 VirtualChannelCount: - Value: 0 - HasValue: 0 + Value: 128 + HasValue: 1 RealChannelCount: - Value: 0 - HasValue: 0 + Value: 32 + HasValue: 1 DSPBufferLength: Value: 0 - HasValue: 0 + HasValue: 1 DSPBufferCount: Value: 0 - HasValue: 0 + HasValue: 1 Plugins: - Value: [] - HasValue: 0 + Value: + - phonon_fmod + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} - HasValue: 0 + HasValue: 1 outputType: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-1969846231847378058 +--- !u!114 &-4410942603647427235 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -198,10 +199,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: 52eb9df5db46521439908db3a29a1bbb parentIdentifier: default displaySortOrder: 0 active: 0 @@ -252,7 +253,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-677337530412509339 +--- !u!114 &-3350049175004170232 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -261,10 +262,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} m_Name: m_EditorClassIdentifier: - identifier: e7a046c753c3c3d4aacc91f6597f310d + identifier: 2c5177b11d81d824dbb064f9ac8527da parentIdentifier: default displaySortOrder: 0 active: 0 @@ -315,7 +316,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &11400000 +--- !u!114 &-3001481334787436968 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -324,56 +325,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} - m_Name: FMODStudioSettings - m_EditorClassIdentifier: - SwitchSettingsMigration: 1 - HasSourceProject: 0 - HasPlatforms: 1 - sourceProjectPath: - sourceBankPath: Banks - SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 - AutomaticSampleLoading: 0 - EncryptionKey: - ImportType: 0 - TargetAssetPath: FMODBanks - TargetBankFolder: - LoggingLevel: 2 - SpeakerModeSettings: [] - SampleRateSettings: [] - LiveUpdateSettings: [] - OverlaySettings: [] - LoggingSettings: [] - BankDirectorySettings: [] - VirtualChannelSettings: [] - RealChannelSettings: [] - Plugins: [] - MasterBanks: - - Master - Banks: [] - BanksToLoad: [] - LiveUpdatePort: 9264 - EnableMemoryTracking: 0 - AndroidUseOBB: 0 - MeterChannelOrdering: 0 - StopEventsOutsideMaxDistance: 0 - BoltUnitOptionsBuildPending: 0 - MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 ---- !u!114 &73006856484707639 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: 97ba6cc2660c0ca498540d254701057a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -424,7 +379,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &2962469479224940258 +--- !u!114 &-2861717080310343318 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -433,29 +388,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97ba6cc2660c0ca498540d254701057a, type: 3} + m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 - parentIdentifier: default + identifier: playInEditor + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: - Value: 0 - HasValue: 0 + Value: 1 + HasValue: 1 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: Value: 0 - HasValue: 0 + HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 0 - HasValue: 0 + Value: 48000 + HasValue: 1 BuildDirectory: Value: HasValue: 0 @@ -463,11 +418,11 @@ MonoBehaviour: Value: 0 HasValue: 0 VirtualChannelCount: - Value: 0 - HasValue: 0 + Value: 1024 + HasValue: 1 RealChannelCount: - Value: 0 - HasValue: 0 + Value: 256 + HasValue: 1 DSPBufferLength: Value: 0 HasValue: 0 @@ -487,7 +442,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &3269054860488306280 +--- !u!114 &-269331343405889267 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -496,10 +451,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -550,7 +505,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &3439397024052853594 +--- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -559,10 +514,56 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} + m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} + m_Name: FMODStudioSettings + m_EditorClassIdentifier: + SwitchSettingsMigration: 1 + HasSourceProject: 0 + HasPlatforms: 1 + sourceProjectPath: + sourceBankPath: Banks + SourceBankPathUnformatted: + AutomaticEventLoading: 1 + BankLoadType: 0 + AutomaticSampleLoading: 0 + EncryptionKey: + ImportType: 0 + TargetAssetPath: FMODBanks + TargetBankFolder: + LoggingLevel: 2 + SpeakerModeSettings: [] + SampleRateSettings: [] + LiveUpdateSettings: [] + OverlaySettings: [] + LoggingSettings: [] + BankDirectorySettings: [] + VirtualChannelSettings: [] + RealChannelSettings: [] + Plugins: [] + MasterBanks: + - Master + Banks: [] + BanksToLoad: [] + LiveUpdatePort: 9264 + EnableMemoryTracking: 0 + AndroidUseOBB: 0 + MeterChannelOrdering: 0 + StopEventsOutsideMaxDistance: 0 + BoltUnitOptionsBuildPending: 0 + MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 +--- !u!114 &1359279498907332141 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 17eea195bdfbf014e91ba7620ee491f8, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2c5177b11d81d824dbb064f9ac8527da + identifier: e7a046c753c3c3d4aacc91f6597f310d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -613,7 +614,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &5183013169311880355 +--- !u!114 &4578093891639519645 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -622,10 +623,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -676,7 +677,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &6363573742549379210 +--- !u!114 &5157692284801470217 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -685,29 +686,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: playInEditor - parentIdentifier: + identifier: 46fbfdf3fc43db0458918377fd40293e + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: - Value: 1 - HasValue: 1 + Value: 0 + HasValue: 0 LiveUpdatePort: Value: 0 HasValue: 0 Overlay: - Value: 1 - HasValue: 1 + Value: 0 + HasValue: 0 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 48000 - HasValue: 1 + Value: 0 + HasValue: 0 BuildDirectory: Value: HasValue: 0 @@ -715,11 +716,11 @@ MonoBehaviour: Value: 0 HasValue: 0 VirtualChannelCount: - Value: 1024 - HasValue: 1 + Value: 0 + HasValue: 0 RealChannelCount: - Value: 256 - HasValue: 1 + Value: 0 + HasValue: 0 DSPBufferLength: Value: 0 HasValue: 0 diff --git a/Assets/Scripts/Graphics.meta b/Assets/Scripts/Graphics.meta new file mode 100644 index 00000000..0b5a9e87 --- /dev/null +++ b/Assets/Scripts/Graphics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ff1d7ddc42834ba08663482ea39d074 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineEffect.cs b/Assets/Scripts/Graphics/OutlineEffect.cs new file mode 100644 index 00000000..098be5ef --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineEffect.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class OutlineEffect : MonoBehaviour { + private Camera mainCamera; + private Camera secondaryCamera; + + private void Awake() { + mainCamera = GetComponent(); + } + + private void Start() { + secondaryCamera = transform.Find("Secondary Camera").GetComponent(); + } + + private void OnRenderImage(RenderTexture src, RenderTexture dest) { + print("Got here"); + secondaryCamera.CopyFrom(mainCamera); + secondaryCamera.clearFlags = CameraClearFlags.Color; + secondaryCamera.backgroundColor = Color.black; + secondaryCamera.cullingMask = 1 << LayerMask.NameToLayer("Interactable"); + + //make the temporary rendertexture + RenderTexture TempRT = new RenderTexture(src.width, src.height, 0, RenderTextureFormat.R8); + + //put it to video memory + TempRT.Create(); + + //set the camera's target texture when rendering + secondaryCamera.targetTexture = TempRT; + + //render all objects this camera can render, but with our custom shader. + secondaryCamera.Render(); + + //copy the temporary RT to the final image + Graphics.Blit(TempRT, dest); + + //release the temporary RT + TempRT.Release(); + } +} diff --git a/Assets/Scripts/Graphics/OutlineEffect.cs.meta b/Assets/Scripts/Graphics/OutlineEffect.cs.meta new file mode 100644 index 00000000..febfd2f0 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 50a09f1793b854c81b6e1f8db407f176 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs b/Assets/Scripts/Graphics/OutlineFeature.cs new file mode 100644 index 00000000..48dd5593 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineFeature.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class OutlineFeature : ScriptableRendererFeature { + [System.Serializable] + public class OutlineFeatureSettings { + public bool isEnabled = true; + public RenderPassEvent insertTiming = RenderPassEvent.AfterRendering; + public Material material; + } + + public OutlineFeatureSettings settings = new OutlineFeatureSettings(); + private RenderTargetHandle renderTargetHandle; + private OutlineRenderPass renderPass; + + public override void Create() { + renderPass = new OutlineRenderPass("Outline Pass", settings.insertTiming, settings.material); + } + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { + if (!settings.isEnabled) return; + + RenderTargetIdentifier cameraColorTargetIdent = renderer.cameraColorTarget; + renderPass.setup(cameraColorTargetIdent); + renderer.EnqueuePass(renderPass); + } +} diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs.meta b/Assets/Scripts/Graphics/OutlineFeature.cs.meta new file mode 100644 index 00000000..a1b437c0 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineFeature.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e67bce010483b442f8b2c94965360a86 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs b/Assets/Scripts/Graphics/OutlineRenderPass.cs new file mode 100644 index 00000000..842a9bdf --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class OutlineRenderPass : ScriptableRenderPass { + private string profilerTag; + private Material material; + private RenderTargetIdentifier cameraColorTargetIdent; + private RenderTargetHandle tempTexture; + + public OutlineRenderPass(string profilerTag, RenderPassEvent renderPassEvent, Material material) { + this.profilerTag = profilerTag; + this.renderPassEvent = renderPassEvent; + this.material = material; + } + + public void setup(RenderTargetIdentifier cameraColorTargetIdent) { + this.cameraColorTargetIdent = cameraColorTargetIdent; + } + + public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) { + cmd.GetTemporaryRT(tempTexture.id, cameraTextureDescriptor); + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { + CommandBuffer cmd = CommandBufferPool.Get(profilerTag); + cmd.Clear(); + + // TODO stuff happens here! + cmd.Blit(cameraColorTargetIdent, tempTexture.Identifier(), material, 0); + cmd.Blit(tempTexture.Identifier(), cameraColorTargetIdent); + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + CommandBufferPool.Release(cmd); + } + + public override void FrameCleanup(CommandBuffer cmd) { + cmd.ReleaseTemporaryRT(tempTexture.id); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta b/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta new file mode 100644 index 00000000..b4926c29 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3041cbc1cf964b008faea3f0ac996bba +timeCreated: 1644176479 \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineSelector.mat b/Assets/Scripts/Graphics/OutlineSelector.mat new file mode 100644 index 00000000..e0b582e3 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineSelector.mat @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3343911706550335055 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OutlineSelector + m_Shader: {fileID: 4800000, guid: ddee5e160afcb494c8df388a38ab8812, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineSelector.mat.meta b/Assets/Scripts/Graphics/OutlineSelector.mat.meta new file mode 100644 index 00000000..4b3d016c --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineSelector.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4dc2b184e3ad4befa715f0c441b7d20 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineSelector.shader b/Assets/Scripts/Graphics/OutlineSelector.shader new file mode 100644 index 00000000..2cfde00e --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineSelector.shader @@ -0,0 +1,51 @@ +Shader "Custom/OutlineSelector" { + Properties { + _MainTex ("Texture", 2D) = "white" {} + } + SubShader { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f { + float2 uv : TEXCOORD0; + UNITY_FOG_COORDS(1) + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + v2f vert (appdata v) { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target { + // sample the texture + // fixed4 col = tex2D(_MainTex, i.uv); + fixed4 col = fixed4(1, 1, 1, 1); + // apply fog + UNITY_APPLY_FOG(i.fogCoord, col); + return col; + } + ENDCG + } + } +} diff --git a/Assets/Scripts/Graphics/OutlineSelector.shader.meta b/Assets/Scripts/Graphics/OutlineSelector.shader.meta new file mode 100644 index 00000000..a5a4841e --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineSelector.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ddee5e160afcb494c8df388a38ab8812 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index b9a801ce..b9c89647 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -1,5 +1,22 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5846740753714490180 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: e67bce010483b442f8b2c94965360a86, type: 3} + m_Name: NewOutlineFeature + m_EditorClassIdentifier: + m_Active: 1 + settings: + isEnabled: 1 + insertTiming: 1000 + material: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12,8 +29,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: ForwardRenderer m_EditorClassIdentifier: - m_RendererFeatures: [] - m_RendererFeatureMap: + m_RendererFeatures: + - {fileID: -5846740753714490180} + m_RendererFeatureMap: bc540c094334dcae postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 9c5e037f..65821f68 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,7 +12,7 @@ TagManager: - Water - UI - Player - - + - Interactable - - - From db9ef9bdf1aff1142effc05740d7abbfd97609bc Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 10 Feb 2022 18:07:03 -0800 Subject: [PATCH 02/14] Functioning outline --- Assets/Prefabs/Interactables/Ball.prefab | 3 +- Assets/Prefabs/Interactables/Cube.prefab | 5 +- Assets/Prefabs/Interactables/Door v2.prefab | 4 +- Assets/Prefabs/Interactables/Door.prefab | 2 +- .../Prefabs/Interactables/Dummy Lock.prefab | 2 +- .../Interactables/Gate (Locked).prefab | 6 +- .../Interactables/Gate (Unlocked).prefab | 4 +- .../Interactables/Interactable Base.prefab | 3 +- Assets/Prefabs/Interactables/Key.prefab | 2 +- Assets/Prefabs/Interactables/Lock.prefab | 2 +- .../Interactables/Well_Bucket_Lift.prefab | 20 +- Assets/Scenes/StreetLevel.unity | 964 ++++++++++++++---- Assets/Scripts/Graphics/OutlineEffect.cs | 43 - Assets/Scripts/Graphics/OutlineEffect.cs.meta | 11 - ...utlineSelector.mat => OutlineMaterial.mat} | 4 +- ...ctor.mat.meta => OutlineMaterial.mat.meta} | 0 ...neSelector.shader => OutlineShader.shader} | 21 +- ....shader.meta => OutlineShader.shader.meta} | 0 .../URP Settings/ForwardRenderer.asset | 60 +- .../URP Settings/OutlineOverlayRenderer.asset | 62 ++ .../OutlineOverlayRenderer.asset.meta | 8 + .../UniversalRP-HighQuality.asset | 5 +- .../URP Settings/UniversalRP-LowQuality.asset | 1 + .../UniversalRP-MediumQuality.asset | 3 +- 24 files changed, 954 insertions(+), 281 deletions(-) delete mode 100644 Assets/Scripts/Graphics/OutlineEffect.cs delete mode 100644 Assets/Scripts/Graphics/OutlineEffect.cs.meta rename Assets/Scripts/Graphics/{OutlineSelector.mat => OutlineMaterial.mat} (98%) rename Assets/Scripts/Graphics/{OutlineSelector.mat.meta => OutlineMaterial.mat.meta} (100%) rename Assets/Scripts/Graphics/{OutlineSelector.shader => OutlineShader.shader} (57%) rename Assets/Scripts/Graphics/{OutlineSelector.shader.meta => OutlineShader.shader.meta} (100%) create mode 100644 Assets/Settings/URP Settings/OutlineOverlayRenderer.asset create mode 100644 Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta diff --git a/Assets/Prefabs/Interactables/Ball.prefab b/Assets/Prefabs/Interactables/Ball.prefab index 85fb403b..2cdbd046 100644 --- a/Assets/Prefabs/Interactables/Ball.prefab +++ b/Assets/Prefabs/Interactables/Ball.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 7609458109135603034} - component: {fileID: 7609458109135603035} - component: {fileID: 7609458109135603028} - m_Layer: 0 + m_Layer: 7 m_Name: Ball m_TagString: Untagged m_Icon: {fileID: 0} @@ -2525,6 +2525,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: movementSpeed: 1 + playerLayer: 6 maxSpeed: 10 freezeRotation: 1 --- !u!114 &7609458109135603028 diff --git a/Assets/Prefabs/Interactables/Cube.prefab b/Assets/Prefabs/Interactables/Cube.prefab index 7a2f897d..caf33748 100644 --- a/Assets/Prefabs/Interactables/Cube.prefab +++ b/Assets/Prefabs/Interactables/Cube.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 4795329138781609756} - component: {fileID: 4795329138781609757} - component: {fileID: 4795329138781609758} - m_Layer: 0 + m_Layer: 7 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -413,6 +413,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: movementSpeed: 1 + playerLayer: 6 maxSpeed: 10 freezeRotation: 1 --- !u!1 &4795329138887181543 @@ -424,7 +425,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4795329138887181542} - m_Layer: 0 + m_Layer: 7 m_Name: Center m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Door v2.prefab b/Assets/Prefabs/Interactables/Door v2.prefab index 7d7c4418..21320a99 100644 --- a/Assets/Prefabs/Interactables/Door v2.prefab +++ b/Assets/Prefabs/Interactables/Door v2.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 2359756735399934658} - component: {fileID: 2359756735399934659} - component: {fileID: 2359756735399934656} - m_Layer: 0 + m_Layer: 7 m_Name: Door v2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -136,7 +136,7 @@ GameObject: - component: {fileID: 2359756736066362860} - component: {fileID: 2359756736066362861} - component: {fileID: 2359756736066362858} - m_Layer: 0 + m_Layer: 7 m_Name: Gate Mesh m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Door.prefab b/Assets/Prefabs/Interactables/Door.prefab index 91107046..0e351e58 100644 --- a/Assets/Prefabs/Interactables/Door.prefab +++ b/Assets/Prefabs/Interactables/Door.prefab @@ -18,7 +18,7 @@ GameObject: - component: {fileID: 2904333231284592463} - component: {fileID: 2904333231284592460} - component: {fileID: 2904333231284592461} - m_Layer: 0 + m_Layer: 7 m_Name: Door m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Dummy Lock.prefab b/Assets/Prefabs/Interactables/Dummy Lock.prefab index 5a3d9238..a8a1c16e 100644 --- a/Assets/Prefabs/Interactables/Dummy Lock.prefab +++ b/Assets/Prefabs/Interactables/Dummy Lock.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 3594502753389608681} - component: {fileID: 6499754372677302386} - component: {fileID: 7241472463710246339} - m_Layer: 0 + m_Layer: 7 m_Name: Dummy Lock m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Gate (Locked).prefab b/Assets/Prefabs/Interactables/Gate (Locked).prefab index c9868b03..a7c9923a 100644 --- a/Assets/Prefabs/Interactables/Gate (Locked).prefab +++ b/Assets/Prefabs/Interactables/Gate (Locked).prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 8254623289462329078} - component: {fileID: 8254623289462329079} - component: {fileID: 8254623289462329076} - m_Layer: 0 + m_Layer: 7 m_Name: Lock m_TagString: Untagged m_Icon: {fileID: 0} @@ -146,7 +146,7 @@ GameObject: - component: {fileID: 8254623289744407600} - component: {fileID: 8254623289744407601} - component: {fileID: 8254623289744407606} - m_Layer: 0 + m_Layer: 7 m_Name: Gate (Locked) m_TagString: Untagged m_Icon: {fileID: 0} @@ -691,7 +691,7 @@ GameObject: - component: {fileID: 8254623289791865149} - component: {fileID: 8254623289791865146} - component: {fileID: 8254623289791865147} - m_Layer: 0 + m_Layer: 7 m_Name: Gate (1) m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Gate (Unlocked).prefab b/Assets/Prefabs/Interactables/Gate (Unlocked).prefab index 04da63cc..f51b745c 100644 --- a/Assets/Prefabs/Interactables/Gate (Unlocked).prefab +++ b/Assets/Prefabs/Interactables/Gate (Unlocked).prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 3008955352867139539} - component: {fileID: 3008955352867139501} - component: {fileID: 3008955352867139500} - m_Layer: 0 + m_Layer: 7 m_Name: Gate (Unlocked) m_TagString: Untagged m_Icon: {fileID: 0} @@ -561,7 +561,7 @@ GameObject: - component: {fileID: 3008955352914607112} - component: {fileID: 3008955352914607119} - component: {fileID: 3008955352914607118} - m_Layer: 0 + m_Layer: 7 m_Name: Gate (1) m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Interactable Base.prefab b/Assets/Prefabs/Interactables/Interactable Base.prefab index 79c7f826..3f0985ef 100644 --- a/Assets/Prefabs/Interactables/Interactable Base.prefab +++ b/Assets/Prefabs/Interactables/Interactable Base.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 7007801196651952347} - component: {fileID: 4723133526917844122} - component: {fileID: 4793178900451971204} - m_Layer: 0 + m_Layer: 7 m_Name: Interactable Base m_TagString: Untagged m_Icon: {fileID: 0} @@ -105,5 +105,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: movementSpeed: 0.5 + playerLayer: 6 maxSpeed: 10 freezeRotation: 1 diff --git a/Assets/Prefabs/Interactables/Key.prefab b/Assets/Prefabs/Interactables/Key.prefab index 92c91674..75290680 100644 --- a/Assets/Prefabs/Interactables/Key.prefab +++ b/Assets/Prefabs/Interactables/Key.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 4171394045610244615} - component: {fileID: 4171394045610244612} - component: {fileID: 4171394045610244613} - m_Layer: 0 + m_Layer: 7 m_Name: Key m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Lock.prefab b/Assets/Prefabs/Interactables/Lock.prefab index 6e9fd1f6..becb1c0c 100644 --- a/Assets/Prefabs/Interactables/Lock.prefab +++ b/Assets/Prefabs/Interactables/Lock.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 3035223382364655420} - component: {fileID: 3035223382364655421} - component: {fileID: 3035223382364655418} - m_Layer: 0 + m_Layer: 7 m_Name: Lock m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Interactables/Well_Bucket_Lift.prefab b/Assets/Prefabs/Interactables/Well_Bucket_Lift.prefab index ed9f8bdd..7aac7ece 100644 --- a/Assets/Prefabs/Interactables/Well_Bucket_Lift.prefab +++ b/Assets/Prefabs/Interactables/Well_Bucket_Lift.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 4442211184507422947} - component: {fileID: 4442211184507422956} - m_Layer: 0 + m_Layer: 7 m_Name: Well_Bucket_Lift m_TagString: Untagged m_Icon: {fileID: 0} @@ -64,7 +64,7 @@ GameObject: - component: {fileID: 4442211184634013901} - component: {fileID: 4442211184634013891} - component: {fileID: 4442211184634013900} - m_Layer: 0 + m_Layer: 7 m_Name: RopeHanging (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -205,6 +205,10 @@ PrefabInstance: propertyPath: m_Name value: Well_Bucket (1) objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d06e2954ef88f5e48a2fdb4a01290871, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d06e2954ef88f5e48a2fdb4a01290871, type: 3} --- !u!1 &3559126117029711454 stripped @@ -217,7 +221,7 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d06e2954ef88f5e48a2fdb4a01290871, type: 3} m_PrefabInstance: {fileID: 4442211184280744719} m_PrefabAsset: {fileID: 0} ---- !u!65 &4442211184714845958 +--- !u!65 &4442211184714845957 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -228,9 +232,9 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.002066136, y: 0.0020444675, z: 0.00016364278} - m_Center: {x: -0.0000026421635, y: -0.000013506786, z: -0.0025437085} ---- !u!65 &4442211184714845957 + m_Size: {x: 0.0029036289, y: 0.00002732366, z: 0.0025017397} + m_Center: {x: 0.000012779707, y: -0.0010359833, z: -0.00137466} +--- !u!65 &4442211184714845958 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -241,8 +245,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.0029036289, y: 0.00002732366, z: 0.0025017397} - m_Center: {x: 0.000012779707, y: -0.0010359833, z: -0.00137466} + m_Size: {x: 0.002066136, y: 0.0020444675, z: 0.00016364278} + m_Center: {x: -0.0000026421635, y: -0.000013506786, z: -0.0025437085} --- !u!95 &4442211184714845959 Animator: serializedVersion: 3 diff --git a/Assets/Scenes/StreetLevel.unity b/Assets/Scenes/StreetLevel.unity index 7c1986f5..f2b04ce2 100644 --- a/Assets/Scenes/StreetLevel.unity +++ b/Assets/Scenes/StreetLevel.unity @@ -1380,7 +1380,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83080 + m_Name: pb_Mesh32760 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1972,7 +1972,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81112 + m_Name: pb_Mesh30790 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2136,7 +2136,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82956 + m_Name: pb_Mesh32640 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2613,7 +2613,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83770 + m_Name: pb_Mesh33448 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2777,7 +2777,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81996 + m_Name: pb_Mesh31678 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3264,7 +3264,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82816 + m_Name: pb_Mesh32502 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3428,7 +3428,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81264 + m_Name: pb_Mesh30942 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3592,7 +3592,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81642 + m_Name: pb_Mesh31324 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -4212,7 +4212,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82278 + m_Name: pb_Mesh31960 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5374,7 +5374,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84060 + m_Name: pb_Mesh33736 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5538,7 +5538,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83472 + m_Name: pb_Mesh33150 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5696,6 +5696,123 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &147639524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147639525} + - component: {fileID: 147639528} + - component: {fileID: 147639527} + - component: {fileID: 147639526} + m_Layer: 0 + m_Name: OutlineCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &147639525 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147639524} + 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_Children: [] + m_Father: {fileID: 477894334} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &147639526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147639524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &147639527 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147639524} + m_Enabled: 1 +--- !u!20 &147639528 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147639524} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 128 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1001 &156529840 PrefabInstance: m_ObjectHideFlags: 0 @@ -5771,7 +5888,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84114 + m_Name: pb_Mesh33790 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6334,7 +6451,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83858 + m_Name: pb_Mesh33534 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6528,7 +6645,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81820 + m_Name: pb_Mesh31504 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7385,7 +7502,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82514 + m_Name: pb_Mesh32196 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8169,7 +8286,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83508 + m_Name: pb_Mesh33186 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9579,7 +9696,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83154 + m_Name: pb_Mesh32832 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10357,6 +10474,79 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: +--- !u!1001 &237853797 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Name + value: TEMP TEST BALL (1) + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603032, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1114991686} + - target: {fileID: 7609458109135603033, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1114991686} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.x + value: 17.9 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.y + value: 2.4 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.z + value: 34.7 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603038, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1114991686} + - target: {fileID: 7609458109135603039, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} --- !u!4 &243479377 stripped Transform: m_CorrespondingSourceObject: {fileID: 4888730894688542074, guid: e04578c601a8d66448d9c007ba6ebd6e, type: 3} @@ -10686,7 +10876,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82972 + m_Name: pb_Mesh32656 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10850,7 +11040,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82234 + m_Name: pb_Mesh31914 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11014,7 +11204,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-35218 + m_Name: pb_Mesh-8472 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11188,7 +11378,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82874 + m_Name: pb_Mesh32560 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -13868,7 +14058,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81838 + m_Name: pb_Mesh31522 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14032,7 +14222,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82304 + m_Name: pb_Mesh31986 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14341,7 +14531,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82134 + m_Name: pb_Mesh31816 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14818,7 +15008,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81624 + m_Name: pb_Mesh31306 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14982,7 +15172,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82662 + m_Name: pb_Mesh32346 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15146,7 +15336,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82598 + m_Name: pb_Mesh32282 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15310,7 +15500,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81594 + m_Name: pb_Mesh31276 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16783,7 +16973,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81386 + m_Name: pb_Mesh31064 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16947,7 +17137,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82336 + m_Name: pb_Mesh32018 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18248,7 +18438,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83782 + m_Name: pb_Mesh33460 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18796,7 +18986,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83450 + m_Name: pb_Mesh33128 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20609,7 +20799,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81444 + m_Name: pb_Mesh31126 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21086,7 +21276,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81130 + m_Name: pb_Mesh30808 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21250,7 +21440,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81166 + m_Name: pb_Mesh30844 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21500,7 +21690,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83024 + m_Name: pb_Mesh32704 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -22784,7 +22974,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81476 + m_Name: pb_Mesh31158 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23279,6 +23469,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2620666226370321361, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2620666226370321362, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} propertyPath: m_RootOrder value: 0 @@ -23327,8 +23521,29 @@ PrefabInstance: propertyPath: m_Name value: Camera objectReference: {fileID: 0} + - target: {fileID: 2620666226370321373, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_Cameras.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_Cameras.Array.data[0] + value: + objectReference: {fileID: 147639528} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} +--- !u!4 &477894334 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2620666226370321362, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + m_PrefabInstance: {fileID: 477894333} + m_PrefabAsset: {fileID: 0} --- !u!1001 &480490917 PrefabInstance: m_ObjectHideFlags: 0 @@ -23632,7 +23847,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81856 + m_Name: pb_Mesh31540 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23796,7 +24011,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83364 + m_Name: pb_Mesh33042 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23997,7 +24212,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82580 + m_Name: pb_Mesh32264 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -24226,7 +24441,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81530 + m_Name: pb_Mesh31214 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25641,7 +25856,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82084 + m_Name: pb_Mesh31766 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26118,7 +26333,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84000 + m_Name: pb_Mesh33676 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26600,7 +26815,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83426 + m_Name: pb_Mesh33104 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26764,7 +26979,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81330 + m_Name: pb_Mesh31008 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27617,7 +27832,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83870 + m_Name: pb_Mesh33548 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27786,7 +28001,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82114 + m_Name: pb_Mesh31796 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -28631,7 +28846,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83376 + m_Name: pb_Mesh33054 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -28795,7 +29010,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83122 + m_Name: pb_Mesh32800 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29272,7 +29487,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82060 + m_Name: pb_Mesh31742 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30203,7 +30418,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-37776 + m_Name: pb_Mesh-10944 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30367,7 +30582,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83918 + m_Name: pb_Mesh33594 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30561,7 +30776,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81464 + m_Name: pb_Mesh31146 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30794,7 +31009,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83952 + m_Name: pb_Mesh33628 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31271,7 +31486,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-37594 + m_Name: pb_Mesh-10762 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31440,7 +31655,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83600 + m_Name: pb_Mesh33278 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31604,7 +31819,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82458 + m_Name: pb_Mesh32140 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31855,7 +32070,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83094 + m_Name: pb_Mesh32772 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33178,7 +33393,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82648 + m_Name: pb_Mesh32332 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34024,7 +34239,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82688 + m_Name: pb_Mesh32370 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34188,7 +34403,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83534 + m_Name: pb_Mesh33212 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37201,7 +37416,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83720 + m_Name: pb_Mesh33398 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37786,7 +38001,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82838 + m_Name: pb_Mesh32524 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37950,7 +38165,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82030 + m_Name: pb_Mesh31710 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38427,7 +38642,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81374 + m_Name: pb_Mesh31052 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38591,7 +38806,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81100 + m_Name: pb_Mesh30778 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -39375,7 +39590,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83840 + m_Name: pb_Mesh33516 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41195,7 +41410,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84084 + m_Name: pb_Mesh33760 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41359,7 +41574,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82216 + m_Name: pb_Mesh31898 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41719,7 +41934,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81568 + m_Name: pb_Mesh31250 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -42576,7 +42791,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81518 + m_Name: pb_Mesh31202 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -42740,7 +42955,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83970 + m_Name: pb_Mesh33646 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43217,7 +43432,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84202 + m_Name: pb_Mesh33878 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43381,7 +43596,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83886 + m_Name: pb_Mesh33562 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43868,7 +44083,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83640 + m_Name: pb_Mesh33318 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -45356,7 +45571,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82532 + m_Name: pb_Mesh32216 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -45627,7 +45842,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81346 + m_Name: pb_Mesh31024 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -46812,7 +47027,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81872 + m_Name: pb_Mesh31556 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -46976,7 +47191,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81410 + m_Name: pb_Mesh31088 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -47140,7 +47355,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81278 + m_Name: pb_Mesh30956 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -47834,7 +48049,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82770 + m_Name: pb_Mesh32454 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -48077,7 +48292,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82048 + m_Name: pb_Mesh31728 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -49492,7 +49707,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81398 + m_Name: pb_Mesh31076 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -50975,7 +51190,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84150 + m_Name: pb_Mesh33826 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -51526,7 +51741,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82740 + m_Name: pb_Mesh32422 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -52388,7 +52603,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81236 + m_Name: pb_Mesh30914 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -52865,7 +53080,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82890 + m_Name: pb_Mesh32576 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -53593,7 +53808,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81610 + m_Name: pb_Mesh31292 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -53818,7 +54033,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83226 + m_Name: pb_Mesh32904 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -53982,7 +54197,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82992 + m_Name: pb_Mesh32674 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -54464,7 +54679,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82622 + m_Name: pb_Mesh32306 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -55497,7 +55712,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84028 + m_Name: pb_Mesh33704 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -57214,13 +57429,177 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: +--- !u!43 &1114991686 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-42044 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 240 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 240 + localAABB: + m_Center: {x: 0, y: 0.24, z: 0} + m_Extent: {x: 0.24, y: 0.24, z: 0.24} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000400050006000700080009000a000b000c000d000e000f0010001100120013001400150016001700180019001a001b001c001d001e001f0020002100220023002400250026002700280029002a002b002c002d002e002f0030003100320033003400350036003700380039003a003b003c003d003e003f0040004100420043004400450046004700480049004a004b004c004d004e004f0050005100520053005400550056005700580059005a005b005c005d005e005f0060006100620063006400650066006700680069006a006b006c006d006e006f0070007100720073007400750076007700780079007a007b007c007d007e007f0080008100820083008400850086008700880089008a008b008c008d008e008f0090009100920093009400950096009700980099009a009b009c009d009e009f00a000a100a200a300a400a500a600a700a800a900aa00ab00ac00ad00ae00af00b000b100b200b300b400b500b600b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100d200d300d400d500d600d700d800d900da00db00dc00dd00de00df00e000e100e200e300e400e500e600e700e800e900ea00eb00ec00ed00ee00ef00 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 240 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 15360 + _typelessdata: 243401be7068e33e00000000ee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d246beeb51b83e56e3973dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e397bdc14ade3e8fc2f53dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246beeb51b83e56e3973d46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e51be8fc2753e2434013e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2f5bd1ddaa03ef3d2463e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d246beeb51b83e56e3973d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f5bd1ddaa03ef3d2463e3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e397bdc14ade3e8fc2f53d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e56e397bdc14ade3e8fc2f53dff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f5bd1ddaa03ef3d2463eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000005a7bbb3e520e513eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401be7068e33e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f53de23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000008fc2f53e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000005a7bbb3e520e513e000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e3973dc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e397bdc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e3973dc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d000000008fc2f53e0000000000000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000008fc2f53e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f53de23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d2434013e7068e33e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000243401be7068e33e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000008fc2f53e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f5bde23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000008fc2f53e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000000000002434013e7068e33e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f5bde23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000008fc2f53e0000000000000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e397bdc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bdc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973dc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000005a7bbb3e520e51be000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be243401be7068e33e00000000ee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f5bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d246beeb51b83e56e397bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e397bdc14ade3e8fc2f5bdff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e51beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d246beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e397bdc14ade3e8fc2f5bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f5bd1ddaa03ef3d246be3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d246beeb51b83e56e397bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d246beeb51b83e56e397bd46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f5bd1ddaa03ef3d246be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e51be8fc2753e243401be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e243401be7068e33e00000000532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33ef3d246beeb51b83e56e397bd532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d246beeb51b83e56e3973d532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e397bdac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e520e51be8fc2753e243401beac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc275be8fc2753e00000000ac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e397bdec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc275be8fc2753e00000000ec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e3973dec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e3973dac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc275be8fc2753e00000000ac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e2434013eac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013e7068e33e00000000ee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f53dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463eeb51b83e56e3973dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e3973dc14ade3e8fc2f53dff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e513eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f53d1ddaa03ef3d2463eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e3973dc14ade3e8fc2f53d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f53d1ddaa03ef3d2463e3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d2463eeb51b83e56e3973d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d2463eeb51b83e56e3973d46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f53d1ddaa03ef3d2463e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e513e8fc2753e2434013e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e000000005a7bbb3e520e513e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d2463e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc2753e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e520e51be8fc2753e2434013eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f5bde4d0293ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f5bd1ddaa03ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f5bde4d0293ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc2753e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d2463e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e513e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d520e51be8fc2753e2434013eac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc275be8fc2753e00000000ac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e3973dac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc275be8fc2753e00000000ac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e243401beac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753ef3d246be8fc2f53d56e397bdac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc275be8fc2753e00000000ec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e397bdec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973dec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e3973d532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e397bd532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123d520e51be8fc2753e243401beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f5bd1ddaa03ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f5bde4d0293ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bd1ddaa03ef3d246be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e51be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e000000008fc2753e8fc275be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc275be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc275be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e00000000d61ce93d520e51be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000005a7bbb3e520e51beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e56e3973dc14ade3e8fc2f5bdff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f53d1ddaa03ef3d246beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e3973dc14ade3e8fc2f5bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd2434013e7068e33e00000000ee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d2463eeb51b83e56e397bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e3973dc14ade3e8fc2f5bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3ef3d2463eeb51b83e56e397bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f53d1ddaa03ef3d246be3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d2463eeb51b83e56e397bd46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e513e8fc2753e243401be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d00000000ed47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d2463e8fc2f53d56e3973ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e3973d70be3b3d8fc2f53ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e513e8fc2753e2434013e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2f53de4d0293ef3d2463e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d2463e8fc2f53d56e3973d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f53de4d0293ef3d2463e3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e3973d70be3b3d8fc2f53d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d56e3973d70be3b3d8fc2f53dfb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f53de4d0293ef3d2463efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e00000000d61ce93d520e513efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d2434013ef4d0123d00000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f53ddf3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000000000000000000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d00000000d61ce93d520e513e00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e397bd70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e3973d70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e397bd70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d00000000000000000000000000000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000000000000000000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f53ddf3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f2434013e000000002434013ef4d0123d00000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000000000000000000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f5bddf3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000000000000000000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000243401bef4d0123d00000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f5bddf3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000000000000000000000000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bd70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000d61ce93d520e51be00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be2434013ef4d0123d00000000ed47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f5bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d2463e8fc2f53d56e397bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e3973d70be3b3d8fc2f5bdfb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e51befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d246befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e3973d70be3b3d8fc2f5bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f53de4d0293ef3d246be3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d2463e8fc2f53d56e397bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d2463e8fc2f53d56e397bd46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f53de4d0293ef3d246be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e513e8fc2753e243401be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d000000005322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123df3d2463e8fc2f53d56e397bd5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e397bdac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d520e513e8fc2753e243401beac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2753e8fc2753e00000000ac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e397bdec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2753e8fc2753e00000000ec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e3973dec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e3973dac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc2753e8fc2753e00000000ac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e2434013eac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e00000000d61ce93d520e513e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d2463e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc2753e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e520e513e8fc2753e2434013eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f53d1ddaa03ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f53de4d0293ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f53d1ddaa03ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc2753e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d2463e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e513e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401bef4d0123d00000000ed4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f53ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e397bd70be3b3d8fc2f53dfb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e513efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f5bde4d0293ef3d2463efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e397bd70be3b3d8fc2f53d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f5bde4d0293ef3d2463e3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d246be8fc2f53d56e3973d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d246be8fc2f53d56e3973d46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f5bde4d0293ef3d2463e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e51be8fc2753e2434013e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e00000000d61ce93d520e51befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d56e397bd70be3b3d8fc2f5bdfb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f5bde4d0293ef3d246befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e397bd70be3b3d8fc2f5bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd243401bef4d0123d00000000ed4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d246be8fc2f53d56e397bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e397bd70be3b3d8fc2f5bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3df3d246be8fc2f53d56e397bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f5bde4d0293ef3d246be3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d246be8fc2f53d56e397bd46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e51be8fc2753e243401be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e520e513e8fc2753e243401beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f53de4d0293ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f53d1ddaa03ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53de4d0293ef3d246be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e51be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000008fc2753e8fc275be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc275be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc275be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000005a7bbb3e520e51be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e520e513e8fc2753e2434013eac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2753e8fc2753e00000000ac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e3973dac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2753e8fc2753e00000000ac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e243401beac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753ef3d2463eeb51b83e56e397bdac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc2753e8fc2753e00000000ec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e397bdec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d2463eeb51b83e56e3973dec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e3973d5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e397bd5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e2434013e7068e33e000000005322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.24, z: 0} + m_Extent: {x: 0.24, y: 0.24, z: 0.24} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &1116831313 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83336 + m_Name: pb_Mesh33014 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -57697,7 +58076,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82852 + m_Name: pb_Mesh32538 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -58209,7 +58588,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82490 + m_Name: pb_Mesh32172 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -58747,7 +59126,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81938 + m_Name: pb_Mesh31620 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -58941,7 +59320,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83822 + m_Name: pb_Mesh33500 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -59448,7 +59827,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82708 + m_Name: pb_Mesh32390 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -59612,7 +59991,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83110 + m_Name: pb_Mesh32788 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -60465,13 +60844,177 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ebb8f68368b1744c8bdf1ba34e61ab9, type: 3} +--- !u!43 &1233217579 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-25084 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 240 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 240 + localAABB: + m_Center: {x: 0, y: 0.24, z: 0} + m_Extent: {x: 0.24, y: 0.24, z: 0.24} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000400050006000700080009000a000b000c000d000e000f0010001100120013001400150016001700180019001a001b001c001d001e001f0020002100220023002400250026002700280029002a002b002c002d002e002f0030003100320033003400350036003700380039003a003b003c003d003e003f0040004100420043004400450046004700480049004a004b004c004d004e004f0050005100520053005400550056005700580059005a005b005c005d005e005f0060006100620063006400650066006700680069006a006b006c006d006e006f0070007100720073007400750076007700780079007a007b007c007d007e007f0080008100820083008400850086008700880089008a008b008c008d008e008f0090009100920093009400950096009700980099009a009b009c009d009e009f00a000a100a200a300a400a500a600a700a800a900aa00ab00ac00ad00ae00af00b000b100b200b300b400b500b600b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100d200d300d400d500d600d700d800d900da00db00dc00dd00de00df00e000e100e200e300e400e500e600e700e800e900ea00eb00ec00ed00ee00ef00 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 240 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 40 + format: 0 + dimension: 4 + - stream: 0 + offset: 56 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 15360 + _typelessdata: 243401be7068e33e00000000ee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d246beeb51b83e56e3973dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e397bdc14ade3e8fc2f53dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246beeb51b83e56e3973d46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e51be8fc2753e2434013e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2f5bd1ddaa03ef3d2463e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d246beeb51b83e56e3973d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f5bd1ddaa03ef3d2463e3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e397bdc14ade3e8fc2f53d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e56e397bdc14ade3e8fc2f53dff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f5bd1ddaa03ef3d2463eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000005a7bbb3e520e513eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401be7068e33e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f53de23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000008fc2f53e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000005a7bbb3e520e513e000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e3973dc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e397bdc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e3973dc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d000000008fc2f53e0000000000000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000008fc2f53e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f53de23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d2434013e7068e33e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000243401be7068e33e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000008fc2f53e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f5bde23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000008fc2f53e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000000000002434013e7068e33e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f5bde23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000008fc2f53e0000000000000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e397bdc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bdc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973dc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000005a7bbb3e520e51be000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be243401be7068e33e00000000ee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f5bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d246beeb51b83e56e397bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e397bdc14ade3e8fc2f5bdff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e51beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d246beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e397bdc14ade3e8fc2f5bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f5bd1ddaa03ef3d246be3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d246beeb51b83e56e397bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d246beeb51b83e56e397bd46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f5bd1ddaa03ef3d246be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e51be8fc2753e243401be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e243401be7068e33e00000000532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33ef3d246beeb51b83e56e397bd532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d246beeb51b83e56e3973d532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e397bdac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e520e51be8fc2753e243401beac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc275be8fc2753e00000000ac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e397bdec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc275be8fc2753e00000000ec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e3973dec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e3973dac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc275be8fc2753e00000000ac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e2434013eac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013e7068e33e00000000ee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f53dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463eeb51b83e56e3973dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e3973dc14ade3e8fc2f53dff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e513eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f53d1ddaa03ef3d2463eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e3973dc14ade3e8fc2f53d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f53d1ddaa03ef3d2463e3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d2463eeb51b83e56e3973d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d2463eeb51b83e56e3973d46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f53d1ddaa03ef3d2463e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e513e8fc2753e2434013e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e000000005a7bbb3e520e513e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d2463e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc2753e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e520e51be8fc2753e2434013eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f5bde4d0293ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f5bd1ddaa03ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f5bde4d0293ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc2753e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d2463e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e513e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d520e51be8fc2753e2434013eac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc275be8fc2753e00000000ac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e3973dac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc275be8fc2753e00000000ac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e243401beac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753ef3d246be8fc2f53d56e397bdac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc275be8fc2753e00000000ec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e397bdec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973dec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e3973d532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e397bd532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123d520e51be8fc2753e243401beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f5bd1ddaa03ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f5bde4d0293ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bd1ddaa03ef3d246be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e51be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e000000008fc2753e8fc275be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc275be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc275be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e00000000d61ce93d520e51be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000005a7bbb3e520e51beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e56e3973dc14ade3e8fc2f5bdff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f53d1ddaa03ef3d246beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e3973dc14ade3e8fc2f5bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd2434013e7068e33e00000000ee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d2463eeb51b83e56e397bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e3973dc14ade3e8fc2f5bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3ef3d2463eeb51b83e56e397bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f53d1ddaa03ef3d246be3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d2463eeb51b83e56e397bd46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e513e8fc2753e243401be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d00000000ed47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d2463e8fc2f53d56e3973ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e3973d70be3b3d8fc2f53ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e513e8fc2753e2434013e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2f53de4d0293ef3d2463e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d2463e8fc2f53d56e3973d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f53de4d0293ef3d2463e3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e3973d70be3b3d8fc2f53d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d56e3973d70be3b3d8fc2f53dfb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f53de4d0293ef3d2463efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e00000000d61ce93d520e513efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d2434013ef4d0123d00000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f53ddf3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000000000000000000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d00000000d61ce93d520e513e00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e397bd70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e3973d70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e397bd70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d00000000000000000000000000000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000000000000000000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f53ddf3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f2434013e000000002434013ef4d0123d00000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000000000000000000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f5bddf3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000000000000000000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000243401bef4d0123d00000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f5bddf3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000000000000000000000000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bd70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000d61ce93d520e51be00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be2434013ef4d0123d00000000ed47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f5bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d2463e8fc2f53d56e397bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e3973d70be3b3d8fc2f5bdfb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e51befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d246befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e3973d70be3b3d8fc2f5bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f53de4d0293ef3d246be3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d2463e8fc2f53d56e397bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d2463e8fc2f53d56e397bd46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f53de4d0293ef3d246be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e513e8fc2753e243401be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d000000005322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123df3d2463e8fc2f53d56e397bd5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e397bdac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d520e513e8fc2753e243401beac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2753e8fc2753e00000000ac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e397bdec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2753e8fc2753e00000000ec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e3973dec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e3973dac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc2753e8fc2753e00000000ac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e2434013eac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e00000000d61ce93d520e513e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d2463e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc2753e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e520e513e8fc2753e2434013eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f53d1ddaa03ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f53de4d0293ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f53d1ddaa03ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc2753e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d2463e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e513e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401bef4d0123d00000000ed4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f53ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e397bd70be3b3d8fc2f53dfb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e513efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f5bde4d0293ef3d2463efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e397bd70be3b3d8fc2f53d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f5bde4d0293ef3d2463e3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d246be8fc2f53d56e3973d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d246be8fc2f53d56e3973d46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f5bde4d0293ef3d2463e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e51be8fc2753e2434013e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e00000000d61ce93d520e51befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d56e397bd70be3b3d8fc2f5bdfb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f5bde4d0293ef3d246befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e397bd70be3b3d8fc2f5bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd243401bef4d0123d00000000ed4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d246be8fc2f53d56e397bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e397bd70be3b3d8fc2f5bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3df3d246be8fc2f53d56e397bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f5bde4d0293ef3d246be3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d246be8fc2f53d56e397bd46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e51be8fc2753e243401be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e520e513e8fc2753e243401beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f53de4d0293ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f53d1ddaa03ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53de4d0293ef3d246be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e51be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000008fc2753e8fc275be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc275be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc275be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000005a7bbb3e520e51be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e520e513e8fc2753e2434013eac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2753e8fc2753e00000000ac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e3973dac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2753e8fc2753e00000000ac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e243401beac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753ef3d2463eeb51b83e56e397bdac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc2753e8fc2753e00000000ec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e397bdec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d2463eeb51b83e56e3973dec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e3973d5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e397bd5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e2434013e7068e33e000000005322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.24, z: 0} + m_Extent: {x: 0.24, y: 0.24, z: 0.24} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!43 &1235333010 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82166 + m_Name: pb_Mesh31848 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -60635,7 +61178,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83324 + m_Name: pb_Mesh33002 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -60799,7 +61342,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84012 + m_Name: pb_Mesh33688 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -62392,7 +62935,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82444 + m_Name: pb_Mesh32126 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -62550,6 +63093,75 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &1262776468 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Name + value: TEMP TEST BALL + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603032, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1233217579} + - target: {fileID: 7609458109135603033, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1233217579} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.x + value: 17.2 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.y + value: 2.4 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalPosition.z + value: 34.8 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7609458109135603038, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1233217579} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} --- !u!1 &1265523675 GameObject: m_ObjectHideFlags: 0 @@ -62869,7 +63481,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82418 + m_Name: pb_Mesh32100 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63033,7 +63645,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83588 + m_Name: pb_Mesh33266 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63197,7 +63809,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81208 + m_Name: pb_Mesh30886 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -64015,7 +64627,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83134 + m_Name: pb_Mesh32812 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -67115,7 +67727,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82392 + m_Name: pb_Mesh32074 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -67284,7 +67896,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81190 + m_Name: pb_Mesh30868 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -68535,7 +69147,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83402 + m_Name: pb_Mesh33080 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69012,7 +69624,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83496 + m_Name: pb_Mesh33174 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69176,7 +69788,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81664 + m_Name: pb_Mesh31346 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69340,7 +69952,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82634 + m_Name: pb_Mesh32318 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69504,7 +70116,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81316 + m_Name: pb_Mesh30994 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69668,7 +70280,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83238 + m_Name: pb_Mesh32916 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70002,7 +70614,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82472 + m_Name: pb_Mesh32154 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70575,7 +71187,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82148 + m_Name: pb_Mesh31830 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -71781,7 +72393,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81580 + m_Name: pb_Mesh31262 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -71945,7 +72557,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81964 + m_Name: pb_Mesh31646 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -72264,7 +72876,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83312 + m_Name: pb_Mesh32990 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -72428,7 +73040,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81682 + m_Name: pb_Mesh31364 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -73485,7 +74097,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82610 + m_Name: pb_Mesh32294 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -73649,7 +74261,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82010 + m_Name: pb_Mesh31692 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -76915,7 +77527,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83352 + m_Name: pb_Mesh33030 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -78728,7 +79340,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82404 + m_Name: pb_Mesh32086 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -80132,7 +80744,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83576 + m_Name: pb_Mesh33254 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -80977,7 +81589,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83250 + m_Name: pb_Mesh32928 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -84458,7 +85070,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81904 + m_Name: pb_Mesh31586 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -85315,7 +85927,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82380 + m_Name: pb_Mesh32062 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -85479,7 +86091,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83708 + m_Name: pb_Mesh33386 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -86766,7 +87378,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83690 + m_Name: pb_Mesh33368 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -88489,7 +89101,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83484 + m_Name: pb_Mesh33162 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -88714,7 +89326,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83296 + m_Name: pb_Mesh32974 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -89000,7 +89612,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82100 + m_Name: pb_Mesh31782 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -89725,7 +90337,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82252 + m_Name: pb_Mesh31934 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -90082,11 +90694,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.y - value: 0.77050364 + value: 0.73250365 objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.z - value: -5.9243155 + value: -5.9123144 objectReference: {fileID: 0} - target: {fileID: 2359756735399934660, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_RootOrder @@ -91418,7 +92030,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83988 + m_Name: pb_Mesh33664 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -91582,7 +92194,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84190 + m_Name: pb_Mesh33866 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92094,7 +92706,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83270 + m_Name: pb_Mesh32948 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92258,7 +92870,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81748 + m_Name: pb_Mesh31430 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92422,7 +93034,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81788 + m_Name: pb_Mesh31470 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92939,7 +93551,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81422 + m_Name: pb_Mesh31100 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93143,7 +93755,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81950 + m_Name: pb_Mesh31632 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93317,7 +93929,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83936 + m_Name: pb_Mesh33612 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93481,7 +94093,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83734 + m_Name: pb_Mesh33412 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93645,7 +94257,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81700 + m_Name: pb_Mesh31382 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93809,7 +94421,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81304 + m_Name: pb_Mesh30982 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93973,7 +94585,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81774 + m_Name: pb_Mesh31456 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94198,7 +94810,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82728 + m_Name: pb_Mesh32410 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94362,7 +94974,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82430 + m_Name: pb_Mesh32112 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94839,7 +95451,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83616 + m_Name: pb_Mesh33294 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -95008,7 +95620,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83068 + m_Name: pb_Mesh32748 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -96492,7 +97104,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81292 + m_Name: pb_Mesh30970 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -96686,7 +97298,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83200 + m_Name: pb_Mesh32878 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -96850,7 +97462,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82914 + m_Name: pb_Mesh32600 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -97189,7 +97801,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh84072 + m_Name: pb_Mesh33748 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98286,7 +98898,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81088 + m_Name: pb_Mesh30766 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98450,7 +99062,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83438 + m_Name: pb_Mesh33116 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98614,7 +99226,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81150 + m_Name: pb_Mesh30828 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98788,7 +99400,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83174 + m_Name: pb_Mesh32852 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98952,7 +99564,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82796 + m_Name: pb_Mesh32480 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99116,7 +99728,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83038 + m_Name: pb_Mesh32718 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99349,7 +99961,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81984 + m_Name: pb_Mesh31666 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99963,7 +100575,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82198 + m_Name: pb_Mesh31880 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -100950,7 +101562,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh83282 + m_Name: pb_Mesh32960 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -101427,7 +102039,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82264 + m_Name: pb_Mesh31946 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -102819,7 +103431,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82782 + m_Name: pb_Mesh32466 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -107693,7 +108305,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-37514 + m_Name: pb_Mesh-10682 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -108027,7 +108639,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81548 + m_Name: pb_Mesh31230 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -108561,7 +109173,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82552 + m_Name: pb_Mesh32236 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109004,7 +109616,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81760 + m_Name: pb_Mesh31442 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109168,7 +109780,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh81802 + m_Name: pb_Mesh31486 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109714,7 +110326,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82356 + m_Name: pb_Mesh32038 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109883,7 +110495,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh82758 + m_Name: pb_Mesh32442 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -111170,7 +111782,7 @@ PrefabInstance: objectReference: {fileID: 477193883} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.x - value: -1.1806793 + value: -1.1726799 objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.y diff --git a/Assets/Scripts/Graphics/OutlineEffect.cs b/Assets/Scripts/Graphics/OutlineEffect.cs deleted file mode 100644 index 098be5ef..00000000 --- a/Assets/Scripts/Graphics/OutlineEffect.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class OutlineEffect : MonoBehaviour { - private Camera mainCamera; - private Camera secondaryCamera; - - private void Awake() { - mainCamera = GetComponent(); - } - - private void Start() { - secondaryCamera = transform.Find("Secondary Camera").GetComponent(); - } - - private void OnRenderImage(RenderTexture src, RenderTexture dest) { - print("Got here"); - secondaryCamera.CopyFrom(mainCamera); - secondaryCamera.clearFlags = CameraClearFlags.Color; - secondaryCamera.backgroundColor = Color.black; - secondaryCamera.cullingMask = 1 << LayerMask.NameToLayer("Interactable"); - - //make the temporary rendertexture - RenderTexture TempRT = new RenderTexture(src.width, src.height, 0, RenderTextureFormat.R8); - - //put it to video memory - TempRT.Create(); - - //set the camera's target texture when rendering - secondaryCamera.targetTexture = TempRT; - - //render all objects this camera can render, but with our custom shader. - secondaryCamera.Render(); - - //copy the temporary RT to the final image - Graphics.Blit(TempRT, dest); - - //release the temporary RT - TempRT.Release(); - } -} diff --git a/Assets/Scripts/Graphics/OutlineEffect.cs.meta b/Assets/Scripts/Graphics/OutlineEffect.cs.meta deleted file mode 100644 index febfd2f0..00000000 --- a/Assets/Scripts/Graphics/OutlineEffect.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 50a09f1793b854c81b6e1f8db407f176 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineSelector.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat similarity index 98% rename from Assets/Scripts/Graphics/OutlineSelector.mat rename to Assets/Scripts/Graphics/OutlineMaterial.mat index e0b582e3..ed5395f8 100644 --- a/Assets/Scripts/Graphics/OutlineSelector.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -20,13 +20,13 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: OutlineSelector + m_Name: OutlineMaterial m_Shader: {fileID: 4800000, guid: ddee5e160afcb494c8df388a38ab8812, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: diff --git a/Assets/Scripts/Graphics/OutlineSelector.mat.meta b/Assets/Scripts/Graphics/OutlineMaterial.mat.meta similarity index 100% rename from Assets/Scripts/Graphics/OutlineSelector.mat.meta rename to Assets/Scripts/Graphics/OutlineMaterial.mat.meta diff --git a/Assets/Scripts/Graphics/OutlineSelector.shader b/Assets/Scripts/Graphics/OutlineShader.shader similarity index 57% rename from Assets/Scripts/Graphics/OutlineSelector.shader rename to Assets/Scripts/Graphics/OutlineShader.shader index 2cfde00e..cfdfba22 100644 --- a/Assets/Scripts/Graphics/OutlineSelector.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -1,4 +1,4 @@ -Shader "Custom/OutlineSelector" { +Shader "Custom/Outline" { Properties { _MainTex ("Texture", 2D) = "white" {} } @@ -24,23 +24,36 @@ Shader "Custom/OutlineSelector" { float2 uv : TEXCOORD0; UNITY_FOG_COORDS(1) float4 vertex : SV_POSITION; + float4 screenPos : TEXCOORD2; }; sampler2D _MainTex; float4 _MainTex_ST; + UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); + UNITY_DECLARE_TEX2D(_CameraOpaqueTexture); v2f vert (appdata v) { v2f o; o.vertex = UnityObjectToClipPos(v.vertex); o.uv = TRANSFORM_TEX(v.uv, _MainTex); + o.screenPos = ComputeScreenPos(o.vertex); + COMPUTE_EYEDEPTH(o.screenPos.z); UNITY_TRANSFER_FOG(o,o.vertex); return o; } fixed4 frag (v2f i) : SV_Target { - // sample the texture - // fixed4 col = tex2D(_MainTex, i.uv); - fixed4 col = fixed4(1, 1, 1, 1); + // depth + float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos))); + float depth = sceneZ - i.screenPos.z; + + // screen color + float2 screenPosition = i.screenPos.xy / i.screenPos.w; + fixed4 screenColor = UNITY_SAMPLE_TEX2D(_CameraOpaqueTexture, screenPosition); + + // mixing + fixed4 depthColor = fixed4(depth, depth, depth, 1) * 5; + fixed4 col = (depth > 0.01) ? depthColor : screenColor; // apply fog UNITY_APPLY_FOG(i.fogCoord, col); return col; diff --git a/Assets/Scripts/Graphics/OutlineSelector.shader.meta b/Assets/Scripts/Graphics/OutlineShader.shader.meta similarity index 100% rename from Assets/Scripts/Graphics/OutlineSelector.shader.meta rename to Assets/Scripts/Graphics/OutlineShader.shader.meta diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index b9c89647..d55f3d33 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -1,22 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-5846740753714490180 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e67bce010483b442f8b2c94965360a86, type: 3} - m_Name: NewOutlineFeature - m_EditorClassIdentifier: - m_Active: 1 - settings: - isEnabled: 1 - insertTiming: 1000 - material: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30,8 +13,8 @@ MonoBehaviour: m_Name: ForwardRenderer m_EditorClassIdentifier: m_RendererFeatures: - - {fileID: -5846740753714490180} - m_RendererFeatureMap: bc540c094334dcae + - {fileID: 5037087261189653048} + m_RendererFeatureMap: 38c2da292d54e745 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -60,3 +43,42 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_AccurateGbufferNormals: 0 +--- !u!114 &5037087261189653048 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: NewRenderObjects + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: NewRenderObjects + Event: 300 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 128 + PassNames: [] + overrideMaterial: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} + overrideMaterialPassIndex: 0 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 diff --git a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset new file mode 100644 index 00000000..d5151280 --- /dev/null +++ b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5846740753714490180 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: e67bce010483b442f8b2c94965360a86, type: 3} + m_Name: NewOutlineFeature + m_EditorClassIdentifier: + m_Active: 1 + settings: + isEnabled: 1 + insertTiming: 1000 + material: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: OutlineOverlayRenderer + m_EditorClassIdentifier: + m_RendererFeatures: + - {fileID: -5846740753714490180} + m_RendererFeatureMap: bc540c094334dcae + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + tileDepthInfoPS: {fileID: 0} + tileDeferredPS: {fileID: 0} + stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 128 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_AccurateGbufferNormals: 0 diff --git a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta new file mode 100644 index 00000000..3f0a167a --- /dev/null +++ b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70ac421f3ede043f19f01d22cada22d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset b/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset index 71f8c6eb..af8a5c26 100644 --- a/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 0 @@ -29,7 +30,7 @@ MonoBehaviour: m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 - m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsRenderingMode: 0 m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 1 m_AdditionalLightsShadowmapResolution: 512 @@ -47,7 +48,7 @@ MonoBehaviour: m_DebugLevel: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 + m_ColorGradingLutSize: 16 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 diff --git a/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset b/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset index 8d3cfdc7..be86b587 100644 --- a/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 diff --git a/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset b/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset index 385781ac..5e159f95 100644 --- a/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 @@ -29,7 +30,7 @@ MonoBehaviour: m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsRenderingMode: 0 m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 From a525f89d42ae34e0905a4c3c5a1d6797c446ef8b Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 10 Feb 2022 18:37:27 -0800 Subject: [PATCH 03/14] Adjustable outline size and color --- Assets/Scenes/StreetLevel.unity | 16 ++++++--- Assets/Scripts/Graphics/OutlineMaterial.mat | 1 + Assets/Scripts/Graphics/OutlineShader.shader | 33 ++++++++++++++++--- .../URP Settings/ForwardRenderer.asset | 2 +- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/StreetLevel.unity b/Assets/Scenes/StreetLevel.unity index f2b04ce2..488a607d 100644 --- a/Assets/Scenes/StreetLevel.unity +++ b/Assets/Scenes/StreetLevel.unity @@ -10485,6 +10485,10 @@ PrefabInstance: propertyPath: m_Name value: TEMP TEST BALL (1) objectReference: {fileID: 0} + - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7609458109135603032, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_Mesh value: @@ -10499,7 +10503,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.x - value: 17.9 + value: 18.59 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.y @@ -10507,7 +10511,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.z - value: 34.7 + value: 34.6 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalRotation.w @@ -23537,6 +23541,10 @@ PrefabInstance: propertyPath: m_Cameras.Array.data[0] value: objectReference: {fileID: 147639528} + - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} + propertyPath: m_RequiresOpaqueTextureOption + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} --- !u!4 &477894334 stripped @@ -63118,7 +63126,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.x - value: 17.2 + value: 16.5 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.y @@ -63126,7 +63134,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.z - value: 34.8 + value: 34.6 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index ed5395f8..edd99267 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -96,6 +96,7 @@ Material: - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DepthRadius: 0.002 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Assets/Scripts/Graphics/OutlineShader.shader b/Assets/Scripts/Graphics/OutlineShader.shader index cfdfba22..d8bb9a86 100644 --- a/Assets/Scripts/Graphics/OutlineShader.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -1,7 +1,10 @@ Shader "Custom/Outline" { Properties { - _MainTex ("Texture", 2D) = "white" {} + _OutlineColor ("Outline Color", Color) = (1, 1, 1, 1) + _OutlineIntensity ("Outline Intensity", Float) = 1.0 + _DepthRadius ("Depth Radius", Float) = 0.01 } + SubShader { Tags { "RenderType"="Opaque" } LOD 100 @@ -29,6 +32,9 @@ Shader "Custom/Outline" { sampler2D _MainTex; float4 _MainTex_ST; + float _DepthRadius; + float4 _OutlineColor; + float _OutlineIntensity; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); UNITY_DECLARE_TEX2D(_CameraOpaqueTexture); @@ -42,18 +48,35 @@ Shader "Custom/Outline" { return o; } + float getDepth(v2f i, float4 offset) { + float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos + offset))); + return sceneZ - i.screenPos.z; + } + + float getMax(float4 values) { + float maxValue = 0; + for (int i = 0; i < 4; i++) maxValue = max(maxValue, values[i]); + return maxValue; + } + fixed4 frag (v2f i) : SV_Target { // depth - float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos))); - float depth = sceneZ - i.screenPos.z; + // float4 depthOffset = float4(0.1, 0.1, 0, 0); + // float depth = getDepth(i, depthOffset); + float4 adjacentDepths = 0; + float4 localDepth = getDepth(i, 0); + adjacentDepths[0] = getDepth(i, float4(-_DepthRadius, 0, 0, 0)); + adjacentDepths[1] = getDepth(i, float4(_DepthRadius, 0, 0, 0)); + adjacentDepths[2] = getDepth(i, float4(0, -_DepthRadius, 0, 0)); + adjacentDepths[3] = getDepth(i, float4(0, _DepthRadius, 0, 0)); // screen color float2 screenPosition = i.screenPos.xy / i.screenPos.w; fixed4 screenColor = UNITY_SAMPLE_TEX2D(_CameraOpaqueTexture, screenPosition); // mixing - fixed4 depthColor = fixed4(depth, depth, depth, 1) * 5; - fixed4 col = (depth > 0.01) ? depthColor : screenColor; + float depth = max(adjacentDepths[0], getMax(adjacentDepths)); + fixed4 col = (depth > 0.1) ? _OutlineColor * _OutlineIntensity : screenColor; // apply fog UNITY_APPLY_FOG(i.fogCoord, col); return col; diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index d55f3d33..90ce12ee 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -58,7 +58,7 @@ MonoBehaviour: m_Active: 1 settings: passTag: NewRenderObjects - Event: 300 + Event: 500 filterSettings: RenderQueueType: 0 LayerMask: From 4c46e9b73d5ee4051690dc18714be68dbb71d645 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Fri, 11 Feb 2022 09:08:40 -0800 Subject: [PATCH 04/14] More user-friendly parameters --- Assets/Scenes/StreetLevel.unity | 81 +++++++++++++++++--- Assets/Scripts/Graphics/OutlineMaterial.mat | 3 + Assets/Scripts/Graphics/OutlineRenderPass.cs | 1 - Assets/Scripts/Graphics/OutlineShader.shader | 38 +++++---- 4 files changed, 90 insertions(+), 33 deletions(-) diff --git a/Assets/Scenes/StreetLevel.unity b/Assets/Scenes/StreetLevel.unity index 488a607d..31a5bcca 100644 --- a/Assets/Scenes/StreetLevel.unity +++ b/Assets/Scenes/StreetLevel.unity @@ -4149,7 +4149,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8137009872141556459, guid: d919d17a9f4139549bd3d3460198260b, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8137009872141556459, guid: d919d17a9f4139549bd3d3460198260b, type: 3} propertyPath: m_LocalPosition.x @@ -4206,6 +4206,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 4888730894688542074, guid: e04578c601a8d66448d9c007ba6ebd6e, type: 3} m_PrefabInstance: {fileID: 509954487} m_PrefabAsset: {fileID: 0} +--- !u!1001 &129799759 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalPosition.x + value: 17.321 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalPosition.y + value: 2.159 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalPosition.z + value: 33.472992 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4171394045610244670, guid: 7506235076e9c144c935105053be16a5, type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7506235076e9c144c935105053be16a5, type: 3} --- !u!43 &132879883 Mesh: m_ObjectHideFlags: 0 @@ -10499,11 +10556,11 @@ PrefabInstance: objectReference: {fileID: 1114991686} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.x - value: 18.59 + value: 18.4 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.y @@ -10511,7 +10568,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.z - value: 34.6 + value: 34.21 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalRotation.w @@ -34192,7 +34249,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4110885184432113440, guid: 9cf5b5056d8ae294a970d2d17ac2887f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4110885184432113440, guid: 9cf5b5056d8ae294a970d2d17ac2887f, type: 3} propertyPath: m_LocalPosition.x @@ -40109,7 +40166,7 @@ Transform: - {fileID: 582259208} - {fileID: 1823427057} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &766208287 PrefabInstance: @@ -46385,7 +46442,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &896001750 PrefabInstance: @@ -63122,11 +63179,11 @@ PrefabInstance: objectReference: {fileID: 1233217579} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.x - value: 16.5 + value: 17.2 objectReference: {fileID: 0} - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} propertyPath: m_LocalPosition.y @@ -69147,7 +69204,7 @@ Transform: - {fileID: 485006596} - {fileID: 418179840} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1337986677 Mesh: @@ -102583,7 +102640,7 @@ Transform: - {fileID: 1564846787} - {fileID: 2097158246} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1977851605 PrefabInstance: @@ -102744,7 +102801,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1981496751 stripped Transform: diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index edd99267..60522d82 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -106,6 +106,7 @@ Material: - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 + - _OutlineIntensity: 8 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 @@ -114,11 +115,13 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _Threshold: 0.05 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.4009434, g: 0.7767149, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs b/Assets/Scripts/Graphics/OutlineRenderPass.cs index 842a9bdf..60c193b0 100644 --- a/Assets/Scripts/Graphics/OutlineRenderPass.cs +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs @@ -28,7 +28,6 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData CommandBuffer cmd = CommandBufferPool.Get(profilerTag); cmd.Clear(); - // TODO stuff happens here! cmd.Blit(cameraColorTargetIdent, tempTexture.Identifier(), material, 0); cmd.Blit(tempTexture.Identifier(), cameraColorTargetIdent); context.ExecuteCommandBuffer(cmd); diff --git a/Assets/Scripts/Graphics/OutlineShader.shader b/Assets/Scripts/Graphics/OutlineShader.shader index d8bb9a86..f93944a3 100644 --- a/Assets/Scripts/Graphics/OutlineShader.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -1,8 +1,8 @@ Shader "Custom/Outline" { Properties { - _OutlineColor ("Outline Color", Color) = (1, 1, 1, 1) - _OutlineIntensity ("Outline Intensity", Float) = 1.0 - _DepthRadius ("Depth Radius", Float) = 0.01 + _OutlineColor ("Outline Color", Color) = (1, 1, 1, 1) // color of the outline + _OutlineIntensity ("Outline Intensity", Range(1, 50)) = 1.0 // degree to which outline glows + _OutlineSize ("Outline Size", Range(0, 0.005)) = 0.002 // size of the outline } SubShader { @@ -13,7 +13,6 @@ Shader "Custom/Outline" { CGPROGRAM #pragma vertex vert #pragma fragment frag - // make fog work #pragma multi_compile_fog #include "UnityCG.cginc" @@ -24,15 +23,12 @@ Shader "Custom/Outline" { }; struct v2f { - float2 uv : TEXCOORD0; UNITY_FOG_COORDS(1) float4 vertex : SV_POSITION; - float4 screenPos : TEXCOORD2; + float4 screenPos : TEXCOORD0; }; - sampler2D _MainTex; - float4 _MainTex_ST; - float _DepthRadius; + float _OutlineSize; float4 _OutlineColor; float _OutlineIntensity; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); @@ -41,18 +37,19 @@ Shader "Custom/Outline" { v2f vert (appdata v) { v2f o; o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = TRANSFORM_TEX(v.uv, _MainTex); o.screenPos = ComputeScreenPos(o.vertex); COMPUTE_EYEDEPTH(o.screenPos.z); UNITY_TRANSFER_FOG(o,o.vertex); return o; } + // gets the depth value at i.screenpos float getDepth(v2f i, float4 offset) { float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos + offset))); return sceneZ - i.screenPos.z; } + // returns max value in a float4 float getMax(float4 values) { float maxValue = 0; for (int i = 0; i < 4; i++) maxValue = max(maxValue, values[i]); @@ -60,24 +57,25 @@ Shader "Custom/Outline" { } fixed4 frag (v2f i) : SV_Target { - // depth - // float4 depthOffset = float4(0.1, 0.1, 0, 0); - // float depth = getDepth(i, depthOffset); + const float THRESHOLD = 0.05; + + // depth sampling float4 adjacentDepths = 0; float4 localDepth = getDepth(i, 0); - adjacentDepths[0] = getDepth(i, float4(-_DepthRadius, 0, 0, 0)); - adjacentDepths[1] = getDepth(i, float4(_DepthRadius, 0, 0, 0)); - adjacentDepths[2] = getDepth(i, float4(0, -_DepthRadius, 0, 0)); - adjacentDepths[3] = getDepth(i, float4(0, _DepthRadius, 0, 0)); + adjacentDepths[0] = getDepth(i, float4(-_OutlineSize, 0, 0, 0)); + adjacentDepths[1] = getDepth(i, float4(_OutlineSize, 0, 0, 0)); + adjacentDepths[2] = getDepth(i, float4(0, -_OutlineSize, 0, 0)); + adjacentDepths[3] = getDepth(i, float4(0, _OutlineSize, 0, 0)); // screen color float2 screenPosition = i.screenPos.xy / i.screenPos.w; fixed4 screenColor = UNITY_SAMPLE_TEX2D(_CameraOpaqueTexture, screenPosition); // mixing - float depth = max(adjacentDepths[0], getMax(adjacentDepths)); - fixed4 col = (depth > 0.1) ? _OutlineColor * _OutlineIntensity : screenColor; - // apply fog + float depth = max(localDepth, getMax(adjacentDepths)); + fixed4 col = (depth > THRESHOLD) ? _OutlineColor * _OutlineIntensity : screenColor; + + // apply fog? UNITY_APPLY_FOG(i.fogCoord, col); return col; } From c5c1bd1fc13558f6cec8039750601188bb31e5cd Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Fri, 11 Feb 2022 09:33:35 -0800 Subject: [PATCH 05/14] Integration --- .../FMOD/Resources/FMODStudioSettings.asset | 292 ++--- Assets/Prefabs/Camera.prefab | 2 +- Assets/Scenes/StreetLevel.unity | 1039 +++-------------- 3 files changed, 291 insertions(+), 1042 deletions(-) diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 36f47898..9e1cc91b 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,7 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: -<<<<<<< HEAD ---- !u!114 &-6839538693101453803 +--- !u!114 &-6812093695341766958 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} m_Name: m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d + identifier: e7a046c753c3c3d4aacc91f6597f310d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -64,10 +63,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-6514307184278897654 -======= ---- !u!114 &-8561231834635165734 ->>>>>>> master +--- !u!114 &-1860268102004090922 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -76,10 +72,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} m_Name: m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: 52eb9df5db46521439908db3a29a1bbb parentIdentifier: default displaySortOrder: 0 active: 0 @@ -130,7 +126,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-5377599697116212355 +--- !u!114 &-70041036054920279 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -139,62 +135,61 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default + identifier: playInEditor parentIdentifier: displaySortOrder: 0 active: 1 Properties: LiveUpdate: - Value: 0 + Value: 1 HasValue: 1 LiveUpdatePort: - Value: 9264 - HasValue: 1 - Overlay: Value: 0 + HasValue: 0 + Overlay: + Value: 1 HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 0 + Value: 48000 HasValue: 1 BuildDirectory: - Value: Desktop - HasValue: 1 + Value: + HasValue: 0 SpeakerMode: - Value: 3 - HasValue: 1 + Value: 0 + HasValue: 0 VirtualChannelCount: - Value: 128 + Value: 1024 HasValue: 1 RealChannelCount: - Value: 32 + Value: 256 HasValue: 1 DSPBufferLength: Value: 0 - HasValue: 1 + HasValue: 0 DSPBufferCount: Value: 0 - HasValue: 1 + HasValue: 0 Plugins: - Value: - - phonon_fmod - HasValue: 1 + Value: [] + HasValue: 0 StaticPlugins: Value: [] - HasValue: 1 + HasValue: 0 CallbackHandler: Value: {fileID: 0} - HasValue: 1 + HasValue: 0 outputType: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-4410942603647427235 +--- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -203,10 +198,55 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} + m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} + m_Name: FMODStudioSettings + m_EditorClassIdentifier: + SwitchSettingsMigration: 1 + HasSourceProject: 1 + HasPlatforms: 1 + sourceProjectPath: + sourceBankPath: + SourceBankPathUnformatted: + AutomaticEventLoading: 1 + BankLoadType: 0 + AutomaticSampleLoading: 0 + EncryptionKey: + ImportType: 0 + TargetAssetPath: FMODBanks + TargetBankFolder: + LoggingLevel: 2 + SpeakerModeSettings: [] + SampleRateSettings: [] + LiveUpdateSettings: [] + OverlaySettings: [] + LoggingSettings: [] + BankDirectorySettings: [] + VirtualChannelSettings: [] + RealChannelSettings: [] + Plugins: [] + MasterBanks: [] + Banks: [] + BanksToLoad: [] + LiveUpdatePort: 9264 + EnableMemoryTracking: 0 + AndroidUseOBB: 0 + MeterChannelOrdering: 0 + StopEventsOutsideMaxDistance: 0 + BoltUnitOptionsBuildPending: 0 + MigratedPlatforms: 150000000a000000060000000500000012000000080000000b0000000c000000090000000200000001000000 +--- !u!114 &2857895975134498898 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 52eb9df5db46521439908db3a29a1bbb + identifier: c88d16e5272a4e241b0ef0ac2e53b73d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -257,7 +297,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-3350049175004170232 +--- !u!114 &5688071088583857569 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -266,10 +306,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2c5177b11d81d824dbb064f9ac8527da + identifier: b7716510a1f36934c87976f3a81dbf3d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -320,7 +360,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-3001481334787436968 +--- !u!114 &5838893388792593255 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -383,10 +423,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 -<<<<<<< HEAD ---- !u!114 &-2861717080310343318 -======= ---- !u!114 &2557962179914093501 +--- !u!114 &7304117275678044656 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -395,94 +432,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default - parentIdentifier: + identifier: 46fbfdf3fc43db0458918377fd40293e + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: Value: 0 - HasValue: 1 + HasValue: 0 LiveUpdatePort: - Value: 9264 - HasValue: 1 - Overlay: - Value: 0 - HasValue: 1 - Logging: Value: 0 HasValue: 0 - SampleRate: - Value: 0 - HasValue: 1 - BuildDirectory: - Value: Desktop - HasValue: 1 - SpeakerMode: - Value: 3 - HasValue: 1 - VirtualChannelCount: - Value: 128 - HasValue: 1 - RealChannelCount: - Value: 32 - HasValue: 1 - DSPBufferLength: - Value: 0 - HasValue: 1 - DSPBufferCount: - Value: 0 - HasValue: 1 - Plugins: - Value: - - phonon_fmod - HasValue: 1 - StaticPlugins: - Value: [] - HasValue: 1 - CallbackHandler: - Value: {fileID: 0} - HasValue: 1 - outputType: - threadAffinities: - Value: [] - HasValue: 0 ---- !u!114 &2962469479224940258 ->>>>>>> master -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 335f0a4b26fb46942858ea029e030d2a, type: 3} - m_Name: - m_EditorClassIdentifier: - identifier: playInEditor - parentIdentifier: - displaySortOrder: 0 - active: 1 - Properties: - LiveUpdate: - Value: 1 - HasValue: 1 - LiveUpdatePort: - Value: 9264 - HasValue: 1 Overlay: Value: 0 - HasValue: 1 + HasValue: 0 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 48000 - HasValue: 1 + Value: 0 + HasValue: 0 BuildDirectory: Value: HasValue: 0 @@ -490,11 +462,11 @@ MonoBehaviour: Value: 0 HasValue: 0 VirtualChannelCount: - Value: 1024 - HasValue: 1 + Value: 0 + HasValue: 0 RealChannelCount: - Value: 256 - HasValue: 1 + Value: 0 + HasValue: 0 DSPBufferLength: Value: 0 HasValue: 0 @@ -514,7 +486,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-269331343405889267 +--- !u!114 &8497015975347773006 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -523,10 +495,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -577,53 +549,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: eef8d824ea7b63742966aaa0e94ac383, type: 3} - m_Name: FMODStudioSettings - m_EditorClassIdentifier: - SwitchSettingsMigration: 1 - HasSourceProject: 0 - HasPlatforms: 1 - sourceProjectPath: - sourceBankPath: Banks - SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 - AutomaticSampleLoading: 0 - EncryptionKey: - ImportType: 0 - TargetAssetPath: FMODBanks - TargetBankFolder: - LoggingLevel: 2 - SpeakerModeSettings: [] - SampleRateSettings: [] - LiveUpdateSettings: [] - OverlaySettings: [] - LoggingSettings: [] - BankDirectorySettings: [] - VirtualChannelSettings: [] - RealChannelSettings: [] - Plugins: [] - MasterBanks: - - Master - Banks: [] - BanksToLoad: [] - LiveUpdatePort: 9264 - EnableMemoryTracking: 0 - AndroidUseOBB: 0 - MeterChannelOrdering: 0 - StopEventsOutsideMaxDistance: 0 - BoltUnitOptionsBuildPending: 0 - MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 ---- !u!114 &1359279498907332141 +--- !u!114 &8579997554293876383 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -632,10 +558,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} m_Name: m_EditorClassIdentifier: - identifier: e7a046c753c3c3d4aacc91f6597f310d + identifier: 2c5177b11d81d824dbb064f9ac8527da parentIdentifier: default displaySortOrder: 0 active: 0 @@ -686,7 +612,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &4578093891639519645 +--- !u!114 &8922624999443584948 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -695,10 +621,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -749,7 +675,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &5157692284801470217 +--- !u!114 &9215031891141315169 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -758,13 +684,13 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e - parentIdentifier: default + identifier: default + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: Value: 0 @@ -774,11 +700,7 @@ MonoBehaviour: HasValue: 1 Overlay: Value: 0 -<<<<<<< HEAD HasValue: 0 -======= - HasValue: 1 ->>>>>>> master Logging: Value: 0 HasValue: 0 @@ -805,10 +727,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 0 + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} HasValue: 0 diff --git a/Assets/Prefabs/Camera.prefab b/Assets/Prefabs/Camera.prefab index a26ad1f9..b24eff8a 100644 --- a/Assets/Prefabs/Camera.prefab +++ b/Assets/Prefabs/Camera.prefab @@ -99,7 +99,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 + m_RequiresOpaqueTextureOption: 1 m_CameraType: 0 m_Cameras: [] m_RendererIndex: -1 diff --git a/Assets/Scenes/StreetLevel.unity b/Assets/Scenes/StreetLevel.unity index 31a5bcca..36853e85 100644 --- a/Assets/Scenes/StreetLevel.unity +++ b/Assets/Scenes/StreetLevel.unity @@ -1380,7 +1380,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32760 + m_Name: pb_Mesh23496 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1972,7 +1972,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30790 + m_Name: pb_Mesh21526 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2136,7 +2136,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32640 + m_Name: pb_Mesh23376 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2613,7 +2613,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33448 + m_Name: pb_Mesh24184 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2777,7 +2777,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31678 + m_Name: pb_Mesh22414 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3264,7 +3264,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32502 + m_Name: pb_Mesh23238 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3428,7 +3428,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30942 + m_Name: pb_Mesh21678 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3592,7 +3592,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31324 + m_Name: pb_Mesh22060 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -4149,7 +4149,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8137009872141556459, guid: d919d17a9f4139549bd3d3460198260b, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8137009872141556459, guid: d919d17a9f4139549bd3d3460198260b, type: 3} propertyPath: m_LocalPosition.x @@ -4206,70 +4206,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 4888730894688542074, guid: e04578c601a8d66448d9c007ba6ebd6e, type: 3} m_PrefabInstance: {fileID: 509954487} m_PrefabAsset: {fileID: 0} ---- !u!1001 &129799759 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalPosition.x - value: 17.321 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalPosition.y - value: 2.159 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalPosition.z - value: 33.472992 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244666, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4171394045610244670, guid: 7506235076e9c144c935105053be16a5, type: 3} - propertyPath: m_Name - value: Key - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7506235076e9c144c935105053be16a5, type: 3} --- !u!43 &132879883 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31960 + m_Name: pb_Mesh22696 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5431,7 +5374,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33736 + m_Name: pb_Mesh24472 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5595,7 +5538,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33150 + m_Name: pb_Mesh23886 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5753,123 +5696,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &147639524 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 147639525} - - component: {fileID: 147639528} - - component: {fileID: 147639527} - - component: {fileID: 147639526} - m_Layer: 0 - m_Name: OutlineCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &147639525 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147639524} - 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_Children: [] - m_Father: {fileID: 477894334} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &147639526 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147639524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: 1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 ---- !u!81 &147639527 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147639524} - m_Enabled: 1 ---- !u!20 &147639528 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 147639524} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 128 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1001 &156529840 PrefabInstance: m_ObjectHideFlags: 0 @@ -5945,7 +5771,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33790 + m_Name: pb_Mesh24526 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6508,7 +6334,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33534 + m_Name: pb_Mesh24270 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6702,7 +6528,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31504 + m_Name: pb_Mesh22240 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7559,7 +7385,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32196 + m_Name: pb_Mesh22932 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8343,7 +8169,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33186 + m_Name: pb_Mesh23922 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -9753,7 +9579,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32832 + m_Name: pb_Mesh23568 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10531,83 +10357,6 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!1001 &237853797 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Name - value: TEMP TEST BALL (1) - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603032, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1114991686} - - target: {fileID: 7609458109135603033, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1114991686} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.x - value: 18.4 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.y - value: 2.4 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.z - value: 34.21 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603038, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1114991686} - - target: {fileID: 7609458109135603039, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} --- !u!4 &243479377 stripped Transform: m_CorrespondingSourceObject: {fileID: 4888730894688542074, guid: e04578c601a8d66448d9c007ba6ebd6e, type: 3} @@ -10937,7 +10686,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32656 + m_Name: pb_Mesh23392 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11101,7 +10850,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31914 + m_Name: pb_Mesh22650 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11265,7 +11014,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-8472 + m_Name: pb_Mesh-2770 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11439,7 +11188,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32560 + m_Name: pb_Mesh23296 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14119,7 +13868,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31522 + m_Name: pb_Mesh22258 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14283,7 +14032,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31986 + m_Name: pb_Mesh22722 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14592,7 +14341,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31816 + m_Name: pb_Mesh22552 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15069,7 +14818,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31306 + m_Name: pb_Mesh22042 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15233,7 +14982,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32346 + m_Name: pb_Mesh23082 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15397,7 +15146,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32282 + m_Name: pb_Mesh23018 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15561,7 +15310,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31276 + m_Name: pb_Mesh22012 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -17034,7 +16783,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31064 + m_Name: pb_Mesh21800 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -17198,7 +16947,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32018 + m_Name: pb_Mesh22754 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18499,7 +18248,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33460 + m_Name: pb_Mesh24196 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19047,7 +18796,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33128 + m_Name: pb_Mesh23864 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -20860,7 +20609,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31126 + m_Name: pb_Mesh21862 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21337,7 +21086,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30808 + m_Name: pb_Mesh21544 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21501,7 +21250,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30844 + m_Name: pb_Mesh21580 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21751,7 +21500,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32704 + m_Name: pb_Mesh23440 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23035,7 +22784,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31158 + m_Name: pb_Mesh21894 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -23530,10 +23279,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2620666226370321361, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2620666226370321362, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} propertyPath: m_RootOrder value: 0 @@ -23582,33 +23327,12 @@ PrefabInstance: propertyPath: m_Name value: Camera objectReference: {fileID: 0} - - target: {fileID: 2620666226370321373, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - propertyPath: m_CameraType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - propertyPath: m_Cameras.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - propertyPath: m_Cameras.Array.data[0] - value: - objectReference: {fileID: 147639528} - target: {fileID: 2620666226370321375, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} propertyPath: m_RequiresOpaqueTextureOption value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} ---- !u!4 &477894334 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2620666226370321362, guid: a9a74faecb2f3a3418ff8acfb9196aec, type: 3} - m_PrefabInstance: {fileID: 477894333} - m_PrefabAsset: {fileID: 0} --- !u!1001 &480490917 PrefabInstance: m_ObjectHideFlags: 0 @@ -23912,7 +23636,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31540 + m_Name: pb_Mesh22276 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -24076,7 +23800,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33042 + m_Name: pb_Mesh23778 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -24277,7 +24001,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32264 + m_Name: pb_Mesh23000 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -24506,7 +24230,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31214 + m_Name: pb_Mesh21950 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -25921,7 +25645,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31766 + m_Name: pb_Mesh22502 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26398,7 +26122,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33676 + m_Name: pb_Mesh24412 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -26880,7 +26604,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33104 + m_Name: pb_Mesh23840 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27044,7 +26768,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31008 + m_Name: pb_Mesh21744 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27897,7 +27621,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33548 + m_Name: pb_Mesh24284 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -28066,7 +27790,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31796 + m_Name: pb_Mesh22532 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -28911,7 +28635,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33054 + m_Name: pb_Mesh23790 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29075,7 +28799,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32800 + m_Name: pb_Mesh23536 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29552,7 +29276,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31742 + m_Name: pb_Mesh22478 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30483,7 +30207,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-10944 + m_Name: pb_Mesh-5242 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30647,7 +30371,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33594 + m_Name: pb_Mesh24330 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -30841,7 +30565,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31146 + m_Name: pb_Mesh21882 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31074,7 +30798,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33628 + m_Name: pb_Mesh24364 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31551,7 +31275,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-10762 + m_Name: pb_Mesh-5060 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31720,7 +31444,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33278 + m_Name: pb_Mesh24014 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -31884,7 +31608,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32140 + m_Name: pb_Mesh22876 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -32135,7 +31859,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32772 + m_Name: pb_Mesh23508 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -33458,7 +33182,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32332 + m_Name: pb_Mesh23068 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34249,7 +33973,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4110885184432113440, guid: 9cf5b5056d8ae294a970d2d17ac2887f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4110885184432113440, guid: 9cf5b5056d8ae294a970d2d17ac2887f, type: 3} propertyPath: m_LocalPosition.x @@ -34304,7 +34028,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32370 + m_Name: pb_Mesh23106 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -34468,7 +34192,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33212 + m_Name: pb_Mesh23948 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -37481,7 +37205,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33398 + m_Name: pb_Mesh24134 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38066,7 +37790,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32524 + m_Name: pb_Mesh23260 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38230,7 +37954,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31710 + m_Name: pb_Mesh22446 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38707,7 +38431,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31052 + m_Name: pb_Mesh21788 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -38871,7 +38595,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30778 + m_Name: pb_Mesh21514 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -39655,7 +39379,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33516 + m_Name: pb_Mesh24252 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -40166,7 +39890,7 @@ Transform: - {fileID: 582259208} - {fileID: 1823427057} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &766208287 PrefabInstance: @@ -41475,7 +41199,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33760 + m_Name: pb_Mesh24496 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41639,7 +41363,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31898 + m_Name: pb_Mesh22634 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -41999,7 +41723,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31250 + m_Name: pb_Mesh21986 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -42856,7 +42580,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31202 + m_Name: pb_Mesh21938 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43020,7 +42744,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33646 + m_Name: pb_Mesh24382 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43497,7 +43221,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33878 + m_Name: pb_Mesh24614 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -43661,7 +43385,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33562 + m_Name: pb_Mesh24298 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -44148,7 +43872,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33318 + m_Name: pb_Mesh24054 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -45636,7 +45360,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32216 + m_Name: pb_Mesh22952 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -45907,7 +45631,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31024 + m_Name: pb_Mesh21760 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -46442,7 +46166,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &896001750 PrefabInstance: @@ -47092,7 +46816,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31556 + m_Name: pb_Mesh22292 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -47256,7 +46980,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31088 + m_Name: pb_Mesh21824 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -47420,7 +47144,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30956 + m_Name: pb_Mesh21692 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -48114,7 +47838,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32454 + m_Name: pb_Mesh23190 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -48357,7 +48081,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31728 + m_Name: pb_Mesh22464 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -49772,7 +49496,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31076 + m_Name: pb_Mesh21812 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -51255,7 +50979,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33826 + m_Name: pb_Mesh24562 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -51806,7 +51530,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32422 + m_Name: pb_Mesh23158 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -52668,7 +52392,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30914 + m_Name: pb_Mesh21650 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -53145,7 +52869,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32576 + m_Name: pb_Mesh23312 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -53873,7 +53597,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31292 + m_Name: pb_Mesh22028 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -54098,7 +53822,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32904 + m_Name: pb_Mesh23640 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -54262,7 +53986,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32674 + m_Name: pb_Mesh23410 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -54744,7 +54468,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32306 + m_Name: pb_Mesh23042 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -55777,7 +55501,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33704 + m_Name: pb_Mesh24440 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -57494,177 +57218,13 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!43 &1114991686 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-42044 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 240 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 240 - localAABB: - m_Center: {x: 0, y: 0.24, z: 0} - m_Extent: {x: 0.24, y: 0.24, z: 0.24} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000400050006000700080009000a000b000c000d000e000f0010001100120013001400150016001700180019001a001b001c001d001e001f0020002100220023002400250026002700280029002a002b002c002d002e002f0030003100320033003400350036003700380039003a003b003c003d003e003f0040004100420043004400450046004700480049004a004b004c004d004e004f0050005100520053005400550056005700580059005a005b005c005d005e005f0060006100620063006400650066006700680069006a006b006c006d006e006f0070007100720073007400750076007700780079007a007b007c007d007e007f0080008100820083008400850086008700880089008a008b008c008d008e008f0090009100920093009400950096009700980099009a009b009c009d009e009f00a000a100a200a300a400a500a600a700a800a900aa00ab00ac00ad00ae00af00b000b100b200b300b400b500b600b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100d200d300d400d500d600d700d800d900da00db00dc00dd00de00df00e000e100e200e300e400e500e600e700e800e900ea00eb00ec00ed00ee00ef00 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 240 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 15360 - _typelessdata: 243401be7068e33e00000000ee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d246beeb51b83e56e3973dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e397bdc14ade3e8fc2f53dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246beeb51b83e56e3973d46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e51be8fc2753e2434013e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2f5bd1ddaa03ef3d2463e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d246beeb51b83e56e3973d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f5bd1ddaa03ef3d2463e3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e397bdc14ade3e8fc2f53d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e56e397bdc14ade3e8fc2f53dff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f5bd1ddaa03ef3d2463eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000005a7bbb3e520e513eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401be7068e33e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f53de23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000008fc2f53e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000005a7bbb3e520e513e000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e3973dc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e397bdc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e3973dc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d000000008fc2f53e0000000000000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000008fc2f53e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f53de23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d2434013e7068e33e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000243401be7068e33e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000008fc2f53e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f5bde23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000008fc2f53e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000000000002434013e7068e33e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f5bde23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000008fc2f53e0000000000000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e397bdc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bdc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973dc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000005a7bbb3e520e51be000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be243401be7068e33e00000000ee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f5bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d246beeb51b83e56e397bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e397bdc14ade3e8fc2f5bdff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e51beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d246beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e397bdc14ade3e8fc2f5bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f5bd1ddaa03ef3d246be3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d246beeb51b83e56e397bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d246beeb51b83e56e397bd46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f5bd1ddaa03ef3d246be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e51be8fc2753e243401be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e243401be7068e33e00000000532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33ef3d246beeb51b83e56e397bd532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d246beeb51b83e56e3973d532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e397bdac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e520e51be8fc2753e243401beac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc275be8fc2753e00000000ac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e397bdec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc275be8fc2753e00000000ec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e3973dec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e3973dac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc275be8fc2753e00000000ac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e2434013eac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013e7068e33e00000000ee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f53dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463eeb51b83e56e3973dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e3973dc14ade3e8fc2f53dff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e513eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f53d1ddaa03ef3d2463eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e3973dc14ade3e8fc2f53d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f53d1ddaa03ef3d2463e3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d2463eeb51b83e56e3973d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d2463eeb51b83e56e3973d46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f53d1ddaa03ef3d2463e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e513e8fc2753e2434013e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e000000005a7bbb3e520e513e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d2463e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc2753e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e520e51be8fc2753e2434013eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f5bde4d0293ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f5bd1ddaa03ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f5bde4d0293ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc2753e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d2463e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e513e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d520e51be8fc2753e2434013eac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc275be8fc2753e00000000ac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e3973dac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc275be8fc2753e00000000ac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e243401beac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753ef3d246be8fc2f53d56e397bdac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc275be8fc2753e00000000ec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e397bdec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973dec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e3973d532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e397bd532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123d520e51be8fc2753e243401beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f5bd1ddaa03ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f5bde4d0293ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bd1ddaa03ef3d246be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e51be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e000000008fc2753e8fc275be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc275be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc275be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e00000000d61ce93d520e51be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000005a7bbb3e520e51beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e56e3973dc14ade3e8fc2f5bdff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f53d1ddaa03ef3d246beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e3973dc14ade3e8fc2f5bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd2434013e7068e33e00000000ee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d2463eeb51b83e56e397bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e3973dc14ade3e8fc2f5bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3ef3d2463eeb51b83e56e397bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f53d1ddaa03ef3d246be3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d2463eeb51b83e56e397bd46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e513e8fc2753e243401be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d00000000ed47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d2463e8fc2f53d56e3973ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e3973d70be3b3d8fc2f53ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e513e8fc2753e2434013e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2f53de4d0293ef3d2463e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d2463e8fc2f53d56e3973d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f53de4d0293ef3d2463e3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e3973d70be3b3d8fc2f53d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d56e3973d70be3b3d8fc2f53dfb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f53de4d0293ef3d2463efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e00000000d61ce93d520e513efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d2434013ef4d0123d00000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f53ddf3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000000000000000000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d00000000d61ce93d520e513e00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e397bd70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e3973d70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e397bd70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d00000000000000000000000000000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000000000000000000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f53ddf3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f2434013e000000002434013ef4d0123d00000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000000000000000000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f5bddf3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000000000000000000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000243401bef4d0123d00000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f5bddf3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000000000000000000000000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bd70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000d61ce93d520e51be00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be2434013ef4d0123d00000000ed47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f5bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d2463e8fc2f53d56e397bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e3973d70be3b3d8fc2f5bdfb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e51befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d246befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e3973d70be3b3d8fc2f5bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f53de4d0293ef3d246be3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d2463e8fc2f53d56e397bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d2463e8fc2f53d56e397bd46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f53de4d0293ef3d246be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e513e8fc2753e243401be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d000000005322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123df3d2463e8fc2f53d56e397bd5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e397bdac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d520e513e8fc2753e243401beac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2753e8fc2753e00000000ac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e397bdec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2753e8fc2753e00000000ec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e3973dec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e3973dac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc2753e8fc2753e00000000ac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e2434013eac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e00000000d61ce93d520e513e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d2463e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc2753e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e520e513e8fc2753e2434013eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f53d1ddaa03ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f53de4d0293ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f53d1ddaa03ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc2753e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d2463e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e513e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401bef4d0123d00000000ed4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f53ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e397bd70be3b3d8fc2f53dfb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e513efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f5bde4d0293ef3d2463efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e397bd70be3b3d8fc2f53d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f5bde4d0293ef3d2463e3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d246be8fc2f53d56e3973d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d246be8fc2f53d56e3973d46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f5bde4d0293ef3d2463e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e51be8fc2753e2434013e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e00000000d61ce93d520e51befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d56e397bd70be3b3d8fc2f5bdfb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f5bde4d0293ef3d246befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e397bd70be3b3d8fc2f5bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd243401bef4d0123d00000000ed4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d246be8fc2f53d56e397bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e397bd70be3b3d8fc2f5bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3df3d246be8fc2f53d56e397bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f5bde4d0293ef3d246be3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d246be8fc2f53d56e397bd46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e51be8fc2753e243401be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e520e513e8fc2753e243401beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f53de4d0293ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f53d1ddaa03ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53de4d0293ef3d246be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e51be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000008fc2753e8fc275be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc275be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc275be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000005a7bbb3e520e51be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e520e513e8fc2753e2434013eac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2753e8fc2753e00000000ac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e3973dac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2753e8fc2753e00000000ac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e243401beac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753ef3d2463eeb51b83e56e397bdac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc2753e8fc2753e00000000ec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e397bdec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d2463eeb51b83e56e3973dec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e3973d5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e397bd5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e2434013e7068e33e000000005322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0.24, z: 0} - m_Extent: {x: 0.24, y: 0.24, z: 0.24} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &1116831313 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33014 + m_Name: pb_Mesh23750 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -58141,7 +57701,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32538 + m_Name: pb_Mesh23274 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -58653,7 +58213,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32172 + m_Name: pb_Mesh22908 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -59191,7 +58751,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31620 + m_Name: pb_Mesh22356 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -59385,7 +58945,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33500 + m_Name: pb_Mesh24236 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -59892,7 +59452,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32390 + m_Name: pb_Mesh23126 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -60056,7 +59616,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32788 + m_Name: pb_Mesh23524 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -60909,177 +60469,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ebb8f68368b1744c8bdf1ba34e61ab9, type: 3} ---- !u!43 &1233217579 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-25084 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 240 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 240 - localAABB: - m_Center: {x: 0, y: 0.24, z: 0} - m_Extent: {x: 0.24, y: 0.24, z: 0.24} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000400050006000700080009000a000b000c000d000e000f0010001100120013001400150016001700180019001a001b001c001d001e001f0020002100220023002400250026002700280029002a002b002c002d002e002f0030003100320033003400350036003700380039003a003b003c003d003e003f0040004100420043004400450046004700480049004a004b004c004d004e004f0050005100520053005400550056005700580059005a005b005c005d005e005f0060006100620063006400650066006700680069006a006b006c006d006e006f0070007100720073007400750076007700780079007a007b007c007d007e007f0080008100820083008400850086008700880089008a008b008c008d008e008f0090009100920093009400950096009700980099009a009b009c009d009e009f00a000a100a200a300a400a500a600a700a800a900aa00ab00ac00ad00ae00af00b000b100b200b300b400b500b600b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100d200d300d400d500d600d700d800d900da00db00dc00dd00de00df00e000e100e200e300e400e500e600e700e800e900ea00eb00ec00ed00ee00ef00 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 240 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 40 - format: 0 - dimension: 4 - - stream: 0 - offset: 56 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 15360 - _typelessdata: 243401be7068e33e00000000ee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d246beeb51b83e56e3973dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e397bdc14ade3e8fc2f53dee4715bf46b03f3ff853a13e29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246beeb51b83e56e3973d46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e51be8fc2753e2434013e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2f5bd1ddaa03ef3d2463e46b03fbffb53a13eed47153f1c4b1dbf2d917eb229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d246beeb51b83e56e3973d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f5bd1ddaa03ef3d2463e3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e397bdc14ade3e8fc2f53d3bcd13bf3acd133f3acd133ff20435bf00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e56e397bdc14ade3e8fc2f53dff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f5bd1ddaa03ef3d2463eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000005a7bbb3e520e513eff53a1beee47153f46b03f3f96f56bbf000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401be7068e33e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f53de23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000008fc2f53e00000000e23b89beac8a713f8f69473e9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000005a7bbb3e520e513e000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e3973dc14ade3e8fc2f53d000000005422473fade0203f0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e397bdc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e3973dc14ade3e8fc2f53d00000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d000000008fc2f53e0000000000000000ec256f3f61b1b63e0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000008fc2f53e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f53de23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d2434013e7068e33e00000000e23b893eac8a713f8f69473e9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000243401be7068e33e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000008fc2f53e00000000e23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bdc14ade3e8fc2f5bde23b89beac8a713f8f6947be9741763f9be98b3e00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000008fc2f53e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000000000002434013e7068e33e00000000e23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f5bde23b893eac8a713f8f6947be9741763f9be98bbe00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000008fc2f53e0000000000000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973dc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e397bdc14ade3e8fc2f5bd00000000ec256f3f61b1b6be0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bdc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973dc14ade3e8fc2f5bd000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd000000005a7bbb3e520e51be000000005422473fade020bf0000803f0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be243401be7068e33e00000000ee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e397bdc14ade3e8fc2f5bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d246beeb51b83e56e397bdee4715bf46b03f3ff853a1be29fa493f1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e397bdc14ade3e8fc2f5bdff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e51beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d246beff53a1beee47153f46b03fbf96f56b3f000000004996c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e397bdc14ade3e8fc2f5bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f5bd1ddaa03ef3d246be3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d246beeb51b83e56e397bd3bcd13bf3acd133f3acd13bff204353f00000000f40435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d246beeb51b83e56e397bd46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f5bd1ddaa03ef3d246be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e51be8fc2753e243401be46b03fbffb53a13eed4715bf1c4b1d3f2d917e3229fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e243401be7068e33e00000000532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33ef3d246beeb51b83e56e397bd532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d246beeb51b83e56e3973d532247bfafe0203f000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e397bdac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e520e51be8fc2753e243401beac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc275be8fc2753e00000000ac8a71bf9569473edf3b89be99e98b3e8ed2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e397bdec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc275be8fc2753e00000000ec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246beeb51b83e56e3973dec256fbf61b1b63e000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d246beeb51b83e56e3973dac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc275be8fc2753e00000000ac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e2434013eac8a71bf9569473edf3b893e99e98bbe8ed2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013e7068e33e00000000ee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e3973dc14ade3e8fc2f53dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463eeb51b83e56e3973dee47153f46b03f3ff853a13e29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e3973dc14ade3e8fc2f53dff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e000000005a7bbb3e520e513eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f53d1ddaa03ef3d2463eff53a13eee47153f46b03f3f96f56bbf000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e56e3973dc14ade3e8fc2f53d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdc14ade3e8fc2f53d1ddaa03ef3d2463e3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03ef3d2463eeb51b83e56e3973d3bcd133f3acd133f3acd133ff20435bf00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246beeb51b83ef3d2463eeb51b83e56e3973d46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2f53d1ddaa03ef3d2463e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e1ddaa03e520e513e8fc2753e2434013e46b03f3ffb53a13eed47153f1c4b1dbf2d917e3229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e000000005a7bbb3e520e513e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e8fc2f5bd1ddaa03ef3d2463e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc2753e956947bede3b893eac8a713f30b77abf0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e520e51be8fc2753e2434013eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f5bde4d0293ef3d2463eafe020bf000000005322473f522247bf00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f5bd1ddaa03ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f5bde4d0293ef3d2463e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc2753e61b1b6be00000000ec256f3fec256fbf0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d2463e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e513e946947bedf3b89beac8a713f30b77abfab66863178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d520e51be8fc2753e2434013eac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc275be8fc2753e00000000ac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e3973dac8a71bf946947bedf3b893e99e98bbe8dd2bfb1994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc275be8fc2753e00000000ac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e51be8fc2753e243401beac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753ef3d246be8fc2f53d56e397bdac8a71bf946947bedf3b89be99e98b3e8dd2bf31994176bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc275be8fc2753e00000000ec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d246be8fc2f53d56e397bdec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973dec256fbf61b1b6be000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e3973d532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d246be8fc2f53d56e397bd532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000532247bfafe020bf000000000000000000000000000080bf000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123d520e51be8fc2753e243401beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f5bd1ddaa03ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f5bde4d0293ef3d246beafe020bf00000000532247bf5222473f00000000afe020bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bd1ddaa03ef3d246be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e51be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e000000008fc2753e8fc275be956947bede3b893eac8a71bf30b77a3f0000000079fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bd1ddaa03ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc275be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f5bde4d0293ef3d246be61b1b6be00000000ec256fbfec256f3f0000000060b1b6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc275be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e00000000d61ce93d520e51be946947bedf3b89beac8a71bf30b77a3fab6686b178fc4ebe000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000005a7bbb3e520e51beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e56e3973dc14ade3e8fc2f5bdff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3e8fc2f53d1ddaa03ef3d246beff53a13eee47153f46b03fbf96f56b3f000000004996c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e56e3973dc14ade3e8fc2f5bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd2434013e7068e33e00000000ee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d2463eeb51b83e56e397bdee47153f46b03f3ff853a1be29fa493f1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e3973dc14ade3e8fc2f5bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973dc14ade3ef3d2463eeb51b83e56e397bd3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463eeb51b83e8fc2f53d1ddaa03ef3d246be3bcd133f3acd133f3acd13bff204353f00000000f404353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be1ddaa03ef3d2463eeb51b83e56e397bd46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e520e513e8fc2753e243401be46b03f3ffb53a13eed4715bf1c4b1d3f2d917eb229fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d00000000ed47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000f3d2463e8fc2f53d56e3973ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e3973d56e3973d70be3b3d8fc2f53ded47153f46b03fbffb53a13e29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e513e8fc2753e2434013e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2f53de4d0293ef3d2463e46b03f3ffb53a1beed47153f1d4b1dbf0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d2463e8fc2f53d56e3973d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f53de4d0293ef3d2463e3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e3973d70be3b3d8fc2f53d3acd133f3acd13bf3acd133ff30435bf00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d56e3973d70be3b3d8fc2f53dfb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f53de4d0293ef3d2463efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e00000000d61ce93d520e513efb53a13eed4715bf46b03f3f96f56bbf3c9889324596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d2434013ef4d0123d00000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f53ddf3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d000000000000000000000000df3b893eac8a71bf9469473e994176bf99e98bbe8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d00000000d61ce93d520e513e00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e513e56e397bd70be3b3d8fc2f53d00000000532247bfafe0203f000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d56e3973d70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d56e397bd70be3b3d8fc2f53d00000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d00000000000000000000000000000000ec256fbf61b1b63e000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000000000000000000000000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f53ddf3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d243401bef4d0123d00000000df3b89beac8a71bf9469473e994176bf99e98b3e8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f2434013e000000002434013ef4d0123d00000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f243401be00000000000000000000000000000000df3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e3973d70be3b3d8fc2f5bddf3b893eac8a71bf946947be994176bf99e98bbe8dd2bfb1000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd000000000000000000000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f0000000000000000243401bef4d0123d00000000df3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f5bddf3b89beac8a71bf946947be994176bf99e98b3e8dd2bf31000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000000000000000000000000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f000000000000000056e397bd70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000ec256fbf61b1b6be000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e3973d70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bd56e397bd70be3b3d8fc2f5bd00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd00000000d61ce93d520e51be00000000532247bfafe020bf000080bf0000000000000000000080bf0c5cc63e0000803fd8411d3f0000803f00000000520e51be2434013ef4d0123d00000000ed47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f243401be0000000056e3973d70be3b3d8fc2f5bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f5bdf3d2463e8fc2f53d56e397bded47153f46b03fbffb53a1be29fa49bf1d4b1dbf00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be56e397bd56e3973d70be3b3d8fc2f5bdfb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e51befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d246befb53a13eed4715bf46b03fbf96f56b3f3c9889b24596c63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e3973d70be3b3d8fc2f5bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f53de4d0293ef3d246be3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d2463e8fc2f53d56e397bd3acd133f3acd13bf3acd13bff304353f00000000f304353f000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d2463e8fc2f53d56e397bd46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f53de4d0293ef3d246be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e513e8fc2753e243401be46b03f3ffb53a1beed4715bf1d4b1d3f0000000029fa493f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e2434013ef4d0123d000000005322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f00000000f4d0123df3d2463e8fc2f53d56e397bd5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53df3d2463e8fc2f53d56e3973d5322473fafe020bf0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e397bdac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d520e513e8fc2753e243401beac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e8fc2753e8fc2753e00000000ac8a713f946947bedf3b89be99e98b3e8dd2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e397bdec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2753e8fc2753e00000000ec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463e8fc2f53d56e3973dec256f3f61b1b6be0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d2463e8fc2f53d56e3973dac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d8fc2753e8fc2753e00000000ac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e2434013eac8a713f946947bedf3b893e99e98bbe8dd2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e00000000d61ce93d520e513e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f53de4d0293ef3d2463e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e000000008fc2753e8fc2753e9469473edf3b89beac8a713f30b77abfab6686b178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e520e513e8fc2753e2434013eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e51be8fc2753e8fc2f53d1ddaa03ef3d2463eafe0203f000000005322473f522247bf00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e8fc2f53de4d0293ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f53d1ddaa03ef3d2463e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000008fc2753e8fc2753e61b1b63e00000000ec256f3fec256fbf0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000008fc2753e8fc2753e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d2463e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bd1ddaa03e000000005a7bbb3e520e513e9569473ede3b893eac8a713f30b77abf0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e243401bef4d0123d00000000ed4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e0000000056e397bd70be3b3d8fc2f53ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53df3d246be8fc2f53d56e3973ded4715bf46b03fbffb53a13e29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e3973d56e397bd70be3b3d8fc2f53dfb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d00000000d61ce93d520e513efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d8fc2f5bde4d0293ef3d2463efb53a1beed4715bf46b03f3f96f56bbf3c9889b24596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e56e397bd70be3b3d8fc2f53d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d70be3b3d8fc2f5bde4d0293ef3d2463e3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293ef3d246be8fc2f53d56e3973d3acd13bf3acd13bf3acd133ff30435bf00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e8fc2f53df3d246be8fc2f53d56e3973d46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd8fc2f53d8fc2f5bde4d0293ef3d2463e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246bee4d0293e520e51be8fc2753e2434013e46b03fbffb53a1beed47153f1d4b1dbf0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753e00000000d61ce93d520e51befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d56e397bd70be3b3d8fc2f5bdfb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3d8fc2f5bde4d0293ef3d246befb53a1beed4715bf46b03fbf96f56b3f3c9889324596c6be000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e56e397bd70be3b3d8fc2f5bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f5bd243401bef4d0123d00000000ed4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803f2434013e00000000f3d246be8fc2f53d56e397bded4715bf46b03fbffb53a1be29fa49bf1d4b1d3f00000000000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463e56e397bd56e397bd70be3b3d8fc2f5bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f56e397bd70be3b3df3d246be8fc2f53d56e397bd3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d246be8fc2f53d8fc2f5bde4d0293ef3d246be3acd13bf3acd13bf3acd13bff304353f00000000f30435bf000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f5bde4d0293e8fc2f5bde4d0293ef3d246be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803ff3d2463ee4d0293ef3d246be8fc2f53d56e397bd46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f56e3973d8fc2f53d520e51be8fc2753e243401be46b03fbffb53a1beed4715bf1d4b1d3f0000000029fa49bf000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e520e513e8fc2753e243401beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f520e513e8fc2753e8fc2f53de4d0293ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e8fc2f53d1ddaa03ef3d246beafe0203f00000000532247bf5222473f00000000afe0203f000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53de4d0293ef3d246be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e00000000d61ce93d520e51be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f00000000d61ce93d000000008fc2753e8fc275be9469473edf3b89beac8a71bf30b77a3fab66863178fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53de4d0293ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53de4d0293e000000008fc2753e8fc275be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e8fc2f53d1ddaa03ef3d246be61b1b63e00000000ec256fbfec256f3f0000000060b1b63e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e8fc2f53d1ddaa03ef3d246be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f8fc2f53d1ddaa03e000000008fc2753e8fc275be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e000000005a7bbb3e520e51be9569473ede3b893eac8a71bf30b77a3f0000000079fc4e3e000080bf0c5cc63e0000803fd8411d3f0000803f000000005a7bbb3e520e513e8fc2753e2434013eac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f2434013e8fc2753e8fc2753e8fc2753e00000000ac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e3973dac8a713f9569473edf3b893e99e98bbe8ed2bfb19941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83e8fc2753e8fc2753e00000000ac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753e520e513e8fc2753e243401beac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f243401be8fc2753ef3d2463eeb51b83e56e397bdac8a713f9569473edf3b89be99e98b3e8ed2bf319941763f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e8fc2753e8fc2753e00000000ec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000008fc2753ef3d2463eeb51b83e56e397bdec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83ef3d2463eeb51b83e56e3973dec256f3f61b1b63e0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e3973d5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e3973deb51b83ef3d2463eeb51b83e56e397bd5322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f56e397bdeb51b83e2434013e7068e33e000000005322473fafe0203f0000000000000000000000000000803f000080bf0c5cc63e0000803fd8411d3f0000803f000000007068e33e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0.24, z: 0} - m_Extent: {x: 0.24, y: 0.24, z: 0.24} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!43 &1235333010 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31848 + m_Name: pb_Mesh22584 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -61243,7 +60639,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33002 + m_Name: pb_Mesh23738 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -61407,7 +60803,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33688 + m_Name: pb_Mesh24424 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63000,7 +62396,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32126 + m_Name: pb_Mesh22862 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63158,75 +62554,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &1262776468 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7609458109135603029, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Name - value: TEMP TEST BALL - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603032, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1233217579} - - target: {fileID: 7609458109135603033, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1233217579} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.x - value: 17.2 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.y - value: 2.4 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalPosition.z - value: 34.6 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603037, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7609458109135603038, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 1233217579} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0097e8f2656820d4dac7620b563d50c9, type: 3} --- !u!1 &1265523675 GameObject: m_ObjectHideFlags: 0 @@ -63546,7 +62873,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32100 + m_Name: pb_Mesh22836 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63710,7 +63037,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33266 + m_Name: pb_Mesh24002 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -63874,7 +63201,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30886 + m_Name: pb_Mesh21622 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -64692,7 +64019,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32812 + m_Name: pb_Mesh23548 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -67792,7 +67119,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32074 + m_Name: pb_Mesh22810 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -67961,7 +67288,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30868 + m_Name: pb_Mesh21604 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69204,7 +68531,7 @@ Transform: - {fileID: 485006596} - {fileID: 418179840} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1337986677 Mesh: @@ -69212,7 +68539,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33080 + m_Name: pb_Mesh23816 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69689,7 +69016,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33174 + m_Name: pb_Mesh23910 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -69853,7 +69180,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31346 + m_Name: pb_Mesh22082 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70017,7 +69344,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32318 + m_Name: pb_Mesh23054 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70181,7 +69508,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30994 + m_Name: pb_Mesh21730 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70345,7 +69672,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32916 + m_Name: pb_Mesh23652 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -70679,7 +70006,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32154 + m_Name: pb_Mesh22890 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -71252,7 +70579,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31830 + m_Name: pb_Mesh22566 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -72458,7 +71785,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31262 + m_Name: pb_Mesh21998 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -72622,7 +71949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31646 + m_Name: pb_Mesh22382 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -72941,7 +72268,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32990 + m_Name: pb_Mesh23726 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -73105,7 +72432,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31364 + m_Name: pb_Mesh22100 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -74162,7 +73489,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32294 + m_Name: pb_Mesh23030 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -74326,7 +73653,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31692 + m_Name: pb_Mesh22428 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -77592,7 +76919,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33030 + m_Name: pb_Mesh23766 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -79405,7 +78732,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32086 + m_Name: pb_Mesh22822 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -80809,7 +80136,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33254 + m_Name: pb_Mesh23990 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -81654,7 +80981,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32928 + m_Name: pb_Mesh23664 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -85135,7 +84462,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31586 + m_Name: pb_Mesh22322 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -85992,7 +85319,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32062 + m_Name: pb_Mesh22798 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -86156,7 +85483,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33386 + m_Name: pb_Mesh24122 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -87443,7 +86770,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33368 + m_Name: pb_Mesh24104 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -89166,7 +88493,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33162 + m_Name: pb_Mesh23898 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -89391,7 +88718,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32974 + m_Name: pb_Mesh23710 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -89677,7 +89004,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31782 + m_Name: pb_Mesh22518 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -90402,7 +89729,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31934 + m_Name: pb_Mesh22670 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -90759,11 +90086,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.y - value: 0.73250365 + value: 0.77050364 objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.z - value: -5.9123144 + value: -5.9243155 objectReference: {fileID: 0} - target: {fileID: 2359756735399934660, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_RootOrder @@ -92095,7 +91422,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33664 + m_Name: pb_Mesh24400 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92259,7 +91586,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33866 + m_Name: pb_Mesh24602 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92771,7 +92098,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32948 + m_Name: pb_Mesh23684 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -92935,7 +92262,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31430 + m_Name: pb_Mesh22166 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93099,7 +92426,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31470 + m_Name: pb_Mesh22206 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93616,7 +92943,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31100 + m_Name: pb_Mesh21836 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93820,7 +93147,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31632 + m_Name: pb_Mesh22368 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -93994,7 +93321,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33612 + m_Name: pb_Mesh24348 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94158,7 +93485,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33412 + m_Name: pb_Mesh24148 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94322,7 +93649,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31382 + m_Name: pb_Mesh22118 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94486,7 +93813,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30982 + m_Name: pb_Mesh21718 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94650,7 +93977,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31456 + m_Name: pb_Mesh22192 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -94875,7 +94202,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32410 + m_Name: pb_Mesh23146 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -95039,7 +94366,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32112 + m_Name: pb_Mesh22848 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -95516,7 +94843,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33294 + m_Name: pb_Mesh24030 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -95685,7 +95012,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32748 + m_Name: pb_Mesh23484 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -97169,7 +96496,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30970 + m_Name: pb_Mesh21706 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -97363,7 +96690,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32878 + m_Name: pb_Mesh23614 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -97527,7 +96854,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32600 + m_Name: pb_Mesh23336 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -97866,7 +97193,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33748 + m_Name: pb_Mesh24484 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -98963,7 +98290,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30766 + m_Name: pb_Mesh21502 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99127,7 +98454,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh33116 + m_Name: pb_Mesh23852 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99291,7 +98618,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh30828 + m_Name: pb_Mesh21564 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99465,7 +98792,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32852 + m_Name: pb_Mesh23588 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99629,7 +98956,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32480 + m_Name: pb_Mesh23216 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -99793,7 +99120,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32718 + m_Name: pb_Mesh23454 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -100026,7 +99353,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31666 + m_Name: pb_Mesh22402 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -100640,7 +99967,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31880 + m_Name: pb_Mesh22616 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -101627,7 +100954,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32960 + m_Name: pb_Mesh23696 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -102104,7 +101431,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31946 + m_Name: pb_Mesh22682 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -102640,7 +101967,7 @@ Transform: - {fileID: 1564846787} - {fileID: 2097158246} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1977851605 PrefabInstance: @@ -102801,7 +102128,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1981496751 stripped Transform: @@ -103496,7 +102823,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32466 + m_Name: pb_Mesh23202 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -108370,7 +107697,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-10682 + m_Name: pb_Mesh-4980 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -108704,7 +108031,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31230 + m_Name: pb_Mesh21966 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109238,7 +108565,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32236 + m_Name: pb_Mesh22972 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109681,7 +109008,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31442 + m_Name: pb_Mesh22178 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -109845,7 +109172,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh31486 + m_Name: pb_Mesh22222 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -110391,7 +109718,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32038 + m_Name: pb_Mesh22774 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -110560,7 +109887,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh32442 + m_Name: pb_Mesh23178 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -111847,7 +111174,7 @@ PrefabInstance: objectReference: {fileID: 477193883} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.x - value: -1.1726799 + value: -1.1806793 objectReference: {fileID: 0} - target: {fileID: 2359756735399934658, guid: c72ecd617af26ff44a37eb25727a0b10, type: 3} propertyPath: m_ConnectedAnchor.y From cb61b3522a800d52f30afc07d02bdfd739e6cbdc Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Fri, 11 Feb 2022 09:37:58 -0800 Subject: [PATCH 06/14] Cleanup --- .../FMOD/Resources/FMODStudioSettings.asset | 177 +++++++++--------- .../URP Settings/ForwardRenderer.asset | 2 +- .../URP Settings/OutlineOverlayRenderer.asset | 62 ------ .../OutlineOverlayRenderer.asset.meta | 8 - .../UniversalRP-HighQuality.asset | 1 - .../URP Settings/UniversalRP-LowQuality.asset | 1 - .../UniversalRP-MediumQuality.asset | 1 - 7 files changed, 90 insertions(+), 162 deletions(-) delete mode 100644 Assets/Settings/URP Settings/OutlineOverlayRenderer.asset delete mode 100644 Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 9e1cc91b..c5004a11 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6812093695341766958 +--- !u!114 &-2109931483907959586 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: m_EditorClassIdentifier: - identifier: e7a046c753c3c3d4aacc91f6597f310d + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -63,7 +63,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-1860268102004090922 +--- !u!114 &-652645456764513100 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -72,10 +72,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 52eb9df5db46521439908db3a29a1bbb + identifier: b7716510a1f36934c87976f3a81dbf3d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -126,7 +126,53 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-70041036054920279 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: eef8d824ea7b63742966aaa0e94ac383, type: 3} + m_Name: FMODStudioSettings + m_EditorClassIdentifier: + SwitchSettingsMigration: 1 + HasSourceProject: 0 + HasPlatforms: 1 + sourceProjectPath: + sourceBankPath: Banks + SourceBankPathUnformatted: + AutomaticEventLoading: 1 + BankLoadType: 0 + AutomaticSampleLoading: 0 + EncryptionKey: + ImportType: 0 + TargetAssetPath: FMODBanks + TargetBankFolder: + LoggingLevel: 2 + SpeakerModeSettings: [] + SampleRateSettings: [] + LiveUpdateSettings: [] + OverlaySettings: [] + LoggingSettings: [] + BankDirectorySettings: [] + VirtualChannelSettings: [] + RealChannelSettings: [] + Plugins: [] + MasterBanks: + - Master + Banks: [] + BanksToLoad: [] + LiveUpdatePort: 9264 + EnableMemoryTracking: 0 + AndroidUseOBB: 0 + MeterChannelOrdering: 0 + StopEventsOutsideMaxDistance: 0 + BoltUnitOptionsBuildPending: 0 + MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 +--- !u!114 &1022096093135027323 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -189,52 +235,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: eef8d824ea7b63742966aaa0e94ac383, type: 3} - m_Name: FMODStudioSettings - m_EditorClassIdentifier: - SwitchSettingsMigration: 1 - HasSourceProject: 1 - HasPlatforms: 1 - sourceProjectPath: - sourceBankPath: - SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 - AutomaticSampleLoading: 0 - EncryptionKey: - ImportType: 0 - TargetAssetPath: FMODBanks - TargetBankFolder: - LoggingLevel: 2 - SpeakerModeSettings: [] - SampleRateSettings: [] - LiveUpdateSettings: [] - OverlaySettings: [] - LoggingSettings: [] - BankDirectorySettings: [] - VirtualChannelSettings: [] - RealChannelSettings: [] - Plugins: [] - MasterBanks: [] - Banks: [] - BanksToLoad: [] - LiveUpdatePort: 9264 - EnableMemoryTracking: 0 - AndroidUseOBB: 0 - MeterChannelOrdering: 0 - StopEventsOutsideMaxDistance: 0 - BoltUnitOptionsBuildPending: 0 - MigratedPlatforms: 150000000a000000060000000500000012000000080000000b0000000c000000090000000200000001000000 ---- !u!114 &2857895975134498898 +--- !u!114 &1035649151806295889 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -243,10 +244,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: 46fbfdf3fc43db0458918377fd40293e parentIdentifier: default displaySortOrder: 0 active: 0 @@ -297,7 +298,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &5688071088583857569 +--- !u!114 &1094919873718708265 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -306,20 +307,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d - parentIdentifier: default + identifier: default + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: Value: 0 HasValue: 0 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: Value: 0 HasValue: 0 @@ -349,10 +350,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 0 + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} HasValue: 0 @@ -360,7 +361,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &5838893388792593255 +--- !u!114 &2320774789392061834 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -369,10 +370,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97ba6cc2660c0ca498540d254701057a, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -423,7 +424,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &7304117275678044656 +--- !u!114 &3048360124830411489 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -432,10 +433,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: 97ba6cc2660c0ca498540d254701057a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e + identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -486,7 +487,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &8497015975347773006 +--- !u!114 &3253343605972182293 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -495,10 +496,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: 52eb9df5db46521439908db3a29a1bbb parentIdentifier: default displaySortOrder: 0 active: 0 @@ -549,7 +550,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &8579997554293876383 +--- !u!114 &5285853640733814438 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -558,10 +559,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} + m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2c5177b11d81d824dbb064f9ac8527da + identifier: e7a046c753c3c3d4aacc91f6597f310d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -612,7 +613,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &8922624999443584948 +--- !u!114 &6236561972038306882 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -621,10 +622,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} m_Name: m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: 2c5177b11d81d824dbb064f9ac8527da parentIdentifier: default displaySortOrder: 0 active: 0 @@ -675,7 +676,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &9215031891141315169 +--- !u!114 &7551495610035834729 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -684,20 +685,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default - parentIdentifier: + identifier: c88d16e5272a4e241b0ef0ac2e53b73d + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: Value: 0 HasValue: 0 LiveUpdatePort: - Value: 9264 - HasValue: 1 + Value: 0 + HasValue: 0 Overlay: Value: 0 HasValue: 0 @@ -727,10 +728,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 1 + HasValue: 0 StaticPlugins: Value: [] - HasValue: 1 + HasValue: 0 CallbackHandler: Value: {fileID: 0} HasValue: 0 diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index 90ce12ee..06267254 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -53,7 +53,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: NewRenderObjects + m_Name: Outliner m_EditorClassIdentifier: m_Active: 1 settings: diff --git a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset deleted file mode 100644 index d5151280..00000000 --- a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset +++ /dev/null @@ -1,62 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-5846740753714490180 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: e67bce010483b442f8b2c94965360a86, type: 3} - m_Name: NewOutlineFeature - m_EditorClassIdentifier: - m_Active: 1 - settings: - isEnabled: 1 - insertTiming: 1000 - material: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: OutlineOverlayRenderer - m_EditorClassIdentifier: - m_RendererFeatures: - - {fileID: -5846740753714490180} - m_RendererFeatureMap: bc540c094334dcae - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - tileDepthInfoPS: {fileID: 0} - tileDeferredPS: {fileID: 0} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 128 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 0 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_AccurateGbufferNormals: 0 diff --git a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta b/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta deleted file mode 100644 index 3f0a167a..00000000 --- a/Assets/Settings/URP Settings/OutlineOverlayRenderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70ac421f3ede043f19f01d22cada22d2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset b/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset index af8a5c26..2b66eb88 100644 --- a/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-HighQuality.asset @@ -18,7 +18,6 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 0 diff --git a/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset b/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset index be86b587..8d3cfdc7 100644 --- a/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-LowQuality.asset @@ -18,7 +18,6 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 diff --git a/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset b/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset index 5e159f95..016a1df7 100644 --- a/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset +++ b/Assets/Settings/URP Settings/UniversalRP-MediumQuality.asset @@ -18,7 +18,6 @@ MonoBehaviour: m_RendererData: {fileID: 0} m_RendererDataList: - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} - - {fileID: 11400000, guid: 70ac421f3ede043f19f01d22cada22d2, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 From d0c4539561dc553e21cb9f2b62d10feb7f11f670 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 17 Feb 2022 09:54:01 -0800 Subject: [PATCH 07/14] Minor change --- Assets/Scripts/Graphics/OutlineMaterial.mat | 3 ++- Assets/Settings/URP Settings/ForwardRenderer.asset | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index 60522d82..2618bd19 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -107,6 +107,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineIntensity: 8 + - _OutlineSize: 0.002 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 @@ -122,6 +123,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 0.4009434, g: 0.7767149, b: 1, a: 1} + - _OutlineColor: {r: 0.43715137, g: 1, b: 0.39999998, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index 06267254..eef20674 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -57,7 +57,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 1 settings: - passTag: NewRenderObjects + passTag: Outliner Event: 500 filterSettings: RenderQueueType: 0 From bc08a129fbd3840171988fa698833872b05b0ac6 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 17 Feb 2022 10:00:00 -0800 Subject: [PATCH 08/14] Updated for style guide --- Assets/Scripts/Graphics/OutlineFeature.cs | 12 ++++++--- Assets/Scripts/Graphics/OutlineRenderPass.cs | 18 ++++++++----- Assets/Scripts/Graphics/OutlineShader.shader | 27 +++++++++++++------- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs b/Assets/Scripts/Graphics/OutlineFeature.cs index 48dd5593..19e570a6 100644 --- a/Assets/Scripts/Graphics/OutlineFeature.cs +++ b/Assets/Scripts/Graphics/OutlineFeature.cs @@ -4,9 +4,11 @@ using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; -public class OutlineFeature : ScriptableRendererFeature { +public class OutlineFeature : ScriptableRendererFeature + { [System.Serializable] - public class OutlineFeatureSettings { + public class OutlineFeatureSettings + { public bool isEnabled = true; public RenderPassEvent insertTiming = RenderPassEvent.AfterRendering; public Material material; @@ -16,11 +18,13 @@ public class OutlineFeatureSettings { private RenderTargetHandle renderTargetHandle; private OutlineRenderPass renderPass; - public override void Create() { + public override void Create() + { renderPass = new OutlineRenderPass("Outline Pass", settings.insertTiming, settings.material); } - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { if (!settings.isEnabled) return; RenderTargetIdentifier cameraColorTargetIdent = renderer.cameraColorTarget; diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs b/Assets/Scripts/Graphics/OutlineRenderPass.cs index 60c193b0..ec9e1253 100644 --- a/Assets/Scripts/Graphics/OutlineRenderPass.cs +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs @@ -4,27 +4,32 @@ using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; -public class OutlineRenderPass : ScriptableRenderPass { +public class OutlineRenderPass : ScriptableRenderPass +{ private string profilerTag; private Material material; private RenderTargetIdentifier cameraColorTargetIdent; private RenderTargetHandle tempTexture; - public OutlineRenderPass(string profilerTag, RenderPassEvent renderPassEvent, Material material) { + public OutlineRenderPass(string profilerTag, RenderPassEvent renderPassEvent, Material material) + { this.profilerTag = profilerTag; this.renderPassEvent = renderPassEvent; this.material = material; } - public void setup(RenderTargetIdentifier cameraColorTargetIdent) { + public void setup(RenderTargetIdentifier cameraColorTargetIdent) + { this.cameraColorTargetIdent = cameraColorTargetIdent; } - public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) { + public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) + { cmd.GetTemporaryRT(tempTexture.id, cameraTextureDescriptor); } - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { CommandBuffer cmd = CommandBufferPool.Get(profilerTag); cmd.Clear(); @@ -35,7 +40,8 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData CommandBufferPool.Release(cmd); } - public override void FrameCleanup(CommandBuffer cmd) { + public override void FrameCleanup(CommandBuffer cmd) + { cmd.ReleaseTemporaryRT(tempTexture.id); } } \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineShader.shader b/Assets/Scripts/Graphics/OutlineShader.shader index f93944a3..3857e071 100644 --- a/Assets/Scripts/Graphics/OutlineShader.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -1,11 +1,14 @@ -Shader "Custom/Outline" { - Properties { +Shader "Custom/Outline" + { + Properties + { _OutlineColor ("Outline Color", Color) = (1, 1, 1, 1) // color of the outline _OutlineIntensity ("Outline Intensity", Range(1, 50)) = 1.0 // degree to which outline glows _OutlineSize ("Outline Size", Range(0, 0.005)) = 0.002 // size of the outline } - SubShader { + SubShader + { Tags { "RenderType"="Opaque" } LOD 100 @@ -17,12 +20,14 @@ Shader "Custom/Outline" { #include "UnityCG.cginc" - struct appdata { + struct appdata + { float4 vertex : POSITION; float2 uv : TEXCOORD0; }; - struct v2f { + struct v2f + { UNITY_FOG_COORDS(1) float4 vertex : SV_POSITION; float4 screenPos : TEXCOORD0; @@ -34,7 +39,8 @@ Shader "Custom/Outline" { UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); UNITY_DECLARE_TEX2D(_CameraOpaqueTexture); - v2f vert (appdata v) { + v2f vert (appdata v) + { v2f o; o.vertex = UnityObjectToClipPos(v.vertex); o.screenPos = ComputeScreenPos(o.vertex); @@ -44,19 +50,22 @@ Shader "Custom/Outline" { } // gets the depth value at i.screenpos - float getDepth(v2f i, float4 offset) { + float getDepth(v2f i, float4 offset) + { float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.screenPos + offset))); return sceneZ - i.screenPos.z; } // returns max value in a float4 - float getMax(float4 values) { + float getMax(float4 values) + { float maxValue = 0; for (int i = 0; i < 4; i++) maxValue = max(maxValue, values[i]); return maxValue; } - fixed4 frag (v2f i) : SV_Target { + fixed4 frag (v2f i) : SV_Target + { const float THRESHOLD = 0.05; // depth sampling From f5254be46ab980e31e20cd9b72b1dd7e7a14f21c Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 17 Feb 2022 10:09:58 -0800 Subject: [PATCH 09/14] Separate outline effect for non-selected interactables --- .../FMOD/Resources/FMODStudioSettings.asset | 229 +++++++++--------- Assets/Scripts/Graphics/OutlineFeature.cs | 34 --- .../Scripts/Graphics/OutlineFeature.cs.meta | 11 - .../Graphics/OutlineMaterialSelected.mat | 128 ++++++++++ .../Graphics/OutlineMaterialSelected.mat.meta | 8 + Assets/Scripts/Graphics/OutlineShader.shader | 1 + .../URP Settings/ForwardRenderer.asset | 42 +++- ProjectSettings/TagManager.asset | 2 +- 8 files changed, 293 insertions(+), 162 deletions(-) delete mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs delete mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineMaterialSelected.mat create mode 100644 Assets/Scripts/Graphics/OutlineMaterialSelected.mat.meta diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 3d5ed68e..3d126b00 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8928186618375588040 +--- !u!114 &-7091194627917028399 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: 46fbfdf3fc43db0458918377fd40293e parentIdentifier: default displaySortOrder: 0 active: 0 @@ -63,7 +63,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-7860345620044191798 +--- !u!114 &-2697575944041847878 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,7 +126,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-7399542882400878330 +--- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -135,10 +135,57 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} + m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} + m_Name: FMODStudioSettings + m_EditorClassIdentifier: + SwitchSettingsMigration: 1 + HasSourceProject: 1 + HasPlatforms: 1 + sourceProjectPath: FMOD/LongTermGame6.fspro + sourceBankPath: FMOD\Build + SourceBankPathUnformatted: + AutomaticEventLoading: 1 + BankLoadType: 0 + AutomaticSampleLoading: 0 + EncryptionKey: + ImportType: 0 + TargetAssetPath: FMODBanks + TargetBankFolder: + LoggingLevel: 2 + SpeakerModeSettings: [] + SampleRateSettings: [] + LiveUpdateSettings: [] + OverlaySettings: [] + LoggingSettings: [] + BankDirectorySettings: [] + VirtualChannelSettings: [] + RealChannelSettings: [] + Plugins: [] + MasterBanks: + - Menu + Banks: + - Testing + BanksToLoad: [] + LiveUpdatePort: 9264 + EnableMemoryTracking: 0 + AndroidUseOBB: 0 + MeterChannelOrdering: 0 + StopEventsOutsideMaxDistance: 0 + BoltUnitOptionsBuildPending: 0 + MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 +--- !u!114 &27952529618102217 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 97ba6cc2660c0ca498540d254701057a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2c5177b11d81d824dbb064f9ac8527da + identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -189,7 +236,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-4639518289413977777 +--- !u!114 &1485708929205689309 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -198,10 +245,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + identifier: 52eb9df5db46521439908db3a29a1bbb parentIdentifier: default displaySortOrder: 0 active: 0 @@ -252,7 +299,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-3422936272772139418 +--- !u!114 &1912415605968577345 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -261,10 +308,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} + m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 52eb9df5db46521439908db3a29a1bbb + identifier: 2c5177b11d81d824dbb064f9ac8527da parentIdentifier: default displaySortOrder: 0 active: 0 @@ -315,7 +362,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-3160993911012333591 +--- !u!114 &2149450860230768304 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -324,10 +371,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: b7716510a1f36934c87976f3a81dbf3d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -378,7 +425,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &11400000 +--- !u!114 &2530527019981598777 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -387,57 +434,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} - m_Name: FMODStudioSettings - m_EditorClassIdentifier: - SwitchSettingsMigration: 1 - HasSourceProject: 1 - HasPlatforms: 1 - sourceProjectPath: FMOD/LongTermGame6.fspro - sourceBankPath: FMOD\Build - SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 - AutomaticSampleLoading: 0 - EncryptionKey: - ImportType: 0 - TargetAssetPath: FMODBanks - TargetBankFolder: - LoggingLevel: 2 - SpeakerModeSettings: [] - SampleRateSettings: [] - LiveUpdateSettings: [] - OverlaySettings: [] - LoggingSettings: [] - BankDirectorySettings: [] - VirtualChannelSettings: [] - RealChannelSettings: [] - Plugins: [] - MasterBanks: - - Menu - Banks: - - Testing - BanksToLoad: [] - LiveUpdatePort: 9264 - EnableMemoryTracking: 0 - AndroidUseOBB: 0 - MeterChannelOrdering: 0 - StopEventsOutsideMaxDistance: 0 - BoltUnitOptionsBuildPending: 0 - MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 ---- !u!114 &74630066465562608 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 97ba6cc2660c0ca498540d254701057a, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 + identifier: c88d16e5272a4e241b0ef0ac2e53b73d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -488,7 +488,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &99189954829989511 +--- !u!114 &4870205303611548035 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -497,62 +497,61 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default + identifier: playInEditor parentIdentifier: displaySortOrder: 0 active: 1 Properties: LiveUpdate: - Value: 0 + Value: 1 HasValue: 1 LiveUpdatePort: - Value: 9264 - HasValue: 1 - Overlay: Value: 0 + HasValue: 0 + Overlay: + Value: 1 HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 0 + Value: 48000 HasValue: 1 BuildDirectory: - Value: Desktop - HasValue: 1 + Value: + HasValue: 0 SpeakerMode: - Value: 3 - HasValue: 1 + Value: 0 + HasValue: 0 VirtualChannelCount: - Value: 128 + Value: 1024 HasValue: 1 RealChannelCount: - Value: 32 + Value: 256 HasValue: 1 DSPBufferLength: Value: 0 - HasValue: 1 + HasValue: 0 DSPBufferCount: Value: 0 - HasValue: 1 + HasValue: 0 Plugins: - Value: - - phonon_fmod - HasValue: 1 + Value: [] + HasValue: 0 StaticPlugins: Value: [] - HasValue: 1 + HasValue: 0 CallbackHandler: Value: {fileID: 0} - HasValue: 1 + HasValue: 0 outputType: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &1221207373812680130 +--- !u!114 &5937529589221925167 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -561,20 +560,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d - parentIdentifier: default + identifier: default + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: Value: 0 HasValue: 0 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: Value: 0 HasValue: 0 @@ -604,10 +603,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 0 + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} HasValue: 0 @@ -615,7 +614,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &2472401914285189869 +--- !u!114 &6301768396760209218 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -624,29 +623,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: m_EditorClassIdentifier: - identifier: playInEditor - parentIdentifier: + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: - Value: 1 - HasValue: 1 + Value: 0 + HasValue: 0 LiveUpdatePort: - Value: 9264 - HasValue: 1 + Value: 0 + HasValue: 0 Overlay: Value: 0 - HasValue: 1 + HasValue: 0 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 48000 - HasValue: 1 + Value: 0 + HasValue: 0 BuildDirectory: Value: HasValue: 0 @@ -654,11 +653,11 @@ MonoBehaviour: Value: 0 HasValue: 0 VirtualChannelCount: - Value: 1024 - HasValue: 1 + Value: 0 + HasValue: 0 RealChannelCount: - Value: 256 - HasValue: 1 + Value: 0 + HasValue: 0 DSPBufferLength: Value: 0 HasValue: 0 @@ -678,7 +677,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &8826158149706490684 +--- !u!114 &8566473422023744763 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -687,10 +686,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default displaySortOrder: 0 active: 0 diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs b/Assets/Scripts/Graphics/OutlineFeature.cs deleted file mode 100644 index 19e570a6..00000000 --- a/Assets/Scripts/Graphics/OutlineFeature.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class OutlineFeature : ScriptableRendererFeature - { - [System.Serializable] - public class OutlineFeatureSettings - { - public bool isEnabled = true; - public RenderPassEvent insertTiming = RenderPassEvent.AfterRendering; - public Material material; - } - - public OutlineFeatureSettings settings = new OutlineFeatureSettings(); - private RenderTargetHandle renderTargetHandle; - private OutlineRenderPass renderPass; - - public override void Create() - { - renderPass = new OutlineRenderPass("Outline Pass", settings.insertTiming, settings.material); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - if (!settings.isEnabled) return; - - RenderTargetIdentifier cameraColorTargetIdent = renderer.cameraColorTarget; - renderPass.setup(cameraColorTargetIdent); - renderer.EnqueuePass(renderPass); - } -} diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs.meta b/Assets/Scripts/Graphics/OutlineFeature.cs.meta deleted file mode 100644 index a1b437c0..00000000 --- a/Assets/Scripts/Graphics/OutlineFeature.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e67bce010483b442f8b2c94965360a86 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat new file mode 100644 index 00000000..0aaa0ace --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3343911706550335055 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OutlineMaterialSelected + m_Shader: {fileID: 4800000, guid: ddee5e160afcb494c8df388a38ab8812, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DepthRadius: 0.002 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineIntensity: 8 + - _OutlineSize: 0.002 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _Threshold: 0.05 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 0.43715137, g: 1, b: 0.39999998, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat.meta b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat.meta new file mode 100644 index 00000000..aa175e00 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f481bf8bfb9a047c8b2346d1e39836be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineShader.shader b/Assets/Scripts/Graphics/OutlineShader.shader index 3857e071..3a17186a 100644 --- a/Assets/Scripts/Graphics/OutlineShader.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -83,6 +83,7 @@ Shader "Custom/Outline" // mixing float depth = max(localDepth, getMax(adjacentDepths)); fixed4 col = (depth > THRESHOLD) ? _OutlineColor * _OutlineIntensity : screenColor; + col = lerp(screenColor, col, _OutlineColor[3]); // apply opacity of color // apply fog? UNITY_APPLY_FOG(i.fogCoord, col); diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index eef20674..bad707d5 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -1,5 +1,44 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6118721879849541629 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: Outliner Selected + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: Outliner Selected + Event: 300 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 256 + PassNames: [] + overrideMaterial: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} + overrideMaterialPassIndex: 0 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14,7 +53,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: - {fileID: 5037087261189653048} - m_RendererFeatureMap: 38c2da292d54e745 + - {fileID: -6118721879849541629} + m_RendererFeatureMap: 38c2da292d54e74503602860deee15ab postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 65821f68..90e64f9a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - Player - Interactable - - + - InteractableSelected - - - From 2cb4aefa8651219a6de9f8c2fa7c5acd84f8f0c3 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 17 Feb 2022 10:32:12 -0800 Subject: [PATCH 10/14] Held object has more intense outline --- Assets/Scripts/Graphics/OutlineMaterial.mat | 2 +- Assets/Scripts/Graphics/OutlineRenderPass.cs | 47 ------------------- .../Graphics/OutlineRenderPass.cs.meta | 3 -- Assets/Scripts/Interaction/Interactable.cs | 17 +++++-- .../URP Settings/ForwardRenderer.asset | 4 +- ProjectSettings/TagManager.asset | 2 +- 6 files changed, 18 insertions(+), 57 deletions(-) delete mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs delete mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs.meta diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index 2618bd19..bbe1b851 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -123,6 +123,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 0.43715137, g: 1, b: 0.39999998, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 0.050980393} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs b/Assets/Scripts/Graphics/OutlineRenderPass.cs deleted file mode 100644 index ec9e1253..00000000 --- a/Assets/Scripts/Graphics/OutlineRenderPass.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -public class OutlineRenderPass : ScriptableRenderPass -{ - private string profilerTag; - private Material material; - private RenderTargetIdentifier cameraColorTargetIdent; - private RenderTargetHandle tempTexture; - - public OutlineRenderPass(string profilerTag, RenderPassEvent renderPassEvent, Material material) - { - this.profilerTag = profilerTag; - this.renderPassEvent = renderPassEvent; - this.material = material; - } - - public void setup(RenderTargetIdentifier cameraColorTargetIdent) - { - this.cameraColorTargetIdent = cameraColorTargetIdent; - } - - public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) - { - cmd.GetTemporaryRT(tempTexture.id, cameraTextureDescriptor); - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - CommandBuffer cmd = CommandBufferPool.Get(profilerTag); - cmd.Clear(); - - cmd.Blit(cameraColorTargetIdent, tempTexture.Identifier(), material, 0); - cmd.Blit(tempTexture.Identifier(), cameraColorTargetIdent); - context.ExecuteCommandBuffer(cmd); - cmd.Clear(); - CommandBufferPool.Release(cmd); - } - - public override void FrameCleanup(CommandBuffer cmd) - { - cmd.ReleaseTemporaryRT(tempTexture.id); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta b/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta deleted file mode 100644 index b4926c29..00000000 --- a/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3041cbc1cf964b008faea3f0ac996bba -timeCreated: 1644176479 \ No newline at end of file diff --git a/Assets/Scripts/Interaction/Interactable.cs b/Assets/Scripts/Interaction/Interactable.cs index c50536ca..7a512a8a 100644 --- a/Assets/Scripts/Interaction/Interactable.cs +++ b/Assets/Scripts/Interaction/Interactable.cs @@ -32,6 +32,8 @@ public class Interactable : MonoBehaviour public Vector3 GrabPoint { get; private set; } private int _ignoreRaycastLayer; + private int _interactableLayer; + private int _interactableHeldLayer; private Transform _cameraTransform; private float _lastLineOfSightCheck; @@ -40,6 +42,8 @@ public class Interactable : MonoBehaviour private void Start() { _ignoreRaycastLayer = LayerMask.NameToLayer("Ignore Raycast"); + _interactableLayer = LayerMask.NameToLayer("Interactable"); + _interactableHeldLayer = LayerMask.NameToLayer("InteractableHeld"); if (Camera.main != null) _cameraTransform = Camera.main.transform; @@ -50,6 +54,7 @@ public void InteractStart(GameObject source, Vector3 point) onInteractStart.Invoke(source, point); GrabPoint = point; IsHeld = true; + setLayerForHeldStatus(); _lastLineOfSightCheck = Time.time; } @@ -58,6 +63,7 @@ public void InteractEnd() { IsHeld = false; onInteractEnd.Invoke(); + setLayerForHeldStatus(); } private void Update() @@ -75,7 +81,6 @@ private void CheckForObstruction() GameObject self = gameObject; // Move this object to the "Ignore Raycast" layer so we don't count ourself as a blocking object. - int originalLayer = self.layer; self.layer = _ignoreRaycastLayer; if (Physics.Raycast(transform.position, directionToPlayer, out var hit)) @@ -84,7 +89,13 @@ private void CheckForObstruction() if (hit.transform.CompareTag("Player") == false) InteractEnd(); } - - gameObject.layer = originalLayer; + + // reset to correct layer + setLayerForHeldStatus(); + } + + private void setLayerForHeldStatus() + { + gameObject.layer = IsHeld ? _interactableHeldLayer : _interactableLayer; } } \ No newline at end of file diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index bad707d5..8ff1f850 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -15,14 +15,14 @@ MonoBehaviour: m_Active: 1 settings: passTag: Outliner Selected - Event: 300 + Event: 500 filterSettings: RenderQueueType: 0 LayerMask: serializedVersion: 2 m_Bits: 256 PassNames: [] - overrideMaterial: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} + overrideMaterial: {fileID: 2100000, guid: f481bf8bfb9a047c8b2346d1e39836be, type: 2} overrideMaterialPassIndex: 0 overrideDepthState: 0 depthCompareFunction: 4 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 90e64f9a..8c34c22d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - Player - Interactable - - InteractableSelected + - InteractableHeld - - - From 8a49ec0abaa1870a484fd1a693ad4d07bc57f810 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 17 Feb 2022 10:42:00 -0800 Subject: [PATCH 11/14] Reverted unintended changes to FMODStudioSettings --- .../FMOD/Resources/FMODStudioSettings.asset | 229 +++++++++--------- 1 file changed, 115 insertions(+), 114 deletions(-) diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 3d126b00..3d5ed68e 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7091194627917028399 +--- !u!114 &-8928186618375588040 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,10 +9,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} + m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 46fbfdf3fc43db0458918377fd40293e + identifier: c88d16e5272a4e241b0ef0ac2e53b73d parentIdentifier: default displaySortOrder: 0 active: 0 @@ -63,7 +63,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &-2697575944041847878 +--- !u!114 &-7860345620044191798 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,54 +126,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: eef8d824ea7b63742966aaa0e94ac383, type: 3} - m_Name: FMODStudioSettings - m_EditorClassIdentifier: - SwitchSettingsMigration: 1 - HasSourceProject: 1 - HasPlatforms: 1 - sourceProjectPath: FMOD/LongTermGame6.fspro - sourceBankPath: FMOD\Build - SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 - AutomaticSampleLoading: 0 - EncryptionKey: - ImportType: 0 - TargetAssetPath: FMODBanks - TargetBankFolder: - LoggingLevel: 2 - SpeakerModeSettings: [] - SampleRateSettings: [] - LiveUpdateSettings: [] - OverlaySettings: [] - LoggingSettings: [] - BankDirectorySettings: [] - VirtualChannelSettings: [] - RealChannelSettings: [] - Plugins: [] - MasterBanks: - - Menu - Banks: - - Testing - BanksToLoad: [] - LiveUpdatePort: 9264 - EnableMemoryTracking: 0 - AndroidUseOBB: 0 - MeterChannelOrdering: 0 - StopEventsOutsideMaxDistance: 0 - BoltUnitOptionsBuildPending: 0 - MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 ---- !u!114 &27952529618102217 +--- !u!114 &-7399542882400878330 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -182,10 +135,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97ba6cc2660c0ca498540d254701057a, type: 3} + m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 + identifier: 2c5177b11d81d824dbb064f9ac8527da parentIdentifier: default displaySortOrder: 0 active: 0 @@ -236,7 +189,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &1485708929205689309 +--- !u!114 &-4639518289413977777 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -245,10 +198,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} + m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 52eb9df5db46521439908db3a29a1bbb + identifier: 0f8eb3f400726694eb47beb1a9f94ce8 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -299,7 +252,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &1912415605968577345 +--- !u!114 &-3422936272772139418 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -308,10 +261,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9660e62d6232af242877f0cc2b90c63d, type: 3} + m_Script: {fileID: 11500000, guid: d92d0baf34dae0e4ea032a42bd6107c0, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 2c5177b11d81d824dbb064f9ac8527da + identifier: 52eb9df5db46521439908db3a29a1bbb parentIdentifier: default displaySortOrder: 0 active: 0 @@ -362,7 +315,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &2149450860230768304 +--- !u!114 &-3160993911012333591 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -371,10 +324,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} + m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} m_Name: m_EditorClassIdentifier: - identifier: b7716510a1f36934c87976f3a81dbf3d + identifier: fd7c55dab0fce234b8c25f6ffca523c1 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -425,7 +378,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &2530527019981598777 +--- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -434,10 +387,57 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3} + m_Script: {fileID: 11500000, guid: eef8d824ea7b63742966aaa0e94ac383, type: 3} + m_Name: FMODStudioSettings + m_EditorClassIdentifier: + SwitchSettingsMigration: 1 + HasSourceProject: 1 + HasPlatforms: 1 + sourceProjectPath: FMOD/LongTermGame6.fspro + sourceBankPath: FMOD\Build + SourceBankPathUnformatted: + AutomaticEventLoading: 1 + BankLoadType: 0 + AutomaticSampleLoading: 0 + EncryptionKey: + ImportType: 0 + TargetAssetPath: FMODBanks + TargetBankFolder: + LoggingLevel: 2 + SpeakerModeSettings: [] + SampleRateSettings: [] + LiveUpdateSettings: [] + OverlaySettings: [] + LoggingSettings: [] + BankDirectorySettings: [] + VirtualChannelSettings: [] + RealChannelSettings: [] + Plugins: [] + MasterBanks: + - Menu + Banks: + - Testing + BanksToLoad: [] + LiveUpdatePort: 9264 + EnableMemoryTracking: 0 + AndroidUseOBB: 0 + MeterChannelOrdering: 0 + StopEventsOutsideMaxDistance: 0 + BoltUnitOptionsBuildPending: 0 + MigratedPlatforms: 0c000000150000000b0000000a00000009000000120000000800000005000000060000000200000001000000 +--- !u!114 &74630066465562608 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 97ba6cc2660c0ca498540d254701057a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: c88d16e5272a4e241b0ef0ac2e53b73d + identifier: 2fea114e74ecf3c4f920e1d5cc1c4c40 parentIdentifier: default displaySortOrder: 0 active: 0 @@ -488,7 +488,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &4870205303611548035 +--- !u!114 &99189954829989511 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -497,61 +497,62 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} + m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: playInEditor + identifier: default parentIdentifier: displaySortOrder: 0 active: 1 Properties: LiveUpdate: - Value: 1 + Value: 0 HasValue: 1 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: - Value: 1 + Value: 0 HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 48000 + Value: 0 HasValue: 1 BuildDirectory: - Value: - HasValue: 0 + Value: Desktop + HasValue: 1 SpeakerMode: - Value: 0 - HasValue: 0 + Value: 3 + HasValue: 1 VirtualChannelCount: - Value: 1024 + Value: 128 HasValue: 1 RealChannelCount: - Value: 256 + Value: 32 HasValue: 1 DSPBufferLength: Value: 0 - HasValue: 0 + HasValue: 1 DSPBufferCount: Value: 0 - HasValue: 0 + HasValue: 1 Plugins: - Value: [] - HasValue: 0 + Value: + - phonon_fmod + HasValue: 1 StaticPlugins: Value: [] - HasValue: 0 + HasValue: 1 CallbackHandler: Value: {fileID: 0} - HasValue: 0 + HasValue: 1 outputType: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &5937529589221925167 +--- !u!114 &1221207373812680130 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -560,20 +561,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9587379c972e4a54da1949613f11e1c6, type: 3} + m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3} m_Name: m_EditorClassIdentifier: - identifier: default - parentIdentifier: + identifier: b7716510a1f36934c87976f3a81dbf3d + parentIdentifier: default displaySortOrder: 0 - active: 1 + active: 0 Properties: LiveUpdate: Value: 0 HasValue: 0 LiveUpdatePort: - Value: 9264 - HasValue: 1 + Value: 0 + HasValue: 0 Overlay: Value: 0 HasValue: 0 @@ -603,10 +604,10 @@ MonoBehaviour: HasValue: 0 Plugins: Value: [] - HasValue: 1 + HasValue: 0 StaticPlugins: Value: [] - HasValue: 1 + HasValue: 0 CallbackHandler: Value: {fileID: 0} HasValue: 0 @@ -614,7 +615,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &6301768396760209218 +--- !u!114 &2472401914285189869 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -623,29 +624,29 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3} + m_Script: {fileID: 11500000, guid: 335f0a4b26fb46942858ea029e030d2a, type: 3} m_Name: m_EditorClassIdentifier: - identifier: 0f8eb3f400726694eb47beb1a9f94ce8 - parentIdentifier: default + identifier: playInEditor + parentIdentifier: displaySortOrder: 0 - active: 0 + active: 1 Properties: LiveUpdate: - Value: 0 - HasValue: 0 + Value: 1 + HasValue: 1 LiveUpdatePort: - Value: 0 - HasValue: 0 + Value: 9264 + HasValue: 1 Overlay: Value: 0 - HasValue: 0 + HasValue: 1 Logging: Value: 0 HasValue: 0 SampleRate: - Value: 0 - HasValue: 0 + Value: 48000 + HasValue: 1 BuildDirectory: Value: HasValue: 0 @@ -653,11 +654,11 @@ MonoBehaviour: Value: 0 HasValue: 0 VirtualChannelCount: - Value: 0 - HasValue: 0 + Value: 1024 + HasValue: 1 RealChannelCount: - Value: 0 - HasValue: 0 + Value: 256 + HasValue: 1 DSPBufferLength: Value: 0 HasValue: 0 @@ -677,7 +678,7 @@ MonoBehaviour: threadAffinities: Value: [] HasValue: 0 ---- !u!114 &8566473422023744763 +--- !u!114 &8826158149706490684 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -686,10 +687,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3} + m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3} m_Name: m_EditorClassIdentifier: - identifier: fd7c55dab0fce234b8c25f6ffca523c1 + identifier: 46fbfdf3fc43db0458918377fd40293e parentIdentifier: default displaySortOrder: 0 active: 0 From e7a00a4fe873a6361bbacb4bfc856bdfbd73983b Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 7 Apr 2022 10:18:56 -0700 Subject: [PATCH 12/14] Improved edge detection using camera normals --- Assets/Scripts/Graphics/OutlineFeature.cs | 35 +++++++++ .../Scripts/Graphics/OutlineFeature.cs.meta | 11 +++ .../Graphics/OutlineMaterialSelected.mat | 10 ++- .../Scripts/Graphics/OutlineObjectsFeature.cs | 36 +++++++++ .../Graphics/OutlineObjectsFeature.cs.meta | 11 +++ Assets/Scripts/Graphics/OutlineRenderPass.cs | 47 ++++++++++++ .../Graphics/OutlineRenderPass.cs.meta | 11 +++ Assets/Scripts/Graphics/OutlineShader.shader | 74 ++++++++++++++++--- .../URP Settings/ForwardRenderer.asset | 57 ++++++++++++-- 9 files changed, 271 insertions(+), 21 deletions(-) create mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs create mode 100644 Assets/Scripts/Graphics/OutlineFeature.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineObjectsFeature.cs create mode 100644 Assets/Scripts/Graphics/OutlineObjectsFeature.cs.meta create mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs create mode 100644 Assets/Scripts/Graphics/OutlineRenderPass.cs.meta diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs b/Assets/Scripts/Graphics/OutlineFeature.cs new file mode 100644 index 00000000..671b895a --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineFeature.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class OutlineFeature : ScriptableRendererFeature +{ + [System.Serializable] + public class OutlineFeatureSettings + { + public bool isEnabled = true; + public RenderPassEvent insertTiming = RenderPassEvent.AfterRendering; + public Material material; + } + + public OutlineFeatureSettings settings = new OutlineFeatureSettings(); + private RenderTargetHandle renderTargetHandle; + private OutlineRenderPass renderPass; + + public override void Create() + { + renderPass = new OutlineRenderPass("Outline Pass", settings.insertTiming, settings.material); + } + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + if (!settings.isEnabled) return; + + RenderTargetIdentifier cameraColorTargetIdent = renderer.cameraColorTarget; + renderPass.setup(cameraColorTargetIdent); + renderPass.ConfigureInput(ScriptableRenderPassInput.Normal); + renderer.EnqueuePass(renderPass); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineFeature.cs.meta b/Assets/Scripts/Graphics/OutlineFeature.cs.meta new file mode 100644 index 00000000..a7eed7da --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineFeature.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e6204cd418c7e4bd59128df568813bf0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat index 0aaa0ace..7dbc28ca 100644 --- a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat +++ b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: OutlineMaterialSelected m_Shader: {fileID: 4800000, guid: ddee5e160afcb494c8df388a38ab8812, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _DODEPTHEDGEDETECTION_ON _DONORMALEDGEDETECTION_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -97,16 +97,20 @@ Material: - _Cull: 2 - _Cutoff: 0.5 - _DepthRadius: 0.002 + - _DepthThreshold: 0.029 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DoDepthEdgeDetection: 1 + - _DoNormalEdgeDetection: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NormalThreshold: 0 - _OcclusionStrength: 1 - - _OutlineIntensity: 8 + - _OutlineIntensity: 28.3 - _OutlineSize: 0.002 - _Parallax: 0.005 - _QueueOffset: 0 @@ -123,6 +127,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 0.43715137, g: 1, b: 0.39999998, a: 1} + - _OutlineColor: {r: 0.4371513, g: 1, b: 0.39999992, a: 0.18431373} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineObjectsFeature.cs b/Assets/Scripts/Graphics/OutlineObjectsFeature.cs new file mode 100644 index 00000000..97144021 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineObjectsFeature.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Experimental.Rendering.Universal; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class OutlineObjectsFeature : RenderObjects { + private RenderObjectsPass rpoPass; + + // public OutlineObjectsFeatureSettings newSettings = new OutlineObjectsFeatureSettings(); + public RenderPassEvent insertTiming; + public LayerMask layerMask; + public Material mainMaterial; + + + [System.Serializable] + public class OutlineObjectsFeatureSettings : RenderObjectsSettings + { + public RenderPassEvent insertTiming = RenderPassEvent.AfterRenderingTransparents; + // public Material material; + public int layerMask = 1 << 7; + } + + public override void Create() + { + rpoPass = new RenderObjectsPass("Outline Objects Pass", insertTiming, new string[0], RenderQueueType.Opaque, layerMask, new CustomCameraSettings()); + } + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + rpoPass.overrideMaterial = mainMaterial; + rpoPass.ConfigureInput(ScriptableRenderPassInput.Normal); + renderer.EnqueuePass(rpoPass); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineObjectsFeature.cs.meta b/Assets/Scripts/Graphics/OutlineObjectsFeature.cs.meta new file mode 100644 index 00000000..bf92289e --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineObjectsFeature.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec8f6252a7d164088b26deaa5b34b585 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs b/Assets/Scripts/Graphics/OutlineRenderPass.cs new file mode 100644 index 00000000..ec9e1253 --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +public class OutlineRenderPass : ScriptableRenderPass +{ + private string profilerTag; + private Material material; + private RenderTargetIdentifier cameraColorTargetIdent; + private RenderTargetHandle tempTexture; + + public OutlineRenderPass(string profilerTag, RenderPassEvent renderPassEvent, Material material) + { + this.profilerTag = profilerTag; + this.renderPassEvent = renderPassEvent; + this.material = material; + } + + public void setup(RenderTargetIdentifier cameraColorTargetIdent) + { + this.cameraColorTargetIdent = cameraColorTargetIdent; + } + + public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) + { + cmd.GetTemporaryRT(tempTexture.id, cameraTextureDescriptor); + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + CommandBuffer cmd = CommandBufferPool.Get(profilerTag); + cmd.Clear(); + + cmd.Blit(cameraColorTargetIdent, tempTexture.Identifier(), material, 0); + cmd.Blit(tempTexture.Identifier(), cameraColorTargetIdent); + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + CommandBufferPool.Release(cmd); + } + + public override void FrameCleanup(CommandBuffer cmd) + { + cmd.ReleaseTemporaryRT(tempTexture.id); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta b/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta new file mode 100644 index 00000000..a0888e7b --- /dev/null +++ b/Assets/Scripts/Graphics/OutlineRenderPass.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 54cae72bddf484d09a7a9ea58dff0e15 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Graphics/OutlineShader.shader b/Assets/Scripts/Graphics/OutlineShader.shader index 3a17186a..87873f3c 100644 --- a/Assets/Scripts/Graphics/OutlineShader.shader +++ b/Assets/Scripts/Graphics/OutlineShader.shader @@ -5,6 +5,11 @@ Shader "Custom/Outline" _OutlineColor ("Outline Color", Color) = (1, 1, 1, 1) // color of the outline _OutlineIntensity ("Outline Intensity", Range(1, 50)) = 1.0 // degree to which outline glows _OutlineSize ("Outline Size", Range(0, 0.005)) = 0.002 // size of the outline + _DepthThreshold ("Depth Threshold", Range(0, 0.10)) = 0.05 + _NormalThreshold ("Normal Threshold", Range(0, 1)) = 1.0 + +// [Toggle] _DoDepthEdgeDetection ("Depth Edge Detection", Float) = 1.0 +// [Toggle] _DoNormalEdgeDetection ("Normal Edge Detection", Float) = 1.0 } SubShader @@ -14,6 +19,8 @@ Shader "Custom/Outline" Pass { CGPROGRAM +// Upgrade NOTE: excluded shader from DX11, OpenGL ES 2.0 because it uses unsized arrays +#pragma exclude_renderers d3d11 gles #pragma vertex vert #pragma fragment frag #pragma multi_compile_fog @@ -36,7 +43,12 @@ Shader "Custom/Outline" float _OutlineSize; float4 _OutlineColor; float _OutlineIntensity; + float _NormalThreshold; + float _DepthThreshold; + // float _DoDepthEdgeDetection; + // float _DoNormalEdgeDetection; UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); + UNITY_DECLARE_TEX2D(_CameraNormalsTexture); UNITY_DECLARE_TEX2D(_CameraOpaqueTexture); v2f vert (appdata v) @@ -49,6 +61,24 @@ Shader "Custom/Outline" return o; } + + + + + // detect if at edge using the camera normals + bool detectEdgeFromNormal(float2 offsets[4], float2 screenPosition) + { + float3 normals[4]; + for (int j = 0; j < 4; j++) normals[j] = UNITY_SAMPLE_TEX2D(_CameraNormalsTexture, screenPosition + offsets[j]); + const float3 normalFiniteDifference0 = normals[1] - normals[0]; + const float3 normalFiniteDifference1 = normals[3] - normals[2]; + float edgeNormal = sqrt(dot(normalFiniteDifference0, normalFiniteDifference0) + dot(normalFiniteDifference1, normalFiniteDifference1)); + return edgeNormal > _NormalThreshold; + } + + + + // gets the depth value at i.screenpos float getDepth(v2f i, float4 offset) { @@ -63,28 +93,48 @@ Shader "Custom/Outline" for (int i = 0; i < 4; i++) maxValue = max(maxValue, values[i]); return maxValue; } - - fixed4 frag (v2f i) : SV_Target + + // detect if at edge using the depth buffer + bool detectEdgeFromDepth(v2f i, float2 offsets[4]) { - const float THRESHOLD = 0.05; + // const float THRESHOLD = 0.05; // depth sampling float4 adjacentDepths = 0; float4 localDepth = getDepth(i, 0); - adjacentDepths[0] = getDepth(i, float4(-_OutlineSize, 0, 0, 0)); - adjacentDepths[1] = getDepth(i, float4(_OutlineSize, 0, 0, 0)); - adjacentDepths[2] = getDepth(i, float4(0, -_OutlineSize, 0, 0)); - adjacentDepths[3] = getDepth(i, float4(0, _OutlineSize, 0, 0)); + for (int j = 0; j < 4; j++) adjacentDepths[j] = getDepth(i, float4(offsets[j], 0, 0)); + + float depth = max(localDepth, getMax(adjacentDepths)); + return depth > _DepthThreshold; + } + + + + + + fixed4 frag (v2f i) : SV_Target + { + float2 offsets[] = { + float2(-_OutlineSize, 0), + float2(_OutlineSize, 0), + float2(0, -_OutlineSize), + float2(0, _OutlineSize), + }; + // screen color - float2 screenPosition = i.screenPos.xy / i.screenPos.w; - fixed4 screenColor = UNITY_SAMPLE_TEX2D(_CameraOpaqueTexture, screenPosition); + const float2 screenPosition = i.screenPos.xy / i.screenPos.w; + const fixed4 screenColor = UNITY_SAMPLE_TEX2D(_CameraOpaqueTexture, screenPosition); + // edge detection + const bool atDepthEdge = detectEdgeFromDepth(i, offsets); + const bool atNormalEdge = detectEdgeFromNormal(offsets, screenPosition); + bool atEdge = atDepthEdge && atNormalEdge; + // mixing - float depth = max(localDepth, getMax(adjacentDepths)); - fixed4 col = (depth > THRESHOLD) ? _OutlineColor * _OutlineIntensity : screenColor; + fixed4 col = (atEdge) ? _OutlineColor * _OutlineIntensity : screenColor; col = lerp(screenColor, col, _OutlineColor[3]); // apply opacity of color - + // apply fog? UNITY_APPLY_FOG(i.fogCoord, col); return col; diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index 8ff1f850..c13528bf 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} m_Name: Outliner Selected m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 settings: passTag: Outliner Selected Event: 500 @@ -54,7 +54,8 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 5037087261189653048} - {fileID: -6118721879849541629} - m_RendererFeatureMap: 38c2da292d54e74503602860deee15ab + - {fileID: 2835584169613232667} + m_RendererFeatureMap: 38c2da292d54e74503602860deee15ab1b8a8458c7045a27 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -83,6 +84,50 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_AccurateGbufferNormals: 0 +--- !u!114 &2835584169613232667 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: ec8f6252a7d164088b26deaa5b34b585, type: 3} + m_Name: Outliner Objects A + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: Outliner Objects A + Event: 500 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 128 + PassNames: [] + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 + insertTiming: 500 + layerMask: + serializedVersion: 2 + m_Bits: 128 + mainMaterial: {fileID: 2100000, guid: f481bf8bfb9a047c8b2346d1e39836be, type: 2} --- !u!114 &5037087261189653048 MonoBehaviour: m_ObjectHideFlags: 0 @@ -95,7 +140,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} m_Name: Outliner m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 settings: passTag: Outliner Event: 500 @@ -109,10 +154,10 @@ MonoBehaviour: overrideMaterialPassIndex: 0 overrideDepthState: 0 depthCompareFunction: 4 - enableWrite: 1 + enableWrite: 0 stencilSettings: overrideStencilState: 0 - stencilReference: 0 + stencilReference: 15 stencilCompareFunction: 8 passOperation: 0 failOperation: 0 @@ -121,4 +166,4 @@ MonoBehaviour: overrideCamera: 0 restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 + cameraFieldOfView: 129 From 4e5b5b1db946076774f08d0c4394402ba20390d6 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 7 Apr 2022 15:46:04 -0700 Subject: [PATCH 13/14] Minor adjustments --- Assets/Scripts/Graphics/OutlineMaterial.mat | 4 +- .../Graphics/OutlineMaterialSelected.mat | 6 +- .../URP Settings/ForwardRenderer.asset | 79 ++++++------------- 3 files changed, 28 insertions(+), 61 deletions(-) diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index bbe1b851..9055f531 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -97,6 +97,7 @@ Material: - _Cull: 2 - _Cutoff: 0.5 - _DepthRadius: 0.002 + - _DepthThreshold: 0.05 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -105,6 +106,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NormalThreshold: 1 - _OcclusionStrength: 1 - _OutlineIntensity: 8 - _OutlineSize: 0.002 @@ -123,6 +125,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 0.050980393} + - _OutlineColor: {r: 0, g: 0.6132076, b: 0.08225962, a: 0.105882354} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat index 7dbc28ca..c43916e7 100644 --- a/Assets/Scripts/Graphics/OutlineMaterialSelected.mat +++ b/Assets/Scripts/Graphics/OutlineMaterialSelected.mat @@ -97,7 +97,7 @@ Material: - _Cull: 2 - _Cutoff: 0.5 - _DepthRadius: 0.002 - - _DepthThreshold: 0.029 + - _DepthThreshold: 0.069 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DoDepthEdgeDetection: 1 @@ -110,7 +110,7 @@ Material: - _Metallic: 0 - _NormalThreshold: 0 - _OcclusionStrength: 1 - - _OutlineIntensity: 28.3 + - _OutlineIntensity: 6.7 - _OutlineSize: 0.002 - _Parallax: 0.005 - _QueueOffset: 0 @@ -127,6 +127,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 0.4371513, g: 1, b: 0.39999992, a: 0.18431373} + - _OutlineColor: {r: 0.43715128, g: 1, b: 0.3999999, a: 0.36862746} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Settings/URP Settings/ForwardRenderer.asset b/Assets/Settings/URP Settings/ForwardRenderer.asset index c13528bf..21f598ec 100644 --- a/Assets/Settings/URP Settings/ForwardRenderer.asset +++ b/Assets/Settings/URP Settings/ForwardRenderer.asset @@ -1,44 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6118721879849541629 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: Outliner Selected - m_EditorClassIdentifier: - m_Active: 0 - settings: - passTag: Outliner Selected - Event: 500 - filterSettings: - RenderQueueType: 0 - LayerMask: - serializedVersion: 2 - m_Bits: 256 - PassNames: [] - overrideMaterial: {fileID: 2100000, guid: f481bf8bfb9a047c8b2346d1e39836be, type: 2} - overrideMaterialPassIndex: 0 - overrideDepthState: 0 - depthCompareFunction: 4 - enableWrite: 1 - stencilSettings: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 0 - failOperation: 0 - zFailOperation: 0 - cameraSettings: - overrideCamera: 0 - restoreCamera: 1 - offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52,10 +13,9 @@ MonoBehaviour: m_Name: ForwardRenderer m_EditorClassIdentifier: m_RendererFeatures: - - {fileID: 5037087261189653048} - - {fileID: -6118721879849541629} - {fileID: 2835584169613232667} - m_RendererFeatureMap: 38c2da292d54e74503602860deee15ab1b8a8458c7045a27 + - {fileID: 6779064132620506433} + m_RendererFeatureMap: 1b8a8458c7045a2741d56f5ee912145e postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -94,17 +54,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ec8f6252a7d164088b26deaa5b34b585, type: 3} - m_Name: Outliner Objects A + m_Name: Outliner Selected m_EditorClassIdentifier: m_Active: 1 settings: - passTag: Outliner Objects A + passTag: Outliner Selected Event: 500 filterSettings: RenderQueueType: 0 LayerMask: serializedVersion: 2 - m_Bits: 128 + m_Bits: 384 PassNames: [] overrideMaterial: {fileID: 0} overrideMaterialPassIndex: 0 @@ -126,9 +86,9 @@ MonoBehaviour: insertTiming: 500 layerMask: serializedVersion: 2 - m_Bits: 128 + m_Bits: 256 mainMaterial: {fileID: 2100000, guid: f481bf8bfb9a047c8b2346d1e39836be, type: 2} ---- !u!114 &5037087261189653048 +--- !u!114 &6779064132620506433 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -137,27 +97,27 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: Outliner + m_Script: {fileID: 11500000, guid: ec8f6252a7d164088b26deaa5b34b585, type: 3} + m_Name: Outline Unselected m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 settings: - passTag: Outliner - Event: 500 + passTag: Outline Unselected + Event: 300 filterSettings: RenderQueueType: 0 LayerMask: serializedVersion: 2 - m_Bits: 128 + m_Bits: 384 PassNames: [] - overrideMaterial: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} + overrideMaterial: {fileID: 0} overrideMaterialPassIndex: 0 overrideDepthState: 0 depthCompareFunction: 4 - enableWrite: 0 + enableWrite: 1 stencilSettings: overrideStencilState: 0 - stencilReference: 15 + stencilReference: 0 stencilCompareFunction: 8 passOperation: 0 failOperation: 0 @@ -166,4 +126,9 @@ MonoBehaviour: overrideCamera: 0 restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 129 + cameraFieldOfView: 60 + insertTiming: 500 + layerMask: + serializedVersion: 2 + m_Bits: 128 + mainMaterial: {fileID: 2100000, guid: b4dc2b184e3ad4befa715f0c441b7d20, type: 2} From 74d099dc31922c40a90efe8dd18d967675f1a354 Mon Sep 17 00:00:00 2001 From: Corey Ethington Date: Thu, 7 Apr 2022 15:49:47 -0700 Subject: [PATCH 14/14] More minor adjustments --- Assets/Scripts/Graphics/OutlineMaterial.mat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Graphics/OutlineMaterial.mat b/Assets/Scripts/Graphics/OutlineMaterial.mat index 9055f531..a1a1870c 100644 --- a/Assets/Scripts/Graphics/OutlineMaterial.mat +++ b/Assets/Scripts/Graphics/OutlineMaterial.mat @@ -108,7 +108,7 @@ Material: - _Metallic: 0 - _NormalThreshold: 1 - _OcclusionStrength: 1 - - _OutlineIntensity: 8 + - _OutlineIntensity: 1 - _OutlineSize: 0.002 - _Parallax: 0.005 - _QueueOffset: 0 @@ -125,6 +125,6 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 0, g: 0.6132076, b: 0.08225962, a: 0.105882354} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 0.12156863} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: []