特训显示修改

tcx_xiyou_solider
DESKTOP-RH64908\Administrator 2024-04-02 15:54:35 +08:00 committed by PC-202302260912\Administrator
parent ed1d27394e
commit 9faf16c17f
2 changed files with 23 additions and 21 deletions

View File

@ -6168,9 +6168,9 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8DEF\u8D39\uFF0C\u9752\u6C41\u8FBE\u5230\u4E00\u7EA7"
m_Text: "\u8DEF\u8D39\uFF0C\u9752\u6C41\u662F\u5426\u8FBE\u5230\u7279\u8BAD6\u7EA7\u5E76\u5206\u522B\u89E3\u60D1\u4E00\u4E2A"
--- !u!1 &6674535297107104870
GameObject:
m_ObjectHideFlags: 0

View File

@ -74,13 +74,12 @@ function SpecailTrainingInfoPopup:OnShow()
HeroManager.GetHeroTrainingAddPro(self._curHerodata.dynamicId)
self.ScrollView:SetData(self.showList, function(index, go)
self:SetSingleData(index,go,self.showList[index])
LayoutRebuilder.ForceRebuildLayoutImmediate(go.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(go.transform)
end)
--ForceRebuildLayout(self.GameObject.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
self.ScrollView:SetIndex(1)
LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
end
--
--_data=TrainingConfig
@ -245,7 +244,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
Util.GetGameObject( singleAttList[i][1],"Progress/Image"):GetComponent("RectTransform").sizeDelta = Vector3.New(360*size,25,0)
Util.GetGameObject( singleAttList[i][1],"Progress/Text"):GetComponent("Text").text = string.format("%s/%s",curExp,trainExp)
-- ForceRebuildLayout( singleAttList[i][1].transform)
LayoutRebuilder.ForceRebuildLayoutImmediate(singleAttList[i][1].transform)
singleAttList[i][1]:SetActive(true)
end
local activeIsOpen=false
@ -298,10 +297,12 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
PopupTipPanel.ShowTip(Language[12268])
return
end
if tData.Level<=curLevel then
if tData.Level<=curLevel then
if #selectSkillUnlockItems1==0 or #selectSkillUnlockItems2==0 then
PopupTipPanel.ShowTip(Language[10054])
return
end
local item={}
@ -385,12 +386,13 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
end
self.ScrollView:SetData(self.showList, function(index, go)
self:SetSingleData(index,go,self.showList[index])
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(go.transform)
end)
--ForceRebuildLayout(_go.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(_go.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(_go.transform)
--ForceRebuildLayout(self.GameObject.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
--UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(self.GameObject.transform)
end)
end
@ -431,9 +433,9 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
tmpData[i].type=4
end
if tData.NeedItem1[i][1]== 56 then
tmpData[i].Name= ItemBaseTypeName[tData.NeedItem1[i][2]]
tmpData[i].Name= ItemBaseTypeName[tData.NeedItem1[i][2]]
else
tmpData[i].Name= ItemTypeName[tData.NeedItem1[i][1]]
tmpData[i].Name= ItemTypeName[tData.NeedItem1[i][1]]
end
end
local index=#tmpData
@ -459,13 +461,14 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
local itemIcon= Util.GetGameObject(singleSkillList[i],"hero/icon"):GetComponent("Image")
if curData.type==1 then
Util.GetGameObject(singleSkillList[i],"Name"):GetComponent("Text").text=GetQuantityStrByquality(curData.data[3])..curData.Name
itemIcon.sprite=self.spLoader:LoadSprite("UI_hz_beibao_duigoudi")
itemIcon.sprite=self.spLoader:LoadSprite("r_characterbg_blue")
elseif curData.type==2 then
Util.GetGameObject(singleSkillList[i],"Name"):GetComponent("Text").text=NumToChinese[curData.heroGroupData[1]]..""..curData.Name
itemIcon.sprite=self.spLoader:LoadSprite("UI_hz_zhonghe05_70")
itemIcon.sprite=self.spLoader:LoadSprite("r_hero_jinjie-touxiang2")
else
Util.GetGameObject(singleSkillList[i],"Name"):GetComponent("Text").text=GetQuantityStrByquality(curData.data[3])..curData.Name
itemIcon.sprite=self.spLoader:LoadSprite("UI_hz_beibao_duigoudi")
itemIcon.sprite=self.spLoader:LoadSprite("r_characterbg_blue")
end
local needNum= Util.GetGameObject(singleSkillList[i],"hero/lvbg/CountText"):GetComponent("Text")
local neednum=1
@ -490,6 +493,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
end
UIManager.OpenPanel(UIName.TrainingItemListPanel,curData,
function(selectItems,selectHeroOrItems)
LogError("curData.type======================"..curData.type)
itemIcon.gameObject:SetActive(true)
if curData.type==1 then
selectSkillUnlockItems1={}
@ -502,7 +506,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
selectSkillUnlockItems1[i]=selectItems[i]
end
else
itemIcon.sprite=self.spLoader:LoadSprite("UI_hz_beibao_duigoudi")
itemIcon.sprite=self.spLoader:LoadSprite("r_characterbg_blue")
add:SetActive(true)
needNum.text="0".."/"..neednum
end
@ -530,10 +534,10 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
add:SetActive(true)
needNum.text="0".."/"..neednum
end
elseif curData.type==3 then
elseif curData.type==3 then
selectSkillUnlockItems1={}
if #selectItems>0 then
--LogError("selectItems======================"..#selectItems.." selectItems[1].type==="..selectItems[1].type)
if selectItems[1].type==1 or selectItems[1].type==3 then
itemIcon.sprite=self.spLoader:LoadSprite(selectItems[1].icon)
@ -569,7 +573,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
itemIcon.sprite=self.spLoader:LoadSprite("UI_hz_zhonghe05_70")
add:SetActive(true)
needNum.text="0".."/"..neednum
end
end
end
end
@ -582,9 +586,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
else
SkillContent:SetActive(false)
end
--ForceRebuildLayout(_go.transform)
LayoutRebuilder.ForceRebuildLayoutImmediate(_go.transform)
UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(_go.transform)
_go:SetActive(true)
end
function SpecailTrainingInfoPopup:SetSingleData2(index,_go,_data)