puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
puxuan 2025-11-04 18:05:03 +08:00
parent 42c869a94e
commit e801062ca8
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/battle/controller/battle_base_controller.lua
View File

@ -2505,7 +2505,7 @@ function BattleBaseController:getRandomSkillList(getCount, isGodSkill, excludeMa
local randomSkillNewSkillPool = {} local randomSkillNewSkillPool = {}
local randomSkillSkillWeight = {} local randomSkillSkillWeight = {}
for skillId, info in pairs(cfg) do 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 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 info.limit_times or self:getSkillCount(skillId) < info.limit_times then
if not self.randomSkillMap[skillId] then if not self.randomSkillMap[skillId] then

1
lua/app/ui/battle/battle_box_open_ui.lua
View File

@ -110,6 +110,7 @@ function BattleBoxOpenUI:getDouble()
self.rewardCell:showRewardNum(self.rewards.num * 2) self.rewardCell:showRewardNum(self.rewards.num * 2)
self.okBtn:setActive(true) self.okBtn:setActive(true)
self.adBtn:setActive(false) self.adBtn:setActive(false)
self.okBtn:setAnchoredPositionX(0)
end end
return BattleBoxOpenUI return BattleBoxOpenUI

4
lua/app/ui/battle/battle_result_ui.lua
View File

@ -155,7 +155,7 @@ function BattleResultUI:onLoadRootComplete()
self:refreshArenaBoxNode() self:refreshArenaBoxNode()
end) end)
self:addEventListener(EventManager.CUSTOM_EVENT.BATTLE_DOUBLE_REWARD, function() self:addEventListener(EventManager.CUSTOM_EVENT.BATTLE_DOUBLE_REWARD, function()
self:onReviveDouble() self:onReceiveDouble()
end) end)
end end
@ -516,7 +516,7 @@ function BattleResultUI:onGetDouble()
ModuleManager.BattleManager:reqChapterDoubleReward() ModuleManager.BattleManager:reqChapterDoubleReward()
end end
function BattleResultUI:onReviveDouble() function BattleResultUI:onReceiveDouble()
self.isDouble = true self.isDouble = true
self:refreshRewards() self:refreshRewards()
self.doubleOkBtn:setAnchoredPositionX(0) self.doubleOkBtn:setAnchoredPositionX(0)

6
lua/app/ui/common/cell/reward_cell.lua
View File

@ -23,7 +23,7 @@ end
function RewardCell:refresh(reward, mask, check) function RewardCell:refresh(reward, mask, check)
if reward.type == GConst.REWARD_TYPE.ITEM then if reward.type == GConst.REWARD_TYPE.ITEM then
self.id = reward.item.id self.id = reward.item.id
self.num = reward.item.num self.num = reward.item.num or reward.item.count
self.type = reward.type self.type = reward.type
self.itemCell:setActive(true) self.itemCell:setActive(true)
self.equipCell:setActive(false) self.equipCell:setActive(false)
@ -166,8 +166,8 @@ function RewardCell:showRewardNum(numStr)
end end
function RewardCell:setNumTxDouble() function RewardCell:setNumTxDouble()
if self.count then if self.num then
local count = self.count * 2 local count = self.num * 2
if count > 100 then if count > 100 then
self:showRewardNum(GFunc.num2Str(count)) self:showRewardNum(GFunc.num2Str(count))
else else