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-10-15 20:39:00 +08:00
parent 3692ef1e34
commit 2fb0bdc8df
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/global/global_func.lua
View File

@ -1362,7 +1362,7 @@ function GFunc.setAdsSprite(img, isGrey)
if isGrey then if isGrey then
icon = skip and "common_ad_6" or "common_ad_5" icon = skip and "common_ad_6" or "common_ad_5"
else else
icon = skip and "common_ad_4" or "common_ad_3" icon = skip and "common_ad_4" or "common_ad_1"
end end
img:setSprite(GConst.ATLAS_PATH.COMMON, icon) img:setSprite(GConst.ATLAS_PATH.COMMON, icon)
end end

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

@ -2389,7 +2389,7 @@ function BattleBaseController:getRandomSkillList(getCount, onlyCommonSkill, excl
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] then
if info.universal and (info.universal == 1 or info.universal == 2) then if info.universal and info.universal == 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
table.insert(self.randomSkillNewSkillPool, skillId) table.insert(self.randomSkillNewSkillPool, skillId)

2
lua/app/ui/activity/act_seven_day/cell/gift_cell.lua
View File

@ -56,7 +56,7 @@ function GiftCell:refresh(info, period)
self.titleTx:setText(I18N:getText("act_gift", info.id, "value")) self.titleTx:setText(I18N:getText("act_gift", info.id, "value"))
self.limitTx:setText(I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_8) .. giftRemainNum .. "/" .. info.cfg.limit) self.limitTx:setText(I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_8) .. giftRemainNum .. "/" .. info.cfg.limit)
if info.cfg.recharge_id then if info.cfg.recharge_id or info.cfg.item_cost then
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_5") self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_5")
else else
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_4") self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_4")

2
lua/app/ui/activity/act_seven_day/cell/task_cell.lua
View File

@ -8,7 +8,7 @@ function TaskCell:refresh(id, period)
local progress = math.max(taskInfo.progress, 0) local progress = math.max(taskInfo.progress, 0)
local targetCount = cfg.number local targetCount = cfg.number
if cfg.type == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then if cfg.type == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
targetCount = DataManager.ArenaData:getGradingScore(targetCount) targetCount = DataManager.ArenaData:getGradingScore(targetCount - 1) + 1
progress = DataManager.ArenaData:getGradingScore(progress) progress = DataManager.ArenaData:getGradingScore(progress)
end end
progress = math.min(progress, targetCount) progress = math.min(progress, targetCount)

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

@ -211,7 +211,7 @@ function RewardCell:setLocalScale(x, y, z)
end end
function RewardCell:showFrameAnimation(rewardType) function RewardCell:showFrameAnimation(rewardType)
self.frameAni:setVisible(true) self.frameAni:setActive(true)
self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = true self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = true
if self.frameAniType ~= GConst.REWARD_TYPE.ITEM then if self.frameAniType ~= GConst.REWARD_TYPE.ITEM then
-- CS.UnityEngine.Animator.StringToHash("frame_reward") 结果是997722489 -- CS.UnityEngine.Animator.StringToHash("frame_reward") 结果是997722489
@ -222,7 +222,7 @@ end
function RewardCell:hideFrameAnimation() function RewardCell:hideFrameAnimation()
self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = false self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = false
self.frameAni:setVisible(false) self.frameAni:setActive(false)
end end
function RewardCell:showRightUpIcon(show, atlas, iconName) function RewardCell:showRightUpIcon(show, atlas, iconName)