From bd83514e8288fa6003c1b0fad617c85bf90cb141 Mon Sep 17 00:00:00 2001 From: chenyuqi <1357020360@qq.com> Date: Wed, 20 Mar 2024 19:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=88=98=E6=96=97=E5=89=8D=E5=92=8C=E6=88=98=E6=96=97?= =?UTF-8?q?=E5=86=85=E7=AB=8B=E7=BB=98=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fonts/SourceHanSansCN-Medium SDF.asset | 4 +- .../LevelSceneUI/UIPosterAndSkillInfo.prefab | 1542 +++++++++++++++++ .../UIPosterAndSkillInfo.prefab.meta | 7 + .../UI/Prefab/LevelSceneUI/UITeamFight.prefab | 4 +- .../Scripts/Framework/UI/UIManager.Window.cs | 3 + .../Gameplay/Level/State/BattleState.cs | 2 + .../Gameplay/Level/State/PrepareState.cs | 4 + .../Scripts/Gameplay/Team/TeamManager.UI.cs | 13 + .../Gameplay/Team/TeamManager.UI.cs.meta | 3 + .../Code/Scripts/Gameplay/Team/TeamManager.cs | 6 +- .../UIPosterAndSkillInfoController.cs | 112 ++ .../UIPosterAndSkillInfoController.cs.meta | 11 + .../FightReady/UITeamFightController.cs | 35 +- .../UI_StartBtn_CMSBtnController.cs | 2 + .../UI/UIBinder/UIPosterAndSkillInfoBinder.cs | 48 + .../UIPosterAndSkillInfoBinder.cs.meta | 11 + 16 files changed, 1786 insertions(+), 21 deletions(-) create mode 100644 ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab create mode 100644 ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab.meta create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs.meta create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs.meta create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs create mode 100644 ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs.meta diff --git a/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset b/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset index ae501f8d736..b9c008998fb 100644 --- a/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset +++ b/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c85487b12df5ac74e1602293bc4aa059c1dbd79879c8a39da3f0fe419c78601 -size 8681366 +oid sha256:c949543c9379194b69d5f508d5cb4e1acaf83f3e9bbc27c08966c4c0e1eddb7f +size 8685517 diff --git a/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab new file mode 100644 index 00000000000..6d1a78e8a2d --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab @@ -0,0 +1,1542 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &479324902845653238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7654477066102010246} + - component: {fileID: 5557021409576581712} + - component: {fileID: 3182225291564444778} + m_Layer: 5 + m_Name: Image_UI_PosterShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7654477066102010246 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479324902845653238} + 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: 365248029760201153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 245, y: 1826.0459} + m_SizeDelta: {x: 487, y: 3659.0918} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5557021409576581712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479324902845653238} + m_CullTransparentMesh: 1 +--- !u!114 &3182225291564444778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479324902845653238} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b1b121b675dde5a46a3b963ae0c50ca7, 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 &855513573308453199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 365248029760201153} + m_Layer: 5 + m_Name: GameObj_SkillInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &365248029760201153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855513573308453199} + 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: 5260383636370141986} + - {fileID: 7654477066102010246} + - {fileID: 8797797722769182732} + m_Father: {fileID: 6327197852501126704} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: 0} + m_SizeDelta: {x: 1920, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2329328601947059140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5567222662547702171} + - component: {fileID: 4934979929728764618} + - component: {fileID: 5879892878204143241} + m_Layer: 5 + m_Name: Text_SkillInfoDes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5567222662547702171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2329328601947059140} + 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: 4421170645613492262} + 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: 110, y: -29} + m_SizeDelta: {x: 530, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4934979929728764618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2329328601947059140} + m_CullTransparentMesh: 1 +--- !u!114 &5879892878204143241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2329328601947059140} + 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: "\u5411\u524D\u65B9\u53D1\u5C04\u4E00\u679A\u5927\u53E3\u5F84\u69B4\u5F39\uFF0C\u5BF9\u65E0\u62A4\u7532\u5355\u4F4D\u9020\u6210999\u70B9\u4F24\u5BB3" + 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: 3003121663 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.69803923} + 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2335305439027880257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 925036208823152071} + - component: {fileID: 9078993569483320259} + - component: {fileID: 2202282919434680353} + m_Layer: 5 + m_Name: Text_EnglishName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &925036208823152071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2335305439027880257} + 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: 917114116947107272} + 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: 364.8, y: -22.5} + m_SizeDelta: {x: 600, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9078993569483320259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2335305439027880257} + m_CullTransparentMesh: 1 +--- !u!114 &2202282919434680353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2335305439027880257} + 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: TELETHA TESTAROSSA + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c06fb088272c9a1439e7cabe6d54f3d7, type: 2} + m_sharedMaterial: {fileID: 4565336450146555445, guid: c06fb088272c9a1439e7cabe6d54f3d7, + 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: 27 + m_fontSizeBase: 27 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2695746329493190209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5564460732273875107} + - component: {fileID: 1394074767986255914} + - component: {fileID: 6788751420625748952} + m_Layer: 5 + m_Name: Text_SkillName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5564460732273875107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2695746329493190209} + 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: 2488338441070193474} + 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: 175.5, y: 0} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1394074767986255914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2695746329493190209} + m_CullTransparentMesh: 1 +--- !u!114 &6788751420625748952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2695746329493190209} + 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: "\u8D85\u7EA7\u601D\u7EF4\u7206\u5F39" + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3462871018672555299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4421170645613492262} + - component: {fileID: 5884249432933767395} + - component: {fileID: 9135446859714955055} + m_Layer: 5 + m_Name: ImageBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4421170645613492262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462871018672555299} + 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: 2571623343108715312} + - {fileID: 2488338441070193474} + - {fileID: 8675927029939849927} + - {fileID: 5567222662547702171} + m_Father: {fileID: 8797797722769182732} + 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: 247.89539, y: 48.499817} + m_SizeDelta: {x: 776, y: 216} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5884249432933767395 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462871018672555299} + m_CullTransparentMesh: 1 +--- !u!114 &9135446859714955055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3462871018672555299} + 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: 2b46157dfc7ace34ba0349c6c5ec3611, 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 &3831172514285746178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9068613299694100579} + - component: {fileID: 5621471621337503706} + - component: {fileID: 5489397532008223447} + m_Layer: 5 + m_Name: Text_SkillCDSecond + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9068613299694100579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831172514285746178} + 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: 8675927029939849927} + 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: 31.774902, y: 0.1} + m_SizeDelta: {x: 100, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5621471621337503706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831172514285746178} + m_CullTransparentMesh: 1 +--- !u!114 &5489397532008223447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3831172514285746178} + 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: "\u79D2" + 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: 2164260863 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.5019608} + 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: 22 + m_fontSizeBase: 22 + 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 &4779928449035185729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8797797722769182732} + - component: {fileID: 9104570272094888291} + - component: {fileID: 1370355139069272167} + m_Layer: 5 + m_Name: Image_StandPaintting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8797797722769182732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4779928449035185729} + 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: 4421170645613492262} + - {fileID: 917114116947107272} + m_Father: {fileID: 365248029760201153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 133.4, y: 56} + m_SizeDelta: {x: 1433.6, y: 1433.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9104570272094888291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4779928449035185729} + m_CullTransparentMesh: 1 +--- !u!114 &1370355139069272167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4779928449035185729} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 22cc49c0414a21d40931a0e00d79a406, 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 &6570085001129144558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2488338441070193474} + - component: {fileID: 3972650020267520709} + - component: {fileID: 3689461049610136093} + m_Layer: 5 + m_Name: Image_SkillInfoLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2488338441070193474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6570085001129144558} + 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: 5564460732273875107} + m_Father: {fileID: 4421170645613492262} + 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: -137.1, y: 73.4} + m_SizeDelta: {x: 35, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3972650020267520709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6570085001129144558} + m_CullTransparentMesh: 1 +--- !u!114 &3689461049610136093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6570085001129144558} + 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: e668477d8a82d84479f321d4858ca0c0, 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 &6647266744504207805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8675927029939849927} + - component: {fileID: 6374949332356451265} + - component: {fileID: 3991694622461670534} + m_Layer: 5 + m_Name: ImageSkillCDLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8675927029939849927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647266744504207805} + 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: 532482004288769240} + - {fileID: 9068613299694100579} + m_Father: {fileID: 4421170645613492262} + 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: -103.1, y: 29} + m_SizeDelta: {x: 103, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6374949332356451265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647266744504207805} + m_CullTransparentMesh: 1 +--- !u!114 &3991694622461670534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647266744504207805} + 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: d5c4b353d45da2f4ebd3013a54f77977, 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 &6924016346090107263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 917114116947107272} + - component: {fileID: 7204011712809866854} + - component: {fileID: 6514997192903468813} + m_Layer: 5 + m_Name: Image_Profession + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &917114116947107272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924016346090107263} + 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: 2181009478392671503} + - {fileID: 925036208823152071} + m_Father: {fileID: 8797797722769182732} + 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: -70.80463, y: 223.00034} + m_SizeDelta: {x: 95, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7204011712809866854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924016346090107263} + m_CullTransparentMesh: 1 +--- !u!114 &6514997192903468813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924016346090107263} + 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: 5dcce62519cdaea4288a4208215b33f2, 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 &7097670839008232372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5260383636370141986} + - component: {fileID: 8146157896928787268} + - component: {fileID: 4537964730813527487} + - component: {fileID: 3586520369918658785} + m_Layer: 5 + m_Name: Button_SkillInfoBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5260383636370141986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7097670839008232372} + 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: 365248029760201153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.000001013279, y: 110.91861} + m_SizeDelta: {x: 1921.5, y: 221.83722} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8146157896928787268 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7097670839008232372} + m_CullTransparentMesh: 1 +--- !u!114 &4537964730813527487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7097670839008232372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3586520369918658785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7097670839008232372} + 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: 4537964730813527487} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7129396328662953598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6327197852501126704} + m_Layer: 5 + m_Name: UIPosterAndSkillInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6327197852501126704 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7129396328662953598} + 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: 365248029760201153} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7647587705865593147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532482004288769240} + - component: {fileID: 6332275603653452791} + - component: {fileID: 2513678913572972842} + m_Layer: 5 + m_Name: Text_SkillCD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532482004288769240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647587705865593147} + 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: 8675927029939849927} + 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.2, y: 0.1} + m_SizeDelta: {x: 100, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6332275603653452791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647587705865593147} + m_CullTransparentMesh: 1 +--- !u!114 &2513678913572972842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647587705865593147} + 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: 25 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c1ea998da02a4a24e95a403fc41daee0, type: 2} + m_sharedMaterial: {fileID: 2828816531699154909, guid: c1ea998da02a4a24e95a403fc41daee0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2164260863 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.5019608} + 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: 22 + m_fontSizeBase: 22 + 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 &7978335011762970360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2181009478392671503} + - component: {fileID: 635666484880476104} + - component: {fileID: 5663433247376870} + m_Layer: 5 + m_Name: Text_CharacterName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2181009478392671503 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7978335011762970360} + 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: 917114116947107272} + 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: 365.1, y: 19} + m_SizeDelta: {x: 600, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &635666484880476104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7978335011762970360} + m_CullTransparentMesh: 1 +--- !u!114 &5663433247376870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7978335011762970360} + 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: "\u6CF0\u857E\u838E\xB7\u6CF0\u65AF\u5854\u7F57\u838E" + 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: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8766511693277502313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2571623343108715312} + - component: {fileID: 1953169169179007261} + - component: {fileID: 7260561332452054531} + m_Layer: 5 + m_Name: Image_CharacterLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2571623343108715312 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766511693277502313} + 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: 4421170645613492262} + 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: -276, y: 0} + m_SizeDelta: {x: 181, y: 181} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1953169169179007261 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766511693277502313} + m_CullTransparentMesh: 1 +--- !u!114 &7260561332452054531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766511693277502313} + 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: ed973c6a7f2801648a07e4e04fb18ead, 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 diff --git a/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab.meta b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab.meta new file mode 100644 index 00000000000..b49dc15e19c --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d0cb61373d7745438b4c47688e7d62f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UITeamFight.prefab b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UITeamFight.prefab index 09a08e2880a..11537d60bd5 100644 --- a/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UITeamFight.prefab +++ b/ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UITeamFight.prefab @@ -819,7 +819,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7654477066102010246 RectTransform: m_ObjectHideFlags: 0 @@ -6395,7 +6395,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8797797722769182732 RectTransform: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs index c8a0a3ce6a0..4b9637397cf 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs +++ b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs @@ -78,6 +78,7 @@ public partial class UIManager _WindowMeta(UINameConst.UI_BuyDiamond, UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_LevelDetail, UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_DailyBonus, UIWindowLayer.Normal); + _WindowMeta(UINameConst.UIFightPoster, UIWindowLayer.Normal); _WindowMeta(UINameConst.UINoticeTwo, UIWindowLayer.Waiting); @@ -104,6 +105,8 @@ public static class UINameConst public static readonly string UIDefeatGame = "LevelSceneUI/LevelSettle/UIDefeatGame"; public static readonly string UIPassGame = "LevelSceneUI/LevelSettle/UIPassGame"; public static readonly string UIFightScene = "LevelSceneUI/UIFightScene"; + public static readonly string UIFightPoster = "LevelSceneUI/UIPosterAndSkillInfo"; + public static readonly string UISelectCharacter = "MainScene/ShowCharacter/UISelectCharacter"; public static readonly string UIShowAllCharacterSort = "MainScene/UIShowAllCharacterSort"; public static readonly string UI_Cultivate = "MainScene/ShowCharacter/UI_Cultivate"; diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/BattleState.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/BattleState.cs index 8708408785d..898eb35d0f1 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/BattleState.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/BattleState.cs @@ -460,6 +460,7 @@ namespace Gameplay.Level if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, false); } @@ -469,6 +470,7 @@ namespace Gameplay.Level if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, true); } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/PrepareState.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/PrepareState.cs index 19daf1b5637..07150054680 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/PrepareState.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/PrepareState.cs @@ -208,6 +208,7 @@ namespace Gameplay.Level if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } } } @@ -267,6 +268,7 @@ namespace Gameplay.Level if (!TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = true; + TeamManager.Instance.OpenFightPosterUI(characterIDHere); } } } @@ -383,6 +385,7 @@ namespace Gameplay.Level if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, false); } @@ -392,6 +395,7 @@ namespace Gameplay.Level if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, true); } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs new file mode 100644 index 00000000000..155043e72e6 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs @@ -0,0 +1,13 @@ +using Framework; +public partial class TeamManager +{ + public async void OpenFightPosterUI(uint uid) + { + await UIManager.Instance.OpenWindow(UINameConst.UIFightPoster, uid); + } + + public void CloseFightPosterUI() + { + UIManager.Instance.CloseWindow(UINameConst.UIFightPoster); + } +} \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs.meta new file mode 100644 index 00000000000..29edbc5d1d5 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a5eca23f43b145fa87b6ed0973351254 +timeCreated: 1710932595 \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.cs index dcfef67e4d9..76821a4609b 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.cs @@ -16,7 +16,7 @@ using Constants = Framework.Constants; using EventManager = Framework.EventManager; //队伍管理器 -public class TeamManager +public partial class TeamManager { private static TeamManager m_instance; private TeamManager() @@ -899,10 +899,10 @@ public class SingleTeamCharacterInfo private bool _isInLevel = false; //是否被创建到战场中，没有的话不能取到各种值 //测试数据 - private uint m_uid; + private uint m_uid; //战场中生成的UID private CharacType m_type; - public readonly uint OutUid; //战场中生成的UID + public readonly uint OutUid; //养成界面的UID public enum CharacType { diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs new file mode 100644 index 00000000000..2a5b2e721e8 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs @@ -0,0 +1,112 @@ +using System.Collections; +using System.Collections.Generic; +using cfg.CharacterCfg; +using cfg.SkillCfg; +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; +using Gameplay; +using PhxhSDK; + +public class UIPosterAndSkillInfoController : UIWindow +{ + //UI GameObj + ///Auto Gen Start/// + public Button Button_SkillInfoBg; + public Image Image_UI_PosterShadow; + public Image Image_StandPaintting; + public Image Image_CharacterLogo; + public Image Image_SkillInfoLogo; + public TMP_Text Text_SkillName; + public TMP_Text Text_SkillCD; + public TMP_Text Text_SkillCDSecond; + public TMP_Text Text_SkillInfoDes; + public Image Image_Profession; + public TMP_Text Text_CharacterName; + public TMP_Text Text_EnglishName; + + ///Auto Gen End/// + + private uint _fightUid; + private CharacterDataInfo _data; + // deal with input data + public override void PreLoad(object data = null) + { + if (data != null) + { + _fightUid = (uint)data; + var singleCharData = TeamManager.Instance.GetSingleCharacByUid(_fightUid); + _data = CharacterDataInfoManager.Instance.DataDic[singleCharData.OutUid];; + } + } + + // Use this for initialization + public override void OnInit() + { + //bind UI GameObj + UIPosterAndSkillInfoBinder.GetComponents(this); + } + + //invoke when open window + protected override void OnShowWindow(object data = null) + { + _RefreshPoster(); + _RefreshInfo(); + _RefreshSkill(); + } + + //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 async void _RefreshPoster() + { + var path = CommonUtils.GetCharacterPicPath(_data.Cfg.RoleID,CommonUtils.ECharacterPicPathType.Poster); + Image_StandPaintting.sprite = await AssetManager.Instance.LoadAssetAsync(path); + + } + + private async void _RefreshInfo() + { + var cfg = _data.Cfg; + var professionData = TableManager.Instance.Tables.JobAttri.GetOrDefault((int)cfg.Job); + + Image_Profession.sprite = AssetManager.Instance.GetPreLoadResult(professionData.IconPath); + Text_CharacterName.text = CommonUtils.GetLocalizeText(cfg.Name); + Text_EnglishName.text = CommonUtils.GetLocalizeText(cfg.NickName); + } + + private void _RefreshSkill() + { + var singleUnitData = TeamManager.Instance.GetSingleCharacByUid(_fightUid); + var skillID = CommonUtils.GetGameUnitUltraSkillID(singleUnitData.OutUid); + DataSkill skillData = TableManager.Instance.Tables.SkillConfig?.Get(skillID); + + if (skillData != null) + { + Text_SkillName.text = CommonUtils.GetLocalizeText(skillData.Name); + Text_SkillCD.text = CommonUtils.GetLocalizeText("time_sec", skillData.CDTime); + Text_SkillInfoDes.text = CommonUtils.GetLocalizeText(skillData.SkillDesc); + } + } +} \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs.meta new file mode 100644 index 00000000000..e8dd7335dc7 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 42fb6b56cdc6c444b868392d6e23aa5a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs index 7945bcdb87a..010df21e003 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs @@ -191,7 +191,7 @@ public class UITeamFightController : UIWindow { if (LevelManager.Instance.CurrentLevel.IsPreparing()) { - GameObj_SkillInfo.gameObject.SetActive(false); + //GameObj_SkillInfo.gameObject.SetActive(false); Image_ReserveFold.gameObject.SetActive(false); RefreshWaitList(); RefreshOnFightList(); @@ -441,6 +441,7 @@ public class UITeamFightController : UIWindow if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } if (LevelManager.Instance.CurrentLevel.IsInBattle()) @@ -499,7 +500,7 @@ public class UITeamFightController : UIWindow void RefreshToFightSelect(uint uid) { RefreshSkillInfo(); - GameObj_SkillInfo.SetActive(true); + //GameObj_SkillInfo.SetActive(true); SetSelectFightItem(uid); } @@ -700,7 +701,7 @@ public class UITeamFightController : UIWindow if(TeamManager.Instance.SelectID == uid) { RefreshSkillInfo(); - GameObj_SkillInfo.SetActive(false); + //GameObj_SkillInfo.SetActive(false); TeamManager.Instance.SetSelectID(); SetSelectFightUid(); } @@ -752,7 +753,7 @@ public class UITeamFightController : UIWindow if (LevelManager.Instance.CurrentLevel.IsPreparing()) { RefreshSkillInfo(); - GameObj_SkillInfo.SetActive(true); + //GameObj_SkillInfo.SetActive(true); SetSelectFightItem(uid); } else if (LevelManager.Instance.CurrentLevel.IsInBattle()) @@ -765,7 +766,7 @@ public class UITeamFightController : UIWindow void RefreshFightBack(uint uid) { RefreshWaitList(true); - GameObj_SkillInfo.SetActive(false); + //GameObj_SkillInfo.SetActive(false); SetSelectFightItem(uid, true); } @@ -845,6 +846,7 @@ public class UITeamFightController : UIWindow if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } } @@ -956,7 +958,7 @@ public class UITeamFightController : UIWindow if (TeamManager.Instance.SelectID == uid) { RefreshSkillInfo(); - GameObj_SkillInfo.SetActive(false); + //GameObj_SkillInfo.SetActive(false); TeamManager.Instance.SetSelectID(); SetSelectFightUid(); } @@ -1137,6 +1139,7 @@ public class UITeamFightController : UIWindow { await UniTask.DelayFrame(2); TeamManager.IsHideAllUI = true; + TeamManager.Instance.OpenFightPosterUI(uid); } } @@ -1176,7 +1179,7 @@ public class UITeamFightController : UIWindow LevelManager.Instance.CurrentLevel.SelectUnit(uid); comp.RefreshSelect(true); - GameObj_SkillInfo.SetActive(true); + //GameObj_SkillInfo.SetActive(true); } else if (uid != selectFightUid) { @@ -1191,7 +1194,7 @@ public class UITeamFightController : UIWindow if (TeamManager.Instance.GetFightList().Contains(uid)) { SetSelectFightUid(); - GameObj_SkillInfo.SetActive(false); + //GameObj_SkillInfo.SetActive(false); TeamManager.Instance.SelectToWait(uid); FightToWait(uid); return; @@ -1384,7 +1387,7 @@ public class UITeamFightController : UIWindow RefreshFightSelect(uid); RefreshSkillInfo(uid); - GameObj_SkillInfo.gameObject.SetActive(true); + //GameObj_SkillInfo.gameObject.SetActive(true); _skillPutUid = uid; EnterPutSkill(uid); } @@ -1394,7 +1397,7 @@ public class UITeamFightController : UIWindow TeamManager.Instance.SetSelectID(uid); selectFightUid = uid; RefreshFightSelect(uid); - GameObj_SkillInfo.SetActive(true); + //GameObj_SkillInfo.SetActive(true); RefreshSkillInfo(); } @@ -1413,7 +1416,7 @@ public class UITeamFightController : UIWindow if (m_curSkillState == SkillPutState.Dragging) { SetSelectFightItem(Constants.INVALID_UINT_ID, true); - GameObj_SkillInfo.gameObject.SetActive(false); + //GameObj_SkillInfo.gameObject.SetActive(false); ExitPutSkill(); } } @@ -1476,6 +1479,7 @@ public class UITeamFightController : UIWindow if (!TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = true; + TeamManager.Instance.OpenFightPosterUI(uid); } } @@ -1512,7 +1516,7 @@ public class UITeamFightController : UIWindow if (m_curSkillState == SkillPutState.Dragging) { SetSelectFightItem(Constants.INVALID_UINT_ID, true); - GameObj_SkillInfo.gameObject.SetActive(false); + //GameObj_SkillInfo.gameObject.SetActive(false); ExitPutSkill(); } return; @@ -1558,7 +1562,7 @@ public class UITeamFightController : UIWindow void ClearSelectFight() { SetSelectFightUid(); - GameObj_SkillInfo.SetActive(false); + //GameObj_SkillInfo.SetActive(false); foreach (var go in m_fightItemList) { var comp = go.GetComponent(); @@ -1639,6 +1643,7 @@ public class UITeamFightController : UIWindow if (!TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = true; + TeamManager.Instance.OpenFightPosterUI(uid); } } } @@ -1681,6 +1686,7 @@ public class UITeamFightController : UIWindow if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.UI_END_USE_SKILL, true); } @@ -1713,6 +1719,7 @@ public class UITeamFightController : UIWindow if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } if (!LevelManager.Instance.CurrentLevel.IsInBattle()) @@ -1723,7 +1730,7 @@ public class UITeamFightController : UIWindow _skillPutUid = Constants.INVALID_UINT_ID; SetSelectFightItem(Constants.INVALID_UINT_ID, true); - GameObj_SkillInfo.gameObject.SetActive(false); + //GameObj_SkillInfo.gameObject.SetActive(false); // if (m_curSkillState == SkillPutState.Dragging) // { // DebugUtil.LogError("没有退出技能释放！！！"); diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs index 8ce480344ad..84d669b4929 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs @@ -313,6 +313,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{ if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } EventManager.Instance.Send(EventManager.EventName.INFIGHT_PLAYER_SKILL_RELEASE, data); GoCancelSkill.SetActive(false); @@ -346,6 +347,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{ if (TeamManager.IsHideAllUI) { TeamManager.IsHideAllUI = false; + TeamManager.Instance.CloseFightPosterUI(); } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs new file mode 100644 index 00000000000..56563d2d223 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs @@ -0,0 +1,48 @@ +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 UIPosterAndSkillInfoBinder +{ + + public static void GetComponents(UIPosterAndSkillInfoController window) + { + window.Button_SkillInfoBg = window.GetComponent