From f228ee9389357b8721dc5c3d69324aabdbc9f6f8 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Wed, 19 Mar 2025 11:33:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Art/UIPrefab/UILittleTip.prefab | 616 ++++++++++++ Assets/Art/UIPrefab/UILittleTip.prefab.meta | 7 + Assets/Art/UIPrefab/UILoading.prefab | 187 +++- ...ghtPlus_Builtin_Pipeline.unitypackage.meta | 7 + ...ghlightPlus_URP_Pipeline.unitypackage.meta | 7 + .../Framework/Examples.unitypackage.meta | 7 + ....FlappyBird.Unity2019.4+.unitypackage.meta | 7 + ....CubeMaster.Unity2019.4+.unitypackage.meta | 7 + .../AudioKit/Example.unitypackage.meta | 7 + .../Toolkits/ResKit/Example.unitypackage.meta | 7 + .../Toolkits/UIKit/Example.unitypackage.meta | 7 + .../Toolkits/UIKit/Tests.unitypackage.meta | 7 + .../ActionKit/Example.unitypackage.meta | 7 + .../BindableKit/Example.unitypackage.meta | 7 + .../CodeGenKit/Example.unitypackage.meta | 7 + .../DeclareKit/Example.unitypackage.meta | 7 + .../EventKit/Example.unitypackage.meta | 7 + .../FSMKit/Examples.unitypackage.meta | 7 + .../GridKit/Example.unitypackage.meta | 7 + .../_CoreKit/IOCKit/Example.unitypackage.meta | 7 + .../LocaleKit/Example.unitypackage.meta | 7 + .../PoolKit/Example.unitypackage.meta | 7 + .../SingletonKit/Example.unitypackage.meta | 7 + .../TableKit/Example.unitypackage.meta | 7 + .../Scenes/TestUIPanels/TestUILittleTip.unity | 943 ++++++++++++++++++ .../TestUIPanels/TestUILittleTip.unity.meta | 7 + Assets/Scripts/Actions/ActionHelper.cs | 1 + Assets/Scripts/Actions/TextWindowAction.cs | 1 - Assets/Scripts/UI/UILittleTip.Designer.cs | 49 + .../Scripts/UI/UILittleTip.Designer.cs.meta | 11 + Assets/Scripts/UI/UILittleTip.cs | 35 + Assets/Scripts/UI/UILittleTip.cs.meta | 11 + Assets/Scripts/UI/UILoading.Designer.cs | 5 +- Assets/Scripts/UI/UILoading.cs | 14 + Assets/Scripts/UI/UIModuleSelect.cs | 11 +- 35 files changed, 2034 insertions(+), 11 deletions(-) create mode 100644 Assets/Art/UIPrefab/UILittleTip.prefab create mode 100644 Assets/Art/UIPrefab/UILittleTip.prefab.meta create mode 100644 Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta create mode 100644 Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta create mode 100644 Assets/QFramework/Framework/Examples.unitypackage.meta create mode 100644 Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta create mode 100644 Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta create mode 100644 Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta create mode 100644 Assets/Scenes/TestUIPanels/TestUILittleTip.unity create mode 100644 Assets/Scenes/TestUIPanels/TestUILittleTip.unity.meta create mode 100644 Assets/Scripts/UI/UILittleTip.Designer.cs create mode 100644 Assets/Scripts/UI/UILittleTip.Designer.cs.meta create mode 100644 Assets/Scripts/UI/UILittleTip.cs create mode 100644 Assets/Scripts/UI/UILittleTip.cs.meta diff --git a/Assets/Art/UIPrefab/UILittleTip.prefab b/Assets/Art/UIPrefab/UILittleTip.prefab new file mode 100644 index 00000000..058ffd54 --- /dev/null +++ b/Assets/Art/UIPrefab/UILittleTip.prefab @@ -0,0 +1,616 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2180330123012645724 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1411077056144564339} + - component: {fileID: 3803868343765438876} + - component: {fileID: 6947180896696442033} + - component: {fileID: 2677073639366391683} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1411077056144564339 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2180330123012645724} + 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: 8704799002673306708} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3803868343765438876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2180330123012645724} + m_CullTransparentMesh: 1 +--- !u!114 &6947180896696442033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2180330123012645724} + 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: "\u5C0F\u6280\u5DE7\uFF1A\u53CC\u51FB\u67D0\u4E2A\u89E3\u5256\u7ED3\u6784\u540E\uFF0C\u53EF\u5C06\u6B64\u7ED3\u6784\u8BBE\u7F6E\u4E3A\u65CB\u8F6C\u4E2D\u5FC3\u3002" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_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: 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!114 &2677073639366391683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2180330123012645724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: TMPro.TextMeshProUGUI +--- !u!1 &2701225928669049761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3662045897017563233} + - component: {fileID: 766014776934214959} + - component: {fileID: 3186014196807713151} + - component: {fileID: 2576324219425133624} + - component: {fileID: 6793518604679108387} + - component: {fileID: 4794842547672112217} + m_Layer: 0 + m_Name: CloseBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3662045897017563233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + 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: 4405638741115069694} + m_Father: {fileID: 8704799002673306708} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &766014776934214959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + m_CullTransparentMesh: 1 +--- !u!114 &3186014196807713151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + 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: 1, g: 1, b: 1, a: 0} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &2576324219425133624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3186014196807713151} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6793518604679108387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 32 + m_MinHeight: 22 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &4794842547672112217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701225928669049761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!1 &5608280968778920448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1990147873835951299} + - component: {fileID: -7459796795925696493} + m_Layer: 0 + m_Name: UILittleTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1990147873835951299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5608280968778920448} + 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: 8704799002673306708} + 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!114 &-7459796795925696493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5608280968778920448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9735f53c20f49214f82ce98a857f7c36, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 6947180896696442033} + CloseBtn: {fileID: 2576324219425133624} +--- !u!1 &6726024726035087252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8704799002673306708} + - component: {fileID: 5417112980514228579} + - component: {fileID: 7649899701508399314} + - component: {fileID: 4852565084900974948} + - component: {fileID: 3695604386032601808} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8704799002673306708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6726024726035087252} + 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: 1411077056144564339} + - {fileID: 3662045897017563233} + m_Father: {fileID: 1990147873835951299} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -131} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5417112980514228579 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6726024726035087252} + m_CullTransparentMesh: 1 +--- !u!114 &7649899701508399314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6726024726035087252} + 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: 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: 21300000, guid: 9a72772d7c3b99f46b44640be63e6b5c, type: 3} + m_Type: 1 + 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!114 &4852565084900974948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6726024726035087252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 111 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &3695604386032601808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6726024726035087252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &8225795634580519460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4405638741115069694} + - component: {fileID: 115531650834352417} + - component: {fileID: 180838320938584260} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4405638741115069694 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8225795634580519460} + 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: 3662045897017563233} + 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 &115531650834352417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8225795634580519460} + m_CullTransparentMesh: 1 +--- !u!114 &180838320938584260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8225795634580519460} + 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: "\u5173\u95ED" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293682945 + m_fontColor: {r: 0.003921569, g: 0.40392157, b: 0.9254902, 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: 16 + m_fontSizeBase: 16 + 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_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: 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} diff --git a/Assets/Art/UIPrefab/UILittleTip.prefab.meta b/Assets/Art/UIPrefab/UILittleTip.prefab.meta new file mode 100644 index 00000000..842ee83d --- /dev/null +++ b/Assets/Art/UIPrefab/UILittleTip.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e94dfead59869b14fa22f34ba2ef27d4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: uilittletip_prefab + assetBundleVariant: diff --git a/Assets/Art/UIPrefab/UILoading.prefab b/Assets/Art/UIPrefab/UILoading.prefab index 10668f78..f04edaf7 100644 --- a/Assets/Art/UIPrefab/UILoading.prefab +++ b/Assets/Art/UIPrefab/UILoading.prefab @@ -200,8 +200,159 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af5b162bfb754814088637fd26472827, type: 3} m_Name: m_EditorClassIdentifier: - Icon: {fileID: 0} + Progress: {fileID: 7226405206529294422} Label: {fileID: 4884732938524178579} +--- !u!1 &5520283199099506863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2213779641585808628} + - component: {fileID: 5250276585408212064} + - component: {fileID: 7226405206529294422} + - component: {fileID: 8818777081010864843} + m_Layer: 5 + m_Name: Progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2213779641585808628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520283199099506863} + 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: 6283001140684225269} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5250276585408212064 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520283199099506863} + m_CullTransparentMesh: 1 +--- !u!114 &7226405206529294422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520283199099506863} + 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: 0% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, 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: 28 + m_fontSizeBase: 28 + 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_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: 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!114 &8818777081010864843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520283199099506863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: Progress + CustomComment: + mComponentName: TMPro.TextMeshProUGUI --- !u!1 &7998146748625470978 GameObject: m_ObjectHideFlags: 0 @@ -213,6 +364,7 @@ GameObject: - component: {fileID: 6283001140684225269} - component: {fileID: 4517963929021853123} - component: {fileID: 4875958709208229070} + - component: {fileID: 1193003060469290150} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -231,7 +383,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2213779641585808628} m_Father: {fileID: 4038960654069473388} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -387,6 +540,36 @@ MonoBehaviour: - {fileID: 21300000, guid: 509b9f1e15f547e4ebdc2250671c4574, type: 3} totalTime: 5 loop: 1 +--- !u!114 &1193003060469290150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7998146748625470978} + 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: 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: 21300000, guid: a3fa5847dfe821f40a2ff185a19a090e, type: 3} + 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 &8170186854872684619 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta b/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta new file mode 100644 index 00000000..645dfac7 --- /dev/null +++ b/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c87a0e1993f7439285693c04d6dab68 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta b/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta new file mode 100644 index 00000000..20bc5863 --- /dev/null +++ b/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 52f45c84fa7e04a17922d3833762b05c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples.unitypackage.meta b/Assets/QFramework/Framework/Examples.unitypackage.meta new file mode 100644 index 00000000..b1674801 --- /dev/null +++ b/Assets/QFramework/Framework/Examples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51c6f3b897886a44991168f065c0a99d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta b/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta new file mode 100644 index 00000000..80087a26 --- /dev/null +++ b/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bf6cf57b414f194baf76e0a325b7964 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta b/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta new file mode 100644 index 00000000..9c21e330 --- /dev/null +++ b/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a84ca8d2ecd964e4688324f75f6f582a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta new file mode 100644 index 00000000..650fdeb0 --- /dev/null +++ b/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fae029c3eecbe44ea3ff0b493f20601 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta new file mode 100644 index 00000000..46c7886f --- /dev/null +++ b/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3f0c8e9f16a58243b803d5d47a79c03 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta new file mode 100644 index 00000000..28fa79a2 --- /dev/null +++ b/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 976cb377135fda24791255ebe76b2e57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta b/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta new file mode 100644 index 00000000..c6cc42c5 --- /dev/null +++ b/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5176cd918f52ea842b73948dd3bc26a8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta new file mode 100644 index 00000000..5f92dd2d --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 92ad6261b6f1d234e95b0d3d93ecb063 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta new file mode 100644 index 00000000..6ab466ab --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 92073d73c00ba4745a1846e66e0d487e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta new file mode 100644 index 00000000..969bcd8b --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c8cdbc6f43d08374d8ad57ba52c291e9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta new file mode 100644 index 00000000..12a9b0a4 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 921cbf26409b3dc42bced514dfbc0294 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta new file mode 100644 index 00000000..39da17f3 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 260510f68d4501045937a08a041e9193 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta new file mode 100644 index 00000000..c889b1c8 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ec7c95d917901144b2b4c87d6223452 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta new file mode 100644 index 00000000..1f2f24f5 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d649e0c4be6794b47be815440ab085d3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta new file mode 100644 index 00000000..769786cd --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 84093f18d10915540be5035bf0bebf1c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta new file mode 100644 index 00000000..82304f47 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 160fc31f922750444afec5e3d7280c07 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta new file mode 100644 index 00000000..c2941e5e --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 637404373c3be1b4abb149a6ec887955 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta new file mode 100644 index 00000000..2e8929b9 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43709ae6df606fe4680b4f2cdb456ef2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta new file mode 100644 index 00000000..74ac4669 --- /dev/null +++ b/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27a53bb609d45b240a6ae0f54e40ac3b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestUIPanels/TestUILittleTip.unity b/Assets/Scenes/TestUIPanels/TestUILittleTip.unity new file mode 100644 index 00000000..5fd733eb --- /dev/null +++ b/Assets/Scenes/TestUIPanels/TestUILittleTip.unity @@ -0,0 +1,943 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &232179914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 232179919} + - component: {fileID: 232179918} + - component: {fileID: 232179917} + - component: {fileID: 232179916} + - component: {fileID: 232179915} + m_Layer: 5 + m_Name: UIRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &232179915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232179914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2db7fffd623c478eba3d2cb84034d2f, type: 3} + m_Name: + m_EditorClassIdentifier: + UICamera: {fileID: 270895165} + Canvas: {fileID: 232179918} + CanvasScaler: {fileID: 232179917} + GraphicRaycaster: {fileID: 232179916} + Bg: {fileID: 1423463833} + Common: {fileID: 546961130} + PopUI: {fileID: 464715214} + RightBottom: {fileID: 520844866} + CanvasPanel: {fileID: 1612874465} +--- !u!114 &232179916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232179914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 0 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &232179917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232179914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &232179918 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232179914} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 270895165} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 100 + m_TargetDisplay: 0 +--- !u!224 &232179919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232179914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1423463833} + - {fileID: 546961130} + - {fileID: 520844866} + - {fileID: 464715214} + - {fileID: 1612874465} + - {fileID: 1708535763} + - {fileID: 1941225642} + - {fileID: 270895167} + - {fileID: 485839713} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &270895164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270895167} + - component: {fileID: 270895165} + - component: {fileID: 270895166} + m_Layer: 5 + m_Name: UICamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!20 &270895165 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270895164} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 3 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: 99 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!124 &270895166 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270895164} + m_Enabled: 1 +--- !u!4 &270895167 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270895164} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 232179919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &464715213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464715214} + m_Layer: 5 + m_Name: PopUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &464715214 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464715213} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 232179919} + 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!1 &485839712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 485839713} + - component: {fileID: 485839714} + m_Layer: 5 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &485839713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485839712} + 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: 232179919} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &485839714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485839712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5dc84f25d84334e168bf64050b91e1fb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &520844865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520844866} + - component: {fileID: 520844869} + - component: {fileID: 520844868} + - component: {fileID: 520844867} + m_Layer: 5 + m_Name: RightBottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &520844866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520844865} + 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: 232179919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1828.92, y: 0} + m_Pivot: {x: 1, y: -0.000000461936} +--- !u!222 &520844867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520844865} + m_CullTransparentMesh: 1 +--- !u!114 &520844868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520844865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &520844869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520844865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 8 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 1 +--- !u!1 &546961129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 546961130} + m_Layer: 5 + m_Name: Common + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &546961130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546961129} + 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: 232179919} + 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!1 &558122296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 558122298} + - component: {fileID: 558122297} + m_Layer: 0 + m_Name: TestUILittleTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &558122297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558122296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6b7a3e7dc894eaca1053ef166cdad33, type: 3} + m_Name: + m_EditorClassIdentifier: + PanelName: UILittleTip + Level: 0 + mOtherPanels: [] +--- !u!4 &558122298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558122296} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1423463832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423463833} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1423463833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423463832} + 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: 232179919} + 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!1 &1612874464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1612874465} + m_Layer: 5 + m_Name: CanvasPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1612874465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612874464} + 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: 232179919} + 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!1 &1708535762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1708535763} + - component: {fileID: 1708535764} + m_Layer: 5 + m_Name: Design + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1708535763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708535762} + 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: 3606606786481530144} + m_Father: {fileID: 232179919} + 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!114 &1708535764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708535762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6eba024ea32574239b57b098f1dc6282, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1941225641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1941225642} + - component: {fileID: 1941225644} + - component: {fileID: 1941225643} + m_Layer: 5 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1941225642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941225641} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 232179919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1941225643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941225641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 1 +--- !u!114 &1941225644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941225641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!1001 &3606606786481530143 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1708535763} + m_Modifications: + - target: {fileID: 1411077056144564339, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1411077056144564339, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1411077056144564339, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1411077056144564339, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1411077056144564339, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3662045897017563233, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3662045897017563233, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3662045897017563233, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3662045897017563233, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3662045897017563233, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5608280968778920448, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_Name + value: UILittleTip + objectReference: {fileID: 0} + - target: {fileID: 8704799002673306708, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8704799002673306708, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} +--- !u!224 &3606606786481530144 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1990147873835951299, guid: e94dfead59869b14fa22f34ba2ef27d4, type: 3} + m_PrefabInstance: {fileID: 3606606786481530143} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 232179919} + - {fileID: 558122298} diff --git a/Assets/Scenes/TestUIPanels/TestUILittleTip.unity.meta b/Assets/Scenes/TestUIPanels/TestUILittleTip.unity.meta new file mode 100644 index 00000000..3e4a426f --- /dev/null +++ b/Assets/Scenes/TestUIPanels/TestUILittleTip.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 818d8c3f4f519a24cae4999ba4433a41 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 2aa3890f..b29a2b10 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -27,6 +27,7 @@ public class ActionHelper { "UI3DObjSelect", typeof(QFramework.Example.UI3DObjSelect) }, { "UITextTip", typeof(QFramework.Example.UITextTip) }, { "UITextWindow", typeof(QFramework.Example.UITextWindow) }, + { "UILittleTip", typeof(QFramework.Example.UILittleTip) }, }; diff --git a/Assets/Scripts/Actions/TextWindowAction.cs b/Assets/Scripts/Actions/TextWindowAction.cs index 984f2a07..50a12bbf 100644 --- a/Assets/Scripts/Actions/TextWindowAction.cs +++ b/Assets/Scripts/Actions/TextWindowAction.cs @@ -5,7 +5,6 @@ using QFramework; using System; using QFramework.Example; using System.Linq; -using TreeEditor; public class TextWindowAction : IAction { public ulong ActionID { get; set; } diff --git a/Assets/Scripts/UI/UILittleTip.Designer.cs b/Assets/Scripts/UI/UILittleTip.Designer.cs new file mode 100644 index 00000000..58cf08f6 --- /dev/null +++ b/Assets/Scripts/UI/UILittleTip.Designer.cs @@ -0,0 +1,49 @@ +using System; +using UnityEngine; +using UnityEngine.UI; +using QFramework; + +namespace QFramework.Example +{ + // Generate Id:5a878595-5d0c-407f-8162-40ec24d39988 + public partial class UILittleTip + { + public const string Name = "UILittleTip"; + + [SerializeField] + public TMPro.TextMeshProUGUI Label; + [SerializeField] + public UnityEngine.UI.Button CloseBtn; + + private UILittleTipData mPrivateData = null; + + protected override void ClearUIComponents() + { + Label = null; + CloseBtn = null; + + mData = null; + } + + public UILittleTipData Data + { + get + { + return mData; + } + } + + UILittleTipData mData + { + get + { + return mPrivateData ?? (mPrivateData = new UILittleTipData()); + } + set + { + mUIData = value; + mPrivateData = value; + } + } + } +} diff --git a/Assets/Scripts/UI/UILittleTip.Designer.cs.meta b/Assets/Scripts/UI/UILittleTip.Designer.cs.meta new file mode 100644 index 00000000..7e91ac7b --- /dev/null +++ b/Assets/Scripts/UI/UILittleTip.Designer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f474f38f2ebefe4a97e6c10b0401688 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UILittleTip.cs b/Assets/Scripts/UI/UILittleTip.cs new file mode 100644 index 00000000..14d51bd9 --- /dev/null +++ b/Assets/Scripts/UI/UILittleTip.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using UnityEngine.UI; +using QFramework; + +namespace QFramework.Example +{ + public class UILittleTipData : UIPanelData + { + } + public partial class UILittleTip : UIPanel + { + protected override void OnInit(IUIData uiData = null) + { + mData = uiData as UILittleTipData ?? new UILittleTipData(); + // please add init code here + CloseBtn.onClick.AddListener(() => Hide()); + } + + protected override void OnOpen(IUIData uiData = null) + { + } + + protected override void OnShow() + { + } + + protected override void OnHide() + { + } + + protected override void OnClose() + { + } + } +} diff --git a/Assets/Scripts/UI/UILittleTip.cs.meta b/Assets/Scripts/UI/UILittleTip.cs.meta new file mode 100644 index 00000000..3e71c5d9 --- /dev/null +++ b/Assets/Scripts/UI/UILittleTip.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9735f53c20f49214f82ce98a857f7c36 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UILoading.Designer.cs b/Assets/Scripts/UI/UILoading.Designer.cs index 31cbc4e5..64eb11f8 100644 --- a/Assets/Scripts/UI/UILoading.Designer.cs +++ b/Assets/Scripts/UI/UILoading.Designer.cs @@ -5,11 +5,13 @@ using QFramework; namespace QFramework.Example { - // Generate Id:0cf7907b-fa4f-4136-98bd-0385ff0719f0 + // Generate Id:2c4e0333-8bf3-44db-8e01-bafc76597ccc public partial class UILoading { public const string Name = "UILoading"; + [SerializeField] + public TMPro.TextMeshProUGUI Progress; [SerializeField] public TMPro.TextMeshProUGUI Label; @@ -17,6 +19,7 @@ namespace QFramework.Example protected override void ClearUIComponents() { + Progress = null; Label = null; mData = null; diff --git a/Assets/Scripts/UI/UILoading.cs b/Assets/Scripts/UI/UILoading.cs index e2e08da8..98362203 100644 --- a/Assets/Scripts/UI/UILoading.cs +++ b/Assets/Scripts/UI/UILoading.cs @@ -11,6 +11,7 @@ namespace QFramework.Example } public partial class UILoading : UIPanel { + AsyncOperation ao; protected override void OnInit(IUIData uiData = null) { mData = uiData as UILoadingData ?? new UILoadingData(); @@ -25,13 +26,26 @@ namespace QFramework.Example TypeEventSystem.Global.Register((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject); } + public void SetAsyncOperation(AsyncOperation ao) + { + this.ao = ao; + } protected override void OnOpen(IUIData uiData = null) { //Icon.GetComponent().DORestart(); + Progress.text = ""; } + private void Update() + { + if (ao != null) + { + Progress.text = ao.progress.ToString("P0"); + } + } + protected override void OnShow() { } diff --git a/Assets/Scripts/UI/UIModuleSelect.cs b/Assets/Scripts/UI/UIModuleSelect.cs index f93155b8..d9c7b3b0 100644 --- a/Assets/Scripts/UI/UIModuleSelect.cs +++ b/Assets/Scripts/UI/UIModuleSelect.cs @@ -4,7 +4,6 @@ using QFramework; using TMPro; using UnityEngine.SceneManagement; using System; -using static UnityEditor.Progress; namespace QFramework.Example { @@ -13,7 +12,7 @@ namespace QFramework.Example } public partial class UIModuleSelect : UIPanel { - + AsyncOperation ao; protected override void OnInit(IUIData uiData = null) { mData = uiData as UIModuleSelectData ?? new UIModuleSelectData(); @@ -54,7 +53,8 @@ namespace QFramework.Example Global.Instance.curModule = Global.Instance.appData.Modules[index]; UIKit.OpenPanelAsync(canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => { - SceneManager.LoadSceneAsync(Global.Instance.curModule.Scene, LoadSceneMode.Single); + ao = SceneManager.LoadSceneAsync(Global.Instance.curModule.Scene, LoadSceneMode.Single); + UIKit.GetPanel().SetAsyncOperation(ao); SceneManager.sceneLoaded += OnLoadFinished; }); }); @@ -74,13 +74,10 @@ namespace QFramework.Example // }); //} - - - - } + private void OnLoadFinished(Scene arg0, LoadSceneMode arg1) { SceneManager.sceneLoaded -= OnLoadFinished;