Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-08-26 10:18:38 +08:00
commit c293aba881
3 changed files with 41 additions and 31 deletions

View File

@ -488,7 +488,10 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
end, 1, -1, true) end, 1, -1, true)
this.timer:Start() this.timer:Start()
else else
if this.timer then
this.timer:Stop()
this.timer = nil
end
_timeTextExpert.text = "" _timeTextExpert.text = ""
-- LogGreen("ssssssssss") -- LogGreen("ssssssssss")
-- if this.attackInfoTimeGo then -- if this.attackInfoTimeGo then

View File

@ -58,7 +58,8 @@ function LoadingPanel.Start()
curIndex = 0 curIndex = 0
this.Slider.maxValue = #callList - 1 this.Slider.maxValue = #callList - 1
this.Slider.value = curIndex this.Slider.value = curIndex
this.Tip.text = Language[11346] --"你知道嘛:充值会让你变得更强!" --Language[11346]
this.Tip.text = ""
LoadingPanel.OnStep() LoadingPanel.OnStep()
end end

View File

@ -310,8 +310,8 @@ function this:AllEquipUpBtnOnClick()
--获取到所有未装备的装备 --获取到所有未装备的装备
curPosEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, index) curPosEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, index)
end end
LogBlue("i:"..index.." #curPosEquip:".. #curPosEquip) -- LogBlue("i:"..index.." #curPosEquip:".. #curPosEquip)
LogBlue("计算每个位置可装备的装备战力")-- 取战力最大的装备 -- LogBlue("计算每个位置可装备的装备战力")-- 取战力最大的装备
if curPosEquip and #curPosEquip > 0 then if curPosEquip and #curPosEquip > 0 then
local equiData = {} local equiData = {}
local indexMaxPower = 0 local indexMaxPower = 0
@ -320,24 +320,24 @@ function this:AllEquipUpBtnOnClick()
--获取到宝物战力 --获取到宝物战力
if index == 5 or index == 6 then if index == 5 or index == 6 then
indexMaxPower = EquipTreasureManager.CalculateWarForce(curHeroEquipDatas[index].idDyn) indexMaxPower = EquipTreasureManager.CalculateWarForce(curHeroEquipDatas[index].idDyn)
LogBlue("宝物id"..curHeroEquipDatas[index].idDyn.." id:"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower) --LogBlue("宝物id"..curHeroEquipDatas[index].idDyn.." id:"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower)
else else
--获取到装备战力 --获取到装备战力
indexMaxPower = EquipManager.CalculateWarForce(curHeroEquipDatas[index].id) indexMaxPower = EquipManager.CalculateWarForce(curHeroEquipDatas[index].id)
LogBlue("装备id"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower) --LogBlue("装备id"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower)
end end
end end
LogGreen("循环计算每个装备的战力") --LogGreen("循环计算每个装备的战力")
for i = 1, #curPosEquip do for i = 1, #curPosEquip do
local addPower = 0 local addPower = 0
local curEquip = curPosEquip[i] local curEquip = curPosEquip[i]
if curEquip then if curEquip then
if index == 5 or index == 6 then if index == 5 or index == 6 then
addPower = EquipTreasureManager.CalculateWarForce(curEquip.idDyn) addPower = EquipTreasureManager.CalculateWarForce(curEquip.idDyn)
LogGreen("宝物id"..curEquip.idDyn.." id:"..curEquip.id.." addPower:"..addPower) --LogGreen("宝物id"..curEquip.idDyn.." id:"..curEquip.id.." addPower:"..addPower)
else else
addPower = EquipManager.CalculateWarForce(curEquip.id) addPower = EquipManager.CalculateWarForce(curEquip.id)
LogGreen("装备id"..curEquip.id.." addPower:"..addPower) --LogGreen("装备id"..curEquip.id.." addPower:"..addPower)
end end
end end
if addPower > indexMaxPower then if addPower > indexMaxPower then
@ -345,11 +345,11 @@ function this:AllEquipUpBtnOnClick()
equiData = curEquip equiData = curEquip
end end
end end
if index == 5 or index == 6 then -- if index == 5 or index == 6 then
LogYellow("宝物id"..equiData.idDyn.." id:"..equiData.id) -- LogYellow("宝物id"..equiData.idDyn.." id:"..equiData.id)
else -- else
LogYellow("装备id"..equiData.id) -- LogYellow("装备id"..equiData.id)
end -- end
if (index == 5 or index == 6) then if (index == 5 or index == 6) then
if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn) if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn)
@ -378,15 +378,15 @@ function this:AllEquipUpBtnOnClick()
end end
end end
end end
LogYellow("装备:"..#allEquipIds) -- LogYellow("装备:"..#allEquipIds)
LogYellow("宝物:"..#allTreasureIds) -- LogYellow("宝物:"..#allTreasureIds)
LogYellow("isCanUpEquipTreasure:"..tostring(isCanUpEquipTreasure)) -- LogYellow("isCanUpEquipTreasure:"..tostring(isCanUpEquipTreasure))
if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then
--isCanUpEquipTreasure --isCanUpEquipTreasure
if allEquipIds and #allEquipIds > 0 then if allEquipIds and #allEquipIds > 0 then
for i = 1, #allEquipIds do -- for i = 1, #allEquipIds do
LogGreen("一键装备"..allEquipIds[i]) -- LogGreen("一键装备"..allEquipIds[i])
end -- end
--穿装备协议 --穿装备协议
NetManager.EquipWearRequest( NetManager.EquipWearRequest(
curHeroData.dynamicId, curHeroData.dynamicId,
@ -406,9 +406,9 @@ function this:AllEquipUpBtnOnClick()
end end
--穿戴宝物 --穿戴宝物
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
for i = 1, #allTreasureIds do -- for i = 1, #allTreasureIds do
LogGreen("一键宝物"..allTreasureIds[i]) -- LogGreen("一键宝物"..allTreasureIds[i])
end -- end
--穿装备协议 --穿装备协议
NetManager.EquipWearRequest( NetManager.EquipWearRequest(
curHeroData.dynamicId, curHeroData.dynamicId,
@ -936,8 +936,9 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
elseif _type == 4 then elseif _type == 4 then
--一键穿 把身上装备解绑英雄id --一键穿 把身上装备解绑英雄id
if _equipOrTreasure == 1 then if _equipOrTreasure == 1 then
local isadd
for n, m in ipairs(_selectEquipDataList) do for n, m in ipairs(_selectEquipDataList) do
local isadd = true isadd = true
for i = 1, #curHeroData.equipIdList do for i = 1, #curHeroData.equipIdList do
if equipConfig[tonumber(curHeroData.equipIdList[i])].Position == equipConfig[tonumber(m)].Position then if equipConfig[tonumber(curHeroData.equipIdList[i])].Position == equipConfig[tonumber(m)].Position then
EquipManager.DeleteSingleEquip(curHeroData.equipIdList[i], curHeroData.dynamicId) EquipManager.DeleteSingleEquip(curHeroData.equipIdList[i], curHeroData.dynamicId)
@ -953,25 +954,30 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
end end
EquipManager.UpdateEquipData(_selectEquipDataList, curHeroData.dynamicId) EquipManager.UpdateEquipData(_selectEquipDataList, curHeroData.dynamicId)
else else
local isadd
for i = 1, #_selectEquipDataList do for i = 1, #_selectEquipDataList do
local isadd = true isadd = true
for i = 1, #curHeroData.jewels do for j = 1, #curHeroData.jewels do
--如果英雄身上有和选中的宝物的位置相同的,就替换 --如果英雄身上有和选中的宝物的位置相同的,就替换
if EquipTreasureManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i]).equipType == if EquipTreasureManager.GetSingleTreasureByIdDyn(curHeroData.jewels[j]).equipType ==
EquipTreasureManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then EquipTreasureManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then
EquipTreasureManager.SetTreasureUpOrDown(curHeroData.jewels[i], "0") EquipTreasureManager.SetTreasureUpOrDown(curHeroData.jewels[j], "0")
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId) EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
table.remove(curHeroData.jewels,i) curHeroData.jewels[i] = _selectEquipDataList[i]
table.insert(curHeroData.jewels, _selectEquipDataList[i])
isadd = false isadd = false
break break
end end
end end
-- LogGreen("_selectEquipDataList[i]:".._selectEquipDataList[i])
-- LogGreen("isadd:"..tostring(isadd))
if isadd then if isadd then
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId) EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
table.insert(curHeroData.jewels, _selectEquipDataList[i]) table.insert(curHeroData.jewels, _selectEquipDataList[i])
end end
end end
-- for i = 1, #curHeroData.jewels do
-- LogYellow("curHeroData.jewels:"..i.. " id:"..curHeroData.jewels[i])
-- end
end end
elseif _type == 5 then elseif _type == 5 then
--一键脱 把身上装备英雄id置为“0” 再把英雄装备list清空 --一键脱 把身上装备英雄id置为“0” 再把英雄装备list清空