diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 8e705a5a..57cd1098 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -1362,7 +1362,7 @@ function GFunc.setAdsSprite(img, isGrey) if isGrey then icon = skip and "common_ad_6" or "common_ad_5" else - icon = skip and "common_ad_4" or "common_ad_3" + icon = skip and "common_ad_4" or "common_ad_1" end img:setSprite(GConst.ATLAS_PATH.COMMON, icon) end diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index 28293169..3c177ac8 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -2389,7 +2389,7 @@ function BattleBaseController:getRandomSkillList(getCount, onlyCommonSkill, excl for skillId, info in pairs(cfg) do 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 self.randomSkillMap[skillId] then table.insert(self.randomSkillNewSkillPool, skillId) diff --git a/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua b/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua index ef4ec2a0..e9a9ad96 100755 --- a/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua +++ b/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua @@ -56,7 +56,7 @@ function GiftCell:refresh(info, period) 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) - 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") else self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_4") diff --git a/lua/app/ui/activity/act_seven_day/cell/task_cell.lua b/lua/app/ui/activity/act_seven_day/cell/task_cell.lua index 2da77430..366a0e04 100755 --- a/lua/app/ui/activity/act_seven_day/cell/task_cell.lua +++ b/lua/app/ui/activity/act_seven_day/cell/task_cell.lua @@ -8,7 +8,7 @@ function TaskCell:refresh(id, period) local progress = math.max(taskInfo.progress, 0) local targetCount = cfg.number 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) end progress = math.min(progress, targetCount) diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index d3310049..8e36559f 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -211,7 +211,7 @@ function RewardCell:setLocalScale(x, y, z) end function RewardCell:showFrameAnimation(rewardType) - self.frameAni:setVisible(true) + self.frameAni:setActive(true) self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = true if self.frameAniType ~= GConst.REWARD_TYPE.ITEM then -- CS.UnityEngine.Animator.StringToHash("frame_reward") 结果是997722489 @@ -222,7 +222,7 @@ end function RewardCell:hideFrameAnimation() self.frameAni:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = false - self.frameAni:setVisible(false) + self.frameAni:setActive(false) end function RewardCell:showRightUpIcon(show, atlas, iconName)