From 6bc4adee78139dd80a54cf84b460a530d8ec05f1 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 6 Jun 2022 15:43:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=8B=B1=E9=9B=84=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2]=3D=3D=3D=3D=3D=E8=83=8C=E6=99=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/HandBook/HandBookHeroInfoPanel.prefab | 6 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 34 ++--- .../Prefabs/UI/Popup/RoleGetInfoPopup.prefab | 24 ++-- .../UI/Recruit/SingleRecruitPanel.prefab | 44 +++---- .../UI/XiaoYao/XiaoyaoHeroGetPopup.prefab | 117 ++++++++++++------ .../~Lua/Modules/Popup/SkillInfoPopup.lua | 4 +- .../Modules/XiaoYao/XiaoyaoHeroGetPopup.lua | 6 +- 7 files changed, 141 insertions(+), 94 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 989118847c..de871fe548 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -619,8 +619,8 @@ RectTransform: - {fileID: 1974485989804795072} - {fileID: 3559168877927255485} - {fileID: 1549357831745972050} - - {fileID: 1974526467947202456} - {fileID: 7243046732601692507} + - {fileID: 1974526467947202456} - {fileID: 1974363042441674858} - {fileID: 2025960690052971106} - {fileID: 4126197808121152527} @@ -1667,7 +1667,7 @@ RectTransform: - {fileID: 8520881433147225690} - {fileID: 7748025870594562752} m_Father: {fileID: 164915241442772717} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3587,7 +3587,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 164915241442772717} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 83238fb16e..f18d259e89 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -29836,10 +29836,10 @@ RectTransform: m_Father: {fileID: 1514742784526019917} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 94, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 94, y: -39.665} + m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719194494920943748 CanvasRenderer: @@ -46034,9 +46034,9 @@ RectTransform: m_Father: {fileID: 1514742784526019917} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 27, y: -39.665} m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6198227662777375596 @@ -50247,7 +50247,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 237.3, y: -95.34} - m_SizeDelta: {x: 0, y: 79.33} + m_SizeDelta: {x: 134, y: 79.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8047649643578717371 CanvasRenderer: @@ -55020,9 +55020,9 @@ RectTransform: m_Father: {fileID: 7843831536758449798} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 706.275, y: -37} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841663904524152744 @@ -55159,9 +55159,9 @@ RectTransform: m_Father: {fileID: 7843831536758449798} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 235.425, y: -37} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841404854095346338 @@ -55465,7 +55465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7843436345893266768 RectTransform: m_ObjectHideFlags: 0 @@ -63872,8 +63872,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 160} - m_SizeDelta: {x: 750, y: 141.7} + m_AnchoredPosition: {x: -0.000034332, y: 160} + m_SizeDelta: {x: 896.2, y: 141.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871382871495151358 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index cc3089b6d3..9e909c372e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 90.19998, y: 69.579926} + m_AnchoredPosition: {x: 90.19998, y: -78.42012} m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222152921257836146 @@ -305,8 +305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -496.85} - m_SizeDelta: {x: 911.78, y: 446.2} + m_AnchoredPosition: {x: -0.001833, y: -365.52} + m_SizeDelta: {x: 934.5, y: 731} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222790982303746272 CanvasRenderer: @@ -1431,7 +1431,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 90.2, y: -9} + m_AnchoredPosition: {x: 90.2, y: -157.00005} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &223808261227506364 @@ -1700,7 +1700,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -376.6, y: 36} + m_AnchoredPosition: {x: -376.6, y: -112} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114230251858960156 @@ -3193,7 +3193,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0000095367, y: -9} + m_AnchoredPosition: {x: 0.0000095367, y: -157.00005} m_SizeDelta: {x: 911.78, y: 390} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3685264105058305093 @@ -3813,7 +3813,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -148.00005} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3842046650324987774 @@ -4842,7 +4842,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 11.997848, y: 250.76} + m_AnchoredPosition: {x: 11.997848, y: 102.75995} m_SizeDelta: {x: 0, y: 39.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6721055203894759870 @@ -4995,7 +4995,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 194.5, y: 2.4650137} + m_AnchoredPosition: {x: 194.5, y: -145.53503} m_SizeDelta: {x: 328.23, y: 4.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8248709394375022427 @@ -5729,7 +5729,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -137, y: 166.2} + m_AnchoredPosition: {x: -137, y: 18.199951} m_SizeDelta: {x: 179.17, y: 37.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6164789371220847294 @@ -5804,7 +5804,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 155.3, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2932693287766199764 @@ -6952,7 +6952,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00000095367, y: 329.6} + m_AnchoredPosition: {x: 0.00000095367, y: 181.59996} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7509707285988776397 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 709b09d806..479a498190 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -42997,7 +42997,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224558474284908024 RectTransform: m_ObjectHideFlags: 0 @@ -96677,10 +96677,10 @@ RectTransform: m_Father: {fileID: 4962302989025463740} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42, y: -42} - m_SizeDelta: {x: 84, y: 84} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222587977423639592 CanvasRenderer: @@ -96751,10 +96751,10 @@ RectTransform: m_Father: {fileID: 4962302989025463740} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 204, y: -42} - m_SizeDelta: {x: 240, y: 66} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222882605791076956 CanvasRenderer: @@ -96838,7 +96838,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 469, y: -42} - m_SizeDelta: {x: 324, y: 84} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &243562726934911527 CanvasRenderer: @@ -97139,7 +97139,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 269.8, y: -38.149994} - m_SizeDelta: {x: 287, y: 142.40002} + m_SizeDelta: {x: 0, y: 142.40002} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8958681429632674031 MonoBehaviour: @@ -192112,10 +192112,10 @@ RectTransform: m_Father: {fileID: 6811487750097457237} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 174.5, y: -71.20001} - m_SizeDelta: {x: 225, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &888004739153871973 CanvasRenderer: @@ -192613,7 +192613,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00019662488} - m_SizeDelta: {x: 0, y: 335} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7831612963117775310 MonoBehaviour: @@ -255430,8 +255430,8 @@ RectTransform: 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: 87.8} - m_SizeDelta: {x: 0, y: 791.6} + m_AnchoredPosition: {x: 0, y: 154.7} + m_SizeDelta: {x: 0, y: 925.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4891994551748036195 CanvasRenderer: @@ -255581,10 +255581,10 @@ RectTransform: m_Father: {fileID: 6811487750097457237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 31, y: -71.20001} - m_SizeDelta: {x: 62, y: 62} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1205094569297172439 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoyaoHeroGetPopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoyaoHeroGetPopup.prefab index d4d4115d01..b18ffae7a0 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoyaoHeroGetPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoyaoHeroGetPopup.prefab @@ -120,7 +120,6 @@ GameObject: m_Component: - component: {fileID: 224117904252964514} - component: {fileID: 222790982303746272} - - component: {fileID: 114237087793031864} m_Layer: 5 m_Name: RoleInfo m_TagString: Untagged @@ -139,6 +138,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6099407947204998508} - {fileID: 4624725292118211212} - {fileID: 3513196795103522090} - {fileID: 5728652553189984871} @@ -161,35 +161,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1316961116097826} m_CullTransparentMesh: 0 ---- !u!114 &114237087793031864 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316961116097826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3bb13f4dd8c732d43acc634533999089, 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 --- !u!1 &1329699568529998 GameObject: m_ObjectHideFlags: 0 @@ -844,6 +815,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &163533874064952971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6099407947204998508} + - component: {fileID: 7228810681585973716} + - component: {fileID: 2862280755780943584} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6099407947204998508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163533874064952971} + 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_Children: [] + m_Father: {fileID: 224117904252964514} + m_RootOrder: 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: 8.575, y: 145} + m_SizeDelta: {x: 929, y: 796.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7228810681585973716 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163533874064952971} + m_CullTransparentMesh: 0 +--- !u!114 &2862280755780943584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163533874064952971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 3bb13f4dd8c732d43acc634533999089, 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 --- !u!1 &270192196386119775 GameObject: m_ObjectHideFlags: 0 @@ -2215,7 +2260,7 @@ RectTransform: - {fileID: 1879345866333396004} - {fileID: 4305940564780905772} m_Father: {fileID: 224117904252964514} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2767,7 +2812,7 @@ RectTransform: m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203} m_Children: [] m_Father: {fileID: 224117904252964514} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3075,7 +3120,7 @@ RectTransform: - {fileID: 5844702033721285765} - {fileID: 6224517589887850187} m_Father: {fileID: 224117904252964514} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3343,7 +3388,7 @@ RectTransform: m_Children: - {fileID: 2264153723348019526} m_Father: {fileID: 224117904252964514} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3908,7 +3953,7 @@ RectTransform: - {fileID: 2105628407444880970} - {fileID: 109206584781830602} m_Father: {fileID: 224117904252964514} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4124,7 +4169,7 @@ RectTransform: - {fileID: 224416983558208314} - {fileID: 5436129013872032804} m_Father: {fileID: 224117904252964514} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index fdbdfc64b1..4be7b59aa8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -100,7 +100,7 @@ function this:OnOpen(...) else des1 = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv) end - if curSkillData.needStar~=1 then + if curSkillData.needStar and curSkillData.needStar~=1 then LogError("urSkillData.needStar=="..curSkillData.needStar) if curSkillData.needStar==14 then --this.hintTxt.text=" ".."飞升3解锁" @@ -112,7 +112,7 @@ function this:OnOpen(...) --des1="" end this.desList[1].des.text=des1 - if nextCfg then + if nextCfg and nextCfg.skillConfig then this.desList[2].go.gameObject:SetActive(true) this.hintTxt2.gameObject:SetActive(false) this.line:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua index 475fab5dac..5f49edcff1 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua @@ -220,13 +220,13 @@ function this:SetSelectHero(curHeroData) --星级 SetHeroStars(this.spLoader, this.starGrid, heroSData.Star,1,Vector2.New(42.44,42.44),-7.28, Vector2.New(0.5,0.5), Vector3.New(0,0,-15)) this.skillGrid:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1 - local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSData.Id,heroSData.Star) + local skillList = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(heroSData.Id,heroSData.Star) for i = 1, this.skillGrid.transform.childCount do this.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false) end - for i = 1, #skillList do + for i = 1, 2 do if skillList[i] and skillList[i].skillConfig and skillList[i].skillConfig.Name then local go = this.skillGrid.transform:GetChild(i-1).gameObject go:SetActive(true) @@ -236,6 +236,8 @@ function this:SetSelectHero(curHeroData) Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function() local skillData = {} skillData.skillConfig = skillList[i].skillConfig + skillData.isOpen=skillList[i].isOpen + skillData.needStar=skillList[i].needStar UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,heroStar,1,i) end) end