fix bug
This commit is contained in:
parent
42c869a94e
commit
e801062ca8
@ -2505,7 +2505,7 @@ function BattleBaseController:getRandomSkillList(getCount, isGodSkill, excludeMa
|
||||
local randomSkillNewSkillPool = {}
|
||||
local randomSkillSkillWeight = {}
|
||||
for skillId, info in pairs(cfg) do
|
||||
if not self:getNotInvolvedSkills()[skillId] then
|
||||
if not self:getNotInvolvedSkills()[skillId] and not table.containValue(result, skillId) then
|
||||
if info.universal and info.universal == 1 and info.ads_deity and info.ads_deity == 1 then
|
||||
if not info.limit_times or self:getSkillCount(skillId) < info.limit_times then
|
||||
if not self.randomSkillMap[skillId] then
|
||||
|
||||
@ -110,6 +110,7 @@ function BattleBoxOpenUI:getDouble()
|
||||
self.rewardCell:showRewardNum(self.rewards.num * 2)
|
||||
self.okBtn:setActive(true)
|
||||
self.adBtn:setActive(false)
|
||||
self.okBtn:setAnchoredPositionX(0)
|
||||
end
|
||||
|
||||
return BattleBoxOpenUI
|
||||
@ -155,7 +155,7 @@ function BattleResultUI:onLoadRootComplete()
|
||||
self:refreshArenaBoxNode()
|
||||
end)
|
||||
self:addEventListener(EventManager.CUSTOM_EVENT.BATTLE_DOUBLE_REWARD, function()
|
||||
self:onReviveDouble()
|
||||
self:onReceiveDouble()
|
||||
end)
|
||||
end
|
||||
|
||||
@ -516,7 +516,7 @@ function BattleResultUI:onGetDouble()
|
||||
ModuleManager.BattleManager:reqChapterDoubleReward()
|
||||
end
|
||||
|
||||
function BattleResultUI:onReviveDouble()
|
||||
function BattleResultUI:onReceiveDouble()
|
||||
self.isDouble = true
|
||||
self:refreshRewards()
|
||||
self.doubleOkBtn:setAnchoredPositionX(0)
|
||||
|
||||
@ -23,7 +23,7 @@ end
|
||||
function RewardCell:refresh(reward, mask, check)
|
||||
if reward.type == GConst.REWARD_TYPE.ITEM then
|
||||
self.id = reward.item.id
|
||||
self.num = reward.item.num
|
||||
self.num = reward.item.num or reward.item.count
|
||||
self.type = reward.type
|
||||
self.itemCell:setActive(true)
|
||||
self.equipCell:setActive(false)
|
||||
@ -166,8 +166,8 @@ function RewardCell:showRewardNum(numStr)
|
||||
end
|
||||
|
||||
function RewardCell:setNumTxDouble()
|
||||
if self.count then
|
||||
local count = self.count * 2
|
||||
if self.num then
|
||||
local count = self.num * 2
|
||||
if count > 100 then
|
||||
self:showRewardNum(GFunc.num2Str(count))
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user