[飞升]=======显示修改
parent
1de7293630
commit
2e0bd1ded7
|
@ -80156,9 +80156,9 @@ RectTransform:
|
|||
m_Father: {fileID: 5594375324361613308}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -168.4, y: -7.800003}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -168.4, y: -703}
|
||||
m_SizeDelta: {x: 100, y: 115.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5672899113965607730
|
||||
|
@ -80216,7 +80216,6 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5594375324361613308}
|
||||
- component: {fileID: 5595842481698398710}
|
||||
m_Layer: 5
|
||||
m_Name: RoleFlyUpLayout
|
||||
m_TagString: Untagged
|
||||
|
@ -80245,14 +80244,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5595842481698398710
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5673011542029775386}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5720568459774776745
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -35,7 +35,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: -2, y: 0.000045776367}
|
||||
m_AnchoredPosition: {x: -2, y: 0}
|
||||
m_SizeDelta: {x: 911.7, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8840374508037427462
|
||||
|
@ -87,13 +87,13 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 6
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1.3
|
||||
m_Text:
|
||||
m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684"
|
||||
LanguageIndex: 10911
|
||||
--- !u!1 &4677369722417585249
|
||||
GameObject:
|
||||
|
@ -128,9 +128,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7357172877353762945}
|
||||
m_RootOrder: 0
|
||||
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: -329, y: 504}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -295, y: -430}
|
||||
m_SizeDelta: {x: 338, y: 106}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4898540815014938959
|
||||
|
@ -283,9 +283,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7357172877353762945}
|
||||
m_RootOrder: 1
|
||||
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.000012159, y: 306}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 24.199986, y: -630}
|
||||
m_SizeDelta: {x: 996, y: 356}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5276786805168625830
|
||||
|
@ -358,10 +358,10 @@ RectTransform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 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_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -3.6, y: 81.2}
|
||||
m_SizeDelta: {x: 1076.6, y: 466}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7355087688229137717
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -169,7 +169,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
|
|||
if curUpStarData and #curUpStarData>0 then
|
||||
this.upStar:SetActive(true)
|
||||
this.noUpStarText:SetActive(false)
|
||||
parent.talentTipStrGo:SetActive(true)
|
||||
--parent.talentTipStrGo:SetActive(true)
|
||||
upStarConsumeMaterial={}
|
||||
upStarMaterialIsAll = {}
|
||||
upStarPreList = {}
|
||||
|
@ -270,7 +270,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData()
|
|||
else
|
||||
this.upStar:SetActive(false)
|
||||
this.noUpStarText:SetActive(true)
|
||||
parent.talentTipStrGo:SetActive(false)
|
||||
-- parent.talentTipStrGo:SetActive(false)
|
||||
end
|
||||
self:AutoSelectUpStarHeroList(curUpStarData)
|
||||
end
|
||||
|
|
|
@ -17,6 +17,8 @@ local tabs = {
|
|||
},
|
||||
[RoleInfoPanelIndex.pifu] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816],rpType = -1,
|
||||
},
|
||||
[RoleInfoPanelIndex.feiSheng] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = "飞升",rpType = -1,
|
||||
},
|
||||
}
|
||||
|
||||
local tabPage = {
|
||||
|
@ -26,6 +28,7 @@ local tabPage = {
|
|||
[RoleInfoPanelIndex.juexing] = SubUIConfig.RoleAwakelayout,
|
||||
[RoleInfoPanelIndex.chuanshuo] = SubUIConfig.RoleStoryLayout,
|
||||
[RoleInfoPanelIndex.pifu] = SubUIConfig.RoleSkinLayout,
|
||||
[RoleInfoPanelIndex.feiSheng] = SubUIConfig.RoleFlyUpLayout,
|
||||
}
|
||||
|
||||
local curHeroData--当前英雄信息
|
||||
|
@ -524,6 +527,14 @@ function this:UpdateBtnList()
|
|||
else
|
||||
tabsList[k].gameObject:SetActive(false)
|
||||
end
|
||||
elseif k == RoleInfoPanelIndex.feiSheng then
|
||||
local isopen=ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FlyUp)
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FlyUp)
|
||||
and curHeroData.heroConfig.MaxRank >11 and curHeroData.star < 14 then
|
||||
tabsList[k].gameObject:SetActive(true)
|
||||
else
|
||||
tabsList[k].gameObject:SetActive(false)
|
||||
end
|
||||
else
|
||||
tabsList[k].gameObject:SetActive(true)
|
||||
end
|
||||
|
@ -548,6 +559,9 @@ function this:UpdateBtnList()
|
|||
-- redpot.gameObject:SetActive(upStarRedPointState)
|
||||
-- else
|
||||
redpot.gameObject:SetActive(false)
|
||||
elseif k== RoleInfoPanelIndex.feiSheng then
|
||||
local upStarRedPointState = HeroManager.IsShowFlyUpRedPoint(curHeroData)
|
||||
redpot.gameObject:SetActive(upStarRedPointState)
|
||||
end
|
||||
Util.AddOnceClick(tabsList[k],function()
|
||||
if k == _CurPageIndex then
|
||||
|
@ -603,6 +617,7 @@ function this:UpdateHeroInfoData()
|
|||
for k,v in pairs(this.PageList) do
|
||||
v:OnHide()
|
||||
end
|
||||
LogError("_CurPageIndex==".._CurPageIndex)
|
||||
if _CurPageIndex == RoleInfoPanelIndex.pifu then
|
||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
||||
local HeoSkin = {}
|
||||
|
@ -631,6 +646,13 @@ function this:UpdateHeroInfoData()
|
|||
else
|
||||
_CurPageIndex = RoleInfoPanelIndex.qingbao
|
||||
end
|
||||
elseif _CurPageIndex == RoleInfoPanelIndex.feiSheng then
|
||||
if curHeroData.heroConfig.MaxRank <= 11 or curHeroData.star == 14 then
|
||||
LogError("*********/////////////////")
|
||||
_CurPageIndex=RoleInfoPanelIndex.qingbao
|
||||
else
|
||||
LogError("*********/////////////////222222")
|
||||
end
|
||||
end
|
||||
this:SetSelectBtn(_CurPageIndex)
|
||||
this:OnPageTabChange(_CurPageIndex)
|
||||
|
|
Loading…
Reference in New Issue