【修行】提交

dev_chengFeng
ZhangBiao 2021-05-24 14:58:00 +08:00
parent fa051b65dc
commit 6f27423920
4 changed files with 21 additions and 21 deletions

View File

@ -779,7 +779,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 7.3, y: -54}
m_AnchoredPosition: {x: -15, y: -54}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5691183364272873430
@ -5266,7 +5266,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 7.3, y: -54}
m_AnchoredPosition: {x: 15, y: -54}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6472982270528031277
@ -5682,7 +5682,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: -15}
m_AnchoredPosition: {x: 18, y: -15}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3786470217147903557
@ -6122,7 +6122,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: -15}
m_AnchoredPosition: {x: 18, y: -15}
m_SizeDelta: {x: 180, y: 177}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3325165271274551019

View File

@ -85,7 +85,7 @@ function PracticeImprint:Refresh(isTop,isAni,func)
if not self.ImprintList[i] then
self.ImprintList[i] = newObject(self.ImprintPre)
self.ImprintList[i].transform:SetParent(self.Scrollgrid.transform)
self.ImprintList[i].transform.localScale = Vector3.one
self.ImprintList[i].transform.localScale = Vector3.one*0.9
self.ImprintList[i].transform.localPosition = Vector3.zero
end
self.ImprintList[i]:SetActive(true)
@ -231,7 +231,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
icon.sprite = self.spLoader:LoadSprite(heroData.icon)
lv.text = heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
SetHeroStars(starGrid, heroData.star)
SetHeroStars(self.spLoader,starGrid, heroData.star)
end
Util.AddOnceClick(self.MaskBtn,function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function (_heroData)
@ -241,7 +241,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
icon.sprite = self.spLoader:LoadSprite(_heroData.icon)
lv.text = _heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName))
SetHeroStars(starGrid, _heroData.star)
SetHeroStars(self.spLoader,starGrid, _heroData.star)
--刷新
self:Refresh(true,true,function ()
self:Animation(2)

View File

@ -332,11 +332,13 @@ end
function this.PracticeCheckUpgrade()
local configData = XiuXianConfig[this.PracticeLevel]
if this.StarNum >= configData.NeedStarNum then
for i = 1, #configData.LevelUpCost do
local data = configData.LevelUpCost[i]
if BagManager.GetTotalItemNum(data[1]) < data[2] then
-- LogRed("return false Upgrade 1")
return false
if configData.LevelUpCost then
for i = 1, #configData.LevelUpCost do
local data = configData.LevelUpCost[i]
if BagManager.GetTotalItemNum(data[1]) < data[2] then
-- LogRed("return false Upgrade 1")
return false
end
end
end
-- LogGreen("return true Upgrade")

View File

@ -16,11 +16,11 @@ local curType
local fun--回调
local rechargeData
local activityType = {
[1] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21},
[1] = {name = Language[11935],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21,Text = Language[12319]},
[2] = {name = Language[11936],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8},
[3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25},
[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26},
[5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31},
[3] = {name = "关卡推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25,Text = Language[12320]},
[4] = {name = "心魔试炼礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26,Text = Language[12321]},
[5] = {name = "灵兽推送礼包",timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 31,Text = "恭喜您获得极品灵兽,这是为您准备的灵兽成长礼包,助您实力飞升"},
}
--初始化组件(用于子类重写)
function this:InitComponent()
@ -184,11 +184,9 @@ function this:Refresh()
curGiftId = rechargeData.goodsId
LogBlue("#curGiftId:"..tostring(curGiftId))
if curType == 1 then
this.tip.text = string.format(Language[12319],RechargeConfig[curGiftId].Desc)
elseif curType == 3 then
this.tip.text = string.format(Language[12320])
elseif curType == 4 then
this.tip.text = string.format(Language[12321])
this.tip.text = string.format(activityType[curType].Text,RechargeConfig[curGiftId].Desc)
elseif curType == 3 or curType == 4 or curType == 5 then
this.tip.text = string.format(activityType[curType].Text)
else
this.tip.text = ""
end