【踏碎凌霄】
parent
31b9eb3057
commit
98f12190ea
|
|
@ -327,16 +327,14 @@ function this.InitPanelData()
|
||||||
|
|
||||||
for i = 1, #actData.rewards do
|
for i = 1, #actData.rewards do
|
||||||
local index = #boxList2 + 1
|
local index = #boxList2 + 1
|
||||||
if actData.rewards[i].state == 0 then
|
boxList2[index] = {}
|
||||||
boxList2[index] = {}
|
boxList2[index].obj = newObject(this.boxpre)
|
||||||
boxList2[index].obj = newObject(this.boxpre)
|
boxList2[index].obj.transform:SetParent(this.dmg3grid.transform)
|
||||||
boxList2[index].obj.transform:SetParent(this.dmg3grid.transform)
|
boxList2[index].obj.transform.localScale = Vector3.one
|
||||||
boxList2[index].obj.transform.localScale = Vector3.one
|
boxList2[index].obj.transform.localPosition = Vector3.zero
|
||||||
boxList2[index].obj.transform.localPosition = Vector3.zero
|
boxList2[index].moved = false
|
||||||
boxList2[index].moved = false
|
boxList2[index].obj:SetActive(false)
|
||||||
boxList2[index].obj:SetActive(false)
|
Util.GetGameObject(boxList2[index].obj,"iconRoot/icon"):GetComponent("Image").sprite = Util.LoadSprite(ArtResourcesConfig[boxs[i][2]].Name)
|
||||||
Util.GetGameObject(boxList2[index].obj,"iconRoot/icon"):GetComponent("Image").sprite = Util.LoadSprite(ArtResourcesConfig[boxs[i][2]].Name)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
if #boxList2 > 0 then
|
if #boxList2 > 0 then
|
||||||
boxList2[1].obj:SetActive(true)
|
boxList2[1].obj:SetActive(true)
|
||||||
|
|
@ -793,22 +791,14 @@ function this.RefreshMyDamageShow(role)
|
||||||
this.dmg3Text.text = string.format("%s/%s",num1,num2)
|
this.dmg3Text.text = string.format("%s/%s",num1,num2)
|
||||||
this.dmg3Progress.fillAmount = num1/num2
|
this.dmg3Progress.fillAmount = num1/num2
|
||||||
|
|
||||||
local list = {}
|
|
||||||
for i = 1, #boxs do
|
for i = 1, #boxs do
|
||||||
-- LogBlue("TaSuiLingXiaoHistoryDmg:"..tostring(CommonActPageManager.TaSuiLingXiaoHistoryDmg))
|
if myDamage >= boxs[i][1] then
|
||||||
if CommonActPageManager.TaSuiLingXiaoHistoryDmg < boxs[i][1] then
|
if boxList2[i+1] then
|
||||||
table.insert(list,boxs[i])
|
boxList2[i+1].obj:SetActive(true)
|
||||||
end
|
end
|
||||||
end
|
if boxs[i][1] < CommonActPageManager.TaSuiLingXiaoHistoryDmg then
|
||||||
-- LogGreen("#list:"..tostring(#list))
|
boxList2[i].obj:SetActive(false)
|
||||||
if #list > 0 then
|
else
|
||||||
for i = 1, #list do
|
|
||||||
-- LogYellow("myDamage:"..tostring(myDamage).." list[i][1]:"..tostring(list[i][1]))
|
|
||||||
if myDamage >= list[i][1] then
|
|
||||||
if boxList2[i+1] then
|
|
||||||
boxList2[i+1].obj:SetActive(true)
|
|
||||||
end
|
|
||||||
-- LogPink("not boxList2[i].moved:"..tostring(boxList2[i].moved))
|
|
||||||
if not boxList2[i].moved then
|
if not boxList2[i].moved then
|
||||||
boxList2[i].obj.transform:SetParent(this.bar3.transform)
|
boxList2[i].obj.transform:SetParent(this.bar3.transform)
|
||||||
boxList2[i].obj.transform:DOLocalMove(Vector3.New(math.random(-400, 400),math.random(-100, 100),0), 1.5)
|
boxList2[i].obj.transform:DOLocalMove(Vector3.New(math.random(-400, 400),math.random(-100, 100),0), 1.5)
|
||||||
|
|
@ -818,7 +808,6 @@ function this.RefreshMyDamageShow(role)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ end
|
||||||
function this.TaSuiLingXiaoShow(num)
|
function this.TaSuiLingXiaoShow(num)
|
||||||
if CommonActPageManager.TaSuiLingXiaoMsg then
|
if CommonActPageManager.TaSuiLingXiaoMsg then
|
||||||
local curDmg = CommonActPageManager.TaSuiLingXiaoMsg.damageVal
|
local curDmg = CommonActPageManager.TaSuiLingXiaoMsg.damageVal
|
||||||
local maxDmg = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao).value
|
local maxDmg = CommonActPageManager.TaSuiLingXiaoHistoryDmg
|
||||||
this.tasuilingxiao_CurScore.text = curDmg
|
this.tasuilingxiao_CurScore.text = curDmg
|
||||||
this.tasuilingxiao_MaxScore.text = maxDmg
|
this.tasuilingxiao_MaxScore.text = maxDmg
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,8 @@ function this:OnOpen(...)
|
||||||
elseif curSkillData.skillConfig.Type == SkillType.Bei then
|
elseif curSkillData.skillConfig.Type == SkillType.Bei then
|
||||||
this.skillTypeImage.sprite=Util.LoadSprite(SkillIconType[SkillType.Bei])--被动技
|
this.skillTypeImage.sprite=Util.LoadSprite(SkillIconType[SkillType.Bei])--被动技
|
||||||
end
|
end
|
||||||
|
-- local skillLogiData=ConfigManager.GetConfigData(ConfigName.SkillLogicConfig,curSkillData.skillConfig.Id)
|
||||||
local skillLogiData=ConfigManager.GetConfigData(ConfigName.SkillLogicConfig,curSkillData.skillConfig.Id)
|
-- local ShortDesc = GetLanguageStrById(curSkillData.skillConfig.ShortDesc) or ""
|
||||||
local ShortDesc = GetLanguageStrById(curSkillData.skillConfig.ShortDesc) or ""
|
|
||||||
-- local rateCasting=0
|
-- local rateCasting=0
|
||||||
-- if skillLogiData.CD>0 then
|
-- if skillLogiData.CD>0 then
|
||||||
-- rateCasting=skillLogiData.CD/1000
|
-- rateCasting=skillLogiData.CD/1000
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue