From 7d831dc914e2f24a14e3ec9fe004a65e7a0d1da0 Mon Sep 17 00:00:00 2001 From: AlanDu <652597991@qq.com> Date: Wed, 9 Nov 2022 21:50:47 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E9=A3=98=E5=AD=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=92=8C=E4=BF=A1=E6=81=AF=E6=A1=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/UIForms/UIDialog/UIDialogForm.prefab | 1203 +++++++++++++++++ .../UI/UIForms/UILogin/UILoginForm.prefab | 332 ++++- .../UI/UIForms/UITips/UITipsForm.prefab | 141 +- .../UI/UIForms/UITips/UITipsForm.prefab.meta | 2 +- Assets/Deer/GF/DeerGF.prefab | 3 +- .../Settings/AutoBindGlobalSetting.asset | 8 +- Assets/Deer/Scenes/DeerLauncher.unity | 10 +- .../UIDialogForm.BindComponents.cs | 34 + .../UIDialogForm.BindComponents.cs.meta | 11 + .../UILoginForm.BindComponents.cs | 4 + .../UITipsForm.BindComponents.cs | 8 +- .../UITipsForm.BindComponents.cs.meta | 2 +- .../UI/UIDialog/UIDialogForm.cs | 77 ++ .../UI/UIDialog/UIDialogForm.cs.meta | 11 + .../HotfixBusiness/UI/UILogin/UILoginForm.cs | 46 +- .../HotfixBusiness/UI/UITips/UITipsForm.cs | 70 +- .../UI/UITips/UITipsForm.cs.meta | 2 +- .../Definition/Constant/Constant.UI.cs | 6 + .../LubanConfig/Deer/UIForm_Config.cs | 6 + .../EntityComponentExtension.cs | 3 +- .../Extension/GFExtension/UI/UIExtension.cs | 30 +- .../Extension/GFExtension/UI/UIFixBaseForm.cs | 32 + .../Runtime/Extension/UnityExtension.meta | 8 + .../UnityExtension/WaitForSecondsRealtime.cs | 35 + .../WaitForSecondsRealtime.cs.meta | 11 + .../Runtime/Utils/StringUtils.cs | 176 ++- .../Runtime/Utils/TimeUtils.cs | 37 + .../ComponentAutoBindToolInspector.cs | 9 + .../OverrideUI/CreateUITemplatePrefab.cs | 2 +- .../Runtime/Component/Messenger/IMessenger.cs | 29 + .../Component/Messenger/IMessenger.cs.meta | 3 + .../Component/Messenger/MessengerComponent.cs | 12 +- .../Component/Messenger/MessengerManager.cs | 20 +- .../GFExtension/UI/DeerUIFormHelper.cs | 2 +- .../Runtime/GFExtension/UI/DialogParams.cs | 20 +- .../Main/Runtime/GFExtension/UI/UIBaseForm.cs | 32 +- .../Runtime/GFExtension/UI/UIExtension.cs | 17 +- .../Main/Runtime/Procedure/ProcedureBase.cs | 10 + .../Procedure/ProcedureCheckVersion.cs | 1 + .../Procedure/ProcedureInitResources.cs | 2 + .../Runtime/Procedure/ProcedureLauncher.cs | 1 + .../Procedure/ProcedureLoadAssembly.cs | 2 + .../Main/Runtime/Procedure/ProcedureSplash.cs | 2 + .../Procedure/ProcedureUpdateResources.cs | 2 + LubanTools/DesignerConfigs/.cache.meta | 80 +- .../UIForm_Config.xlsx" | Bin 11215 -> 11443 bytes LubanTools/GenerateDatas/ConfigVersion.xml | 4 +- .../LubanConfig/deer_tbuiform_config.bytes | Bin 171 -> 199 bytes 48 files changed, 2238 insertions(+), 320 deletions(-) create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs.meta create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs.meta create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension.meta create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs create mode 100644 Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs.meta create mode 100644 Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs create mode 100644 Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs.meta diff --git a/Assets/Deer/AssetsHotfix/UI/UIForms/UIDialog/UIDialogForm.prefab b/Assets/Deer/AssetsHotfix/UI/UIForms/UIDialog/UIDialogForm.prefab index e24dffd13..7eb2ee2fc 100644 --- a/Assets/Deer/AssetsHotfix/UI/UIForms/UIDialog/UIDialogForm.prefab +++ b/Assets/Deer/AssetsHotfix/UI/UIForms/UIDialog/UIDialogForm.prefab @@ -1,5 +1,1058 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2707056681865835833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6149183136452916642} + - component: {fileID: 3858273961064112140} + - component: {fileID: 6352110728777937294} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6149183136452916642 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707056681865835833} + 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: 3917206242537176119} + m_RootOrder: 1 + 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: 600, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3858273961064112140 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707056681865835833} + m_CullTransparentMesh: 1 +--- !u!114 &6352110728777937294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707056681865835833} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 835ae3f75c353da4c8911d3744173aa1, 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!1 &3160646576729721110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5095662874428797085} + - component: {fileID: 2923422463187740160} + - component: {fileID: 4290317229756065470} + m_Layer: 0 + m_Name: TxtM_Tilte + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5095662874428797085 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160646576729721110} + 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: 3917206242537176119} + m_RootOrder: 3 + 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: 162} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2923422463187740160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160646576729721110} + m_CullTransparentMesh: 1 +--- !u!114 &4290317229756065470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160646576729721110} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u63D0\u793A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} + m_sharedMaterial: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, 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: 36 + m_fontSizeBase: 36 + 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!1 &5936655168179277267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4619395897465239818} + - component: {fileID: 4079747327496883049} + m_Layer: 5 + m_Name: BtnGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4619395897465239818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936655168179277267} + 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: 361684327817806207} + - {fileID: 7971465326589705999} + - {fileID: 42070715123592776} + m_Father: {fileID: 3917206242537176119} + m_RootOrder: 4 + 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: -2.491, y: -151} + m_SizeDelta: {x: 542.943, y: 64.211} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4079747327496883049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5936655168179277267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &6728887513018776847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9165246051686505295} + - component: {fileID: 2746588705913890281} + - component: {fileID: 3758429696477274892} + m_Layer: 0 + m_Name: TxtM_Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9165246051686505295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728887513018776847} + 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: 3917206242537176119} + m_RootOrder: 2 + 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: 428.47, y: 216.01} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2746588705913890281 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728887513018776847} + m_CullTransparentMesh: 1 +--- !u!114 &3758429696477274892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728887513018776847} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u8FD9\u662F\u63D0\u793A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} + m_sharedMaterial: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, 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: 36 + m_fontSizeBase: 36 + 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!1 &7584636157969217134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 258776312105467690} + - component: {fileID: 3908242238901516531} + - component: {fileID: 3464834107250345156} + - component: {fileID: 2521580241983892280} + m_Layer: 0 + m_Name: Btn_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &258776312105467690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7584636157969217134} + 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: 3917206242537176119} + m_RootOrder: 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 &3908242238901516531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7584636157969217134} + m_CullTransparentMesh: 1 +--- !u!114 &3464834107250345156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7584636157969217134} + 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: 0 + 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!114 &2521580241983892280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7584636157969217134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, 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: 3464834107250345156} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_ButtonUISounds: + - ButtonSoundAssetType: 0 + ButtonSoundType: 2 + ButtonUISoundName: ui_click_button + m_CanClick: 1 + m_CanDoubleClick: 0 + m_DoubleClickIntervalTime: 0.1 + onDoubleClick: + m_PersistentCalls: + m_Calls: [] + m_CanLongPress: 0 + m_ResponseOnceByPress: 0 + m_LongPressDurationTime: 1 + onPress: + m_PersistentCalls: + m_Calls: [] +--- !u!1001 &833839935208513288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4619395897465239818} + m_Modifications: + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: TxtM_Other + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: Btn_Other + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.b + value: 0.04150939 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.g + value: 0.04150939 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_text + value: Other + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} +--- !u!224 &42070715123592776 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 833839935208513288} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1313210056763505360 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 833839935208513288} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8137680999250417736 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 833839935208513288} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1009905749367205951 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4619395897465239818} + m_Modifications: + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: TxtM_Sure + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: Btn_Sure + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.b + value: 0.31132078 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.g + value: 0.31132078 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.r + value: 0.31132078 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_text + value: "\u786E\u5B9A" + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} +--- !u!224 &361684327817806207 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 1009905749367205951} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1704884569612785127 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 1009905749367205951} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8466586075757754239 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 1009905749367205951} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &7324901855194566223 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4619395897465239818} + m_Modifications: + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: TxtM_Cancel + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: Btn_Cancel + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.b + value: 0.59816664 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.g + value: 0.59816664 + objectReference: {fileID: 0} + - target: {fileID: 2357588626457733434, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Color.r + value: 0.6132076 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_text + value: "\u53D6\u6D88" + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} +--- !u!114 &2223647563953719567 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 7324901855194566223} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7971465326589705999 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 7324901855194566223} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8938616098924817303 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 7324901855194566223} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8956922524992915343 PrefabInstance: m_ObjectHideFlags: 0 @@ -103,9 +1156,159 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2978764950009300892, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_CodePath + value: D:/Working/GitHub/Owner/MasterGame/FlyOutSpace/Assets/Deer/Scripts/HotFix/HotFixBusiness/UI/BindComponents + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_ClassName + value: UIDialogForm + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[0] + value: + objectReference: {fileID: 2521580241983892280} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[1] + value: + objectReference: {fileID: 3758429696477274892} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[2] + value: + objectReference: {fileID: 4290317229756065470} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[3] + value: + objectReference: {fileID: 1704884569612785127} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[4] + value: + objectReference: {fileID: 8466586075757754239} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[5] + value: + objectReference: {fileID: 8938616098924817303} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[6] + value: + objectReference: {fileID: 2223647563953719567} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[7] + value: + objectReference: {fileID: 1313210056763505360} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: m_BindComs.Array.data[8] + value: + objectReference: {fileID: 8137680999250417736} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[0].Name + value: Btn_bg + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[1].Name + value: TxtM_Content + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[2].Name + value: TxtM_Tilte + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[3].Name + value: Btn_Sure + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[4].Name + value: TxtM_Sure + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[5].Name + value: Btn_Cancel + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[6].Name + value: TxtM_Cancel + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[7].Name + value: Btn_Other + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[8].Name + value: TxtM_Other + objectReference: {fileID: 0} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[0].BindCom + value: + objectReference: {fileID: 2521580241983892280} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[1].BindCom + value: + objectReference: {fileID: 3758429696477274892} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[2].BindCom + value: + objectReference: {fileID: 4290317229756065470} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[3].BindCom + value: + objectReference: {fileID: 1704884569612785127} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[4].BindCom + value: + objectReference: {fileID: 8466586075757754239} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[5].BindCom + value: + objectReference: {fileID: 8938616098924817303} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[6].BindCom + value: + objectReference: {fileID: 2223647563953719567} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[7].BindCom + value: + objectReference: {fileID: 1313210056763505360} + - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + propertyPath: BindDatas.Array.data[8].BindCom + value: + objectReference: {fileID: 8137680999250417736} - target: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_Name value: UIDialogForm objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} +--- !u!1 &65910635776408172 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + m_PrefabInstance: {fileID: 8956922524992915343} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2873307185811644455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65910635776408172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cf55e0256e785f45ab6161f1408c362, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &3917206242537176119 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5337284280437128120, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + m_PrefabInstance: {fileID: 8956922524992915343} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Deer/AssetsHotfix/UI/UIForms/UILogin/UILoginForm.prefab b/Assets/Deer/AssetsHotfix/UI/UIForms/UILogin/UILoginForm.prefab index f02e86c2c..b57b13715 100644 --- a/Assets/Deer/AssetsHotfix/UI/UIForms/UILogin/UILoginForm.prefab +++ b/Assets/Deer/AssetsHotfix/UI/UIForms/UILogin/UILoginForm.prefab @@ -35,7 +35,7 @@ RectTransform: 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: 27} + m_AnchoredPosition: {x: 0, y: -47} m_SizeDelta: {x: 599.664, y: 252.983} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &185500824502062227 @@ -111,7 +111,7 @@ RectTransform: 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: 361} + m_AnchoredPosition: {x: 0, y: 216} m_SizeDelta: {x: 540, y: 258} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &441674738861497021 @@ -222,7 +222,139 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1001 &1226050220465652983 +--- !u!1001 &444984657232135489 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1495174404976755347} + m_Modifications: + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.x + value: -292 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -226 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: Btn_UIButtonTestTips + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_text + value: "\u98D8\u5B57\u63D0\u793A" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} +--- !u!114 &2272056830402928793 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 444984657232135489} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2140342571449541484 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -359,10 +491,10 @@ PrefabInstance: objectReference: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} ---- !u!114 &623993447138566447 stripped +--- !u!114 &296981030997182132 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} - m_PrefabInstance: {fileID: 1226050220465652983} + m_PrefabInstance: {fileID: 2140342571449541484} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -370,7 +502,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &2140342571449541484 +--- !u!1001 &5042474672100513554 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -387,7 +519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 7 objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_AnchorMax.x @@ -413,6 +545,18 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 60 objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -443,11 +587,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_AnchoredPosition.x - value: 236 + value: -475.99927 objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_AnchoredPosition.y - value: -245 + value: -226 objectReference: {fileID: 0} - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -467,30 +611,22 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_Name - value: Btn_Login1 + value: Btn_UIButtonTestDialog objectReference: {fileID: 0} - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} propertyPath: m_text - value: Button1 + value: "\u63D0\u793A\u6846" objectReference: {fileID: 0} - - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} - - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} ---- !u!114 &296981030997182132 stripped +--- !u!114 &6652211827789542090 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} - m_PrefabInstance: {fileID: 2140342571449541484} + m_PrefabInstance: {fileID: 5042474672100513554} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -627,11 +763,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.size - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.size - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[0] @@ -640,11 +776,11 @@ PrefabInstance: - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[1] value: - objectReference: {fileID: 623993447138566447} + objectReference: {fileID: 296981030997182132} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[2] value: - objectReference: {fileID: 296981030997182132} + objectReference: {fileID: 8717440560290829610} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[3] value: @@ -660,11 +796,11 @@ PrefabInstance: - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[6] value: - objectReference: {fileID: 0} + objectReference: {fileID: 2272056830402928793} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[7] value: - objectReference: {fileID: 0} + objectReference: {fileID: 6652211827789542090} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[0].Name value: RImg_bg @@ -691,11 +827,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[6].Name - value: Btn_UIButtonTes22 + value: Btn_UIButtonTestTips objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[7].Name - value: Btn_UIButtonTes333 + value: Btn_UIButtonTestDialog objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[0].BindCom @@ -704,11 +840,11 @@ PrefabInstance: - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[1].BindCom value: - objectReference: {fileID: 623993447138566447} + objectReference: {fileID: 296981030997182132} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[2].BindCom value: - objectReference: {fileID: 296981030997182132} + objectReference: {fileID: 8717440560290829610} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[3].BindCom value: @@ -724,11 +860,11 @@ PrefabInstance: - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[6].BindCom value: - objectReference: {fileID: 0} + objectReference: {fileID: 2272056830402928793} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[7].BindCom value: - objectReference: {fileID: 0} + objectReference: {fileID: 6652211827789542090} - target: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_Name value: UILoginForm @@ -757,6 +893,134 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e1b8f2ce3f0f146478bc5b2de74aa9f9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7012529678767304946 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1495174404976755347} + m_Modifications: + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 236 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -245 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 794623751391031616, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 856699967206211115, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_Name + value: Btn_Login1 + objectReference: {fileID: 0} + - target: {fileID: 1635818207794938138, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_text + value: Button1 + objectReference: {fileID: 0} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} + - target: {fileID: 8898194497509721920, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} +--- !u!114 &8717440560290829610 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1849590308757087704, guid: 6a059a129e1575d4fb9a6b8abce19c6e, type: 3} + m_PrefabInstance: {fileID: 7012529678767304946} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0a3aa0c9331dc641a6585dbabb1860d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8249607507218526774 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab b/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab index ee3de46ff..8b566913a 100644 --- a/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab +++ b/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5254125711986349810 +--- !u!1 &5118924133471757589 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,31 +8,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2553902914851750832} - - component: {fileID: 7338759088522190349} - - component: {fileID: 1880799604274769654} - - component: {fileID: 5392727725053885990} - - component: {fileID: 3888401132493995834} + - component: {fileID: 3545524520877106917} + - component: {fileID: 6800335094015580398} + - component: {fileID: 1193780717397951429} + - component: {fileID: 8317707825251644697} + - component: {fileID: 3809325514248566122} m_Layer: 0 - m_Name: Img_Gg + m_Name: Img_bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2553902914851750832 +--- !u!224 &3545524520877106917 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5254125711986349810} + m_GameObject: {fileID: 5118924133471757589} 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: 7453607739936132305} - m_Father: {fileID: 2737274998591281624} + - {fileID: 5763350548784992569} + m_Father: {fileID: 1829702113648846121} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -40,35 +41,35 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7338759088522190349 +--- !u!222 &6800335094015580398 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5254125711986349810} + m_GameObject: {fileID: 5118924133471757589} m_CullTransparentMesh: 1 ---- !u!114 &1880799604274769654 +--- !u!114 &1193780717397951429 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5254125711986349810} + m_GameObject: {fileID: 5118924133471757589} 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_Color: {r: 0.68679386, g: 1, b: 0.56981134, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 22b4e5426f1451446b6f2f1a168db759, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -78,23 +79,23 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5392727725053885990 +--- !u!114 &8317707825251644697 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5254125711986349810} + m_GameObject: {fileID: 5118924133471757589} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 - m_Right: 30 - m_Top: 10 - m_Bottom: 10 + m_Left: 20 + m_Right: 20 + m_Top: 20 + m_Bottom: 20 m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -104,13 +105,13 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &3888401132493995834 +--- !u!114 &3809325514248566122 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5254125711986349810} + m_GameObject: {fileID: 5118924133471757589} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} @@ -118,7 +119,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &7920500856640275832 +--- !u!1 &6776182910483645457 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,50 +127,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7453607739936132305} - - component: {fileID: 1589448218714480199} - - component: {fileID: 3606470311295519607} + - component: {fileID: 5763350548784992569} + - component: {fileID: 8091562493284094179} + - component: {fileID: 7583185083888701103} + - component: {fileID: 3409495151912676679} m_Layer: 0 - m_Name: TxtM_Tip + m_Name: TxtM_Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7453607739936132305 +--- !u!224 &5763350548784992569 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7920500856640275832} + m_GameObject: {fileID: 6776182910483645457} 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: 2553902914851750832} + m_Father: {fileID: 3545524520877106917} m_RootOrder: 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_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1589448218714480199 +--- !u!222 &8091562493284094179 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7920500856640275832} + m_GameObject: {fileID: 6776182910483645457} m_CullTransparentMesh: 1 ---- !u!114 &3606470311295519607 +--- !u!114 &7583185083888701103 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7920500856640275832} + m_GameObject: {fileID: 6776182910483645457} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -183,17 +186,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u6D4B\u8BD5\u6587\u5B57" + m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a21c7a47aeaa4e84a858477c407e18e8, type: 2} - m_sharedMaterial: {fileID: -3790260210900978515, guid: a21c7a47aeaa4e84a858477c407e18e8, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3c31266dd0ae57c468b36845e0397b6a, type: 2} + m_sharedMaterial: {fileID: -7329235810595381452, guid: 3c31266dd0ae57c468b36845e0397b6a, 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} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -210,8 +213,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 46 - m_fontSizeBase: 46 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -252,7 +255,21 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1001 &8065127648938713696 +--- !u!114 &3409495151912676679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6776182910483645457} + 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!1001 &6013923600068320913 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -374,52 +391,52 @@ PrefabInstance: - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[0] value: - objectReference: {fileID: 1880799604274769654} + objectReference: {fileID: 1193780717397951429} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_BindComs.Array.data[1] value: - objectReference: {fileID: 3606470311295519607} + objectReference: {fileID: 7583185083888701103} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[0].Name - value: Img_Gg + value: Img_bg objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[1].Name - value: TxtM_Tip + value: TxtM_Content objectReference: {fileID: 0} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[0].BindCom value: - objectReference: {fileID: 1880799604274769654} + objectReference: {fileID: 1193780717397951429} - target: {fileID: 3573344967156380309, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: BindDatas.Array.data[1].BindCom value: - objectReference: {fileID: 3606470311295519607} + objectReference: {fileID: 7583185083888701103} - target: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} propertyPath: m_Name value: UITipsForm objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} ---- !u!1 &1390026886827401091 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} - m_PrefabInstance: {fileID: 8065127648938713696} - m_PrefabAsset: {fileID: 0} ---- !u!224 &2737274998591281624 stripped +--- !u!224 &1829702113648846121 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5337284280437128120, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} - m_PrefabInstance: {fileID: 8065127648938713696} + m_PrefabInstance: {fileID: 6013923600068320913} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3446088716019540850 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8982228020252818915, guid: ee434b8e75f92804ca01e3be759e7c7f, type: 3} + m_PrefabInstance: {fileID: 6013923600068320913} m_PrefabAsset: {fileID: 0} ---- !u!114 &7052841048988979216 +--- !u!114 &-9128087926297871450 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390026886827401091} + m_GameObject: {fileID: 3446088716019540850} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 000441eafe674fe489c30245e0f82bbf, type: 3} + m_Script: {fileID: 11500000, guid: cf9dbcb325945f14e9acc7e082228a67, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab.meta b/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab.meta index 24d63ee75..19c57ffbc 100644 --- a/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab.meta +++ b/Assets/Deer/AssetsHotfix/UI/UIForms/UITips/UITipsForm.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8ef5ceb1a2ffc5746b20f818db0d36c6 +guid: b5b6e5e5b63377b4e9b3556b6812194d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Deer/GF/DeerGF.prefab b/Assets/Deer/GF/DeerGF.prefab index be1f779d8..2b2b4dadb 100644 --- a/Assets/Deer/GF/DeerGF.prefab +++ b/Assets/Deer/GF/DeerGF.prefab @@ -78,7 +78,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} + m_ReferenceResolution: {x: 1334, y: 750} m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -179,6 +179,7 @@ MonoBehaviour: m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!1 &2161921270028258405 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Deer/Resources/Settings/AutoBindGlobalSetting.asset b/Assets/Deer/Resources/Settings/AutoBindGlobalSetting.asset index 4d0116486..d7661ab82 100644 --- a/Assets/Deer/Resources/Settings/AutoBindGlobalSetting.asset +++ b/Assets/Deer/Resources/Settings/AutoBindGlobalSetting.asset @@ -66,11 +66,11 @@ MonoBehaviour: FullName: Dropdown - Prefixe: USpriteAni FullName: UGUISpriteAnimation - - Prefixe: VGridV + - Prefixe: VGridS FullName: LoopGridView - - Prefixe: HGridV + - Prefixe: HGridS FullName: LoopGridView - - Prefixe: VListV + - Prefixe: VListS FullName: LoopListView2 - - Prefixe: HListV + - Prefixe: HListS FullName: LoopListView2 diff --git a/Assets/Deer/Scenes/DeerLauncher.unity b/Assets/Deer/Scenes/DeerLauncher.unity index 55c69c197..b1a40bacf 100644 --- a/Assets/Deer/Scenes/DeerLauncher.unity +++ b/Assets/Deer/Scenes/DeerLauncher.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -130,14 +130,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3697501985222841089, guid: 0c010b67b5d150b45a764cb66e2e007a, type: 3} - propertyPath: m_EditorResourceMode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3697501985222841479, guid: 0c010b67b5d150b45a764cb66e2e007a, type: 3} - propertyPath: m_ResourceMode - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5402190822736383794, guid: 0c010b67b5d150b45a764cb66e2e007a, type: 3} propertyPath: m_Name value: DeerGF diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs new file mode 100644 index 000000000..11b068918 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs @@ -0,0 +1,34 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace HotfixBusiness.UI +{ + public partial class UIDialogForm + { + private UIButtonSuper m_Btn_bg; + private TextMeshProUGUI m_TxtM_Content; + private TextMeshProUGUI m_TxtM_Tilte; + private UIButtonSuper m_Btn_Sure; + private TextMeshProUGUI m_TxtM_Sure; + private UIButtonSuper m_Btn_Cancel; + private TextMeshProUGUI m_TxtM_Cancel; + private UIButtonSuper m_Btn_Other; + private TextMeshProUGUI m_TxtM_Other; + + private void GetBindComponents(GameObject go) + { + ComponentAutoBindTool autoBindTool = go.GetComponent(); + + m_Btn_bg = autoBindTool.GetBindComponent(0); + m_TxtM_Content = autoBindTool.GetBindComponent(1); + m_TxtM_Tilte = autoBindTool.GetBindComponent(2); + m_Btn_Sure = autoBindTool.GetBindComponent(3); + m_TxtM_Sure = autoBindTool.GetBindComponent(4); + m_Btn_Cancel = autoBindTool.GetBindComponent(5); + m_TxtM_Cancel = autoBindTool.GetBindComponent(6); + m_Btn_Other = autoBindTool.GetBindComponent(7); + m_TxtM_Other = autoBindTool.GetBindComponent(8); + } + } +} diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs.meta b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs.meta new file mode 100644 index 000000000..780c2f2d3 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UIDialogForm.BindComponents.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c53aeb168dbf5ef4c943d1f16a1093fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UILoginForm.BindComponents.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UILoginForm.BindComponents.cs index ecdfb69e8..4b93c28c9 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UILoginForm.BindComponents.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UILoginForm.BindComponents.cs @@ -12,6 +12,8 @@ public partial class UILoginForm private UIButtonSuper m_Btn_UIButtonTest; private Image m_Img_Icon; private RawImage m_RImg_NetImage; + private UIButtonSuper m_Btn_UIButtonTestTips; + private UIButtonSuper m_Btn_UIButtonTestDialog; private void GetBindComponents(GameObject go) { @@ -23,6 +25,8 @@ private void GetBindComponents(GameObject go) m_Btn_UIButtonTest = autoBindTool.GetBindComponent(3); m_Img_Icon = autoBindTool.GetBindComponent(4); m_RImg_NetImage = autoBindTool.GetBindComponent(5); + m_Btn_UIButtonTestTips = autoBindTool.GetBindComponent(6); + m_Btn_UIButtonTestDialog = autoBindTool.GetBindComponent(7); } } } diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs index 44be04115..1b54e3307 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs @@ -7,15 +7,15 @@ namespace HotfixBusiness.UI { public partial class UITipsForm { - private Image m_Img_Gg; - private TextMeshProUGUI m_TxtM_Tip; + private Image m_Img_bg; + private TextMeshProUGUI m_TxtM_Content; private void GetBindComponents(GameObject go) { ComponentAutoBindTool autoBindTool = go.GetComponent(); - m_Img_Gg = autoBindTool.GetBindComponent(0); - m_TxtM_Tip = autoBindTool.GetBindComponent(1); + m_Img_bg = autoBindTool.GetBindComponent(0); + m_TxtM_Content = autoBindTool.GetBindComponent(1); } } } diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs.meta b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs.meta index 3280cd63b..702feb81b 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs.meta +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/BindComponents/UITipsForm.BindComponents.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee158f042b7e1244fb22246837cb89a9 +guid: c4343b70e6c1e9e43beb9a3bf8c09190 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs new file mode 100644 index 000000000..63e0633c4 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs @@ -0,0 +1,77 @@ +// ================================================ +//描 述: +//作 者:AlanDu +//创建时间:2022-10-29 18-37-27 +//修改作者:AlanDu +//修改时间:2022-10-29 19-25-45 +//版 本:0.1 +// =============================================== + +using HotfixFramework.Runtime; +using Main.Runtime; + +namespace HotfixBusiness.UI +{ + /// + /// Please modify the description. + /// + public partial class UIDialogForm : UIFixBaseForm + { + private DialogParams m_DialogParams; + protected override void OnInit(object userData) { + base.OnInit(userData); + GetBindComponents(gameObject); + +/*--------------------Auto generate start button listener.Do not modify!--------------------*/ + m_Btn_bg.onClick.AddListener(Btn_bgEvent); + m_Btn_Sure.onClick.AddListener(Btn_SureEvent); + m_Btn_Cancel.onClick.AddListener(Btn_CancelEvent); + m_Btn_Other.onClick.AddListener(Btn_OtherEvent); +/*--------------------Auto generate end button listener.Do not modify!----------------------*/ + } + + protected override void OnOpen(object userData) + { + base.OnOpen(userData); + m_DialogParams = (DialogParams)userData; + if (m_DialogParams == null) + { + Close(); + return; + } + m_TxtM_Tilte.text = m_DialogParams.Title; + m_TxtM_Content.text = m_DialogParams.Message; + m_TxtM_Sure.text = m_DialogParams.ConfirmText; + m_TxtM_Cancel.text = m_DialogParams.CancelText; + m_TxtM_Other.text = m_DialogParams.OtherText; + m_Btn_Sure.gameObject.SetActive(m_DialogParams.Mode >= 1); + m_Btn_Cancel.gameObject.SetActive(m_DialogParams.Mode >= 2); + m_Btn_Other.gameObject.SetActive(m_DialogParams.Mode >= 3); + } + + private void Btn_bgEvent() + { + m_DialogParams.OnClickBackground?.Invoke(m_DialogParams.UserData); + Close(); + } + + private void Btn_SureEvent() + { + m_DialogParams.OnClickConfirm?.Invoke(m_DialogParams.UserData); + Close(); + } + + private void Btn_CancelEvent() + { + m_DialogParams.OnClickCancel?.Invoke(m_DialogParams.UserData); + Close(); + } + + private void Btn_OtherEvent() + { + m_DialogParams.OnClickOther?.Invoke(m_DialogParams.UserData); + Close(); + } +/*--------------------Auto generate footer.Do not add anything below the footer!------------*/ + } +} diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs.meta b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs.meta new file mode 100644 index 000000000..96a030abc --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UIDialog/UIDialogForm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7cf55e0256e785f45ab6161f1408c362 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UILogin/UILoginForm.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UILogin/UILoginForm.cs index bbbf58729..02fe18f57 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UILogin/UILoginForm.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UILogin/UILoginForm.cs @@ -1,13 +1,14 @@ -// ================================================ +// ================================================ //描 述: //作 者:杜鑫 //创建时间:2022-06-18 00-19-22 -//修改作者:杜鑫 -//修改时间:2022-06-18 00-19-22 +//修改作者:AlanDu +//修改时间:2022-11-09 21-26-27 //版 本:0.1 // =============================================== using HotfixBusiness.Procedure; using HotfixFramework.Runtime; +using Main.Runtime; using UnityGameFramework.Runtime; namespace HotfixBusiness.UI @@ -22,9 +23,11 @@ protected override void OnInit(object userData) { GetBindComponents(gameObject); /*--------------------Auto generate start button listener.Do not modify!--------------------*/ - m_Btn_Login.onClick.AddListener(Btn_LoginEvent); - m_Btn_Login1.onClick.AddListener(Btn_Login1Event); - m_Btn_UIButtonTest.onClick.AddListener(Btn_UIButtonTestEvent); + m_Btn_Login.onClick.AddListener(Btn_LoginEvent); + m_Btn_Login1.onClick.AddListener(Btn_Login1Event); + m_Btn_UIButtonTest.onClick.AddListener(Btn_UIButtonTestEvent); + m_Btn_UIButtonTestTips.onClick.AddListener(Btn_UIButtonTestTipsEvent); + m_Btn_UIButtonTestDialog.onClick.AddListener(Btn_UIButtonTestDialogEvent); /*--------------------Auto generate end button listener.Do not modify!----------------------*/ m_RImg_bg.SetTexture(AssetUtility.UI.GetTexturePath("loading_bg")); m_Img_Icon.SetSprite(AssetUtility.UI.GetSpriteCollectionPath("Icon"),AssetUtility.UI.GetSpritePath("Icon/Icon")); @@ -38,6 +41,33 @@ private void Btn_LoginEvent() } private void Btn_Login1Event(){} private void Btn_UIButtonTestEvent(){} + + private void Btn_UIButtonTestTipsEvent() + { + GameEntry.UI.OpenTips("哈喽，我是飘字提示！！！"); + } + + private void Btn_UIButtonTestDialogEvent() + { + DialogParams dialogParams = new DialogParams(); + dialogParams.Mode = 2; + dialogParams.ConfirmText = "确定"; + dialogParams.CancelText = "取消"; + dialogParams.OnClickConfirm = delegate(object o) + { + GameEntry.UI.OpenTips("害，你点击了确定！"); + }; + dialogParams.OnClickCancel = delegate(object o) + { + GameEntry.UI.OpenTips("害，你点击了取消！"); + }; + dialogParams.OnClickBackground = delegate(object o) + { + GameEntry.UI.OpenTips("害，你点击了背景！"); + }; + dialogParams.Message = $"哈喽，我是提示信息框！！！"; + GameEntry.UI.OpenDialog(dialogParams); + } /*--------------------Auto generate footer.Do not add anything below the footer!------------*/ - } -} \ No newline at end of file + } +} diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs index ecb07cabc..4455c4f28 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs @@ -1,53 +1,51 @@ // ================================================ //描 述: //作 者:AlanDu -//创建时间:2022-09-28 10-35-13 +//创建时间:2022-10-29 17-28-58 //修改作者:AlanDu -//修改时间:2022-09-28 10-35-13 +//修改时间:2022-10-29 17-28-58 //版 本:0.1 // =============================================== using HotfixFramework.Runtime; using System.Collections; using System.Collections.Generic; -using UnityEngine; using DG.Tweening; -using GameFramework; +using UnityEngine; namespace HotfixBusiness.UI { - /// - /// 飘字提示框 - /// 温馨提示：参数一 显示内容 参数二 文本颜色 参数三 背景是否打开 默认为开启 - /// - public partial class UITipsForm : UIFixBaseForm - { - protected override void OnInit(object userData) - { - base.OnInit(userData); - GetBindComponents(gameObject); - } + /// + /// Please modify the description. + /// + public partial class UITipsForm : UIFixBaseForm + { + protected override void OnInit(object userData) { + base.OnInit(userData); + GetBindComponents(gameObject); - protected override void OnOpen(object userData) - { - base.OnOpen(userData); +/*--------------------Auto generate start button listener.Do not modify!--------------------*/ +/*--------------------Auto generate end button listener.Do not modify!----------------------*/ + } - MessengerInfo info = userData as MessengerInfo; - //每次打开之前初始化一下位置 - m_Img_Gg.rectTransform.anchoredPosition = Vector2.zero; - //背景是否打开 - m_Img_Gg.enabled = info.param3 == null ? true : (bool)info.param3; - //显示的内容 - m_TxtM_Tip.text = info.param1.ToString(); - //颜色 - m_TxtM_Tip.color = info.param2 == null ? Color.white : (Color)(info.param2); - //移动 - m_Img_Gg.rectTransform.DOLocalMoveY(200, 1).onComplete += () => - { - //当前关闭方法底层左右渐变消失的效果 - Close(); - }; - ReferencePool.Release(info); - } - } + protected override void OnOpen(object userData) + { + base.OnOpen(userData); + MessengerInfo info = (MessengerInfo)userData; + if (info == null) + { + Close(); + return; + } + m_Img_bg.transform.localPosition = Vector3.zero; + string tips = info.param1.ToString(); + Color color = (Color)info.param2; + bool isOpenBg = (bool)info.param3; + m_TxtM_Content.text = tips; + m_TxtM_Content.color = color; + m_Img_bg.enabled = isOpenBg; + m_Img_bg.transform.DOMoveY(3, 1f).OnComplete(Close); + } + /*--------------------Auto generate footer.Do not add anything below the footer!------------*/ + } } diff --git a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs.meta b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs.meta index cd916e820..d8375c2c0 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs.meta +++ b/Assets/Deer/Scripts/Hotfix/HotfixBusiness/UI/UITips/UITipsForm.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 000441eafe674fe489c30245e0f82bbf +guid: cf9dbcb325945f14e9acc7e082228a67 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Deer/Scripts/Hotfix/HotfixCommon/Definition/Constant/Constant.UI.cs b/Assets/Deer/Scripts/Hotfix/HotfixCommon/Definition/Constant/Constant.UI.cs index 7c8fd8e7b..e06db33d3 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixCommon/Definition/Constant/Constant.UI.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixCommon/Definition/Constant/Constant.UI.cs @@ -22,6 +22,12 @@ public static class UI {"PopUI",500 }, {"Guide",600 }, }; + public enum UIFormType + { + MainForm = 1, + SubForm = 2, + ComSubForm = 3, + } } } diff --git a/Assets/Deer/Scripts/Hotfix/HotfixCommon/LubanConfig/Deer/UIForm_Config.cs b/Assets/Deer/Scripts/Hotfix/HotfixCommon/LubanConfig/Deer/UIForm_Config.cs index 963e72fed..ac649e90b 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixCommon/LubanConfig/Deer/UIForm_Config.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixCommon/LubanConfig/Deer/UIForm_Config.cs @@ -18,6 +18,7 @@ public sealed partial class UIForm_Config : Bright.Config.BeanBase public UIForm_Config(ByteBuf _buf) { Id = _buf.ReadInt(); + FormType = _buf.ReadInt(); AssetName = _buf.ReadString(); UiGroupName = _buf.ReadString(); AllowMultiInstance = _buf.ReadBool(); @@ -35,6 +36,10 @@ public static UIForm_Config DeserializeUIForm_Config(ByteBuf _buf) /// public int Id { get; private set; } /// + /// 界面类型 + /// + public int FormType { get; private set; } + /// /// 资源名字 /// public string AssetName { get; private set; } @@ -67,6 +72,7 @@ public override string ToString() { return "{ " + "Id:" + Id + "," + + "FormType:" + FormType + "," + "AssetName:" + AssetName + "," + "UiGroupName:" + UiGroupName + "," + "AllowMultiInstance:" + AllowMultiInstance + "," diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/ComponentExtension/EntityComponentExtension.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/ComponentExtension/EntityComponentExtension.cs index fdb91e20a..992d59eed 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/ComponentExtension/EntityComponentExtension.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/ComponentExtension/EntityComponentExtension.cs @@ -49,6 +49,7 @@ public static void ShowEntity(this EntityComponent entityComponent, Type logicTy public static int GenEntityId(this EntityComponent entityComponent) { - return m_SerialId++; + m_SerialId++; + return m_SerialId; } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIExtension.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIExtension.cs index a5dc81035..19aea8c64 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIExtension.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIExtension.cs @@ -165,7 +165,19 @@ public static void CloseUIForm(this UIComponent uiComponent, UIBaseForm uiForm) return null; } - string assetName = AssetUtility.UI.GetUIFormAsset(uIForm_Config.AssetName); + string assetName = string.Empty; + switch (uIForm_Config.FormType) + { + case (int)Constant.UI.UIFormType.MainForm: + assetName = AssetUtility.UI.GetUIFormAsset(uIForm_Config.AssetName); + break; + case (int)Constant.UI.UIFormType.SubForm: + assetName = AssetUtility.UI.GetUISubFormAsset(uIForm_Config.AssetName); + break; + case (int)Constant.UI.UIFormType.ComSubForm: + assetName = AssetUtility.UI.GetUIComSubFormAsset(uIForm_Config.AssetName); + break; + } if (!uIForm_Config.AllowMultiInstance) { if (uiComponent.IsLoadingUIForm(assetName)) @@ -184,14 +196,7 @@ public static void CloseUIForm(this UIComponent uiComponent, UIBaseForm uiForm) public static void OpenDialog(this UIComponent uiComponent, DialogParams dialogParams) { - if (((ProcedureBase)GameEntry.Procedure.CurrentProcedure).UseNativeDialog) - { - OpenNativeDialog(dialogParams); - } - else - { - uiComponent.OpenUIForm(UIFormId.DialogForm, dialogParams); - } + uiComponent.OpenUIForm(UIFormId.DialogForm, dialogParams); } /// /// 打开飘字提示框 @@ -202,17 +207,12 @@ public static void OpenDialog(this UIComponent uiComponent, DialogParams dialogP /// 背景框（默认打开） public static void OpenTips(this UIComponent uIComponent, string tips, Color? color = null, bool openBg = true) { - MessengerInfo info = ReferencePool.Acquire(); info.param1 = tips; - info.param2 = color == null ? Color.white : color; + info.param2 = color ?? Color.white; info.param3 = openBg; uIComponent.OpenUIForm(UIFormId.UITipsForm, info); } - private static void OpenNativeDialog(DialogParams dialogParams) - { - throw new System.NotImplementedException("OpenNativeDialog"); - } } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIFixBaseForm.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIFixBaseForm.cs index 8dd038365..f3a4212eb 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIFixBaseForm.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/GFExtension/UI/UIFixBaseForm.cs @@ -6,7 +6,10 @@ //修改时间:2022-06-17 15-41-52 //版 本:0.1 // =============================================== + +using System.Collections.Generic; using Main.Runtime; +using UnityEngine; namespace HotfixFramework.Runtime { /// @@ -14,6 +17,35 @@ namespace HotfixFramework.Runtime { /// public class UIFixBaseForm : UIBaseForm { + protected Dictionary OpenSubFormSerialIds = new Dictionary(); + protected void OpenSubForm(UIFormId uiFormId, object userData = null) + { + int serialId = (int)GameEntry.UI.OpenUIForm(uiFormId, userData); + OpenSubFormSerialIds.Add(uiFormId,serialId); + } + + protected int GetSubFormSerialId(UIFormId uiFormId) + { + foreach (var openSubForm in OpenSubFormSerialIds) + { + return openSubForm.Value; + } + + return 0; + } + protected override void OnClose(bool isShutdown, object userData) + { + base.OnClose(isShutdown, userData); + //Debug.Log($"OpenSubFormSerialIds:{OpenSubFormSerialIds.Count}"); + foreach (var openSubForm in OpenSubFormSerialIds) + { + if (GameEntry.UI.HasUIForm(openSubForm.Value)) + { + GameEntry.UI.CloseUIForm(openSubForm.Value); + } + } + OpenSubFormSerialIds.Clear(); + } } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension.meta b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension.meta new file mode 100644 index 000000000..0c364beb7 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2da065b9ad1f85e4796fcc0c98dc161e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs new file mode 100644 index 000000000..49205e658 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs @@ -0,0 +1,35 @@ +// ================================================ +//描 述: +//作 者:AlanDu +//创建时间:2022-10-30 23-03-38 +//修改作者:AlanDu +//修改时间:2022-10-30 23-03-38 +//版 本:0.1 +// =============================================== +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 自定义Coroutine 的 等待时间 区别于 WaitForSeconds +/// WaitForSeconds 受 Time.scaleTime 影响 +/// WaitForSecondsRealtime 不受 Time.scaleTime 影响 +/// +public class WaitForSecondsRealtime : CustomYieldInstruction +{ + + private float waitTime; + + public override bool keepWaiting + { + get + { + return Time.realtimeSinceStartup < waitTime; + } + } + + public WaitForSecondsRealtime(float time) + { + waitTime = Time.realtimeSinceStartup + time; + } +} \ No newline at end of file diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs.meta b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs.meta new file mode 100644 index 000000000..cdb1d2744 --- /dev/null +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Extension/UnityExtension/WaitForSecondsRealtime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ba3181e6f15bed642906673a12e4eea1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/StringUtils.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/StringUtils.cs index 24a70133f..ac224b46c 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/StringUtils.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/StringUtils.cs @@ -9,6 +9,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Text.RegularExpressions; using UnityEngine; public static class StringUtils @@ -47,19 +48,112 @@ public static short ToShort(this string value) short.TryParse(value, out result); return result; } + public static List ToInts(this string value,string strSplit,int defValue = 0) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + int result = 0; + foreach (var t in results) + { + result = defValue; + int.TryParse(t, out result); + resultList.Add(result); + } + } + return resultList; + } + + public static List ToLongs(this string value,string strSplit,long defValue = 0) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + long result = 0; + foreach (var t in results) + { + result = defValue; + long.TryParse(t, out result); + resultList.Add(result); + } + } + return resultList; + } + + public static List ToFloats(this string value,string strSplit,float defValue = 0) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + float result = 0; + foreach (var t in results) + { + result = defValue; + float.TryParse(t, out result); + resultList.Add(result); + } + } + return resultList; + } - public static bool IsNullOrEmpty(string value) + public static List ToDoubles(this string value,string strSplit,double defValue = 0) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + double result = 0; + foreach (var t in results) + { + result = defValue; + double.TryParse(t, out result); + resultList.Add(result); + } + } + return resultList; + } + + public static List ToShorts(this string value,string strSplit,short defValue = 0) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + short result = 0; + foreach (var t in results) + { + result = defValue; + short.TryParse(t, out result); + resultList.Add(result); + } + } + return resultList; + } + public static List ToStrings(this string value,string strSplit) + { + List resultList = new List(); + if (strSplit != null) + { + var results = value.Split(new string[] { strSplit },StringSplitOptions.RemoveEmptyEntries); + resultList = results.ToList(); + } + return resultList; + } + public static bool IsNullOrEmpty(this string value) { return string.IsNullOrEmpty(value); } /// /// 过滤字符 /// - public static string Replace(string strOriginal, string oldchar, string newchar) + public static string Replace(this string value, string oldchar, string newchar) { - if (string.IsNullOrEmpty(strOriginal)) + if (string.IsNullOrEmpty(value)) return ""; - string tempChar = strOriginal; + string tempChar = value; tempChar = tempChar.Replace(oldchar, newchar); return tempChar; @@ -71,15 +165,15 @@ public static string Replace(string strOriginal, string oldchar, string newchar) /// /// /// - public static string ReplaceBadChar(string str) + public static string ReplaceBadChar(this string value) { - if (string.IsNullOrEmpty(str)) + if (string.IsNullOrEmpty(value)) return ""; string strBadChar, tempChar; string[] arrBadChar; strBadChar = "@@,+,',--,%,^,&,?,(,),<,>,[,],{,},/,\\,;,:,\",\"\","; - arrBadChar = SplitString(strBadChar, ","); - tempChar = str; + arrBadChar = strBadChar.SplitString(","); + tempChar = value; for (int i = 0; i < arrBadChar.Length; i++) { if (arrBadChar[i].Length > 0) @@ -95,16 +189,16 @@ public static string ReplaceBadChar(string str) /// /// 要检查的字符串 /// - public static bool ChkBadChar(string str) + public static bool ChkBadChar(this string value) { bool result = false; - if (string.IsNullOrEmpty(str)) + if (string.IsNullOrEmpty(value)) return result; string strBadChar, tempChar; string[] arrBadChar; strBadChar = "@@,+,',--,%,^,&,?,(,),<,>,[,],{,},/,\\,;,:,\",\"\""; arrBadChar = SplitString(strBadChar, ","); - tempChar = str; + tempChar = value; for (int i = 0; i < arrBadChar.Length; i++) { if (tempChar.IndexOf(arrBadChar[i]) >= 0) @@ -118,21 +212,21 @@ public static bool ChkBadChar(string str) /// /// 分割字符串 /// - public static string[] SplitString(string strContent, string strSplit) + public static string[] SplitString(this string value, string strSplit) { - if (string.IsNullOrEmpty(strContent)) + if (string.IsNullOrEmpty(value)) { return null; } - int i = strContent.IndexOf(strSplit); - if (strContent.IndexOf(strSplit) < 0) + int i = value.IndexOf(strSplit); + if (value.IndexOf(strSplit) < 0) { - string[] tmp = { strContent }; + string[] tmp = { value }; return tmp; } //return Regex.Split(strContent, @strSplit.Replace(".", @"\."), RegexOptions.IgnoreCase); - return Regex.Split(strContent, @strSplit.Replace(".", @"\.")); + return Regex.Split(value, @strSplit.Replace(".", @"\.")); } /// /// 分割字符 返回 移除空字符串 @@ -140,9 +234,9 @@ public static string[] SplitString(string strContent, string strSplit) /// /// /// - public static string[] SplitRemoveEmpty(string strContent, string strSplit) + public static string[] SplitRemoveEmpty(this string value, string strSplit) { - string[] result = strContent.Split(new string[] { strSplit }, StringSplitOptions.RemoveEmptyEntries); + string[] result = value.Split(new string[] { strSplit }, StringSplitOptions.RemoveEmptyEntries); return result; } /**/ @@ -252,66 +346,66 @@ public static DateTime StrToDateTime(object strValue, DateTime defValue) /// /// 判断给定的字符串(strNumber)是否是数值型 /// - /// 要确认的字符串 + /// 要确认的字符串 /// 是则返加true 不是则返回 false - public static bool IsNumber(string strNumber) + public static bool IsNumber(this string value) { - return new Regex(@"^([0-9])[0-9]*(\.\w*)?$").IsMatch(strNumber); + return new Regex(@"^([0-9])[0-9]*(\.\w*)?$").IsMatch(value); } /**/ /// /// 检测是否符合email格式 /// - /// 要判断的email字符串 + /// 要判断的email字符串 /// 判断结果 - public static bool IsValidEmail(string strEmail) + public static bool IsValidEmail(this string value) { - return Regex.IsMatch(strEmail, @"^([\w-\.]+)@(( + return Regex.IsMatch(value, @"^([\w-\.]+)@(( [0−9]1,3\.[0−9]1,3\.[0−9]1,3\.)|(([\w−]+\.)+))([a−zA−Z]2,4|[0−9]1,3)( ?)$"); } /// /// 检测是否符合url格式,前面必需含有http:// /// - /// + /// /// - public static bool IsURL(string url) + public static bool IsURL(this string value) { - return Regex.IsMatch(url, @"^http(s)?://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?$"); + return Regex.IsMatch(value, @"^http(s)?://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?$"); } /// /// 检测是否符合电话格式 /// - /// + /// /// - public static bool IsPhoneNumber(string phoneNumber) + public static bool IsPhoneNumber(this string value) { - return Regex.IsMatch(phoneNumber, @"^(\d3|\d{3}-)?\d{7,8}$"); + return Regex.IsMatch(value, @"^(\d3|\d{3}-)?\d{7,8}$"); } /// /// 检测是否符合身份证号码格式 /// - /// + /// /// - public static bool IsIdentityNumber(string num) + public static bool IsIdentityNumber(this string value) { - return Regex.IsMatch(num, @"^\d{17}[\d|X]|\d{15}$"); + return Regex.IsMatch(value, @"^\d{17}[\d|X]|\d{15}$"); } /// /// 转换为小写 /// - /// + /// /// - public static string ToLowerCase(string strContent) + public static string ToLowerCase(this string value) { - return strContent.Substring(0, 1).ToLower() + (strContent.Length > 1 ? strContent.Substring(1) : ""); + return value.Substring(0, 1).ToLower() + (value.Length > 1 ? value.Substring(1) : ""); } - public static string ToUpperFirst(this string str) + public static string ToUpperFirst(this string value) { - return Regex.Replace(str, @"^\w", t => t.Value.ToUpper()); ; + return Regex.Replace(value, @"^\w", t => t.Value.ToUpper()); ; } - public static string ToToLowerFirst(this string str) + public static string ToToLowerFirst(this string value) { - return Regex.Replace(str, @"^\w", t => t.Value.ToLower()); ; + return Regex.Replace(value, @"^\w", t => t.Value.ToLower()); ; } } diff --git a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/TimeUtils.cs b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/TimeUtils.cs index ad90be77b..3fa72fefd 100644 --- a/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/TimeUtils.cs +++ b/Assets/Deer/Scripts/Hotfix/HotfixFramework/Runtime/Utils/TimeUtils.cs @@ -43,4 +43,41 @@ public static int GetTimeZone(string timeZoneStr) var timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(timeZoneStr); return timeZoneInfo.BaseUtcOffset.Hours; } + /// + /// + /// + /// + /// 1 时分秒毫秒，2 时分秒 3 时分 4 分秒毫秒 5 分秒 6 秒毫秒 + /// + public static string ToTimeString(double time,int strType) + { + int hour = (int)time / 3600; + int minute = ((int)time - hour * 3600) / 60; + int second = (int)time - hour * 3600 - minute * 60; + int millisecond = (int)((time - (int)time) * 1000); + if (strType == 1) + { + return $"{hour:D2}:{minute:D2}:{second:D2}.{millisecond:D3}"; + }else if (strType == 2) + { + return $"{hour:D2}:{minute:D2}:{second:D2}"; + }else if (strType == 3) + { + return $"{hour:D2}:{minute:D2}"; + }else if (strType == 4) + { + return $"{minute:D2}:{second:D2}.{millisecond:D3}"; + } + else if (strType == 5) + { + return $"{minute:D2}:{second:D2}"; + }else if (strType == 6) + { + return $"{second:D2}.{millisecond:D3}"; + } + else + { + return string.Empty; + } + } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Editor/ComponentAutoBindTool/ComponentAutoBindToolInspector.cs b/Assets/Deer/Scripts/Main/Editor/ComponentAutoBindTool/ComponentAutoBindToolInspector.cs index ef44873d8..c09a9f26a 100644 --- a/Assets/Deer/Scripts/Main/Editor/ComponentAutoBindTool/ComponentAutoBindToolInspector.cs +++ b/Assets/Deer/Scripts/Main/Editor/ComponentAutoBindTool/ComponentAutoBindToolInspector.cs @@ -372,6 +372,15 @@ private void DrawKvData() /// private void AddBindData(string name, Component bindCom) { + for (int i = 0; i < m_BindDatas.arraySize; i++) + { + SerializedProperty elementData = m_BindDatas.GetArrayElementAtIndex(i); + if (elementData.FindPropertyRelative("Name").stringValue == name) + { + Debug.LogError($"有重复名字！请检查后重新生成！Name:{name}"); + return; + } + } int index = m_BindDatas.arraySize; m_BindDatas.InsertArrayElementAtIndex(index); SerializedProperty element = m_BindDatas.GetArrayElementAtIndex(index); diff --git a/Assets/Deer/Scripts/Main/Editor/OverrideUI/CreateUITemplatePrefab.cs b/Assets/Deer/Scripts/Main/Editor/OverrideUI/CreateUITemplatePrefab.cs index c718a152d..e85a5261e 100644 --- a/Assets/Deer/Scripts/Main/Editor/OverrideUI/CreateUITemplatePrefab.cs +++ b/Assets/Deer/Scripts/Main/Editor/OverrideUI/CreateUITemplatePrefab.cs @@ -58,7 +58,7 @@ static void CreateUIModel(MenuCommand menuCommand) [MenuItem("GameObject/UI/U_ScrollView/HListScroll View", false, 22)] static void CreateHListScroll(MenuCommand menuCommand) { - SaveObject(menuCommand, "ScrollView/HGridScrollView"); + SaveObject(menuCommand, "ScrollView/HListScrollView"); } [MenuItem("GameObject/UI/U_ScrollView/HGridScroll View", false, 23)] static void CreateHGridScroll(MenuCommand menuCommand) diff --git a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs new file mode 100644 index 000000000..2a576460f --- /dev/null +++ b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs @@ -0,0 +1,29 @@ +public interface IMessenger +{ + /// + /// ע¼ + /// + public void OnRegisterEvent(); + /// + /// ȡע¼ + /// + public void OnUnRegisterEvent(); + /// + /// ¼ + /// + /// ע¼ + /// ¼ + public void SendEvent(uint eventName, object pSender = null); + /// + /// ע¼ + /// + /// ע¼ + /// ע¼ + public void RegisterEvent(uint eventName, RegistFunction pFunction); + /// + /// עע¼ + /// + /// עע¼ + /// עע¼ + public void UnRegisterEvent(uint eventName, RegistFunction pFunction); +} \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs.meta b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs.meta new file mode 100644 index 000000000..2d6803428 --- /dev/null +++ b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/IMessenger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1bcf2ce54e734c3eb3d7a3e0f49884e7 +timeCreated: 1667715622 \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerComponent.cs b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerComponent.cs index a48e40971..b4b4d6170 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerComponent.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerComponent.cs @@ -30,17 +30,17 @@ protected override void Awake() m_messengerManager = new MessengerManager(); } - public void RegisterEvent(uint EventID, RegistFunction pFunction) + public void RegisterEvent(uint eventName, RegistFunction pFunction) { - m_messengerManager.RegisterEvent(EventID, pFunction); + m_messengerManager.RegisterEvent(eventName, pFunction); } - public void UnRegisterEvent(uint EventID, RegistFunction pFunction) + public void UnRegisterEvent(uint eventName, RegistFunction pFunction) { - m_messengerManager.UnRegisterEvent(EventID, pFunction); + m_messengerManager.UnRegisterEvent(eventName, pFunction); } - public object SendEvent(uint EventID, object pSender = null) + public object SendEvent(uint eventName, object pSender = null) { - return m_messengerManager.SendEvent(EventID, pSender); + return m_messengerManager.SendEvent(eventName, pSender); } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerManager.cs b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerManager.cs index fde4a83f3..476f9c7e6 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerManager.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Component/Messenger/MessengerManager.cs @@ -13,30 +13,30 @@ public class MessengerManager { private Dictionary m_dispathcerMap = new Dictionary(); - public void RegisterEvent(uint eventID, RegistFunction pFunction) + public void RegisterEvent(uint eventName, RegistFunction pFunction) { - if (!m_dispathcerMap.ContainsKey(eventID)) + if (!m_dispathcerMap.ContainsKey(eventName)) { - m_dispathcerMap.Add(eventID, pFunction); + m_dispathcerMap.Add(eventName, pFunction); return; } Dictionary dispathcerMap; - (dispathcerMap = m_dispathcerMap)[eventID] = (RegistFunction)Delegate.Combine(dispathcerMap[eventID], pFunction); + (dispathcerMap = m_dispathcerMap)[eventName] = (RegistFunction)Delegate.Combine(dispathcerMap[eventName], pFunction); } - public void UnRegisterEvent(uint eventID, RegistFunction pFunction) + public void UnRegisterEvent(uint eventName, RegistFunction pFunction) { - if (m_dispathcerMap.ContainsKey(eventID)) + if (m_dispathcerMap.ContainsKey(eventName)) { Dictionary dispathcerMap; - (dispathcerMap = m_dispathcerMap)[eventID] = (RegistFunction)Delegate.Remove(dispathcerMap[eventID], pFunction); + (dispathcerMap = m_dispathcerMap)[eventName] = (RegistFunction)Delegate.Remove(dispathcerMap[eventName], pFunction); } } - public object SendEvent(uint eventId, object pSender1) + public object SendEvent(uint eventName, object pSender1) { - if (m_dispathcerMap.ContainsKey(eventId) && m_dispathcerMap[eventId] != null) + if (m_dispathcerMap.ContainsKey(eventName) && m_dispathcerMap[eventName] != null) { - return m_dispathcerMap[eventId](pSender1); + return m_dispathcerMap[eventName](pSender1); } return null; } diff --git a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DeerUIFormHelper.cs b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DeerUIFormHelper.cs index a05f5b405..39effea75 100644 --- a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DeerUIFormHelper.cs +++ b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DeerUIFormHelper.cs @@ -15,7 +15,7 @@ namespace Main.Runtime { /// - /// Please modify the description. + /// DeerUIFormHelper /// public class DeerUIFormHelper : UIFormHelperBase { diff --git a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DialogParams.cs b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DialogParams.cs index a977bbb62..81d1045d3 100644 --- a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DialogParams.cs +++ b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/DialogParams.cs @@ -44,16 +44,7 @@ public string Message get; set; } - - /// - /// 弹出窗口时是否暂停游戏。 - /// - public bool PauseGame - { - get; - set; - } - + /// /// 确认按钮文本。 /// @@ -107,7 +98,14 @@ public GameFrameworkAction OnClickOther get; set; } - + /// + /// 背景按钮回调。 + /// + public GameFrameworkAction OnClickBackground + { + get; + set; + } /// /// 用户自定义数据。 /// diff --git a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIBaseForm.cs b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIBaseForm.cs index 20c630655..6aad5b516 100644 --- a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIBaseForm.cs +++ b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIBaseForm.cs @@ -19,7 +19,7 @@ namespace Main.Runtime /// /// Please modify the description. /// - public class UIBaseForm : UIFormLogic + public class UIBaseForm : UIFormLogic,IMessenger { public const int DepthFactor = 100; @@ -172,7 +172,10 @@ protected virtual void Close(bool ignoreFade,float fadeTime = 0.3f,Action fadeCo } else { - m_CloseCoroutine = StartCoroutine(CloseCo(fadeTime,fadeComplete)); + if (gameObject.activeSelf) + { + m_CloseCoroutine = StartCoroutine(CloseCo(fadeTime,fadeComplete)); + } } } protected override void OnDepthChanged(int uiGroupDepth, int depthInUIGroup) @@ -197,26 +200,21 @@ private IEnumerator CloseCo(float duration,Action fadeComplete) fadeComplete?.Invoke(); GameEntryMain.UI.CloseUIForm(this); } - /// - /// 注册事件 - /// - protected virtual void OnRegisterEvent() { } - /// - /// 取消注册事件 - /// - protected virtual void OnUnRegisterEvent() { } - - protected void SendEvent(uint EventID, object pSender = null) + public virtual void OnRegisterEvent() { } + + public virtual void OnUnRegisterEvent() { } + + public void SendEvent(uint eventName, object pSender = null) { - GameEntryMain.Messenger.SendEvent(EventID,pSender); + GameEntryMain.Messenger.SendEvent(eventName,pSender); } - protected void RegisterEvent(uint EventID, RegistFunction pFunction) + public void RegisterEvent(uint eventName, RegistFunction pFunction) { - GameEntryMain.Messenger.RegisterEvent(EventID, pFunction); + GameEntryMain.Messenger.RegisterEvent(eventName, pFunction); } - protected void UnRegisterEvent(uint EventID, RegistFunction pFunction) + public void UnRegisterEvent(uint eventName, RegistFunction pFunction) { - GameEntryMain.Messenger.UnRegisterEvent(EventID, pFunction); + GameEntryMain.Messenger.UnRegisterEvent(eventName, pFunction); } } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIExtension.cs b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIExtension.cs index f22cef871..230d59a3a 100644 --- a/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIExtension.cs +++ b/Assets/Deer/Scripts/Main/Runtime/GFExtension/UI/UIExtension.cs @@ -86,7 +86,7 @@ public static IEnumerator FadeToAlpha(this CanvasGroup canvasGroup, float alpha, float originalAlpha = canvasGroup.alpha; while (time < duration) { - time += Time.deltaTime; + time += Time.realtimeSinceStartup; canvasGroup.alpha = Mathf.Lerp(originalAlpha, alpha, time / duration); yield return new WaitForEndOfFrame(); } @@ -100,7 +100,7 @@ public static IEnumerator SmoothValue(this Slider slider, float value, float dur float originalValue = slider.value; while (time < duration) { - time += Time.deltaTime; + time += Time.realtimeSinceStartup; slider.value = Mathf.Lerp(originalValue, value, time / duration); yield return new WaitForEndOfFrame(); } @@ -123,23 +123,12 @@ public static void CloseUIWithUIGroup(this UIComponent uIComponent, string uiGro } } - public static void OpenDialog(this UIComponent uiComponent, DialogParams dialogParams) + public static void OpenNativeDialog(this UIComponent uiComponent, DialogParams dialogParams) { if (((ProcedureBase)GameEntryMain.Procedure.CurrentProcedure).UseNativeDialog) { - OpenNativeDialog(dialogParams); } - else - { - //uiComponent.OpenUIForm(UIFormId.DialogForm, dialogParams); - } - } - - private static void OpenNativeDialog(DialogParams dialogParams) - { - throw new System.NotImplementedException("OpenNativeDialog"); } - public static void SettingForegroundSwitch(this UIComponent uiComponent, bool isOpen) { var foregroundTrans = InstanceRoot.parent.Find("Foreground"); diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureBase.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureBase.cs index 703bdc10f..abfef9c8f 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureBase.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureBase.cs @@ -17,9 +17,19 @@ public virtual bool UseNativeDialog { get { return false; } } + + protected ProcedureOwner m_ProcedureOwner; + public virtual ProcedureOwner ProcedureOwner => m_ProcedureOwner; + public void ChangeStateByType(ProcedureOwner fsm, Type stateType) { ChangeState(fsm, stateType); } + + protected override void OnEnter(ProcedureOwner procedureOwner) + { + base.OnEnter(procedureOwner); + m_ProcedureOwner = procedureOwner; + } } } \ No newline at end of file diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureCheckVersion.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureCheckVersion.cs index ac1a1c4d6..b144ec305 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureCheckVersion.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureCheckVersion.cs @@ -19,6 +19,7 @@ namespace Main.Runtime.Procedure { public class ProcedureCheckVersion : ProcedureBase { + public override bool UseNativeDialog => true; private int m_DownLoadVersionRetryCount = 5; private int m_CurrDownLoadResourceVersionCount = 0; diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureInitResources.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureInitResources.cs index bc798c51b..7f2249320 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureInitResources.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureInitResources.cs @@ -14,6 +14,8 @@ namespace Main.Runtime.Procedure { public class ProcedureInitResources : ProcedureBase { + public override bool UseNativeDialog => true; + private bool m_InitResourcesComplete = false; protected override void OnEnter(ProcedureOwner procedureOwner) diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLauncher.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLauncher.cs index 847912800..abbdfb7bf 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLauncher.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLauncher.cs @@ -14,6 +14,7 @@ namespace Main.Runtime.Procedure { public class ProcedureLauncher : ProcedureBase { + public override bool UseNativeDialog => true; protected override void OnEnter(ProcedureOwner procedureOwner) { base.OnEnter(procedureOwner); diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLoadAssembly.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLoadAssembly.cs index 4b290bb66..fc53f3731 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLoadAssembly.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureLoadAssembly.cs @@ -34,6 +34,8 @@ namespace Main.Runtime.Procedure { public class ProcedureLoadAssembly : ProcedureBase { + public override bool UseNativeDialog => true; + private LoadAssetCallbacks m_LoadAssetCallbacks; private LoadAssetCallbacks m_LoadMetadataAssetCallbacks; private int m_LoadAssetCount; diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureSplash.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureSplash.cs index 8848b1f0e..dac65664d 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureSplash.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureSplash.cs @@ -14,6 +14,8 @@ namespace Main.Runtime.Procedure { public class ProcedureSplash : ProcedureBase { + public override bool UseNativeDialog => true; + protected override void OnEnter(ProcedureOwner procedureOwner) { base.OnEnter(procedureOwner); diff --git a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureUpdateResources.cs b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureUpdateResources.cs index 18970140c..0475dc4e9 100644 --- a/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureUpdateResources.cs +++ b/Assets/Deer/Scripts/Main/Runtime/Procedure/ProcedureUpdateResources.cs @@ -27,6 +27,8 @@ public enum UpdateStateType public class ProcedureUpdateResources : ProcedureBase { + public override bool UseNativeDialog => true; + private float m_LastUpdateTime; private bool m_NoticeUpdate = false; private bool m_CheckConfigComplete = false; diff --git a/LubanTools/DesignerConfigs/.cache.meta b/LubanTools/DesignerConfigs/.cache.meta index 4befe9ce5..14b583eac 100644 --- a/LubanTools/DesignerConfigs/.cache.meta +++ b/LubanTools/DesignerConfigs/.cache.meta @@ -1,40 +1,40 @@ -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/EBoolOperator.cs,3C58DF1236AA247B981D2BBFCC3D4E3,455,1662695566361 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/GlobalConfig.cs,DF3A93B37ADD4CC6E24D2A690ED1AFC,4190,1662695566339 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/TbGlobalConfig.cs,54B06BC14C643787B36EE5E0B5381,2355,1662695566368 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Enum/AccessFlag.cs,A6A920FE62A2956395EA80C9AB6272,550,1662695566356 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Enum/ETestQuality.cs,B123D84066266D86BB60D96E79EE847,758,1662695566343 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Language_Config.cs,E131CDA29C9D86AAD3C8B21BCFB5E29,1672,1662695566369 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Sounds_Config.cs,1CBDAC71B47D7A284B75702A4CE595B,2429,1662695566359 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbLanguage_Config.cs,5B384DF25ED4E86AF393524054224D54,1874,1662695566349 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbSounds_Config.cs,6976D63A1FA19E1C481574AE6FAAA94,1846,1662695566354 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbUIForm_Config.cs,E052EF17A13C9561E0668B4DF652E76A,1846,1662695566339 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/UIForm_Config.cs,BFE39ADDA17A9E646E4B8C62FCBABFD0,2168,1662695566339 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/CodeInfo.cs,B125F7B78BFA9438DE6CF2AA276E5,1368,1662695566341 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/EErrorCode.cs,86D1635881EF92AD88C2CBC17A6A7,3365,1662695566353 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/EOperation.cs,FB896AFF107C73738011778FCAA925DD,587,1662695566367 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorInfo.cs,EDB4C7DAF4164F38A8A11C3DDE647,1577,1662695566379 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyle.cs,F94B555C8D097F830D664675C9DB479,1488,1662695566340 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleDlgOk.cs,E17853DBAB230D2252E12C35AD76B72,1379,1662695566345 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleDlgOkCancel.cs,3459DB8DC971FEC927FBFDC19F9A6ED,1538,1662695566372 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleMsgbox.cs,F811D559C21B2C31577DA7A1608DEC50,1540,1662695566362 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleTip.cs,F54D9AE28158C8B4FCCACA4A423B3C,1248,1662695566346 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/TbCodeInfo.cs,8BD8DD4AACCC7AAA03934F1B6182AF,1868,1662695566357 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/TbErrorInfo.cs,FE86BF9B21D2FDD18C635A88E9EB6DA7,1822,1662695566358 -D:/Github/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Tables.cs,58BD65F148AB80A0E171F7489644EE36,2599,1662695566371 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__beans__.xlsx,FE171D49FDD83ECC36E175C2582EED68,10174,1659939852466 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__enums__.xlsx,FAC623E8ECDF3A5CF282063CC91B65D,10419,1659939852467 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__tables__.xlsx,2DA697FD24F32EC82B4F40C97357D774,11340,1659939852467 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/C_公共/全局常量配置表.xlsx,1A50C8D54436EABCC9D73FDD527AD225,11455,1659939852462 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/E_错误码/错误码.xlsx,AF554F54A12EF63D3241FAC9F1B5B524,13419,1659939852462 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/J_界面相关/UIForm_Config.xlsx,98608F85A7EC3D94F198FD4421C8152,11215,1659939852463 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/S_声音相关/Sounds_Config.xlsx,EFA0E839ED6E6F53CB732C997455D74,10976,1659939852466 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/W_文字相关/Language_Config.xlsx,AC53C74B5DE3A5598D2426224C8C785,10237,1659939852466 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/common.xml,7EE09048EF82B915316DCAA504A89BA,2041,1659939852467 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/error_code.xml,67CBDA9E1F64EA940B3A822B3922ED8,5199,1659939852468 -D:/Github/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/error.xml,237DFB93BD4D2C219729534BB96E5D56,994,1659939852467 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/common_tbglobalconfig.bytes,3A47FB9CB2F3270A83B7FEE75C980A9,43,1659939852469 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tblanguage_config.bytes,6B423C925574E161D2FB6AFE29538B,21,1659939852469 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tbsounds_config.bytes,39392AD4843F5A22B73B127CC2CCEFBE,84,1659939852471 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tbuiform_config.bytes,D1D6931A8D23C3333F41C6C6E983A793,171,1659939852471 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/error_tbcodeinfo.bytes,59696553D110634F5ABE194D8C524DAE,860,1659939852471 -D:/Github/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/error_tberrorinfo.bytes,BCD4D5B699F80E25AD584D86C1A8114,2267,1659939852471 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/EBoolOperator.cs,3C58DF1236AA247B981D2BBFCC3D4E3,455,1667999983204 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/GlobalConfig.cs,DF3A93B37ADD4CC6E24D2A690ED1AFC,4190,1667999983184 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Common/TbGlobalConfig.cs,54B06BC14C643787B36EE5E0B5381,2355,1667999983193 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Enum/AccessFlag.cs,A6A920FE62A2956395EA80C9AB6272,550,1667999983213 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Enum/ETestQuality.cs,B123D84066266D86BB60D96E79EE847,758,1667999983200 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Language_Config.cs,E131CDA29C9D86AAD3C8B21BCFB5E29,1672,1667999983207 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/Sounds_Config.cs,1CBDAC71B47D7A284B75702A4CE595B,2429,1667999983199 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbLanguage_Config.cs,5B384DF25ED4E86AF393524054224D54,1874,1667999983216 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbSounds_Config.cs,6976D63A1FA19E1C481574AE6FAAA94,1846,1667999983201 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/TbUIForm_Config.cs,E052EF17A13C9561E0668B4DF652E76A,1846,1667999983206 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Deer/UIForm_Config.cs,C316B9FFBE5BC6B9CB7DFF777A4F2D3,2346,1667999983203 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/CodeInfo.cs,B125F7B78BFA9438DE6CF2AA276E5,1368,1667999983209 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/EErrorCode.cs,86D1635881EF92AD88C2CBC17A6A7,3365,1667999983207 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/EOperation.cs,FB896AFF107C73738011778FCAA925DD,587,1667999983202 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorInfo.cs,EDB4C7DAF4164F38A8A11C3DDE647,1577,1667999983184 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyle.cs,F94B555C8D097F830D664675C9DB479,1488,1667999983219 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleDlgOk.cs,E17853DBAB230D2252E12C35AD76B72,1379,1667999983188 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleDlgOkCancel.cs,3459DB8DC971FEC927FBFDC19F9A6ED,1538,1667999983186 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleMsgbox.cs,F811D559C21B2C31577DA7A1608DEC50,1540,1667999983188 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/ErrorStyleTip.cs,F54D9AE28158C8B4FCCACA4A423B3C,1248,1667999983217 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/TbCodeInfo.cs,8BD8DD4AACCC7AAA03934F1B6182AF,1868,1667999983195 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Error/TbErrorInfo.cs,FE86BF9B21D2FDD18C635A88E9EB6DA7,1822,1667999983194 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/Assets/Deer/Scripts/HotFix/HotFixCommon/LubanConfig/Tables.cs,58BD65F148AB80A0E171F7489644EE36,2599,1667999983208 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__beans__.xlsx,FE171D49FDD83ECC36E175C2582EED68,10174,1658665680232 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__enums__.xlsx,FAC623E8ECDF3A5CF282063CC91B65D,10419,1658665680232 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/__tables__.xlsx,2DA697FD24F32EC82B4F40C97357D774,11340,1658665680232 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/C_公共/全局常量配置表.xlsx,1A50C8D54436EABCC9D73FDD527AD225,11455,1658665680228 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/E_错误码/错误码.xlsx,AF554F54A12EF63D3241FAC9F1B5B524,13419,1658665680229 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/J_界面相关/UIForm_Config.xlsx,E7FDF58CC561E32B1058C4E5AECA5B,11443,1668000594502 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/S_声音相关/Sounds_Config.xlsx,EFA0E839ED6E6F53CB732C997455D74,10976,1658665680231 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Datas/W_文字相关/Language_Config.xlsx,AC53C74B5DE3A5598D2426224C8C785,10237,1658665680231 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/common.xml,7EE09048EF82B915316DCAA504A89BA,2041,1658665680233 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/error_code.xml,67CBDA9E1F64EA940B3A822B3922ED8,5199,1658665680233 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/DesignerConfigs/Defines/error.xml,237DFB93BD4D2C219729534BB96E5D56,994,1658665680233 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/common_tbglobalconfig.bytes,3A47FB9CB2F3270A83B7FEE75C980A9,43,1658665680235 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tblanguage_config.bytes,6B423C925574E161D2FB6AFE29538B,21,1658665680236 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tbsounds_config.bytes,39392AD4843F5A22B73B127CC2CCEFBE,84,1658665680236 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/deer_tbuiform_config.bytes,3F5918A27AD18993CFB8FD6FB55F992,199,1668000612016 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/error_tbcodeinfo.bytes,59696553D110634F5ABE194D8C524DAE,860,1658665680237 +D:/Working/GitHub/Owner/Deer_GameFramework_Wolong/LubanTools/GenerateDatas/LubanConfig/error_tberrorinfo.bytes,BCD4D5B699F80E25AD584D86C1A8114,2267,1658665680237 diff --git "a/LubanTools/DesignerConfigs/Datas/J_\347\225\214\351\235\242\347\233\270\345\205\263/UIForm_Config.xlsx" "b/LubanTools/DesignerConfigs/Datas/J_\347\225\214\351\235\242\347\233\270\345\205\263/UIForm_Config.xlsx" index 01d614d115c02a2d9253563e004bd00e78691964..6000803bc9cce6eff3fbc75abe2ee90f321465d4 100644 GIT binary patch delta 3863 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 delta 3633 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 diff --git a/LubanTools/GenerateDatas/ConfigVersion.xml b/LubanTools/GenerateDatas/ConfigVersion.xml index bb93221bd..b9f98cb89 100644 --- a/LubanTools/GenerateDatas/ConfigVersion.xml +++ b/LubanTools/GenerateDatas/ConfigVersion.xml @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/LubanTools/GenerateDatas/LubanConfig/deer_tbuiform_config.bytes b/LubanTools/GenerateDatas/LubanConfig/deer_tbuiform_config.bytes index beaabcf830c5c75582c687d96ddf5ad736ba44ec..d18a94f56829ad94a4323c4e3d5625223ab823d7 100644 GIT binary patch delta 118 zcmZ3@c$|@mgK;9GxIP0DBTuNOOJ-tDe!5$JQ7&shenF@wBLg!dSEy%5W;u+dPxzebPhr{10w((O&`ht literal 171 zcmZQ)WMoX?4fXWNPfW?o11slp zN=(j9FUl{?OJQJ4