diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index d42d0f7ca7..0c6b19e0eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3022,7 +3022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2140040536 RectTransform: m_ObjectHideFlags: 0 @@ -11623,10 +11623,10 @@ RectTransform: m_Father: {fileID: 5538698238708721650} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 590, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &6014766822068860310 CanvasRenderer: @@ -13960,9 +13960,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &5210253197636820229 @@ -17323,9 +17323,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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: 786.59503, y: -43.08} m_SizeDelta: {x: 159.39, y: 50.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1420070111345050450 @@ -20723,7 +20723,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: -232} + m_AnchoredPosition: {x: 0, y: -231.99976} m_SizeDelta: {x: 948.1, y: 191.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1486091877689848605 @@ -25185,10 +25185,10 @@ RectTransform: m_Father: {fileID: 215920149304938626} 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_SizeDelta: {x: 855.1, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 465.55, y: -26.5} + m_SizeDelta: {x: 855.1, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5392194319038496384 CanvasRenderer: @@ -26456,10 +26456,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_SizeDelta: {x: 870, y: 77.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5915642200145091643 CanvasRenderer: @@ -28898,10 +28898,10 @@ RectTransform: m_Father: {fileID: 5538698238708721650} 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: 400, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &1293546753299662278 CanvasRenderer: @@ -30325,7 +30325,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -77.04} + m_AnchoredPosition: {x: 400, y: -77.04001} m_SizeDelta: {x: 800, y: 64.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5337526335800535862 @@ -31318,9 +31318,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 5 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: 435, y: -605.5} m_SizeDelta: {x: 870, y: 309.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5688548084432830598 @@ -31653,10 +31653,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 435, y: -218} + m_SizeDelta: {x: 870, y: 72.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183859335168644090 CanvasRenderer: @@ -32039,8 +32039,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -0.000045776367} - m_SizeDelta: {x: 917, y: 0} + m_AnchoredPosition: {x: 458.5, y: 0.000015258789} + m_SizeDelta: {x: 917, y: 46} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2354951152359418691 CanvasRenderer: @@ -32386,7 +32386,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.5, y: -427.2} - m_SizeDelta: {x: 870, y: 0} + m_SizeDelta: {x: 870, y: 915.2} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2484587132639556036 MonoBehaviour: @@ -33860,9 +33860,9 @@ RectTransform: m_Father: {fileID: 7494134846245643573} 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: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3010712499452228185 @@ -35102,10 +35102,10 @@ RectTransform: m_Father: {fileID: 5538698238708721650} 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: 210, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &1565154669416300507 CanvasRenderer: @@ -35179,7 +35179,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 147, y: -38.000008} + m_AnchoredPosition: {x: 147, y: -24} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5538698237444292551 @@ -35788,7 +35788,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 147, y: -38} + m_AnchoredPosition: {x: 147, y: -23} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5538698237702433798 @@ -36876,8 +36876,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 473.5, y: -100} - m_SizeDelta: {x: 853, y: 60} + m_AnchoredPosition: {x: 459.64996, y: -80} + m_SizeDelta: {x: 825.3, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5538698238344648680 CanvasRenderer: @@ -36909,7 +36909,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -36919,8 +36919,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%" + m_LineSpacing: 0.9 + m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%\u5F53\u65F6\u6CD5\u56FD\u68B5\u8482\u5188\u5408\u6CD5\u7684\u6492\u5B98\u65B9\u7535\u8BDD\u6602\u8D35\u7684\u53CC\u65B9\u7684\u6602\u8D35\u7684\u89C4\u5212\u6309\u80A1\u4EFD\u4EE3\u53F7" LanguageIndex: 0 --- !u!1 &5538698238346183226 GameObject: @@ -37733,8 +37733,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 473.5, y: -100} - m_SizeDelta: {x: 853, y: 56.1} + m_AnchoredPosition: {x: 459.64996, y: -81} + m_SizeDelta: {x: 825.3, y: 56.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5538698238972965632 CanvasRenderer: @@ -37776,8 +37776,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%" + m_LineSpacing: 0.9 + m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%\u7B2C\u4E09\u65B9\u7684\u5E7F\u4E1C\u5BCC\u8C6A\u6BD5\u7ADF\u4F60\u662F\u62C9\u4E2A\u514D\u8D39\u7684\u6602\u8D35\u7684\u548C\u6602\u8D35\u7684\u548C\u53D1\u7684\u6885\u82B1" LanguageIndex: 0 --- !u!1 &5538698239009008945 GameObject: @@ -43528,10 +43528,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 435, y: -605.5} + m_SizeDelta: {x: 870, y: 81.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4863705341942113372 CanvasRenderer: @@ -45721,7 +45721,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &475247785733533137 RectTransform: m_ObjectHideFlags: 0 @@ -48943,9 +48943,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 3 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: 435, y: -411.75} m_SizeDelta: {x: 870, y: 387.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &530755074506280210 @@ -49987,9 +49987,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: -109} m_SizeDelta: {x: 870, y: 218} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5453380272156850861 @@ -50672,9 +50672,9 @@ RectTransform: m_Father: {fileID: 1724954233501732768} 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: 36, y: -14} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3903058791224746062 @@ -50834,7 +50834,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -0.000019445808} - m_SizeDelta: {x: 916, y: 0} + m_SizeDelta: {x: 916, y: 51} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2233394732319046138 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index 54ad01531b..1dee966f77 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -469,6 +469,9 @@ function RoleUpStarLayout:StarUpClick() NetManager.HeroUpStarEvent(curHeroData.dynamicId,upStarConsumeMaterial ,function (msg) UIManager.OpenPanel(UIName.RoleUpStarSuccessPanel,curHeroData,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function () local dropItemTabs = BagManager.GetTableByBackDropData(msg) + if CheckListIsContainValue1(HelpFightManager.upHeroList,curHeroData.dynamicId) then + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HelpFight) + end if #dropItemTabs > 0 then BagManager.SetDropIsSHowEquipPrint(false) UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1, function ()