From bb0421d75d1d9cdc6c32b6ae7cb176c4f45b2e10 Mon Sep 17 00:00:00 2001 From: supahfox <31490939+supahfox@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:10:33 -0300 Subject: [PATCH] v1.0 --- Assets/BannerSystem/BannerSystem.prefab | 8 +- Assets/BannerSystem/BannerSystem.unity | 4 +- .../BannerSystem/Materials/FramePicture.mat | 2 +- .../Materials/VerticalPlaceholder.jpg | 3 + ....png.meta => VerticalPlaceholder.jpg.meta} | 2 +- Assets/BannerSystem/Materials/placeholder.png | 3 - Assets/BannerSystem/Script/BannerSystem.asset | 201 +++++++----- Assets/BannerSystem/Script/BannerSystem.cs | 296 ++++++++++-------- .../d904c1df903da8441a75d31379aab386.asset | 2 +- .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- UserSettings/Layouts/default-2022.dwlt | 164 +++++----- 17 files changed, 397 insertions(+), 302 deletions(-) create mode 100644 Assets/BannerSystem/Materials/VerticalPlaceholder.jpg rename Assets/BannerSystem/Materials/{placeholder.png.meta => VerticalPlaceholder.jpg.meta} (98%) delete mode 100644 Assets/BannerSystem/Materials/placeholder.png diff --git a/Assets/BannerSystem/BannerSystem.prefab b/Assets/BannerSystem/BannerSystem.prefab index fd0eeb7..4b2232a 100644 --- a/Assets/BannerSystem/BannerSystem.prefab +++ b/Assets/BannerSystem/BannerSystem.prefab @@ -761,14 +761,14 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 4822871787309189752} - imageUrls: - - url: https://filetandvine.com/wp-content/uploads/2015/07/pix-uploaded-placeholder.jpg - - url: https://filetandvine.com/wp-content/uploads/2015/07/pix-uploaded-placeholder.jpgt=jpg&name=large + arrayURL: [] + defaultURL: + url: https://dioscarmesi.github.io/Golden%20Midnight/cumple/LonaCumple.png stringUrl: url: renderer: {fileID: 1666915793605624022} field: {fileID: 7379526049786962049} - slideDurationSeconds: 30 + slideDurationSeconds: 1 InputField: {fileID: 6497982948622866344} reSyncButton: {fileID: 8760492488270176137} removeButton: {fileID: 8557382335034051407} diff --git a/Assets/BannerSystem/BannerSystem.unity b/Assets/BannerSystem/BannerSystem.unity index 486af03..5259c93 100644 --- a/Assets/BannerSystem/BannerSystem.unity +++ b/Assets/BannerSystem/BannerSystem.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68b4f4fc924df9f130253576ce5b36e1632d38bdf2da2cb5b0f356c308a2937b -size 41133 +oid sha256:d237301bb1c0684f398125cdd06902d27a2fd7ab2fe7cde60843b0cfb0dee2de +size 48181 diff --git a/Assets/BannerSystem/Materials/FramePicture.mat b/Assets/BannerSystem/Materials/FramePicture.mat index 5d3ec56..170bbfc 100644 --- a/Assets/BannerSystem/Materials/FramePicture.mat +++ b/Assets/BannerSystem/Materials/FramePicture.mat @@ -24,7 +24,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: c733af33fe931aa49acdf0bbcd8a3968, type: 3} + m_Texture: {fileID: 2800000, guid: dfc122581ceddab4aaa8f9b2d71ada1d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/BannerSystem/Materials/VerticalPlaceholder.jpg b/Assets/BannerSystem/Materials/VerticalPlaceholder.jpg new file mode 100644 index 0000000..e2c8f2d --- /dev/null +++ b/Assets/BannerSystem/Materials/VerticalPlaceholder.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7695d0d8d57217e439f5f613ed9185c7773760e634b6f85939e934f72a92703a +size 16816 diff --git a/Assets/BannerSystem/Materials/placeholder.png.meta b/Assets/BannerSystem/Materials/VerticalPlaceholder.jpg.meta similarity index 98% rename from Assets/BannerSystem/Materials/placeholder.png.meta rename to Assets/BannerSystem/Materials/VerticalPlaceholder.jpg.meta index 3b2efcf..531c7b3 100644 --- a/Assets/BannerSystem/Materials/placeholder.png.meta +++ b/Assets/BannerSystem/Materials/VerticalPlaceholder.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c733af33fe931aa49acdf0bbcd8a3968 +guid: dfc122581ceddab4aaa8f9b2d71ada1d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/BannerSystem/Materials/placeholder.png b/Assets/BannerSystem/Materials/placeholder.png deleted file mode 100644 index a5c3e2a..0000000 --- a/Assets/BannerSystem/Materials/placeholder.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d6f19194d31f8c4f448a5e4d190dfc4e66b6bf516e44f342332aa6eda4bb7d5 -size 7809 diff --git a/Assets/BannerSystem/Script/BannerSystem.asset b/Assets/BannerSystem/Script/BannerSystem.asset index 7aaf496..6322dfb 100644 --- a/Assets/BannerSystem/Script/BannerSystem.asset +++ b/Assets/BannerSystem/Script/BannerSystem.asset @@ -44,19 +44,19 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 14 + Data: 15 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: imageUrls + Data: arrayURL - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: imageUrls + Data: arrayURL - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib @@ -98,7 +98,7 @@ MonoBehaviour: Data: 6|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 - Data: "URLs de im\xE1genes a cargar" + Data: URL de los links puestos en el InputField. - Name: Entry: 8 Data: @@ -119,13 +119,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: stringUrl + Data: defaultURL - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: stringUrl + Data: defaultURL - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib @@ -165,6 +165,69 @@ MonoBehaviour: - Name: Entry: 7 Data: 11|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: URL por default de la imagen. + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: stringUrl + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: stringUrl + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: URL of text file containing captions for images, one caption per line. @@ -191,13 +254,13 @@ MonoBehaviour: Data: renderer - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: renderer - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Renderer, UnityEngine.CoreModule @@ -206,7 +269,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -221,19 +284,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 16|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 20|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: "Renderer donde mostrar im\xE1genes descargadas." @@ -260,13 +323,13 @@ MonoBehaviour: Data: field - Name: $v Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: field - Name: k__BackingField Entry: 7 - Data: 18|System.RuntimeType, mscorlib + Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.UI.Text, UnityEngine.UI @@ -275,7 +338,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 18 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -290,19 +353,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 20|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 21|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 25|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Text field for captions. @@ -329,13 +392,13 @@ MonoBehaviour: Data: slideDurationSeconds - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: slideDurationSeconds - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -344,7 +407,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -359,19 +422,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 26|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 30|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: "Duraci\xF3n en segundos de cada imagen." @@ -398,13 +461,13 @@ MonoBehaviour: Data: _loadedIndex - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _loadedIndex - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -413,7 +476,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 28 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -428,7 +491,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -452,13 +515,13 @@ MonoBehaviour: Data: _imageDownloader - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _imageDownloader - Name: k__BackingField Entry: 7 - Data: 31|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -467,7 +530,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -482,7 +545,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -506,13 +569,13 @@ MonoBehaviour: Data: _udonEventReceiver - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _udonEventReceiver - Name: k__BackingField Entry: 7 - Data: 34|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.Common.Interfaces.IUdonEventReceiver, VRC.Udon.Common @@ -521,7 +584,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 34 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -536,7 +599,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -560,13 +623,13 @@ MonoBehaviour: Data: _captions - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _captions - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -575,7 +638,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -590,7 +653,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -614,13 +677,13 @@ MonoBehaviour: Data: _downloadedTextures - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _downloadedTextures - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D[], UnityEngine.CoreModule @@ -629,7 +692,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 40 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -644,7 +707,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -668,13 +731,13 @@ MonoBehaviour: Data: InputField - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: InputField - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Components.VRCUrlInputField, VRCSDK3 @@ -683,7 +746,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 43 + Data: 47 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -698,13 +761,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -725,25 +788,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _syncedToggle + Data: _syncedImageURL - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _syncedToggle + Data: _syncedImageURL - Name: k__BackingField - Entry: 7 - Data: 47|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 47 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -758,19 +815,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 50|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 53|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -794,13 +851,13 @@ MonoBehaviour: Data: reSyncButton - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: reSyncButton - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -809,7 +866,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -824,7 +881,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -848,16 +905,16 @@ MonoBehaviour: Data: removeButton - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: removeButton - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -872,7 +929,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/BannerSystem/Script/BannerSystem.cs b/Assets/BannerSystem/Script/BannerSystem.cs index 5103a0d..6cde4af 100644 --- a/Assets/BannerSystem/Script/BannerSystem.cs +++ b/Assets/BannerSystem/Script/BannerSystem.cs @@ -2,171 +2,209 @@ VRCBannerSystem Author: @supahfox Description: Un sistema de banners que descarga imágenes y texto de una URL y las muestra en un plano. +https://github.com/supahfox/VRCBannerSystem */ using UdonSharp; using UnityEngine; using UnityEngine.UI; +using VRC.SDK3.Components; using VRC.SDK3.Image; using VRC.SDK3.StringLoading; using VRC.SDKBase; -using VRC.SDK3.Components; using VRC.Udon.Common.Interfaces; - [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] - public class BannerSystem : UdonSharpBehaviour - { - [SerializeField, Tooltip("URLs de imágenes a cargar")] - private VRCUrl[] imageUrls; - - [SerializeField, Tooltip("URL of text file containing captions for images, one caption per line.")] - private VRCUrl stringUrl; - - [SerializeField, Tooltip("Renderer donde mostrar imágenes descargadas.")] - private new Renderer renderer; - - [SerializeField, Tooltip("Text field for captions.")] - private Text field; - - [SerializeField, Tooltip("Duración en segundos de cada imagen.")] - private float slideDurationSeconds = 10f; - - private int _loadedIndex = -1; - private VRCImageDownloader _imageDownloader; - private IUdonEventReceiver _udonEventReceiver; - private string[] _captions = new string[0]; - private Texture2D[] _downloadedTextures; +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class BannerSystem : UdonSharpBehaviour +{ + [SerializeField, Tooltip("URL de los links puestos en el InputField.")] + private VRCUrl[] arrayURL; - [SerializeField] - private VRCUrlInputField InputField; + [SerializeField, Tooltip("URL por default de la imagen.")] + private VRCUrl defaultURL; - [UdonSynced, FieldChangeCallback(nameof(SyncedImage))] - private bool _syncedToggle; + [SerializeField, Tooltip("URL of text file containing captions for images, one caption per line.")] + private VRCUrl stringUrl; + + [SerializeField, Tooltip("Renderer donde mostrar imágenes descargadas.")] + private new Renderer renderer; + + [SerializeField, Tooltip("Text field for captions.")] + private Text field; + + [SerializeField, Tooltip("Duración en segundos de cada imagen.")] + private float slideDurationSeconds = 10f; + + private int _loadedIndex = -1; + private VRCImageDownloader _imageDownloader; + private IUdonEventReceiver _udonEventReceiver; + private string[] _captions = new string[0]; + private Texture2D[] _downloadedTextures; - private void Start() - { - _downloadedTextures = new Texture2D[imageUrls.Length]; - _imageDownloader = new VRCImageDownloader(); - _udonEventReceiver = (IUdonEventReceiver)this; - VRCStringDownloader.LoadUrl(stringUrl, _udonEventReceiver); - LoadNextRecursive(); - } + [SerializeField] + private VRCUrlInputField InputField; - public void LoadNextRecursive() - { - LoadNext(); - SendCustomEventDelayedSeconds(nameof(LoadNextRecursive), slideDurationSeconds); - } + [UdonSynced, FieldChangeCallback(nameof(SyncedImageURL))] + private VRCUrl _syncedImageURL; + + private void Start() + { + InitializeArrayURL(); + _downloadedTextures = new Texture2D[arrayURL.Length]; + _imageDownloader = new VRCImageDownloader(); + _udonEventReceiver = (IUdonEventReceiver)this; + VRCStringDownloader.LoadUrl(stringUrl, _udonEventReceiver); + LoadNextRecursive(); + } + + private void InitializeArrayURL() + { + arrayURL = new VRCUrl[1]; + arrayURL[0] = defaultURL; + _syncedImageURL = defaultURL; + } + + public void LoadNextRecursive() + { + LoadNext(); + SendCustomEventDelayedSeconds(nameof(LoadNextRecursive), slideDurationSeconds); + } + + private void LoadNext() + { + _loadedIndex = (int)(Networking.GetServerTimeInMilliseconds() / 1000f / slideDurationSeconds) % arrayURL.Length; + var nextTexture = _downloadedTextures[_loadedIndex]; - private void LoadNext() + if (nextTexture != null) { - _loadedIndex = (int)(Networking.GetServerTimeInMilliseconds() / 1000f / slideDurationSeconds) % imageUrls.Length; - var nextTexture = _downloadedTextures[_loadedIndex]; - - if (nextTexture != null) - { - renderer.sharedMaterial.mainTexture = nextTexture; - } - else - { - var rgbInfo = new TextureInfo(); - rgbInfo.GenerateMipMaps = true; - _imageDownloader.DownloadImage(imageUrls[_loadedIndex], renderer.material, _udonEventReceiver, rgbInfo); - } + renderer.sharedMaterial.mainTexture = nextTexture; } - public void LoadImage() + else { - var nextTexture = _downloadedTextures[0]; - - if (nextTexture != null) - { - renderer.sharedMaterial.mainTexture = nextTexture; - } - else - { - var rgbInfo = new TextureInfo(); - rgbInfo.GenerateMipMaps = true; - _imageDownloader.DownloadImage(imageUrls[_loadedIndex], renderer.material, _udonEventReceiver, rgbInfo); - } - Debug.Log("Imagen cargada"); + var rgbInfo = new TextureInfo(); + rgbInfo.GenerateMipMaps = true; + _imageDownloader.DownloadImage(arrayURL[_loadedIndex], renderer.material, _udonEventReceiver, rgbInfo); } + } - public GameObject reSyncButton; - public bool SyncedImage + public void LoadImage() + { + // Cuando el botón es presionado, cargar la imagen del InputField + _downloadedTextures = new Texture2D[arrayURL.Length]; + _imageDownloader = new VRCImageDownloader(); + _udonEventReceiver = (IUdonEventReceiver)this; + LoadNextRecursive(); + } + + public GameObject reSyncButton; + public VRCUrl SyncedImageURL + { + set { - //Si alguien le da click al botón, se sincroniza la imagen - set + if (_syncedImageURL != value) { - if (value) - { - LoadImage(); - _syncedToggle = false; - } + _syncedImageURL = value; + arrayURL[0] = _syncedImageURL; + LoadImage(); } } + } - public void ReSync() - { - Networking.SetOwner(Networking.LocalPlayer, gameObject); - _syncedToggle = true; - RequestSerialization(); - Debug.Log("Imagen sincronizada"); - } + public void ReSync() + { + Debug.Log("ReSync button clickeado. Sincronizando imagen..."); + Networking.SetOwner(Networking.LocalPlayer, gameObject); + _syncedImageURL = arrayURL[0]; + RequestSerialization(); + Debug.Log("Imagen sincronizada"); + } - public override void OnPlayerJoined(VRCPlayerApi player) - { - if (Networking.IsMaster) - { - SendCustomNetworkEvent(NetworkEventTarget.All, "ReSync"); - } - } + public override void OnDeserialization() + { + Debug.Log("OnDeserialization called. Syncing image if needed."); + SyncedImageURL = _syncedImageURL; + } - public GameObject removeButton; - public void RemoveImage() + public override void OnPlayerJoined(VRCPlayerApi player) + { + if (Networking.IsMaster) { - //Eliminar todas las imagenes y volver a cargar el array anterior por defecto - imageUrls = new VRCUrl[0]; - _downloadedTextures = new Texture2D[imageUrls.Length]; - _imageDownloader = new VRCImageDownloader(); - _udonEventReceiver = (IUdonEventReceiver)this; - LoadNextRecursive(); - Debug.Log("Imagen eliminada"); + Debug.Log("Master player detected. Sending resync event to all."); + SendCustomNetworkEvent(NetworkEventTarget.All, "ReSync"); } + } - //Función para obtener la URL del InputField - public void OnURLInput() - { - setURL(InputField.GetUrl()); - InputField.SetUrl(VRCUrl.Empty); - } + public GameObject removeButton; + public void RemoveImage() + { + // Mostrar imagen por default + _downloadedTextures = new Texture2D[arrayURL.Length]; + _imageDownloader = new VRCImageDownloader(); + _udonEventReceiver = (IUdonEventReceiver)this; + // Cuando el botón es presionado se llamará a InitializeArrayURL() para setear la URL por default + InitializeArrayURL(); + LoadNextRecursive(); + } - public void setURL(VRCUrl url) - { - // Borrar todo el array y remplazarlo por la imagen cargada - imageUrls = new VRCUrl[1]; - imageUrls[0] = url; - _downloadedTextures = new Texture2D[imageUrls.Length]; - _imageDownloader = new VRCImageDownloader(); - _udonEventReceiver = (IUdonEventReceiver)this; - LoadNextRecursive(); - } + // Función para obtener la URL del InputField + public void OnURLInput() + { + setURL(InputField.GetUrl()); + InputField.SetUrl(VRCUrl.Empty); + } - public override void OnImageLoadSuccess(IVRCImageDownload result) - { - Debug.Log($"Imagen cargada: {result.SizeInMemoryBytes} bytes."); - - _downloadedTextures[_loadedIndex] = result.Result; - renderer.sharedMaterial.mainTexture = result.Result; - } + public void setURL(VRCUrl url) + { + // Settear la imagen del inputfield y cargarla + arrayURL = new VRCUrl[1]; + arrayURL[0] = url; + _syncedImageURL = url; + _downloadedTextures = new Texture2D[arrayURL.Length]; + _imageDownloader = new VRCImageDownloader(); + _udonEventReceiver = (IUdonEventReceiver)this; + RequestSerialization(); + LoadNextRecursive(); + Debug.Log("URL seteada"); + } + + public override void OnImageLoadSuccess(IVRCImageDownload result) + { + Debug.Log($"Imagen cargada: {result.SizeInMemoryBytes} bytes."); + + _downloadedTextures[_loadedIndex] = result.Result; + renderer.sharedMaterial.mainTexture = result.Result; + } + + public override void OnImageLoadError(IVRCImageDownload result) + { + Debug.Log($"Imagen no cargada: {result.Error.ToString()}: {result.ErrorMessage}."); + } + + private void OnDestroy() + { + ClearDownloadedTextures(); + DisposeImageDownloader(); + Debug.Log("BannerSystem destruido."); + } - public override void OnImageLoadError(IVRCImageDownload result) + private void ClearDownloadedTextures() + { + for (int i = 0; i < _downloadedTextures.Length; i++) { - Debug.Log($"Imagen no cargada: {result.Error.ToString()}: {result.ErrorMessage}."); + if (_downloadedTextures[i] != null) + { + Destroy(_downloadedTextures[i]); + _downloadedTextures[i] = null; + } } + } - private void OnDestroy() + private void DisposeImageDownloader() + { + if (_imageDownloader != null) { _imageDownloader.Dispose(); - Debug.Log("BannerSystem destruido."); + _imageDownloader = null; } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/Assets/SerializedUdonPrograms/d904c1df903da8441a75d31379aab386.asset b/Assets/SerializedUdonPrograms/d904c1df903da8441a75d31379aab386.asset index 11fe5b4..8f8e856 100644 --- a/Assets/SerializedUdonPrograms/d904c1df903da8441a75d31379aab386.asset +++ b/Assets/SerializedUdonPrograms/d904c1df903da8441a75d31379aab386.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf61d954ecb803046953c666facfb904, type: 3} m_Name: d904c1df903da8441a75d31379aab386 m_EditorClassIdentifier: - serializedProgramCompressedBytes: 1f8b080000000000000aed9d077854d97580ef0884104b6fa223165866299210651776594005d1042c92d8852d2090046225a155815dd6dbbcdd499ce6f4387112a7b74d8fd38b9338dd499cdeab539c6e2776e2c4b9e7bcfb3467de9cf3cacc9cd10cb1f8d0d36be7ddf39f7bcf3db7bcfbaa1a8dfd496db7bfce99b3a6d534981ed3676e9811fb57abdd0edb7fde9e7ffc8c19b3dbabf677af3db7ddd447dc093f5b522becef63766fdc4cd83b27cd15bb1dc4f35da6dffe7dccdedb6ff7e0e880fddf6faf4acdb437f5983673da9c3275a9651122cee14de3ee580af44acdb6bf5bccb3f66c3f260a1ed288a7eaecaf2e7b661ccf0ddb44fbd73d669e40b586edb92bf69e313364655e4689b33f5c6bf00fe36d16b9ed0cb7dd63ffcfb2ff2f917dd8ce75c77bdd7eaddbbfecf617bbed1c770efe9e498ec1b557dcfe12fbbfdafe7f9fdbaf72f7cc767fd3742d75d77edced2f73dbe56e5be3b675ee197d3164ee75d7f6937dd8dee78e0f907dd8ae70dbfbddf9ab649fa6615fe0fc3eb77dc01dbf46f661fba03b3e48f661bbdf1dbf1eb0cd81806df693e329a72b9c7f8ad8cc3f0edb87dcf921b20fdb83c4662bddf6103976901c83ed61276798ec5b5b57f9f6ac76db1677dd48e079ad44760b3906d7def0ee9fe1b36d73c747c93e6c57b9e34f0718f9bab6bbf363429ac64d261ffbd7d3f4cc093cef88bb6fc244e72f9ffb6ab7ed0870ef70dba30cf763e4d851720cb6c703dc8f7bdc67faf9d3d7f14480bbffbc9344f609728c709ff9b63bde19e0de1993fb2981bb9fa620f75381f4cc093cef7480fb1ab73f196287f96ebb963c671d39e71f5b44aeb31cabfd3cb7de4bf78c6eb75fcfdc1b66ff332e8d37c93e6c37b8e3b708cba0dcbbdd35cfb8fd8d31f4f59ffbb0bbf659b26ff59ae5e7c7cd6e7b8fdb6e71d7df8e21dbcfcb33dc3dcf05ec7fd664fba6b3265316c2ea8d34b1bbcfe05e935d3f6c4dc0609bdbce73db2e77ef3bc83e6cb73b19f63935be7dbaddb5cf0764f8c75f88f1fc1d119c5693e7c3f91703e77b021c7b62726c6038369af8f56c93db9e73725f72fb3bc971d83ee2cebf1cd89f0cc879d41d7f27493ff513fef9574cb69f386fb27d972fef4240de05b77d8ce87b9e1cf37d5a94decd6efbb8bbe755b20fdb27dcf1d702d73fe98ebfeef67791ebfdf3b0bde8ae7b23b01f272ffb367ed3edef0ebbb73a85d1e6511bd5f45aafdd88c2ee35f1c362ffcee8801844cf825ff0b3051f3b619dcea815c044a53d18f34e5842cd6c54ba323597a4bb157ff7da2b0651e85bb98ff840ce23207143f65f3f09a9c7edf10e8cc821a81eb4671a6c653788775db2d9fa31fb2f5bca39fbd8210bb7df16f849fb289077c9263bf7ca289520fc0ede73d6caf45a07c3f6880f74d4ee0f610abbf0f74d4c693fa6fe983d36816d95111b52b6d8ed33f8b45cddc7ecdfdc33bb1d323e8d7c23413aee35457c33b5596d20f58de8b73e6b91e9b00856316fb96238b3115b5befcab1c467197a4e062a98634ec64e4496ca3ad66c1ab10e3a9b4330b98eb91af2f9dbe3bdd73af6305d783260eed5a841c6c203eb3fb1b7fbbd1ffd5475b66abb4c23541ba93511aa85810579e9d4f21c09e12a5457cf6c828406f1a738fcd88cee2a217eefba41bc2eb9016661cd946d00acca5aecee88f372f4d61cab3481881a049b5b6d46254e425bc5a19d5d6ab4d1be240cedec29bd3268e18727582b108c4a83447006471063ccc75509fa415797ad5d4f602e1a4799def11e4cb7dfb5e71dcbbe329ce99c29ad324c1bf1603d0912f37df65d2e34c59f9a6ade5073d150c5789c64ba999ce9206da90bd36ebafccc066dd01d01b3f174e723dd7531e926255bcd91c546dd3555b23df698d71268c7b383e858e1191048f6a124f80ffa48d7fa2c3bb1ff7c1253114e7d416cea0b913ab4e6b5522a5964166711ecb2b8382d1601770bc159bfbd7622544bb8329cffa2d8fc1723ff8d21fc93a54ba25dc3d19e5ffa88c50b088622c25f9e2a8cbbaccfa956eb0ff364978a8149781a2482b339820ba627e4ce2f2c81b1a7ba00bfcfd81f9edff2d08839695052cbd103e7931a2861cdb60bd33f6cb5bf4a6a94cc91367bef2d2b65c86e7b9dcf0bd634bb2228d7c52efb2b90f0d69c1aaf38a9942c3187b30476d9dd2e8925a47e3c2f5f81bc01ec3ff39bdbfef5edf639de0035d448707e108f50dd25e9e1165b19db62abd0620f99e85e494d6d24cbdec5591607b67b4aeae3330d3f69243fdc1eabb9501f9c7f6a25e3cda39fe68fb98506f76bd1b4f93d4032c85cce20502fa59e9a9610c70f22261173b37514be46c50b3dd7c52e4ceb91786348e8539cf44ad699c75907e7670c96b84af2a5dd402de039e381e60eb893519b86097304e7e60c59ed92564cf5b12db3012db383ad988a9556c92af339abe06c99ee123a31387703a5405f58721706c3e0db82a12a0f7b23c25e91a35c741224840b38841096a4ae4f8bdbe9c0896afde6b44df375e30da914d7e96c8a9db53723ed8610a7538cd44a9659c858a6092c730fa7406d400148bb20781127185a2c5b4c6e5724c6fc41e1b5b2f0c55c7ec2493b2f4f6bc4e81fe72c96eba6fca13f88b7068cd79b3182a928347e4c73f10a4e886a8f1129964e0b184dafc252b0d5047b323377f87fb55899d7ecb36ee2f0e7a41099560be1d4367c4279e92f95ca2552e1d9ce141e986091a4f02c9584ef6084bf9d50f8324e3894cc06264b36419684706b0e98bf3ae739dbe4e72ce79e035d4a30bd256710099cd149d7363de54238af9503b968dcb574729e5f233fbf8ef34038fd6c645a3d10d40493582f3790165d373e3b33f455886f81a1deb5cc5012fcf025af194b5e738c92578cd44b656a05976320b6838946b99d78b7db72b2c352393bace4b203b61a4bd999190c10924588bb63872c7b0cdf9119f57cc934ab38d340098779e4c1a0359563978db25d567392211a8599e8c19e47c3f9bae5b2f035920fba9ff341f3f13abfc76cc4e2b962ff1eb37be0957a13799fb512b07d0cb05cc921c0d64992f7172a79bd54ed3cc0543b9baa93553bf552b21f2c34d91b38c9e04b0e18a14283ceb839181927a9d0ee969e73507ace21934fc5b951cab487b94cbb2427d38ea323bee2fcd1a0b99d47f6ddc4794b2c4d9754bd65f830ee192bb1d73e1be41dc627e437c0dc12db8fb6a21fdd64a20698e3a74cf2b09ba5dcd526e5aef6bc72d73d9c65d15b9563573e848213e616daeda9ac80c373ccfdae1e2b245c82d75c92854b1da6b02efde26825e5a42d92ff38caf90fd007026d60035e23899748734ff25e1a14f2ecf1bcf2ecbd52c57482a998de3f2b59c5b455c27592c3b530c7ddf663e8e445bfc91ded3649b54e46b5b935c954dbce0987119f539c030c0a9e2f0bdec10986a00d5e5d0a066df8aa4382a0ad81130eb9ea8c94ab1ece2b57354ae8cf32e83f96107d13e7663174eb2f899be547858f458e0b271d20e8e27212eb34bbd169d2b7338a9746c915ee94ca760f57b657e594edecf87fbf3df29cb5ecf3767bd9bd770cd64852de9bb9147913d86214c96e59f02e49d5473855d7e4a83a62e1ca0a7b7fedb47f255377b794aa47b954417b559a495c8f9316fcd7c807b1464c96963d92d33acf382d93d069ed95845f2882f0fb38e1e09ee1adafdc8e11467848c7c8fd92f0c78b207c9f24fc892208df2f317fb208cc1fe01c38b6904bd95fd486dde897f39cfc06932237248a6c2f19bedf282a1d92037e90331150ec0d4b5ad04c9764331de01e0079e07211f2c0435c1ea837eaa3fdf1e7361477481416ab885799f7197fb45f2fad529e3ac859053b8174a7054a69d71ba2ee8f6d8f01e34f0bd448a56489435ce1034b5ce5121e2c780372c13bcc0986820a13ef0bea2c6ce1320ff6ec4dcf9cfe4eab86d74130880a1537030dc6ce40d74dd49cfe42532a65a256ce22d8077ab50c9c6c71edf1546c7b0ca13db6c576b0c5b2461b670dec0dd67dc322bc4d98ad2b74aa0dd8bb93b6558763d31f31fe1b16c5499744bb9df373d04173238e030de9a039c2098666e6681cc121cdcc0e4e3084444fc711dc270b3e2ad5256305d625c724c1e3050a3e2e5552138556522738c950494dc649f27559f0494e3024e4661cc143b2e04e4e30b88d5b71048fc8824f4925e499024bc869a9843c5b600939c30986fe96db7104b7ca821f96f2db7385e6b7b39c646844c10a428536a2ba240b3e5fa005bb25c12f1428b847c2f16211709c9384bf5404e18f70c2a14bece5384842face1ee504d71b6f6da242dcfe794e30b8ba57e2080e717517a414bf5a608a1fe30443e17a2d8ee0101ffa3823b871b39986770b92bc48d66ea58e618095341c8365a4928dbbc28252d23b06c54ab314aa3d2115ad370b2c5a4f4a82df2a50f04549f0bb0a147c4912fc3986e9d4df1cc8bc87113e4c9668b049bce886bb2fdad8a41f33e7846de4c3717a4fe6fdd124e9ec95d2f9b95c3a2100e55b50b95d59411da05305b2939c6e38935c7a126d2f4bda7e1ea76dc75421f2337ea6b8c4797734576ff85788c424ba5e91747d37a7ebb339bad217f4fc59c7de9e7f5de6bcacbd7fa7f70a53507f7fc20f7dcde9e2d49e37a1834ee7e0a68ac479f73398e7ced9eb61782c09cf3e89e7e7733cdf3dc5b3987a34384dbc95235aeda3c631770d937bda4cffd444ab3ebcf60a4aedb3d70639501b06cf64dee60fb34866ae333fd3b918e4fb25f25fc0913f18c8c97e1ecb9e50e4a5cee3d98167fc70007e77bba001ecd48901030ce18c87b2cccfff0e48ba7d21a7dbae403dd18aa9f1d23ce1b4e9b6c7b2ad17e66f259b27d1e1aaa4c317713ab40674a04ff534b86183b48bd67683189cf9eb9e87a536ec4c7174bc26e9f8c59c8ebb63da890e1986eb977d8ede97448b41498bf7705aec0c68e1f56e5f9b4aff1806d8575c9f77581a8b95feeb52fabf844b7f734c2bc825224c87fccafb5392065fca697028a041e699b4a49cc573bd985ffad8fa8e6a18cf17e4a7dd90a4dd97c5b10f1d7e0b468f9e8f8eefcba8ac241a0c4b1a7c39a7418f180fd3e7535b1dc3b34fdbdb7bb14e81fbe4b8974a89774d3685ec779d93701891387c05c7e180c821b8ca55767b661cdf841cc3482538762653095e9944af1b925e5fc9e9d52eea154c83a7d7b8d3cb2f8dd9ed96b8ed9b62c44ca3929e5fc5e9b9cfc82d9decb4f9e337c9da36bc8c24fa3c2de9f3d59c3e0fe6a98f6fbfcc72c49e9521061c459b8f32915ffea56c4cd2eabd9c56fb0d1fd9d2d6533e7e334a66128dc6258dbe86d3e8be3cfdc670497cc584a4cbd772bafc40489e8bdf5b103c93b9275edb391e059d3676b21217e62fa2e73727b1e3a464c7f771766c12f324b4ac2fdb8bae92be8ddc166e587d9c8f27bf29a5feebb8d43f6492b67e337d8b3730961fca7a512b3cd7e5bed29544b35b92665fcf69763eb166ded7b34e63bec94717a934712b2a14c3d2cf483cbe81e371d2e8f530c1d1a7f131a04f17f11cdeab92fed2fdc5d0fa5949ebf7735a37e79dbf8fd9eb3af1ea09c3b591f2afc56f4b1a7c23a7c1eb8a76e37a06a517e932a5216e3ae2bc9217d6bf58785e794e22fd4d1ce94379c44bf14629e24b4da2dd3b24edbe395e8ccb2d2116b580188d12e3f7d127d1ea7949ab6fe1b46a8861b3ec72dd8e3afbede862a6fc0529e5dfcaa5fc6811edd195d01ec5285b2f4ada7e1ba76d7b1e65abcb44b5454aa1e74b929edfcee9d91212d54747a9d939b50b6b4f7f54a11f3ded98d5c6ff3e67b1c6145e9634fc0e2962947cb697fe23984eafcd157f04292c3aa27725d1ec9d9266df19c7ff1762bbb3681f98173c11bb1f07c6a99368f78aa4dd7771da1d30f17b4fa34b9e660be65549afef0e8f6b0bb75a66124b2123ef192949b47e4dd2fa6d4eebcd21d6a4e37a723c956f997a5d4ae7f748dea2f8d6e9c4d2354e7a3a8aa1d91b9266dfcb6976a2247e50db43be29e9fc7d9ccebb43ac99a4cf0a466921ce1967ac17ee316aecbf540a66a4b6a33782faf00cdee1c54b8db8164bd3543aa3d73b84670f5bb2d096839649e685cc7009df6fe4af17e6be34d76af2fb905da1eb9b53ede22fea92fbd1be1aa7912fcb92c63551ee344da15776d63c67d5aa465c8d655b9eb9293a153f084f9bc1e7a1e49ff2f2049c72bd4d29f8c00014ae26e30f54f4d8c49c8c7e4ed482763b5080ff95b7227cb8d35b88abcffe1b738efd680dac105fd504fc7f4813d2028404b6a0fd79c79d478171c64ac0f5c1ea0cae1fd6c4b524274f79cedb5bfa950e3f5402b64fcfcc60fb8026b6782bb156023298d6e023fb11fd9ce6752dfa79ca47d865b15d7155c078456083af16f9d87e54135b2dc9699555184fcec820fa314d44b33067c1edd00d3d5111700c29763faeeda9a46297697f5502b24f9222f7139ac8a031e24da9bb816ebcb28a5dfdac0ca69fd4c4b46a2a679dc382d78a73b946a65af0e3248c80be8bab6e2e6b2540fc0809247e4a13e29c29886dc65fb9eb8615580990de539b81f4d3da0e9e2ebf5909704e9208fe67b473d0697bb1d716cc0c295502a40fa1afaaa90e083f92233cdf3e886464e5de126855b6db287f148f4e18efcd9aacde135c7fb5dc52feb386f47ea47322a574cc864c5a0843d3795702e9042dcf748e0348c768e6a743eaf1b4586ad2622f4b3a410b261d33ec4a8bfe3fd32dca77673641b7e807cdffef1ecb26e8b1fc398070c941f0fcedcf6bfadbb4cb1f43f62218901e71a5267be82ffe00e145588d3a3b8d6b72d298fd2abbef93b9d4d66679edbe3800f2f1dcf06aac5fbdfd82266ef8d4e31829c42d584c2730afa861dbac856d21c1f6214d6c6b5d2ef58651464c92a9c18af9f1ba16d81304ec2f962bd8a60a04db42c0fe52b9826dae40b0e709d85fd604bb9c012b8f5c2b16fe1a2d944f1094bf32bd28e92bbb8ac57da916cafb08ca5fd54439df64c2ec49e3cfed1bc546045ca2866ebe16baed04ddaf69a283591403c69f30aa066ab116a85904d4af97a2b85e716d9df0d9e98ac555cdf32d27283f3cbd282bddf3ad20287f4313a5d78d006ddfecd9547d81c661ce4068f120aed782389740fc4d4d88731122850789ed43806ad8966b619b4db0fd9626b63a578caf8a210c4dfe45b3470f66ad16cc4602f323e504737705c2dc4660fe7639c1546ca7a8c15c4a60fe4e39c154acafd5602e21307fb79c60eeaa4098f71298bf574e30157b76d460ae27307fbf1430a5a03cfb8d66d562be510be62a02f30fca09a66205a406b39ec0fc434d980b4da677e7e6d4eb2625eae151c3b796e0fb234d7c5b4c6e3f63fe2f5da9e6d56e2dd8a709ec3fae24d88a5e560df61102fb4f346127eb92536c7eaa75c9ed2428ff5413e56a26dfc6592150313e1dd0827a8c40fdb37284aa18a7aa413d4aa0fe79394255acb6d4a01e2250ffa21ca12a564f6a500f12a87fa9097555442cc0af49a2984fd5462b4f11a47fa589741753e36b2c3ba598af3bb48c700f31c25f6b1aa13e51bee656c253c4dbaa85f70cc1fb379a78e739bc63e80401ae2f7b507384be5a0b9c21e03eaa090ea63f67265f6756c15243b6410bd93c82ec6f3591f9cd557ffe3178c0cb98606f51d5a48bb02a16ec112dd86d04f6df55126cc548410d762781fdf79ab0a1437e9cdce2855795175acd24c0fe41135854674ae50ff22d22283f560a94f126c92a76a1a8f54b5d2428ff51132554b1512f3e45f7a3565e1f6a3301fc4fd39b57e95c3cc59e29b5b978fb08ca7fd6ae72c07fc2771d32efc4a9015bab05ec2e02ec5f3481c14cb53193fd6906355c0bb57055135cff3a9d357476b5a25854d5aa958d04e5bf69a25cc378bd781fd3510c7c86b4b0b612acff3e9d9549f617d014db2f97b4503e48507e5c13e562e3bdcb3d84c3c0b11740a980890feb08c24f68222cfecbd58a85bf4f0bf74304f77f4c67f554b291a33d5a28571294ff399d7e34bba6afc4778d1e21283fa9891282f2c1a986a1d70ba41894cfd502368300fbd4f4e63dda2054acc3d51a84f71394ffa589d25f6ea2cbd5dd95bddcc40282edbfa7b322c9f67ef755a0f7db4d507e5a13a5377536e3ffb865d7d5f0add0c2574bf0fd8f263e7fc426de7483e8afd72bd6d4cd5ab0eb08ecffd584bd8ea978eeec758f2e10b49fd1440b5569d8f266f478e5cdccd844309a94f2604430874222bc9c38629142f11fbde306ceaa08e09426e06435bfe22bb06a35ff5682b24a13a5d77f3469a23ef5a886709516c23904e10c4d84f9cddf54ec77579b64d04590ced444eacd6dbb73fa32e71370d59ae0f21fb050cc8f6a03168f11acb334b12e30d25ccb117749e555312902af4613de32264f528134ec510ccfd51652d94b40ce2e17908af1a31ac83d04646db980549c76a506f2000139a75c402a56306a20f7139077950b48c51754d540f6109073cb05a462c3500de45902725eb980dc5b8120cf1190f34bd159116f90b612a7633d49502e289f7e9f4a5c55780d41b9703a7365f6142cc568f29216ca0708ca459a28a1d720ce073aeec4f9e74d04f2e2f229fa8a15925ad1df45502ed14459d8005a25ce6d7b94a05d5a7e5dc18a48d5ba82db09d265a5c8ad13e69a816f044979b5c3dd50b2e9836a13683610b4cb35d1c270ef389eeac3ca088a79aff15f49e94288f0579f519c09a7367dab8660acd3c4b82da2d0d37774a32280ccdb6aaa79f70d2de88f13e82b4ad13c95e2814aef54de4140ae2c179095d8a9bc9a805c557e75bf62f7b25adddf4d90aed6445ac720a502ef84b5660f13986bca096625ae357b9cc05c5b4e3015bbf5d4603e4c60ae2b9fb67d25ae83b085a05caf89d2ffa05da6b5943d0fd9dfb6d88be1a3b93731d89fc4785311ec562db09b09d8fa7205ab58f8d5c0de4dc06e2857b08a55941ad86504ecdde50a5631905203bb9880dd58ae6015c7eed5c03610b09bca15ace258be1ad83401bb59136cfeb342153dacdaacd09388b5a63a20fc488ef05693dfc7e993d942feb83ccc2a6db7b847f128c8eb43d9e463f3f08d9c7b206bcc7659232dbca99c1656b24bb3abe7a403dff34c27ea0b4e8b4b68a65361efb266ce721f560793a5528b9c95e0de4e03efcc40b7682f6e61ed5d6f44ba11ca640a265e7a1ea261ca373464bd6a97391e2d136c142e6d4bca9b66cc95d1a1a2e5ae288dbc0291bd5a311c8dd2345a3f39a7ce0db14a23f47fdfd1faa7a9ddab1ae19bbba99d45c87bd129ba179e5ca5542b247ac9a2fcec7b06074a46f14a486621f91bfc59b6bc417c6ee38ef2ccdbc5d37d6b76de6ec8376f274fd136cdbced49f3c2c880ec8e18daf17608ea9cb96a14f343a6bef44afa35fb775f0c126bb1074c9676d8ee5d455d0751eab0f17fa0cef4fed5a56039be1e7bafe75d60207cccd5f8f053fd7f2cd570f39c180100 + serializedProgramCompressedBytes: 1f8b080000000000000aed5d077c1657727f1fa00618304d7444339f0d48a2634c97841088628470a108a1020249c82a1863fbdc7db6cff5dc7db9d44b6f9772c95dea25b92497c4e93d71924b3da7b7bb24975c72f766f6ad7676bf37fbed7edf37d27ee4d00fadb6cd9bf9cfbc79f3e6959d50a3f4bfd45afdeba43aaeea54b56a559dea8aead77fd5e9639ffe71cedcebc7d4a03e5ed0bfdbf5bdb5aa2acb9bf06f756a9efedda4cf86d4b07e734475e8630fde6f515dfaef26fd6e973e83abddfa7f977e2a3549bfd4aaead551754455a6e6642171125f1a32d7522057aa5cffdea71ed077bb902928a4066f55ea5f2dface10deebd34cbbcf9d526750ac3e7daf43bf33a87a35cdf348b13c3d55e11fca39cc34c759fa7f89feff71733ed11c77ebffa5fa7f3f3987e34de6fa15733ed99c0f98f3d9e63845ffaf307f97906bf0ec7de67c8e730f2186f309e69d72f337e5732ee10f680c06f8ad34c749e6fe103987e374c24f5839f30c4fbde67cbe392e30c772735c68ca198e40738f7976849cc371afb97e959cc3719139ee33f7ef27e79487bac0fd3a736c30d7af917338ee37d71f20e770ac37d7af07306d547e1ba827d753465eb8ffa0f26cc3bd0ec703e6fe43e41c8e4de499c5e678905c6b22d7e078c8d079989c6bbd4e74eda6d41c9bcddf1f08947798d06e26d7e0d9471c7d4f74edff88b9fe283987e31273fdb100462edda3e6fee30c4f4f28afbeb8cf537ea604ca3b66de7b5265b72f97973b03faba93e825acce2e253cb8f254a9ec7573ba392e23ef2d27f7dc6b332dcfc3f1b8e1e32972aef53ae9fdc0739456b0be4f57fefabec2e8f3dd08b8ad34ef3e6dce5bccf907c9391c5799ebcf64e1c1d5fd2de6fc5973be3a504e184fe9c0b3b732586b192745f13d270cbde7c8b9c6b8749b395f13286fad39ae33c76a73ff4311ca727169557e3b6c55d1ecb04665da61adf2b74feb55f4366383394e33c793a6bce7c9391c377a9896759a6b7799675f08d070afbf18a1fca86dd646e5b7e18d44e741bbbf3b80eddd11b1dd64c176b3f2dbe99600b65b5574bb75ede91ef3ce4be6fc76721d8ef79afb2f07ce9f0ed03965aebf42e4a3fed6bdff61e5f7b7a795bf0d70e99d09d03b638e6709cdd3e49adb3664937bbb39b699775e25e7703c67aebf1678bedd5c7fdd9cdf419e77efc3f1bc79ee8dc079149dec70f439b9d69cef74cea77cda9cef8a41cbb5d50e8297ab934ee5b7c90e721d8e5de6fe9be45cfba0291f0bd071dfeb56feb8a1db1c2fa8ccb8e122b976815c83638ff2c70d3da6dc8798722f05cabd648e97491997cd336f05f8e8b5e0d241ee515b75afcf25e770ff6da32f37ce0ad3c7e440f97dcadf96f639b24e9d4d9e87fbef04de9b4cf8f6955792c25ecc01adad76ed456a9001688da276b7dc37b377b4807429fc827fabb1d8611da40e680296de4e2bf6a586b597dc60ededcc4f4d257cd7e1ef76fd440f12fd4866119fca280298ebd53f5da4ab36a4af37624f0f3a6b3dfa4eb50ede7af0ad73ba593aa57ffc544eea627b75d0dfa51bdd115d14d03ba7d9ce7c329b48d0ad0bbe735cd3747a9d7dfa8a0be8803eef450e5bf0f755e4b40bb96fd2d786b10fdcafabca3e7dbc86a565ca3ea8ffb69579c24066e7d1def9e4ae3b5d5c574df55a1ae0be06dbb9af69643c348261ca474c359c54833de7e73234f1350c1d2703416993a1b11e214bf9ae6d503598f7389e81607c193325b4dbb783f7161dec85c9624706d4bd1025f034dcbdf48b5b4e7cf4f35f2af18bb651d560b8b5288b6861c002bd746a6e068570114a4a26d502a341f85336f8cbe062cb18c2ef3cd783cfc5574029b64c7e056053b64f9ff61b2f475fcdd04a2d90284360339bcd6ccc71d04eb0415b3ed6d066f72561d0968fcae5410bffec0856300866e3814370a20d418cb94e8b22e8065d2dba753d84563484349debadc8b79b3276aef99f0cc774f2a8541ea63578b18a0489b996eda68af15f59895d5153515185288e53dd249bea305577efb8ab2e37b541df645d406d7674a721ba4b22a21b17d9120bb2b580ec741b8315010681378670a94d656029a98ba22a6bd5d79c2e4603deed418f0d654084da8994e03f00c53deb2ae9300ef88c2017e1ea9c11599d37a33a21bd27c529a7ea329b46b08fdc362e1a013f0e515f977e7638544a78321cff9991f19f85f8af08c13f1e5f1cdae536b4a78d7d28e4441abd4cf8178e2a242d9666b4d7557bedc8ce61239e701e38042b6c084e1f9f583eb77807c2eaca007e5fd1ffecf8558686e271a39dc936f4c04da5bac7b0c9dc88fcf769e92f90a6cabb52afdfbd5f53e9d5c776e3f3824dd8c62c28cf8b5cf7e723c2b76534a585e192d3c4149b26a019485d1f134d700942c7ae805e3726e6dc7ebcfb7c832ec79951012d12dcefc12b54768e7ab8c61644d6d842d4d82e953ddd29290da7d9a936cd6266b8754c7dbcd7a3e4a69e84eb6391ad0f010d656abec59b672f6d71945ec312546d6e05700ab9c9a6104cbd5f1e9710c70d224610e60dda51b812152ef45c1ab9325521e23521a14f61f8e5b433cda61d881a523d63dc24b9d4aea01450ce50a01f05ee6440f330acf6e364b25e2d5ddc86695964cd2c47cdacb3364c85e295d3ca74ae07b822cf1ee00c9bba71acedd2b854c6469c6fd8a58e6a07724939231885ad8a2b232b7c152abc3aa42a16825b4ee537db540e9ab9258aca57f12a9f69230c3da1d52a33f38791709078054f7c16473c6d218ef30763109f6d33561c6c7f6c5c8334f7bacd1c323d833b8c07214eb7721208fdc845be21dbadb6100127a8344408cec64e0a08ee2760155ba3825949ef0df7af7d9ae6455dd6551cca1c6182c1122682598b25244b7eaecacfe12acf3a4be5792d66e5996b230eed0a38b860073865235ec913afe488d75888ab98c4e771b0d45a6049a7e2c132df461c98596fa94cb5c00acc949b0c865b9251ce5abe9c05b67220db0713d83286b2c0f9379b8eec1113ef395d22b0ff21d32dca28bf8c2f7fa1cd77a2f0fde3ea3ba1811cc1be4335e9fe9dc0b2bd01b87cbc22cce65b6c31413443abcfd88c3e6343049f5108ee396fb0c8663110cac1d4c3cc8cdff5fa0c7398c39bc3629b39a08d8e65e6331837c5eb11c394cb6891dc3665cf7a662b9f53cd121b7a58c34e8c217a70ef0a528131eff8f8c174d33541cf6307703b02382f43b8ec2c70102ee5fcee1d9cdfdd9193dfade21a8f9d96c60328c4693c96d98843b76c97cd346374cb96738477e749780507c71e0b1cefc7846325d7c6edb5b571d07a439b061605915395b616e81f0fa3e957e92bbd58292ea37581e7ac4653eec1a79d0ad2a3aea3e5c1dd2aac624e32187c2cfcc46921577116b98fb34858433479555c8bbc852ba79e2ba72127cb5fcd6963bf4d1bb3f0390fbf2a8c32824877eaff71304d733c34da788016f7a82eab1e1da13351b11dad00ca76a7328265b49b098e9dc6261c0b725a5c6a07f077b7fe0d517b170e0a74c6b48a5b6d1238b331332bccbb25f12acc6db67604dbfd73a2ed48f82485639a62bb2e1be8edc512729b3ed164f355d6e6e520362f2b55b6e913d139e39a9d359c411eb21924848e8791a2336a518573385d0eaad0a0864dfce019a33333c035c641d486ebe2ba4683c42a747455c694e319e55ace8534732ee4704e2e649dcd3e31744ce2a8d811d4c6fd687d977de178bbbe7201efe6db99802587f13a1347557ea36385918aab0fd55c7d3866ab0fa581263b8ecdd670367b2767b3c773b2d95ace61b7581cf6274be339ecf51cf11316e29f8d497c0347bcd542bcaa2c1ef18d36e25394b3b02f9f887213a7d7bb38bdde9d935e3773e5dcc395736f4ee56ce1b470caa28595e5f1b4b095ab6ea76dd56d0aeafeb8f6ea55d8a80d9b48385e0cb6cde6c4b107db35264edc3e7da329eb048eb82379676c866c75c967d125d3f55985e39173b4b7739a6fb3697e810a46e31dc6dd3bfadfaeaf3ca85dddc3d86b7276b4188a19446cb7710476712e8a4738cb13be8313b5dd26eaa20c51fb312ee20476fe5aafff8a27ee0eae5e9fb7d4eb2f54c4abd73b39e21d16e29326c723be8bc3b3d386a7d363b5af82702256776b951ed3a98e83e26e1b2f90e8075f926fa27f0f47bcbb00c4f7da8843bb062b6133d3a916e221e9d47d1cf18b05205ec711ef2900f17a1b71c0fc5201306fb010afc1ccdf586699eb71d8f07c8ef36b6152d2b258113f2c61b6659bb3f1c1351dfb6d2a0214fbc2580baaa9975753236703fd05b08103361ba852e2138aa24f9f2aecfc12d854225a1832a0dc094572bc7236d564d30aa6b365671e73bccbcdf7b92fb23e06953bf358824b4e13076d950f343164633c58f106f98a77c8461806a9602b9ce0b84f26e5ed3ce5669bf1e090c5f82c1b3a8cd9612f5f5c58031a896c405755b66543f972ca19d1619b4670ace742029c6c61f5717f647d5c437dac89ec600ba58d23366de0e098ec22aef0deac5f56483676ebb7e3f6b21f888cfe75e52ee22a0c5f1cda476d7e0e52270f4671a02199ad6336c2d0417e280ae1900ef29d36c2106f3d5c8078eb38e7f63f90afdb6fb15186eefb2351f038c8133ec1b1fc68be2cb772483f5600a44f7286f7789e86771747f8893c09dfcdc1f16401e0b88723fe540188df6b230e798aa7a3401292d03865235ca59c8d0db3121ee0099fb6118620e9992884aff284cf701c3f9b27c7676d84c17f3f1785f0359e709b8570cd2a350e6b4ae22c206cd05407b1d58bdb46c2fe8ff106096197456e6d49a178e6dacf735cd57a21cfaad5ce117e314fc2e739c22fe549b88373612f17c0857572c45f2900f12e1b716842611fbdbc9ad06eceddbc9aa7bbb960230c1ddfd7a2100ee9f85ee408bf9e27e11e0ee437f205f91207f29b79827c99c3e2ad3cb1e8e5387e3b4f8efb3890dfc917e47ece6d38fb1cfa29a7a07da2ee7d2fba5698fb53ad1bb43633f3a24d35ab2e6c7a86b5ddc175fa8eb72b401c2f7485e3f3eb6c7c427ed5de69f577ac207b189401f258d058f07cc39df8d4e3483bc049fb519bb48d4a059a35af318cb22340a6dcf0930fc538b2dec7c9faf536591fc890952ebb7697873867ee73de7d5e7af74d67616a507e77061d5dbcda367ae6cc2da2338b6cb396a2ace80fdadc49fd3c8c48c6c17390c3f31b6c78ee09e0699334b71a129d6a1ce98638e9bed1265d430ed2b5181fc6cb96dd32f2d7e23027e737d9e47c7154ce425aa38707ccddacd3450da1e6fbc83b302dd99dfdd989cf7620d54efd6c10075a138377bc9d76c2ea95b7b4c8beb0a810c88f70c87fb30df9dd8c85f967283adc397836e21db7cb06bf4f988e1de8e93076ea60ec732814cbdc5ad1ab9c6cdf62936d63a0b5af436e1c9e878d3427f435bff6c27c02a7f33832dccfc9f0319b0c75011968a98e0457746bdba675d7831d68f7233a61dc86dd298c8cd73819bfd526e3a6887aa263ede1f2f9efd1f7e248f10027c5b7d9a4581f90c21916ba38caff2026413acc6051188f85e2ff3ac7ffb7dbf8df10510b7c8d089321b7fafe2027c17770b180bd4c5a538ee3bd76b4974e6bd442258ce60b7293ee214ebaef8ca21f3a6e1d8c011ab3c6006d2cad38123ccc49f05d360920716fef77d0f2a9ae9af0ee7dfa7567c910bcc7f75e289568cff851f02f7c8c83c307381cbedb86c34e1687e00e94fe5ee9106e993088914a70d0994725f8641cb91ee1e4fa1e2e5a8dc68323d79091cbad8dfede67d45e6a2162a6473939bfd726e7ed8aefaffa7973073ee3f550ed34e2c8f31827cff7d9e4d991a33caefebc6f10385a86187000753e6089fc72af658f73527dbf4daaed2a7edf298adfcc46338e444f70127ddc26d1d61cfd46df98f88a2739597ec026cb27426c2e7ace2778c77b275a06241a0a32999278352ecc5f645fd210478f4f717afc419b1ef7874425515a72eeddb03b85f2274f7392fe904dd25ab6f6410e0196b95f20b9b8ccbe7c980cb9b4591fe4b8ff611bf7bb54dc7ebe970bbf621667d395bae1f52b734d6f1cc99ee124fb844db27b624be664c88e620dc94516ce6fd836992a84a69fe5f0f8111b1ecd4a2e9776dcd46167bd490bf191fee5fc8590fa394eea1fb549bd2167fb6ed2cfd1f5e085f32f1fe224f8a44d82a705f566cb81726b90bdda10958f28ab99c332a9f9dbcaf31cd29f8a16efdab6faccb6d1278d18a38fbac491ea054eaa1fb349551d21def55b7e03caecb6c485e4fc458ef31fb7717ea080fa6889a98f4258df4b9cb43f6193765f48e49b3d92f36bb005fdae9b79efc23a3aa8a5713f885ea8bcfbcb9c843fc9c51a5c6d77f8df8f7c3afd92e8a32c61ed2a7d2b8e64af7092fd944db23d05d4dd71d40f4c3a1f8e9ceb8011f938d27d9893eea76dd2ed54d1338cd947192563df5739b93e1d1e11e5af356f325e3e730c3c2a71a47e8d93fa676c52af0ad1261dfbe25be25cebd4eb1c9f3fcb798bc26be730d6ae21920d2884646f7092fd9c4db24363e207a53de49b9ccc9fb1c9bc574519836936da398119edccfe42fc1198dca3f4b738f97ede261f6415a38e61385b9e391399a38f5be4ef1ddfe624fa059b44bb23696cafe6a11379b7f7f0c66accec1d4eb65fb4c9b629c4b7c4c932c2b83a44a343165f12aea132fd93c24d5f1a505e88ce8ee11b4e545b833b07d68ef2997d2b6b28bb4f5b0c583bf4b0bcb5e7e1143eabf88f4c67ae0fae53b97d6f38dfafc550e9a2efeb95f96de53223914b4b238d7b27de6892fe1268759ad1ea841adc9b714d8ed6949d8b5f86d226da6d28fe17571d02474cd62c051fce82ca55abdca125679fa4ace564dbf1771d12703fc65b80efab8371390e71d03464a7cbe07b3b136a01ff5f9104693a8204baa079c983c6a3c0c87031c0f5b9120fae7725e18ab6e77a31403623e541f6ab9290cd1ab530af6d74216cd1b075185f365414b01d28f760fb3549d82a88a579c01503449f99e841f4eb921095a265c1ebed38a7ac18c0817f2e38bf2109cedc8cd6cf09339def8f509b2a9e56b1779207de6f4abb79ce6779398162806c4f8507d96f4942065d12672ae4156c038bcb6735977a30fdb6244c93472dcbdf9b2f0690de23b6f43bd28e9d6e215c0ce07c99f8a6df95b620d800df71dbdec8553180f41ea966bf2709d2cc4035e326161403682f93cecdef4b82b66814b4931851d5996caa9bf11e2af2f0a11eab685949807870ca59ee299c78e8f3c926e89437e8bee5005e1d56ce52325ff2093f399134ceff4091e4513a233e4f47ec3ea799ce4f3a2f0b4dc70e89d3190d513ab2634947c8aca44382a634ebe7d36c622b1da3af9d8e18e3a6d988c5cb44db33c8b59089fe43f5ff3b495c0b49e23f0210fa0d088e1fff63493f0e5f331f2456b54f799f4c0a94b528a32cffde3aae3fb6955ae1f3d8aba208928bd7063b759bbff724615b6caa953394d2afe24ce85e2f07ec5529604f1360ff24a9c0d61621b0cd04d83f950476ae05587ec85fd046cba4a03c47a0fcb3f18592ae0716b4ca395250ee25507e4e12ca69ca0b4f46943b297200033678440cba6952d06d24d0fdb9247430e0dfaddc19a86240cd9202aa8c00f51763515d3b4c8c183e215cb0ba8a79be0504cabf1c5f288bddf32d2250fe9524944b2c8d48d469b86dfab718b40352d0761368ff5a125aa7670bdd31ff9caace009419a3c88503b14a0ac49b08887f2309e25404918207cc76228062b0554ac1564160fbbc246c95a65a5f60a343ca7e9bba5d0ecc0a2930b71030df4f1298db8a10cc0d04ccbf4d12989b8b10cc5b09987f972430371521982b08987f9f2430b7162198eb0998ff902430b7142198b504cc7f4c12988269333130e71030ff2949600a761fc5c09c45c0fce72481b9b108c1ac2260fe4b92c014ec7d8b81398f80f9af6301269723f2af9613ade6dba5c05c42c0fc37493067282f3f7e75746d59b1e7c89711f8fe5d12bed52a33c996fb7a5f515b3d2b05f63102f61724c18e976717ec5e8ae5d9ab09945f948472a1c56ea3acdf15ec660e4a817a9980fa1f49045530741203f52201f53f9308aa60082506ea0502ea7f251154c1eea718a80709a85f4a22a8826dbe18a84d04d4ff9604758105d4ecdb5e09daa958cc7a9240fa3f92906e54996194c49e7882767d544a09eb8812be2ca984aa58766ddba65310de8352f0b61078ff5712de9b0cbc50703782ebd2ee919ccb5422059c22c0fd9f247030c1de9bdeef6d402806d97229c8a611c8be2209999b03e8d50ff5a2cd5dd00f01c3ceded671f7c216acd8d7a5c03e42c05629e19d0886c82b4e8b5f7cad7d09012c250958b6a449f10f89cc24504e908432bf197582a913b11975bd04da8992d042b3d3896d75bbd935d4ba92b3082af62402d9a4b1a8d8d1d65b08e698c4b2a1e70994259250c27041b6b587d9b3f7c597b9df4e002e1d5f5ba5d3ba05537762d3baeb089465d20110b4e6f0fd216f59aa18604ba4009b4a002b9704ac5c390b50e92784c4e0ba590aae520257c578c68bfe6645b0aa8a352bab09949325a15c64f17ad13efa2618865f9382f5308175ca783626fe2f750aa6827ba5a0dc4fa09c2a09655af95317fdc60e83f618bd972368b962bd9c0304ee9bc6d3b78ed9b8d0362928171328a725a7f7538c6b2eef25504e4f4e702ee84fc582f37d04ca199250ba9b9d0011d8a2a7b8373b994160bb393931a7e0ea0cb1ca7c3b8172a62494ce7cce1e364921dafb992f05df6402df2c49f8e6a9b8eb318a7145c64e02e76c4938dda1b168530d20b61c4192744a01a03606edf86629b01712b0e724777842d08ec502f73304dab992d0ce564e8298db3c8f5e2fbe5919b711182ba5f3ec410b05261c4becd71242f51fb8e14628271080e7252790121c91140ba4d61028e74b42e9ecad39a2b27d83560cc28552104e21102e9084708ef267977a14f7912cd16a2db6e747070172a12490b94d8215cccd8b8d9edf45205d24dda2c346b2bdb8ec2ad676d24500e37202e3e2e43438827bd1883538bb08944ba4c72961fab4f3215a61cb9b2a05d74402d75249b8a62b6e866fbf79a4f86c2d45c0ab1a8b96994b72f8531cc5d732ef21402e4b0a90c518e2ec26402e4f0a908273d9c4806c2440ae480a908211a21890f504c89549015270adb91890ad04c85549015230252106e49d04c85b9202a4e020991890f7102057270548c1edcbc480bc9b00994e0a90827b678a01d94980bc3539d3598a71d6653b81f2b6e4a4248af13b142b09946bc6d32afd332d05fb3762332d1b08946b25a184bd4ea37c0aeb465c66b28d80bc2eb923e082dd4ab111f04b04da6af974db8d95259f4ec0ab494e932418718a35495b0994b5c99aa0558c1306761038d727d76316e364ff5304da0dc91bb4158454cc8f1e25906e1c0b6b1d5617157c7493b3d546f3c298ada7109b82bd8a40bb497a3c7c086f7562cc3982e390ee02d3160411feea54828b4dc51600941318374bc2b8264ba5a7fbbf640bf4bdb5e7a2b6fbbc14e86d04f42d639185e2c2ab621fcdac24406e4d0a90c5389a399700b94d12c84a8b1ba0046f842dca0f11306f4f129882555c0ccce304cced49025330d52c06e60902e61d49025330c32406661701734792c0141c2a1603b38780b93349600a4e601003b38f80b92b39e9bb62dc692b4da0dc2d09e56215ecc1fb9703bac77dfae18bfaa5abd8011dc13e9020b06ba480bd8500bb27a9c00ab6f162c02e25c0ee4d2ab08291a818b0f309b0fb920aac607f490cd8d904d8baa4022b386d4c0cd8cd04d8faa4022b38a82706ec26026c435281158c5cc580ad21c0ee4f2ab082fd2b3160d712601b2581cd7d6b3fc198406c6bbfb304d603c9e96909ce2815eb69dd815096950488efcf205e87fd73e8a177286f9fd76ad5a8bad0ae00860e7dde8c157b589dd396754affc4c3ff8cfeb15d4fe1849f066d52037815e87522ed3e7d17381b52b5f031f42630870a630e69eb22c634bbbb779ad9ce3f6dddb4359d824df3bb95fb498a74ac41cb34fb698b742a6cdb2eef2e6c52036bfee95d50652a75b3d11ebc7b58c17e16307ed78e47f8268e3343b206f6d9486dd1bf1c275c3dea7eab7ddbe078d7b3d304dd85533b9872f676b6d5d7de82595d36899c8ae2ff8a105ccd266976f9780b9e1aa2951a68826e68f90f51bd4fa8819631b5be00b6979da366287982500b117b1e62f2747c4cc1a8fe003e096ce663e3e0d3fcf47ab0dc9a75c9b4efc2c97ed86fdfd5b9da777c8e8e48dab743cd89d603b41b234867d7435066efa901b407afcd746afb45fd776704241663c0c653dbabcf2ea0ac3d48b54fb9ffa0dd747e2a53b01f4dab7ed7f130306b6bd0b4faf0afe4ab55688e1c0c380100 serializedProgramBytesString: programUnityEngineObjects: [] serializationDataFormat: 0 diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..3a1c922 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: c6b0aef85004386498bd49941d31d12f, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..1b4f84a 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 6dc85e6a67f0feb4c82e0a3473006a48, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..70fd165 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: 4d0f3be173fcc674eac96daeb11b04b1, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..44099ed 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: f3a2af27b324ad341a913470580157e7, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..88f8107 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: 3ab2d42fd80f2f043a92a68eba690587, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..d2f5bdc 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 23db16a1af33ff143b918deed244a449, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..798fd18 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: dc2b7980d8b14454987d71fddde34ccb, type: 2} udonAssembly: assemblyError: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 929fd0b..d773ec3 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1600 height: 809 m_ShowMode: 4 - m_Title: Console + m_Title: Project m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 119 + controlID: 88 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,9 +64,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1023 + x: 965 y: 0 - width: 577 + width: 635 height: 759 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -93,8 +93,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 492 - height: 373 + width: 308 + height: 452 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} @@ -112,24 +112,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 373 - width: 1023 - height: 386 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} + y: 452 + width: 965 + height: 307 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 22} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -220,12 +220,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1023 + width: 965 height: 759 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42 + controlID: 43 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -245,12 +245,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1023 - height: 373 + width: 965 + height: 452 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 43 + controlID: 44 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -266,10 +266,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 492 + x: 308 y: 0 - width: 531 - height: 373 + width: 657 + height: 452 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} @@ -371,10 +371,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 247 + x: 413 y: 73 - width: 765 - height: 459 + width: 879 + height: 431 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -515,9 +515,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 446 - width: 1022 - height: 365 + y: 525 + width: 964 + height: 286 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -539,7 +539,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/BannerSystem + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -547,16 +547,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/BannerSystem + - Assets/_Tutorials m_LastFoldersGridSize: 16 m_LastProjectPath: E:\Users\fabuz\Documents\Unity\VRCBannerSystem m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 67} - m_SelectedIDs: 7e650000 - m_LastClickedID: 25982 - m_ExpandedIDs: 00000000862400007e65000080650000826500008465000086650000886500008a6500008c6500008e6500009065000000ca9a3b + scrollPos: {x: 0, y: 26} + m_SelectedIDs: 88240000 + m_LastClickedID: 9352 + m_ExpandedIDs: 0000000088240000fa650000fc650000fe650000006600000266000004660000066600000a6600000c6600004066000068d000007ad0000086d0000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -584,7 +584,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007e65000080650000826500008465000086650000886500008a6500008c6500008e65000090650000 + m_ExpandedIDs: 00000000fa650000fc650000fe65000000660000026600000466000006660000086600000a6600000c660000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -609,24 +609,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 14b4ffff - m_LastClickedInstanceID: -19436 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Materials + m_OriginalName: Materials m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 26174 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: @@ -661,9 +661,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1023 + x: 965 y: 73 - width: 576 + width: 634 height: 738 m_SerializedDataModeController: m_DataMode: 0 @@ -682,7 +682,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 240 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -711,8 +711,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 491 - height: 352 + width: 307 + height: 431 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -726,9 +726,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 14b4ffff - m_LastClickedID: -19436 - m_ExpandedIDs: 68b4ffff78b4ffffc8faffffd8faffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 04bafeff62bafeffd8bdfeff5cdbfeffbadbfeff30dffeffc610ffff2411ffff9614ffff1e65ffff2665ffff646affff6c6affff58a7ffff5ea7ffff92faffffa2faffffa4fafffff4ffffff4ccd000062cd000090d80000c6d80000dcd80000eee0000024e100003ae10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,10 +773,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 308 y: 73 - width: 529 - height: 352 + width: 655 + height: 431 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -869,8 +869,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: -15} - snapOffsetDelta: {x: 0, y: -108} + snapOffset: {x: 67.5, y: -123} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 2 id: Orientation index: 0 @@ -1051,7 +1051,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -216, y: -131} + snapOffset: {x: -216, y: -156} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: AINavigationOverlay @@ -1077,7 +1077,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 48, y: 48} + snapOffset: {x: 48, y: 10} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -1109,9 +1109,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.071, y: 0.772, z: 0} + m_Target: {x: 0.17546989, y: 1.8434325, z: 0} speed: 2 - m_Value: {x: -0.071, y: 0.772, z: 0} + m_Value: {x: 0.17546989, y: 1.8434325, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1133,7 +1133,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1149,7 +1149,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1161,9 +1161,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.8660254 + m_Target: 1.2307782 speed: 2 - m_Value: 0.8660254 + m_Value: 1.2307782 m_Ortho: m_Target: 0 speed: 2 @@ -1209,10 +1209,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 308 y: 73 - width: 529 - height: 352 + width: 655 + height: 431 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1229,7 +1229,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 529, y: 331} + m_TargetSize: {x: 655, y: 410} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1244,10 +1244,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -264.5 - m_HBaseRangeMax: 264.5 - m_VBaseRangeMin: -165.5 - m_VBaseRangeMax: 165.5 + m_HBaseRangeMin: -327.5 + m_HBaseRangeMax: 327.5 + m_VBaseRangeMin: -205 + m_VBaseRangeMax: 205 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1265,23 +1265,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 529 - height: 331 + width: 655 + height: 410 m_Scale: {x: 1, y: 1} - m_Translation: {x: 264.5, y: 165.5} + m_Translation: {x: 327.5, y: 205} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -264.5 - y: -165.5 - width: 529 - height: 331 + x: -327.5 + y: -205 + width: 655 + height: 410 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 529, y: 352} + m_LastWindowPixelSize: {x: 655, y: 431} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1309,9 +1309,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 446 - width: 1022 - height: 365 + y: 525 + width: 964 + height: 286 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0