From e953fe7459bab273b7726514b18cc158d9c12fed Mon Sep 17 00:00:00 2001 From: SnowShow Date: Wed, 26 Mar 2025 10:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=99=BB=E5=BD=95=20=E5=8F=8D=E9=A6=88=20?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/UI/RPG/Widget/Load.meta | 8 + .../RPG/Widget/Load/UIWidget_NetLoad.prefab | 411 ++++++++++++ .../Widget/Load/UIWidget_NetLoad.prefab.meta | 7 + .../RPG/GamePlay/System/Base/DataSystem.cs | 3 +- .../RPG/GamePlay/UI/Widget/Load.meta | 8 + .../UI/Widget/Load/UIWidget_NetLoad.cs | 62 ++ .../UI/Widget/Load/UIWidget_NetLoad.cs.meta | 2 + .../UI/Window/Login/UIWindows_Login.cs | 26 + .../UpdateName/UIWindows_UpdateGameName.cs | 19 + EintooAR/Assets/Scenes/main.unity | 10 +- .../Resources/TEngineGlobalSettings.asset | 4 + .../Layouts/CurrentMaximizeLayout.dwlt | 172 ++--- .../UserSettings/Layouts/default-6000.dwlt | 635 ++++++++---------- 13 files changed, 906 insertions(+), 461 deletions(-) create mode 100644 EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load.meta create mode 100644 EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab create mode 100644 EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs.meta diff --git a/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load.meta b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load.meta new file mode 100644 index 00000000..a6c56ea6 --- /dev/null +++ b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7ed1a098ccc3fc48a7d62628cba6fa2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab new file mode 100644 index 00000000..e7a1c298 --- /dev/null +++ b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab @@ -0,0 +1,411 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4615572164223954884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5973305778619264100} + - component: {fileID: 266681063586033534} + m_Layer: 5 + m_Name: UIWidget_NetLoad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5973305778619264100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615572164223954884} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9141763247880774663} + - {fileID: 2871841046035400247} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &266681063586033534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615572164223954884} + m_CullTransparentMesh: 1 +--- !u!1 &6254877255621496712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9141763247880774663} + - component: {fileID: 1882260464982993967} + - component: {fileID: 1786539445585119403} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9141763247880774663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6254877255621496712} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5973305778619264100} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1882260464982993967 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6254877255621496712} + m_CullTransparentMesh: 1 +--- !u!114 &1786539445585119403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6254877255621496712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7066567889649007964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4845548906434159831} + - component: {fileID: 6107616044419503287} + - component: {fileID: 7303309258862931379} + m_Layer: 5 + m_Name: m_tmptext + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4845548906434159831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7066567889649007964} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2871841046035400247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -67.9} + m_SizeDelta: {x: 0, y: 135.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6107616044419503287 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7066567889649007964} + m_CullTransparentMesh: 1 +--- !u!114 &7303309258862931379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7066567889649007964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: 90 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} + m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, 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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + 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 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7250902962821716668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2871841046035400247} + - component: {fileID: 6853025180466213490} + - component: {fileID: 5725468097758017281} + m_Layer: 5 + m_Name: m_mpimgProgress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2871841046035400247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7250902962821716668} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.53, y: 0.53, z: 0.53} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 4845548906434159831} + m_Father: {fileID: 5973305778619264100} + 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: 0, y: 0} + m_SizeDelta: {x: 400, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6853025180466213490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7250902962821716668} + m_CullTransparentMesh: 1 +--- !u!114 &5725468097758017281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7250902962821716668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 + m_DrawShape: 1 + m_ImageType: 3 + m_MaterialMode: 1 + m_StrokeWidth: 15.06 + m_OutlineWidth: 0 + m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} + m_FalloffDistance: 0.5 + m_ConstrainRotation: 1 + m_ShapeRotation: 0 + m_FlipHorizontal: 0 + m_FlipVertical: 0 + m_Triangle: + m_CornerRadius: {x: 0, y: 0, z: 0} + m_UniformCornerRadius: 0 + m_Rectangle: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_Circle: + m_Radius: 200 + m_FitRadius: 1 + m_Pentagon: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_TipRadius: 0.001 + m_TipSize: 1 + m_Hexagon: + m_CornerRadius: {x: 1, y: 1, z: 1, w: 1} + m_UniformCornerRadius: 0 + m_TipSize: {x: 1, y: 1} + m_UniformTipSize: 0 + m_TipRadius: {x: 1, y: 1} + m_UniformTipRadius: 0 + m_NStarPolygon: + m_SideCount: 3 + m_Inset: 2 + m_CornerRadius: 0 + m_Offset: {x: 0, y: 0} + m_GradientEffect: + m_Enabled: 1 + m_GradientType: 0 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 0, b: 0, a: 1} + key1: {r: 0.8529519, g: 0.068752214, b: 0.9716981, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65342 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_CornerGradientColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + m_Rotation: 0 diff --git a/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab.meta b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab.meta new file mode 100644 index 00000000..3f43733f --- /dev/null +++ b/EintooAR/Assets/AssetRaw/UI/RPG/Widget/Load/UIWidget_NetLoad.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2ed2e7ebc07a3ba4595dd742b352f65b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/Base/DataSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/Base/DataSystem.cs index f750e729..034ee7bc 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/Base/DataSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/Base/DataSystem.cs @@ -2,13 +2,14 @@ using GameBase; using GameLogic.Data.Luban; using GameLogic.Data.So; +using TMPro; namespace GameLogic { public class DataSystem : BaseSystem { private List _datas; - + public RuntimeDataMgr RunTimeData => RuntimeDataMgr.Instance; public override bool OnInit() { diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load.meta new file mode 100644 index 00000000..51929ef3 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 674ace7cbe6946f4e8607fbcf8de8c83 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs new file mode 100644 index 00000000..177ecd0d --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs @@ -0,0 +1,62 @@ +using Cysharp.Threading.Tasks; +using DG.Tweening; +using MPUIKIT; +using UnityEngine; +using UnityEngine.UI; +using TEngine; +using TMPro; + +namespace GameLogic +{ + [Window(UILayer.UI)] + class UIWidget_NetLoad : UIWidget + { + #region 脚本工具生成的代码 + private MPImage m_mpimgProgress; + private TextMeshProUGUI m_tmptext; + protected override void ScriptGenerator() + { + m_mpimgProgress = FindChildComponent("m_mpimgProgress"); + m_tmptext = FindChildComponent("m_mpimgProgress/m_tmptext"); + } + #endregion + + #region 事件 + + protected override void OnCreate() + { + base.OnCreate(); + PlayProgressAnimation(); + } + + private void PlayProgressAnimation() + { + // 重置进度条 + m_mpimgProgress.fillAmount = 0; + + // 创建循环动画，使用SetLoops实现无限循环 + m_mpimgProgress.DOFillAmount(1, 2) + .SetEase(Ease.Linear) + .SetLoops(-1, LoopType.Restart); + } + + protected override void OnUpdate() + { + base.OnUpdate(); + } + + #endregion + + public void SetUp(string text) + { + + } + + protected override void OnDestroy() + { + base.OnDestroy(); + m_mpimgProgress.DOKill(); + } + + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs.meta new file mode 100644 index 00000000..eb4eeca7 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Widget/Load/UIWidget_NetLoad.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 844e2934a3a5f26498278503920f1332 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/Login/UIWindows_Login.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/Login/UIWindows_Login.cs index cad4eac1..ed6c1af6 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/Login/UIWindows_Login.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/Login/UIWindows_Login.cs @@ -18,6 +18,9 @@ namespace GameLogic private Button m_btnRegister; private Button m_btnLogin; private Button m_btnReturn; + + + public UIWidget_NetLoad m_loadWidget; protected override void ScriptGenerator() { m_tmpinputAccount = FindChildComponent("InputGroup/m_tmpinputAccount"); @@ -36,6 +39,7 @@ namespace GameLogic { await UniTask.Yield(); + CreateLoadWidget(); var username = m_tmpinputAccount.text; var password = m_tmpinputPwd.text; var serverip = ServerAddressDataConfig.GetAuthenticationServer(username); @@ -47,6 +51,7 @@ namespace GameLogic username = string.Empty; password = string.Empty; Log.Warning($"注册失败,错误码:{errorMessage}"); + CloseLoadWidget(); return; } var code = await GameNetSystem.Instance.SendCommand(serverip,ECommandType.Register,new object[]{username,password}); @@ -56,16 +61,19 @@ namespace GameLogic username = string.Empty; password = string.Empty; Log.Warning($"注册失败,错误码:{errorMessage}"); + CloseLoadWidget(); return; } username = string.Empty; password = string.Empty; + CloseLoadWidget(); Log.Warning("注册成功"); } private async UniTaskVoid OnClickLoginBtn() { await UniTask.Yield(); + CreateLoadWidget(); var username = m_tmpinputAccount.text; var password = m_tmpinputPwd.text; @@ -77,6 +85,7 @@ namespace GameLogic username = string.Empty; password = string.Empty; Log.Warning($"登录失败,错误码:{errorMessage}"); + CloseLoadWidget(); return; } var result = await GameNetSystem.Instance.SendRequestMultipleDataCommand(serverip,ECommandType.Login,new object[]{username,password}); @@ -86,6 +95,7 @@ namespace GameLogic username = string.Empty; password = string.Empty; Log.Warning($"登录失败,错误码:{errorMessage}"); + CloseLoadWidget(); return; } if(result.data==null && result.data.Length == 0) return; @@ -99,6 +109,7 @@ namespace GameLogic { errorMessage = GameErrorCode.GetErrorMessage(code); Log.Warning($"登录码:{errorMessage}"); + CloseLoadWidget(); return; } var accountInfo = await GameNetSystem.Instance.SendRequestMultipleDataCommand(jwtPayload.gateAddress,ECommandType.GetGameAccountInfo,new object[] @@ -115,6 +126,8 @@ namespace GameLogic /*username = string.Empty; password = string.Empty;*/ DataSystem.Instance.RunTimeData.Login._jwtPayload = jwtPayload; + CloseLoadWidget(); + Log.Warning("登录成功"); } private async UniTaskVoid OnClickReturnBtn() @@ -123,6 +136,19 @@ namespace GameLogic GameEvent.Get().ChangeMode(EPlayMode.Default); await UniTask.Yield(); } + + + + private void CreateLoadWidget() + { + m_loadWidget = CreateWidgetByType(transform); + } + + private void CloseLoadWidget() + { + m_loadWidget?.Destroy(); + } + #endregion } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName/UIWindows_UpdateGameName.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName/UIWindows_UpdateGameName.cs index c2f79fc1..6455c439 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName/UIWindows_UpdateGameName.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName/UIWindows_UpdateGameName.cs @@ -16,6 +16,8 @@ namespace GameLogic #region 脚本工具生成的代码 private TMP_InputField m_tmpinputUpdateName; private Button m_btnConfirm; + + private UIWidget m_loadWidget; protected override void ScriptGenerator() { m_tmpinputUpdateName = FindChildComponent("InputGroup/m_tmpinputUpdateName"); @@ -28,10 +30,12 @@ namespace GameLogic private async UniTaskVoid OnClickConfirmBtn() { await UniTask.Yield(); + CreateLoadWidget(); if (string.IsNullOrEmpty(m_tmpinputUpdateName.text) || m_tmpinputUpdateName.text.Length < 6) { Log.Info("输入的名称不能为空，且长度不能小于6个字符"); m_tmpinputUpdateName.text = ""; + CloseLoadWidget(); return; // 输入为空或长度小于6时返回 } @@ -41,6 +45,7 @@ namespace GameLogic { Log.Info("输入的名称不能包含特殊字符"); m_tmpinputUpdateName.text = ""; + CloseLoadWidget(); return; } @@ -56,6 +61,8 @@ namespace GameLogic if (result != GameErrorCode.GateUpdateGameNameSuccess) { Log.Info("修改用户名失败"); + CloseLoadWidget(); + return; } var accountInfo = await GameNetSystem.Instance.SendRequestMultipleDataCommand(gateAddress, @@ -69,10 +76,22 @@ namespace GameLogic GameEvent.Get().GetAndUpdateUserInfo(gameAccountInfo.GameName); } + CloseLoadWidget(); Close(); // 输入有效，执行其他逻辑 Log.Info("输入有效"); } + + + private void CreateLoadWidget() + { + m_loadWidget = CreateWidgetByType(transform); + } + + private void CloseLoadWidget() + { + m_loadWidget?.Destroy(); + } #endregion } diff --git a/EintooAR/Assets/Scenes/main.unity b/EintooAR/Assets/Scenes/main.unity index bcbec575..e13967b9 100644 --- a/EintooAR/Assets/Scenes/main.unity +++ b/EintooAR/Assets/Scenes/main.unity @@ -1361,6 +1361,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 553327091} m_Modifications: + - target: {fileID: 418265914827938427, guid: c446e4b51cdbd1a46b0071665acb47fe, type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 27 + objectReference: {fileID: 0} - target: {fileID: 4658664239749245639, guid: c446e4b51cdbd1a46b0071665acb47fe, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1447,7 +1451,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6482597658666064390, guid: c446e4b51cdbd1a46b0071665acb47fe, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6898540637858333504, guid: c446e4b51cdbd1a46b0071665acb47fe, type: 3} + propertyPath: m_AnchoredPosition.x + value: -45.75299 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/EintooAR/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset b/EintooAR/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset index d169c793..78fb7eed 100644 --- a/EintooAR/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset +++ b/EintooAR/Assets/TEngine/ResRaw/Resources/TEngineGlobalSettings.asset @@ -82,6 +82,10 @@ MonoBehaviour: componentName: TMP_InputField - uiElementRegex: m_tmpDropdown componentName: TMP_Dropdown + - uiElementRegex: m_tmptext + componentName: TextMeshProUGUI + - uiElementRegex: m_mpimg + componentName: MPImage m_HybridCLRCustomGlobalSettings: HotUpdateAssemblies: - GameBase.dll diff --git a/EintooAR/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/EintooAR/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 82433a11..816f1f01 100644 --- a/EintooAR/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/EintooAR/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -47,10 +47,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 531 + x: 1130 y: 79 - width: 953 - height: 335 + width: 354 + height: 447 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -97,7 +97,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -106,23 +106,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 953 - height: 314 - m_Scale: {x: 0.2353823, y: 0.2353823} - m_Translation: {x: 476.5, y: 157} + width: 354 + height: 426 + m_Scale: {x: 0.31934032, y: 0.31934032} + m_Translation: {x: 177, y: 213} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -2024.3663 + x: -554.26764 y: -667 - width: 4048.7327 + width: 1108.5353 height: 1334 m_MinimalGUI: 1 - m_defaultScale: 0.2353823 - m_LastWindowPixelSize: {x: 953, y: 335} + m_defaultScale: 0.31934032 + m_LastWindowPixelSize: {x: 354, y: 447} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000101000000000000 @@ -175,7 +175,7 @@ MonoBehaviour: x: 0 y: 0 width: 1486 - height: 361 + height: 473 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 @@ -198,8 +198,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 344 - height: 361 + width: 408 + height: 473 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 6} @@ -230,8 +230,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 79 - width: 343 - height: 335 + width: 407 + height: 447 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -246,9 +246,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: faefffff + m_SelectedIDs: f6deffff + m_LastClickedID: -8458 + m_ExpandedIDs: a6e1ffffeeeaffffecefffffeeefffffbe0801001209010016090100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -288,12 +288,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 344 + x: 408 y: 0 - width: 187 - height: 361 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 722 + height: 473 + m_MinSize: {x: 202, y: 226} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 8} m_Panes: - {fileID: 8} @@ -320,10 +320,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 344 + x: 408 y: 79 - width: 185 - height: 335 + width: 720 + height: 447 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -436,12 +436,12 @@ MonoBehaviour: displayed: 1 id: Orientation index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":108.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":2,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-80.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 108, y: -24} + snapOffset: {x: -80, y: -24} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 3 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 @@ -878,9 +878,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0, y: 0.54797614, z: 100} + m_Target: {x: 0.13187283, y: -1.1337487, z: 51.39766} speed: 2 - m_Value: {x: 0, y: 0.54797614, z: 100} + m_Value: {x: 0.10237071, y: -1.1307037, z: 58.472385} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -930,9 +930,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.416929 + m_Target: 0.6045612 speed: 2 - m_Value: 1.416929 + m_Value: 0.63304836 m_Ortho: m_Target: 1 speed: 2 @@ -978,10 +978,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 531 + x: 1130 y: 0 - width: 955 - height: 361 + width: 356 + height: 473 m_MinSize: {x: 52, y: 76} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 2} @@ -1008,13 +1008,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 361 + y: 473 width: 1486 - height: 572 + height: 460 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 110 + controlID: 179 draggingID: 0 --- !u!114 &11 MonoBehaviour: @@ -1033,8 +1033,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 893 - height: 572 + width: 495 + height: 460 m_MinSize: {x: 101, y: 126} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 12} @@ -1064,9 +1064,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 440 - width: 892 - height: 546 + y: 552 + width: 494 + height: 434 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1093,10 +1093,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 893 + x: 495 y: 0 - width: 185 - height: 572 + width: 397 + height: 460 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 14} @@ -1125,10 +1125,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 893 - y: 440 - width: 183 - height: 546 + x: 495 + y: 552 + width: 395 + height: 434 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1151,7 +1151,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager + - Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/Project m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1161,16 +1161,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager + - Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/Project m_LastFoldersGridSize: -1 m_LastProjectPath: D:\TecentUGit\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 780} - m_SelectedIDs: c40a0100 - m_LastClickedID: 68292 - m_ExpandedIDs: 00000000da090100dc090100de090100e0090100e2090100e4090100e6090100e8090100ea090100ec090100ee090100f0090100f2090100f4090100f6090100fa0a0100700b010000ca9a3bffffff7f + scrollPos: {x: 0, y: 306} + m_SelectedIDs: c60b0100 + m_LastClickedID: 68550 + m_ExpandedIDs: 00000000f2090100f4090100f6090100f8090100fa090100fc090100fe090100000a0100020a0100040a0100060a0100080a0100a20a010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1199,7 +1199,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000da090100dc090100de090100e0090100e2090100e4090100e6090100e8090100ea090100ec090100ee090100f0090100f2090100f4090100f6090100 + m_ExpandedIDs: 00000000f2090100f4090100f6090100f8090100fa090100fc090100fe090100000a0100020a0100040a0100060a0100080a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1225,9 +1225,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: f6deffff + m_LastClickedInstanceID: -8458 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300009e44060000000000bc4f0100 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1253,10 +1253,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 28} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 132 + m_DirectoriesAreaWidth: 285 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1272,10 +1272,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1078 + x: 892 y: 0 - width: 408 - height: 572 + width: 594 + height: 460 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 16} @@ -1304,10 +1304,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 1078 - y: 440 - width: 406 - height: 546 + x: 892 + y: 552 + width: 592 + height: 434 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1330,7 +1330,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/AssetRaw/UI/RPG/WIndows/OpenUpdateName + - Assets/AssetRaw/UI/RPG/Widget/Load m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1340,30 +1340,30 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/AssetRaw/UI/RPG/Widget/OpenUpdateName + - Assets/AssetRaw/UI/RPG/Widget/Load m_LastFoldersGridSize: -1 m_LastProjectPath: D:\TecentUGit\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 565.6188} - m_SelectedIDs: 8a0b0100 - m_LastClickedID: 68490 - m_ExpandedIDs: 00000000da090100dc090100de090100e0090100e2090100e4090100e6090100e8090100ea090100ec090100ee090100f0090100f2090100f4090100f6090100aa0a01008c0b010000ca9a3bffffff7f + scrollPos: {x: 0, y: 91} + m_SelectedIDs: ea0d0100 + m_LastClickedID: 69098 + m_ExpandedIDs: 00000000f2090100f4090100f6090100f8090100fa090100fc090100fe090100000a0100020a0100060a0100080a0100760a0100260b0100540b0100e40b0100e60b010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: SkillPanel + m_OriginalName: SkillPanel m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 68586 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 15} @@ -1378,7 +1378,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000da090100dc090100de090100e0090100e2090100e4090100e6090100e8090100ea090100ec090100ee090100f0090100f2090100f4090100f6090100 + m_ExpandedIDs: 00000000f2090100f4090100f6090100f8090100fa090100fc090100fe090100000a0100020a0100040a0100060a0100080a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1404,8 +1404,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: f6deffff + m_LastClickedInstanceID: -8458 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1435,7 +1435,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 50 + m_DirectoriesAreaWidth: 332 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 026b8612..704d2745 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 279 - y: 201 - width: 725 - height: 578 - m_ShowMode: 0 - m_Title: Build Profiles - m_RootView: {fileID: 4} - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -44,62 +20,11 @@ MonoBehaviour: height: 989 m_ShowMode: 4 m_Title: Console - m_RootView: {fileID: 5} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildProfileWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 13862 - draggingID: 0 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -112,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -127,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -170,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -183,8 +108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 18} + - {fileID: 6} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 @@ -194,9 +119,9 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 1661 + controlID: 5597 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -209,8 +134,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 14} + - {fileID: 7} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -220,9 +145,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 1662 + controlID: 5405 draggingID: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -235,21 +160,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 12} - - {fileID: 13} + - {fileID: 8} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1486 - height: 473 + height: 454 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 1663 + controlID: 5406 draggingID: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,16 +191,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 344 - height: 473 + width: 408 + height: 454 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,18 +215,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 344 + x: 408 y: 0 - width: 511 - height: 473 + width: 722 + height: 454 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -316,18 +241,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 855 + x: 1130 y: 0 - width: 631 - height: 473 + width: 356 + height: 454 m_MinSize: {x: 52, y: 76} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -340,21 +265,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 16} - - {fileID: 17} + - {fileID: 12} + - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 - y: 473 + y: 454 width: 1486 - height: 460 + height: 479 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 1794 + controlID: 5430 draggingID: 0 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -371,16 +296,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 821 - height: 460 + width: 356 + height: 479 m_MinSize: {x: 101, y: 126} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -395,18 +320,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 821 + x: 356 y: 0 - width: 565 - height: 460 + width: 544 + height: 479 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -421,18 +346,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1386 + x: 900 y: 0 - width: 100 - height: 460 + width: 586 + height: 479 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 25} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 25} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -453,48 +378,12 @@ MonoBehaviour: height: 933 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 26} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 26} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 15004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 725, y: 400} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Profiles - m_Image: {fileID: 0} - m_Tooltip: - m_TextWithWhitespace: "Build Profiles\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 26 - width: 725 - height: 552 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -515,10 +404,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 856 + x: 1131 y: 24 - width: 629 - height: 447 + width: 354 + height: 428 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -574,29 +463,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 629 - height: 426 - m_Scale: {x: 0.31934032, y: 0.31934032} - m_Translation: {x: 314.5, y: 213} + width: 354 + height: 407 + m_Scale: {x: 0.30509746, y: 0.30509746} + m_Translation: {x: 176.99998, y: 203.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -984.8428 + x: -580.1425 y: -667 - width: 1969.6855 + width: 1160.285 height: 1334 m_MinimalGUI: 1 - m_defaultScale: 0.31934032 - m_LastWindowPixelSize: {x: 629, y: 447} + m_defaultScale: 0.30509746 + m_LastWindowPixelSize: {x: 354, y: 428} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000101000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -619,8 +508,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 343 - height: 447 + width: 407 + height: 428 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -637,7 +526,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 6c02ffff7402ffffae02ffffb608fffffaeffffff4ffffffa6080100fa080100 + m_ExpandedIDs: a6e1ffffeeeaffffecefffffeeefffffbe0801001209010016090100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -654,7 +543,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -662,7 +551,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -683,10 +572,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 345 + x: 409 y: 24 - width: 509 - height: 447 + width: 720 + height: 428 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1241,9 +1130,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0.073736295, y: 3.0384872, z: 195.83817} + m_Target: {x: 0, y: 0, z: 100} speed: 2 - m_Value: {x: 0.073736295, y: 3.0384872, z: 195.83817} + m_Value: {x: 0, y: 0, z: 100} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1293,9 +1182,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.7877302 + m_Target: 3.845256 speed: 2 - m_Value: 1.7877302 + m_Value: 3.845256 m_Ortho: m_Target: 1 speed: 2 @@ -1316,7 +1205,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 22} + m_SceneView: {fileID: 18} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1326,7 +1215,7 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_LastDebugDrawMode: 35 m_ViewIsLockedToObject: 0 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1349,8 +1238,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 820 - height: 434 + width: 355 + height: 453 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1362,7 +1251,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1383,10 +1272,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 822 + x: 357 y: 24 - width: 563 - height: 434 + width: 542 + height: 453 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1409,7 +1298,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Data + - Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1419,16 +1308,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Data + - Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/UI/Window/UpdateName m_LastFoldersGridSize: -1 m_LastProjectPath: D:\TecentUGit\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 60} - m_SelectedIDs: b80a0100 - m_LastClickedID: 68280 - m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e060100800601008206010084060100 + scrollPos: {x: 0, y: 1186} + m_SelectedIDs: 8c0f0100 + m_LastClickedID: 69516 + m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e06010080060100820601008406010086060100880601008a0601008c0601008e06010090060100920601009406010096060100980601009a0601009c060100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1445,7 +1334,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1457,160 +1346,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e060100800601008206010084060100 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c62300009e44060000000000bc4f0100 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 345 ---- !u!114 &25 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Project\u200B" - m_Pos: - serializedVersion: 2 - x: 1387 - y: 24 - width: 98 - height: 434 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/AssetRaw/UI/AR/UISelf - m_Globs: [] - m_ProductIds: - m_AnyWithAssetOrigin: 0 - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 16 - m_LastFolders: - - Assets/AssetRaw/UI/AR/UISelf - m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\TecentUGit\EintooAR\EintooAR - m_LockTracker: - m_IsLocked: 1 - m_FolderTreeState: - scrollPos: {x: 0, y: 565.6188} - m_SelectedIDs: a60a0100 - m_LastClickedID: 68262 - m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e060100800601008206010084060100 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 17} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e060100800601008206010084060100 + m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e06010080060100820601008406010086060100880601008a0601008c0601008e06010090060100920601009406010096060100980601009a0601009c060100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1639,6 +1375,159 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c62300009e44060000000000bc4f0100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 13} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 272 +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Project\u200B" + m_Pos: + serializedVersion: 2 + x: 901 + y: 24 + width: 584 + height: 453 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/AssetRaw/UI/RPG/Widget/Load + m_Globs: [] + m_ProductIds: + m_AnyWithAssetOrigin: 0 + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/AssetRaw/UI/RPG/Widget/Load + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\TecentUGit\EintooAR\EintooAR + m_LockTracker: + m_IsLocked: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 34} + m_SelectedIDs: ea0d0100 + m_LastClickedID: 69098 + m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e06010080060100820601008406010086060100880601008a0601008c0601008e06010090060100920601009406010096060100980601009a0601009c060100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 14} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000720601007406010076060100780601007a0601007c0601007e06010080060100820601008406010086060100880601008a0601008c0601008e06010090060100920601009406010096060100980601009a0601009c060100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1656,7 +1545,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 17} + m_ClientGUIView: {fileID: 14} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1667,8 +1556,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 50 ---- !u!114 &26 + m_DirectoriesAreaWidth: 332 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0}