From e655176af551404d4f52b54e9b1600a3fa74bba7 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 17 Jul 2023 16:58:24 +0100 Subject: [PATCH 1/2] Keyboard code improvements and bug fixes (#467) * Untangle KeyboardPopUpWindow from renaming logic KeyboardPopUpWindow shouldn't have code specific to renaming as it's meant to be generic for all uses of the keyboard * Ensure m_LastInput has a sane value to start with * The sketchbook wasn't updating with the renamed sketch --- .../PopUps/PopUpWindow_SketchbookMenu.prefab | 17 +++++++++- Assets/Scripts/GUI/KeyboardPopUpWindow.cs | 20 ++++-------- Assets/Scripts/GUI/KeyboardPopupButton.cs | 32 +++++++++++++++++++ .../Scripts/GUI/KeyboardPopupButton.cs.meta | 11 +++++++ Assets/Scripts/GUI/MenuPopUpWindow.cs | 23 +++++++++++++ Assets/Scripts/GUI/OptionButton.cs | 2 +- Assets/Scripts/Save/DiskSceneFileInfo.cs | 11 ++++--- Assets/Scripts/Save/FileSketchSet.cs | 5 ++- Assets/Scripts/Save/SceneFileInfo.cs | 2 +- .../Scripts/Sharing/GoogleDriveSketchSet.cs | 2 +- Assets/Scripts/Sharing/PolySketchSet.cs | 2 +- Assets/Scripts/SketchControlsScript.cs | 5 ++- 12 files changed, 107 insertions(+), 25 deletions(-) create mode 100644 Assets/Scripts/GUI/KeyboardPopupButton.cs create mode 100644 Assets/Scripts/GUI/KeyboardPopupButton.cs.meta diff --git a/Assets/Prefabs/PopUps/PopUpWindow_SketchbookMenu.prefab b/Assets/Prefabs/PopUps/PopUpWindow_SketchbookMenu.prefab index 37f755a53f..f33d01f238 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_SketchbookMenu.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_SketchbookMenu.prefab @@ -931,7 +931,7 @@ MonoBehaviour: m_GameObject: {fileID: 8366139741319417911} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} + m_Script: {fileID: 11500000, guid: 68ab65faed9850448927b196242878d7, type: 3} m_Name: m_EditorClassIdentifier: m_DescriptionType: 0 @@ -997,6 +997,21 @@ MonoBehaviour: m_ToggleOnTexture: {fileID: 0} m_AllowUnavailable: 0 m_LinkedUIObject: {fileID: 0} + m_BeforePopupAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114000011997523446} + m_TargetAssemblyTypeName: TiltBrush.MenuPopUpWindow, Assembly-CSharp + m_MethodName: SetInitialKeyboardText + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 references: version: 2 RefIds: [] diff --git a/Assets/Scripts/GUI/KeyboardPopUpWindow.cs b/Assets/Scripts/GUI/KeyboardPopUpWindow.cs index 9f4a726603..5297a6a5d0 100644 --- a/Assets/Scripts/GUI/KeyboardPopUpWindow.cs +++ b/Assets/Scripts/GUI/KeyboardPopUpWindow.cs @@ -14,12 +14,14 @@ using System; using System.IO; +using UnityEngine; namespace TiltBrush { public class KeyboardPopUpWindow : OptionsPopUpWindow { private KeyboardUI m_KeyboardUI; + [NonSerialized] public static string m_InitialText; [NonSerialized] public static string m_LastInput; public bool m_SanitizeFilename; @@ -30,20 +32,11 @@ void Awake() m_KeyboardUI.KeyPressed += KeyPressed; } - override public void SetPopupCommandParameters(int commandParam, int commandParam2) + override public void Init(GameObject rParent, string sText) { - if (commandParam2 != (int)SketchSetType.User) - { - return; - } - var sketchSet = SketchCatalog.m_Instance.GetSet(SketchSetType.User) as FileSketchSet; - var sceneFileInfo = sketchSet.GetSketchSceneFileInfo(commandParam); - var currentName = Path.GetFileName(sceneFileInfo.FullPath); - if (currentName.EndsWith(SaveLoadScript.TILT_SUFFIX)) - { - currentName = currentName.Substring(0, currentName.Length - SaveLoadScript.TILT_SUFFIX.Length); - } - m_KeyboardUI.AddConsoleContent(currentName); + base.Init(rParent, sText); + m_KeyboardUI.AddConsoleContent(m_InitialText); + m_LastInput = m_InitialText; } private void OnDestroy() @@ -56,6 +49,7 @@ private void KeyPressed(object sender, KeyboardKeyEventArgs e) switch (e.Key.KeyType) { case KeyboardKeyType.Enter: + // Logic will been to be updated if we ever have a multi-line keyboard m_LastInput = m_KeyboardUI.ConsoleContent; if (m_ParentPanel) { diff --git a/Assets/Scripts/GUI/KeyboardPopupButton.cs b/Assets/Scripts/GUI/KeyboardPopupButton.cs new file mode 100644 index 0000000000..12c2bd5808 --- /dev/null +++ b/Assets/Scripts/GUI/KeyboardPopupButton.cs @@ -0,0 +1,32 @@ +// Copyright 2023 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using UnityEngine; +using UnityEngine.Events; + +namespace TiltBrush +{ + + public class KeyboardPopupButton : OptionButton + { + [SerializeField] + private UnityEvent m_BeforePopupAction; + + override protected void OnButtonPressed() + { + m_BeforePopupAction.Invoke(this); + base.OnButtonPressed(); + } + } +} // namespace TiltBrush diff --git a/Assets/Scripts/GUI/KeyboardPopupButton.cs.meta b/Assets/Scripts/GUI/KeyboardPopupButton.cs.meta new file mode 100644 index 0000000000..61dd96f588 --- /dev/null +++ b/Assets/Scripts/GUI/KeyboardPopupButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68ab65faed9850448927b196242878d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/MenuPopUpWindow.cs b/Assets/Scripts/GUI/MenuPopUpWindow.cs index a8a4e89333..260876d58a 100644 --- a/Assets/Scripts/GUI/MenuPopUpWindow.cs +++ b/Assets/Scripts/GUI/MenuPopUpWindow.cs @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System.IO; +using UnityEngine; namespace TiltBrush { @@ -25,6 +27,27 @@ public override void SetPopupCommandParameters(int iCommandParam, int iCommandPa { button.SetCommandParameters(iCommandParam, iCommandParam2); } + + // The rename button should only be enabled for categories that support renaming + var renameButton = GetComponentInChildren(); + SketchSetType sketchSetType = (SketchSetType)iCommandParam2; + renameButton.SetButtonAvailable(sketchSetType == SketchSetType.User); + } + + // This code is specific to the "Rename" button in the Sketchbook menu + // This popup class is currently only used for the Sketchbook menu + // If that changes then this probably belongs in a subclass + public void SetInitialKeyboardText(KeyboardPopupButton btn) + { + SketchSetType sketchSetType = (SketchSetType)btn.m_CommandParam2; + var sketchSet = SketchCatalog.m_Instance.GetSet(SketchSetType.User) as FileSketchSet; + var sceneFileInfo = sketchSet.GetSketchSceneFileInfo(btn.m_CommandParam); + var currentName = Path.GetFileName(sceneFileInfo.FullPath); + if (currentName.EndsWith(SaveLoadScript.TILT_SUFFIX)) + { + currentName = currentName.Substring(0, currentName.Length - SaveLoadScript.TILT_SUFFIX.Length); + } + KeyboardPopUpWindow.m_InitialText = currentName; } } diff --git a/Assets/Scripts/GUI/OptionButton.cs b/Assets/Scripts/GUI/OptionButton.cs index b46651c6ff..a6de535b12 100644 --- a/Assets/Scripts/GUI/OptionButton.cs +++ b/Assets/Scripts/GUI/OptionButton.cs @@ -22,7 +22,7 @@ public class OptionButton : BaseButton { [SerializeField] public SketchControlsScript.GlobalCommands m_Command; [SerializeField] public int m_CommandParam = -1; - [SerializeField] protected int m_CommandParam2 = -1; + [SerializeField] public int m_CommandParam2 = -1; [SerializeField] protected bool m_RequiresPopup = false; [SerializeField] protected bool m_CenterPopupOnButton = false; [SerializeField] protected Vector3 m_PopupOffset; diff --git a/Assets/Scripts/Save/DiskSceneFileInfo.cs b/Assets/Scripts/Save/DiskSceneFileInfo.cs index 6544eb3fd7..a9169fb0b7 100644 --- a/Assets/Scripts/Save/DiskSceneFileInfo.cs +++ b/Assets/Scripts/Save/DiskSceneFileInfo.cs @@ -235,12 +235,10 @@ public void Delete() } } - public void Rename(string newName) + public string Rename(string newName) { - if (!Valid) { return; } - - //look to delete the file version first - if (File.Exists(m_fullpath)) + // Look to delete the file version first + if (Valid && File.Exists(m_fullpath)) { string dirPath = Path.GetDirectoryName(m_fullpath); string newPath = Path.Combine(dirPath, $"{newName}{SaveLoadScript.TILT_SUFFIX}"); @@ -261,7 +259,10 @@ public void Rename(string newName) { Debug.LogFormat("IO Exception: Can't Rename {0}", m_fullpath); } + + return newPath; } + return m_fullpath; } /// Returns a readable stream to a pre-existing subfile, diff --git a/Assets/Scripts/Save/FileSketchSet.cs b/Assets/Scripts/Save/FileSketchSet.cs index 8ebe5fa471..eea1d40fbd 100644 --- a/Assets/Scripts/Save/FileSketchSet.cs +++ b/Assets/Scripts/Save/FileSketchSet.cs @@ -354,7 +354,10 @@ public virtual void RenameSketch(int toRename, string newName) driveSet.NotifySketchChanged(m_Sketches[toRename].SceneFileInfo.FullPath); } - m_Sketches[toRename].SceneFileInfo.Rename(newName); + var newPath = m_Sketches[toRename].SceneFileInfo.Rename(newName); + + m_FileWatcher.NotifyCreated(newPath); + } public virtual void Init() diff --git a/Assets/Scripts/Save/SceneFileInfo.cs b/Assets/Scripts/Save/SceneFileInfo.cs index 2c9b396b87..20aa7ac747 100644 --- a/Assets/Scripts/Save/SceneFileInfo.cs +++ b/Assets/Scripts/Save/SceneFileInfo.cs @@ -60,7 +60,7 @@ public interface SceneFileInfo void Delete(); - void Rename(string newName); + string Rename(string newName); bool IsHeaderValid(); diff --git a/Assets/Scripts/Sharing/GoogleDriveSketchSet.cs b/Assets/Scripts/Sharing/GoogleDriveSketchSet.cs index 61d0eb1c82..520238f3a6 100644 --- a/Assets/Scripts/Sharing/GoogleDriveSketchSet.cs +++ b/Assets/Scripts/Sharing/GoogleDriveSketchSet.cs @@ -114,7 +114,7 @@ public void Delete() throw new NotImplementedException(); } - public void Rename(string newName) + public string Rename(string newName) { throw new NotImplementedException(); } diff --git a/Assets/Scripts/Sharing/PolySketchSet.cs b/Assets/Scripts/Sharing/PolySketchSet.cs index aa876d4bf5..e13f13a06b 100644 --- a/Assets/Scripts/Sharing/PolySketchSet.cs +++ b/Assets/Scripts/Sharing/PolySketchSet.cs @@ -841,7 +841,7 @@ public void Delete() throw new NotImplementedException(); } - public void Rename(string newName) + public string Rename(string newName) { throw new NotImplementedException(); } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index b67ec7b675..ab9fb38b0d 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -4528,7 +4528,10 @@ public void LoadSketch(SceneFileInfo fileInfo, bool quickload = false, bool addi { var sketchSetType = (SketchSetType)iParam2; SketchSet sketchSet = SketchCatalog.m_Instance.GetSet(sketchSetType); - sketchSet.RenameSketch(iParam1, KeyboardPopUpWindow.m_LastInput); + if (sketchSetType == SketchSetType.User) + { + sketchSet.RenameSketch(iParam1, KeyboardPopUpWindow.m_LastInput); + } DismissPopupOnCurrentGazeObject(false); break; } From 51921dd77d5466ac8c903b28423de9b52b2ceb66 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Mon, 17 Jul 2023 18:00:50 +0100 Subject: [PATCH 2/2] Fix missing localization for a few promo popups (#468) * set multicam swipe text * Admin panel using new prefab --- Assets/Prefabs/Panels/AdminPanel.prefab | 787 ++++++++---------------- Assets/Scenes/Main.unity | 10 + 2 files changed, 275 insertions(+), 522 deletions(-) diff --git a/Assets/Prefabs/Panels/AdminPanel.prefab b/Assets/Prefabs/Panels/AdminPanel.prefab index aa02cef1f9..a25d127100 100644 --- a/Assets/Prefabs/Panels/AdminPanel.prefab +++ b/Assets/Prefabs/Panels/AdminPanel.prefab @@ -70,6 +70,15 @@ MonoBehaviour: type: 3} m_Command: 30 m_PanelDescription: + m_LocalizedPanelDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_PanelDescriptionPrefab: {fileID: 0} m_PanelDescriptionOffset: {x: 0, y: 0, z: 0} m_PanelDescriptionColor: {r: 0, g: 0, b: 0, a: 0} @@ -178,7 +187,7 @@ MonoBehaviour: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_AdvancedModeHintObject: {fileID: 114654480856464452} + m_AdvancedModeHintObject: {fileID: 7955685702501567233} references: version: 2 RefIds: [] @@ -400,6 +409,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 8be30999677171f49ba7ca7b49128c9f, type: 3} @@ -444,89 +462,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1151811037480924 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4238039632966146} - - component: {fileID: 33815088956998228} - - component: {fileID: 23085454451828992} - m_Layer: 0 - m_Name: PromoFlag_Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4238039632966146 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1151811037480924} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8550003, y: 0.579, z: -0.21300006} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4854270267363418} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33815088956998228 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1151811037480924} - m_Mesh: {fileID: 4300000, guid: b93938f606a52aa47a15020fd6964677, type: 3} ---- !u!23 &23085454451828992 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1151811037480924} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a74057964032bb049aa76b8dd3997fe8, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1192991703587922 GameObject: m_ObjectHideFlags: 0 @@ -818,6 +753,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -984,7 +928,7 @@ Transform: - {fileID: 4736542122326996} - {fileID: 4766230287867736} - {fileID: 4569698380707294} - - {fileID: 4854270267363418} + - {fileID: 2774418415272254032} m_Father: {fileID: 4035380900912510} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1100,6 +1044,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 6f4bc4516de64ce4e81679185dcd5d54, type: 3} @@ -1417,6 +1370,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: b4113b20d65841d4a983113a1018196a, type: 3} @@ -1584,6 +1546,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 8e28e9461c1a0dd49a5107aba9cf58c5, type: 3} @@ -1751,6 +1722,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: f1831d2ed278b99499541d1559015daa, type: 3} @@ -1795,103 +1775,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1818247179125160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4806189023760768} - - component: {fileID: 33783395156215266} - - component: {fileID: 65293634009601190} - - component: {fileID: 23872582088016408} - m_Layer: 0 - m_Name: Stem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4806189023760768 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818247179125160} - m_LocalRotation: {x: -0.70598215, y: -0.46918985, z: 0.23673312, w: 0.47477105} - m_LocalPosition: {x: -0.272, y: 0.205, z: -0.111} - m_LocalScale: {x: 0.0149999885, y: 0.01, z: 0.4564228} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4854270267363418} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -26.629002, y: -119.273, z: 96.998} ---- !u!33 &33783395156215266 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818247179125160} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65293634009601190 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818247179125160} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &23872582088016408 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818247179125160} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a74057964032bb049aa76b8dd3997fe8, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1835688465934486 GameObject: m_ObjectHideFlags: 0 @@ -2112,6 +1995,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -2279,6 +2171,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: edd2e08d6f610b840828462609546014, type: 3} @@ -2609,6 +2510,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 8be30999677171f49ba7ca7b49128c9f, type: 3} @@ -2776,6 +2686,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 2048a8fe7283bdf4ab7fb42386663290, type: 3} @@ -2820,89 +2739,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1948190884543056 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4118964916573738} - - component: {fileID: 33068780310247918} - - component: {fileID: 23005503413235486} - m_Layer: 0 - m_Name: PromoFlag_BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4118964916573738 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948190884543056} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8550003, y: 0.579, z: -0.16300006} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4854270267363418} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33068780310247918 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948190884543056} - m_Mesh: {fileID: 4300000, guid: 9f87d3c16e7a3c94988f41b6a92aaa3e, type: 3} ---- !u!23 &23005503413235486 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948190884543056} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: db0305ff9081c3b448ac79e85d26e5d4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1960334381407134 GameObject: m_ObjectHideFlags: 0 @@ -3026,6 +2862,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 6e03e392d49d47f428a7fd6e63d14606, type: 3} @@ -3193,6 +3038,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 6a0f5802d408e984bbd72168015e36cd, type: 3} @@ -3237,270 +3091,159 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1988580693102008 -GameObject: +--- !u!1001 &6785329023119431653 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4854270267363418} - - component: {fileID: 114654480856464452} - m_Layer: 14 - m_Name: AdvancedPromo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4854270267363418 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4315711334760372} + m_Modifications: + - target: {fileID: 1055250080, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.096 + objectReference: {fileID: 0} + - target: {fileID: 1055250080, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.099 + objectReference: {fileID: 0} + - target: {fileID: 1055250080, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.013 + objectReference: {fileID: 0} + - target: {fileID: 1423503888, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.764 + objectReference: {fileID: 0} + - target: {fileID: 1423503888, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.275 + objectReference: {fileID: 0} + - target: {fileID: 1423503888, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.026 + objectReference: {fileID: 0} + - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_HintDescription.m_TableEntryReference.m_KeyId + value: 5056691860905984 + objectReference: {fileID: 0} + - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_HintDescription.m_TableReference.m_TableCollectionName + value: GUID:c84355079ab3f3e4f8f3812258805f86 + objectReference: {fileID: 0} + - target: {fileID: 4584288707958903752, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_SwitchCaps + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6335177387058214085, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_Name + value: AdvancedPromo + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.211 + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.588 + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.188 + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7726578953136506759, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.38999987 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.19999981 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.049999952 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} +--- !u!4 &2774418415272254032 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8695010600745717173, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + m_PrefabInstance: {fileID: 6785329023119431653} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988580693102008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.38999987, y: -0.19999981, z: 0.049999952} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3097280605328464962} - - {fileID: 4118964916573738} - - {fileID: 4238039632966146} - - {fileID: 4806189023760768} - m_Father: {fileID: 4315711334760372} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114654480856464452 +--- !u!114 &7955685702501567233 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + m_PrefabInstance: {fileID: 6785329023119431653} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988580693102008} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 005e52b7e10096a4d8b3ea9cf63ca08c, type: 3} m_Name: m_EditorClassIdentifier: - m_HintObject: {fileID: 0} - m_HintObjectParent: {fileID: 0} - m_HintObjectScale: 1.05 - m_ActiveMinShowAngle: 0 - m_ScaleXOnly: 0 - m_HintText: {fileID: 0} ---- !u!1 &2599809840311850395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3097280605328464962} - - component: {fileID: 7878500112627755168} - - component: {fileID: 3747057893455548099} - - component: {fileID: 8738675109044497750} - m_Layer: 14 - m_Name: DescriptionTextLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3097280605328464962 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2599809840311850395} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.18799996} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4854270267363418} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.5059996, y: 0.81900024} - m_SizeDelta: {x: 2.6, y: 0.97} - m_Pivot: {x: 0, y: 1} ---- !u!23 &7878500112627755168 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2599809840311850395} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3747057893455548099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2599809840311850395} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 3.5 - m_fontSizeBase: 3.5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -20 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7878500112627755168} - m_maskType: 0 ---- !u!114 &8738675109044497750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2599809840311850395} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6394126819478208514 - references: - version: 2 - RefIds: - - rid: 6394126819478208514 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, - asm: Unity.Localization} - data: - m_Target: {fileID: 3747057893455548099} - m_TrackedProperties: - items: - - rid: 6394126819478208515 - m_UpdateType: 0 - - rid: 6394126819478208515 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, - asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 5056691860905984 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_text diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a11979c0c4..6c7fc60b66 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -23253,6 +23253,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 694338411} m_Modifications: + - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_HintDescription.m_TableEntryReference.m_KeyId + value: 251895636725760 + objectReference: {fileID: 0} + - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f, + type: 3} + propertyPath: m_HintDescription.m_TableReference.m_TableCollectionName + value: GUID:c84355079ab3f3e4f8f3812258805f86 + objectReference: {fileID: 0} - target: {fileID: 6335177387058214085, guid: e845ea7f1bc1b144f8087e425d81fb6f, type: 3} propertyPath: m_Name