From d3ad069a76223f27b7fb1d1240be5b2c0bd16ee6 Mon Sep 17 00:00:00 2001 From: chenyuqi <1357020360@qq.com> Date: Thu, 1 Feb 2024 15:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=95=8C=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=BD=E7=BB=93=E6=9E=9C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefab/Common/Notice/UINoticeTwo.prefab | 975 ++++++++++++++++++ .../Common/Notice/UINoticeTwo.prefab.meta | 7 + .../Scripts/Framework/UI/UIManager.Window.cs | 4 +- .../GameStartLoadingExecutor.cs | 113 +- .../LoadingExecutorWithUILoadingController.cs | 46 +- .../Gameplay/LoadingExecutor/LoadingInfo.cs | 10 + .../Scripts/Gameplay/Net/Client/AppConfig.cs | 5 +- .../Assets/Code/Scripts/Gameplay/UI/PVP.meta | 3 + .../UI_PVPDefendPrepareController.cs | 0 .../UI_PVPDefendPrepareController.cs.meta | 0 .../UI/{ => PVP}/UI_PVPMainController.cs | 6 + .../UI/{ => PVP}/UI_PVPMainController.cs.meta | 0 .../UI/Tips/Notice/UINoticeTwoController.cs | 92 ++ .../Tips/Notice/UINoticeTwoController.cs.meta | 11 + .../Scripts/Gameplay/UI/Tips/UITipsManager.cs | 24 + .../Gameplay/UI/UIBinder/UINoticeTwoBinder.cs | 38 + .../UI/UIBinder/UINoticeTwoBinder.cs.meta | 11 + 17 files changed, 1295 insertions(+), 50 deletions(-) create mode 100644 ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab create mode 100644 ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab.meta create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP.meta rename ProjectNLD/Assets/Code/Scripts/Gameplay/UI/{ => PVP}/UI_PVPDefendPrepareController.cs (100%) rename ProjectNLD/Assets/Code/Scripts/Gameplay/UI/{ => PVP}/UI_PVPDefendPrepareController.cs.meta (100%) rename ProjectNLD/Assets/Code/Scripts/Gameplay/UI/{ => PVP}/UI_PVPMainController.cs (97%) rename ProjectNLD/Assets/Code/Scripts/Gameplay/UI/{ => PVP}/UI_PVPMainController.cs.meta (100%) create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs.meta create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UINoticeTwoBinder.cs create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UINoticeTwoBinder.cs.meta diff --git a/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab b/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab new file mode 100644 index 00000000000..7b26b1b4941 --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab @@ -0,0 +1,975 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &227202576303329553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7775919225394296453} + m_Layer: 5 + m_Name: UINoticeTwo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7775919225394296453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227202576303329553} + 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: 6840238747953973344} + - {fileID: 6829685925458520158} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &405558750737947060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6840238747953973344} + - component: {fileID: 7901385951603076177} + - component: {fileID: 7714601555777616884} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6840238747953973344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405558750737947060} + 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: 7775919225394296453} + 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 &7901385951603076177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405558750737947060} + m_CullTransparentMesh: 1 +--- !u!114 &7714601555777616884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405558750737947060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1502440006628997463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6829685925458520158} + - component: {fileID: 2529319146182351145} + - component: {fileID: 3329353484804375194} + m_Layer: 5 + m_Name: Image_BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6829685925458520158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502440006628997463} + 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: 7327656338424533959} + - {fileID: 2727690188362631285} + - {fileID: 4211417643943646361} + - {fileID: 8921952335357545598} + m_Father: {fileID: 7775919225394296453} + 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: 750, y: 650} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2529319146182351145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502440006628997463} + m_CullTransparentMesh: 1 +--- !u!114 &3329353484804375194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502440006628997463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f86e27df0e8821a4998cbb92ccee49eb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4026387429095460221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3497141997297663393} + - component: {fileID: 2091098161994435275} + - component: {fileID: 8222564089406061166} + m_Layer: 5 + m_Name: Text_Confirm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3497141997297663393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026387429095460221} + 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: 4211417643943646361} + 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 &2091098161994435275 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026387429095460221} + m_CullTransparentMesh: 1 +--- !u!114 &8222564089406061166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026387429095460221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u56DE\u5230\u767B\u5F55\u754C\u9762" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2} + m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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 &4440199567120237872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2727690188362631285} + - component: {fileID: 8464171636023815897} + - component: {fileID: 8328890708935391263} + m_Layer: 5 + m_Name: Text_Desc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2727690188362631285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4440199567120237872} + 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: 6829685925458520158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -273.55} + m_SizeDelta: {x: 683.3766, y: 197.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8464171636023815897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4440199567120237872} + m_CullTransparentMesh: 1 +--- !u!114 &8328890708935391263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4440199567120237872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u91CD\u8FDE\u5931\u8D25\uFF0C\u662F\u5426\u7EE7\u7EED\u5C1D\u8BD5\u91CD\u65B0\u8FDE\u63A5\uFF1F" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2} + m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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 &5321646280720202402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2305567700473476425} + - component: {fileID: 3160674622095853857} + - component: {fileID: 4875590749334919541} + m_Layer: 5 + m_Name: Text_Cancel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2305567700473476425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5321646280720202402} + 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: 8921952335357545598} + 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 &3160674622095853857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5321646280720202402} + m_CullTransparentMesh: 1 +--- !u!114 &4875590749334919541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5321646280720202402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u7EE7\u7EED\u91CD\u8FDE" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2} + m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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 &6794644491753997562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8921952335357545598} + - component: {fileID: 7409282407489023779} + - component: {fileID: 31497961992854709} + - component: {fileID: 4426643031339511515} + m_Layer: 5 + m_Name: Button_Cancel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8921952335357545598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794644491753997562} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2305567700473476425} + m_Father: {fileID: 6829685925458520158} + 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: 194.3, y: -178} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7409282407489023779 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794644491753997562} + m_CullTransparentMesh: 1 +--- !u!114 &31497961992854709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794644491753997562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4426643031339511515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6794644491753997562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 31497961992854709} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7540162013061170480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7327656338424533959} + - component: {fileID: 8631380019378771945} + - component: {fileID: 7287118329911135691} + m_Layer: 5 + m_Name: Text_Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7327656338424533959 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7540162013061170480} + 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: 6829685925458520158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -145} + m_SizeDelta: {x: 683.3766, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8631380019378771945 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7540162013061170480} + m_CullTransparentMesh: 1 +--- !u!114 &7287118329911135691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7540162013061170480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u91CD\u8FDE\u5931\u8D25\uFF0C\u662F\u5426\u7EE7\u7EED\u5C1D\u8BD5\u91CD\u65B0\u8FDE\u63A5\uFF1F" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2} + m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_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 &7830271487728339204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4211417643943646361} + - component: {fileID: 374393277031270392} + - component: {fileID: 2218626659695103085} + - component: {fileID: 2419798389199526813} + m_Layer: 5 + m_Name: Button_Confirm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4211417643943646361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830271487728339204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3497141997297663393} + m_Father: {fileID: 6829685925458520158} + 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: -192, y: -178} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &374393277031270392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830271487728339204} + m_CullTransparentMesh: 1 +--- !u!114 &2218626659695103085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830271487728339204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2419798389199526813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830271487728339204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2218626659695103085} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab.meta b/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab.meta new file mode 100644 index 00000000000..b82a1177c37 --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/Common/Notice/UINoticeTwo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9ae9dfe192d0ee43a0d16704f6c7e2a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs index f94ae642768..94540a99fc0 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs +++ b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs @@ -68,13 +68,14 @@ public partial class UIManager _WindowMeta(UINameConst.UI_Shop, UIWindowLayer.Normal, UIOpenType.FullScreen); _WindowMeta(UINameConst.UI_Purchase, UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_GetItemWindow, UIWindowLayer.Normal); - _WindowMeta(UINameConst.UINoticeOne, UIWindowLayer.Tips); + _WindowMeta(UINameConst.UINoticeOne, UIWindowLayer.Waiting); _WindowMeta(UINameConst.UI_PVPMain,UIWindowLayer.Normal); _WindowMeta(UINameConst.UIMissionWin,UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_Camp,UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_GetItemSettle,UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_Patio, UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_BuyDiamond, UIWindowLayer.Normal); + _WindowMeta(UINameConst.UINoticeTwo, UIWindowLayer.Waiting); } @@ -138,6 +139,7 @@ public static class UINameConst public static readonly string UI_Setting = "Interface/UI_Setting"; public static readonly string UI_Notice = "Interface/UI_Notice"; public static readonly string UIBackReturn = "Interface/UI_BackReturn"; + public static readonly string UINoticeTwo = "Common/Notice/UINoticeTwo"; public static readonly string UITask = "Interface/UI_MissionPannel"; diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs index 01dc855aa37..96630789182 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs @@ -1,4 +1,6 @@ -using System.Threading.Tasks; +using System; +using System.Net.NetworkInformation; +using System.Threading.Tasks; using Cysharp.Threading.Tasks; using Framework; using Gameplay.Net; @@ -35,46 +37,46 @@ namespace Gameplay return result; } - _destProgress = 30f; - result = await LoadLoginUI(); - if (result != LoadingResult.Success) - { - return result; - } - - _destProgress = 80f; - result = await LoadConfig(); - if (result != LoadingResult.Success) - { - return result; - } - - _destProgress = 90f; - result = await _PreloadOthers(); - if (result != LoadingResult.Success) - { - return result; - } - - result = await _LoadPerformance(); - if (result != LoadingResult.Success) - { - return result; - } - - result = await InitGameSetting(); - if (result != LoadingResult.Success) - { - return result; - } - - _destProgress = 95f; - - await UIManager.Instance.OpenWindow(UINameConst.UI_LogIn); - - _destProgress = 100f; + _destProgress = 30f; + result = await LoadLoginUI(); + if (result != LoadingResult.Success) + { + return result; + } + + _destProgress = 80f; + result = await LoadConfig(); + if (result != LoadingResult.Success) + { + return result; + } + + _destProgress = 90f; + result = await _PreloadOthers(); + if (result != LoadingResult.Success) + { + return result; + } + + result = await _LoadPerformance(); + if (result != LoadingResult.Success) + { + return result; + } + + result = await InitGameSetting(); + if (result != LoadingResult.Success) + { + return result; + } + + _destProgress = 95f; + + await UIManager.Instance.OpenWindow(UINameConst.UI_LogIn); + + _destProgress = 100f; - return LoadingResult.Success; + return LoadingResult.Success; } private async UniTask _PreloadOthers() @@ -97,11 +99,38 @@ namespace Gameplay // 是否是安装后第一次运行 private async UniTask FirstRunAppCheck() { - await Net.AppConfig.Instance.UnityRequest(); - + var result = await Net.AppConfig.Instance.UnityRequest(); + if (!result) + { + if (CheckIsDeviceOnline()) + { + return LoadingResult.GameStartSevNetError; + } + return LoadingResult.DeviceNetError; + } return LoadingResult.Success; } + private bool CheckIsDeviceOnline() + { + try + { + Ping ping = new Ping(); + PingReply pr = ping.Send("www.baidu.com", 3000); + if (pr.Status == IPStatus.Success) + { + return true; + } + + return false; + } + + catch (Exception e) + { + return false; + } + } + // 强更检查 private async UniTask AppVersionCheck() diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingExecutorWithUILoadingController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingExecutorWithUILoadingController.cs index d00fd193888..2e0fefedd53 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingExecutorWithUILoadingController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingExecutorWithUILoadingController.cs @@ -1,6 +1,9 @@ using System; using Cysharp.Threading.Tasks; using Framework; +using Gameplay.SubSystems; +using UnityEngine.WSA; +using Application = UnityEngine.Application; namespace Gameplay { @@ -22,6 +25,18 @@ namespace Gameplay //EventManager.Instance.Send(EventManager.EventName.ClearUIStack); var result = await _DoLoading(); + DealWithResult(result); + + _isRunning = false; + + if (_destProgress < 100f) + { + //DebugUtil.LogError(" LoadingExecutorWithUILoadingController {0} < 100f", _destProgress); + } + } + + protected virtual async void DealWithResult(LoadingResult result) + { switch (result) { case (LoadingResult.ErrorTest): @@ -32,19 +47,38 @@ namespace Gameplay // UITipsManager.ShowConfirmOne(title, desc, (Action)GameClientReconnect.BackToStart); break; } - + + case (LoadingResult.DeviceNetError): + { + //启动游戏网络连接错误 + string title = "网络错误"; + string desc = "加载错误，请检查网络连接后重启"; + UITipsManager.ShowConfirmOne(title, desc, (Action)Application.Quit); + break; + } + + case (LoadingResult.GameStartSevNetError): + { + string title = "网络错误"; + string desc = "加载错误，请检查网络连接后重启"; + UITipsManager.ShowConfirmTwo(title, desc, (Action) Reloading, + (Action)Application.Quit); + Reloading(); + break; + } default: break; } + } - _isRunning = false; - - if (_destProgress < 100f) + private void Reloading() + { + if (LoadingExecutorManager.Instance.CurrentExcutor != null) { - //DebugUtil.LogError(" LoadingExecutorWithUILoadingController {0} < 100f", _destProgress); + _isRunning = false; + LoadingExecutorManager.Instance.CurrentExcutor.Excute(); } } - protected virtual async UniTask _DoLoading() { await UniTask.NextFrame(); diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingInfo.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingInfo.cs index 7e7e914c981..695afb6b2c7 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingInfo.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/LoadingExecutor/LoadingInfo.cs @@ -26,5 +26,15 @@ namespace Gameplay /// 加载出错（测试） /// ErrorTest = 1, + + /// + /// 启动游戏时网络连接出错 + /// + GameStartSevNetError = 2, + + /// + /// 当前设备网络问题 + /// + DeviceNetError = 3, } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/AppConfig.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/AppConfig.cs index ff7019a89cf..b6e04608d38 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/AppConfig.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/AppConfig.cs @@ -102,7 +102,7 @@ namespace Gameplay.Net { } - public async UniTask UnityRequest() + public async UniTask UnityRequest() { try { @@ -117,12 +117,15 @@ namespace Gameplay.Net if (m_ServerInfos == null) { DebugUtil.LogError("request---------- serverInfo = null"); + return false; } + return true; } catch (Exception e) { DebugUtil.LogError(e); + return false; } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP.meta new file mode 100644 index 00000000000..fdd638b8b15 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6e18e014971944d7a647efe5f5d9aad1 +timeCreated: 1706765411 \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPDefendPrepareController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPDefendPrepareController.cs similarity index 100% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPDefendPrepareController.cs rename to ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPDefendPrepareController.cs diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPDefendPrepareController.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPDefendPrepareController.cs.meta similarity index 100% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPDefendPrepareController.cs.meta rename to ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPDefendPrepareController.cs.meta diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPMainController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPMainController.cs similarity index 97% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPMainController.cs rename to ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPMainController.cs index 0152a41f078..a03fe433e84 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPMainController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPMainController.cs @@ -107,6 +107,12 @@ public class UI_PVPMainController : UIWindow //invoke when close window protected override void OnHideWindow() { + + } + + public override void OnRelease() + { + base.OnRelease(); UnRegisterEvent(); } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPMainController.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPMainController.cs.meta similarity index 100% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPMainController.cs.meta rename to ProjectNLD/Assets/Code/Scripts/Gameplay/UI/PVP/UI_PVPMainController.cs.meta diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs new file mode 100644 index 00000000000..647693d6450 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.UIElements; +using Button = UnityEngine.UI.Button; +using Image = UnityEngine.UI.Image; +using Toggle = UnityEngine.UI.Toggle; +using ScrollView = PhxhSDK.PhxhScrollView; +using Framework; + +public class UINoticeTwoController : UIWindow +{ + //UI GameObj + ///Auto Gen Start/// + public Image Image_BG; + public TMP_Text Text_Title; + public TMP_Text Text_Desc; + public Button Button_Confirm; + public TMP_Text Text_Confirm; + public Button Button_Cancel; + public TMP_Text Text_Cancel; + + ///Auto Gen End/// + + public struct ShowData + { + public string Title; + public string Content; + public System.Action OkFunc; + public System.Action CancelFunc; + } + + private ShowData _data; + // deal with input data + public override void PreLoad(object data = null) + { + if (data != null) + { + _data = (ShowData)data; + } + } + + // Use this for initialization + public override void OnInit() + { + //bind UI GameObj + UINoticeTwoBinder.GetComponents(this); + + BindButton(Button_Confirm, _OnClickOk); + BindButton(Button_Cancel, _OnClickCancel); + } + + //invoke when open window + protected override void OnShowWindow(object data = null) + { + Text_Title.text = _data.Title; + Text_Desc.text = _data.Content; + } + + //invoke when reload window + protected override void OnReloadWindow(object data = null) + { + + } + + //invoke when close window + protected override void OnHideWindow() + { + + } + + //invoke when destroy + public override void OnRelease() + { + base.OnRelease(); + } + + private void _OnClickOk() + { + _data.OkFunc?.Invoke(); + UITipsManager.CloseConfirmTwo(); + } + + private void _OnClickCancel() + { + _data.CancelFunc?.Invoke(); + UITipsManager.CloseConfirmTwo(); + } +} diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs.meta new file mode 100644 index 00000000000..ee6f6fb98ea --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/Notice/UINoticeTwoController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 47a57fe1da2382a47a2f24d768c4d7d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/UITipsManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/UITipsManager.cs index fbc0dc45fc9..b18346e0e39 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/UITipsManager.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Tips/UITipsManager.cs @@ -1,10 +1,12 @@ using System; using BehaviorDesigner.Runtime.Tasks; using Cysharp.Threading.Tasks; +using Action = System.Action; public class UITipsManager { private static UIWindow _oneConfirm; + private static UIWindow _twoConfirm; private static TipInfo _tipInfo; private static int _tipID; @@ -65,4 +67,26 @@ public class UITipsManager _oneConfirm.CloseWindow(); _oneConfirm = null; } + + public static async void ShowConfirmTwo(string title, string desc, Delegate okFunc = null, + Delegate cancelFunc = null) + { + if (_twoConfirm == null) + { + var showData = new UINoticeTwoController.ShowData() + { + Title = title, + Content = desc, + }; + showData.OkFunc = (Action)okFunc; + showData.CancelFunc = (Action)cancelFunc; + _twoConfirm = await UIManager.Instance.OpenWindow(UINameConst.UINoticeTwo, showData); + } + } + + public static void CloseConfirmTwo() + { + _twoConfirm.CloseWindow(); + _twoConfirm = null; + } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UINoticeTwoBinder.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UINoticeTwoBinder.cs new file mode 100644 index 00000000000..f8a1509272d --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UINoticeTwoBinder.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using Framework; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.UIElements; +using Button = UnityEngine.UI.Button; +using Image = UnityEngine.UI.Image; +using Toggle = UnityEngine.UI.Toggle; +using ScrollView = PhxhSDK.PhxhScrollView; + +public class UINoticeTwoBinder +{ + + public static void GetComponents(UINoticeTwoController window) + { + window.Image_BG = window.GetComponent("Image_BG"); + window.Text_Title = window.GetComponent("Image_BG/Text_Title"); + window.Text_Desc = window.GetComponent("Image_BG/Text_Desc"); + window.Button_Confirm = window.GetComponent