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:03:34 +08:00
parent 2740e23e9b
commit 3692ef1e34
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/global/global_const.lua
View File

@ -253,6 +253,7 @@ GConst.ATLAS_PATH = {
UI_SUPPLY = "assets/arts/atlas/ui/supply.asset", UI_SUPPLY = "assets/arts/atlas/ui/supply.asset",
UI_DUNGEON = "assets/arts/atlas/ui/dungeon.asset", UI_DUNGEON = "assets/arts/atlas/ui/dungeon.asset",
UI_FIRST_CHARGE = "assets/arts/atlas/ui/act_firstcharge.asset", UI_FIRST_CHARGE = "assets/arts/atlas/ui/act_firstcharge.asset",
UI_ACT_SEVENDAY = "assets/arts/atlas/ui/act_sevenday.asset",
} }
GConst.TOUCH_EVENT = { GConst.TOUCH_EVENT = {

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

@ -57,9 +57,9 @@ function GiftCell:refresh(info, period)
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 then
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_11") self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_5")
else else
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_10") self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_SEVENDAY, "act_sevenday_bg_4")
end end
if info.cfg.recommend then if info.cfg.recommend then
@ -78,7 +78,7 @@ function GiftCell:refresh(info, period)
GFunc.setAdsSprite(self.claimBtnAdImg) GFunc.setAdsSprite(self.claimBtnAdImg)
local isClaimAll = giftRemainNum <= 0 local isClaimAll = giftRemainNum <= 0
if isClaimAll then if isClaimAll then
self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3") self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
self.claimBtn:setTouchEnable(false) self.claimBtn:setTouchEnable(false)
self.claimBtnTxGray:setVisible(true) self.claimBtnTxGray:setVisible(true)
self.claimBtnTxGray:setText(I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_10)) self.claimBtnTxGray:setText(I18N:getGlobalText(I18N.GlobalConst.GIFT_ROUTINE_DESC_10))
@ -92,7 +92,7 @@ function GiftCell:refresh(info, period)
else else
self.claimBtn:setTouchEnable(true) self.claimBtn:setTouchEnable(true)
if info.cfg.parameter_pro and info.cfg.parameter_pro[1] == 1 then -- 免费 if info.cfg.parameter_pro and info.cfg.parameter_pro[1] == 1 then -- 免费
self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_3") self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_1")
self.claimBtnAdImg:setActive(false) self.claimBtnAdImg:setActive(false)
self.claimBtnIcon:setActive(false) self.claimBtnIcon:setActive(false)
self.claimBtnNumTx:setActive(false) self.claimBtnNumTx:setActive(false)
@ -103,7 +103,7 @@ function GiftCell:refresh(info, period)
self.claimBtnTx:setVisible(false) self.claimBtnTx:setVisible(false)
self.claimBtnTxGray:setVisible(false) self.claimBtnTxGray:setVisible(false)
elseif info.cfg.item_cost then -- 道具购买 elseif info.cfg.item_cost then -- 道具购买
self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_3") self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1")
self.claimBtnIcon:setSprite(GFunc.getIconRes(info.cfg.item_cost[1].id)) self.claimBtnIcon:setSprite(GFunc.getIconRes(info.cfg.item_cost[1].id))
self.claimBtnAdImg:setActive(false) self.claimBtnAdImg:setActive(false)
self.claimBtnIcon:setActive(true) self.claimBtnIcon:setActive(true)
@ -114,7 +114,7 @@ function GiftCell:refresh(info, period)
self.claimBtnNumTx:setText(info.cfg.item_cost[1].num) self.claimBtnNumTx:setText(info.cfg.item_cost[1].num)
GFunc.centerImgAndTx(self.claimBtnIcon, self.claimBtnNumTx, 0, nil, -6) GFunc.centerImgAndTx(self.claimBtnIcon, self.claimBtnNumTx, 0, nil, -6)
elseif info.cfg.recharge_id == nil then -- 广告 elseif info.cfg.recharge_id == nil then -- 广告
self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_3") self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_1")
self.claimBtnAdImg:setActive(true) self.claimBtnAdImg:setActive(true)
self.claimBtnIcon:setActive(false) self.claimBtnIcon:setActive(false)
self.claimBtnNumTx:setActive(false) self.claimBtnNumTx:setActive(false)
@ -125,7 +125,7 @@ function GiftCell:refresh(info, period)
self.claimBtnTx:setVisible(false) self.claimBtnTx:setVisible(false)
self.claimBtnTxGray:setVisible(false) self.claimBtnTxGray:setVisible(false)
elseif info.cfg.recharge_id then -- 付费购买 elseif info.cfg.recharge_id then -- 付费购买
self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_3") self.claimBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1")
self.claimBtnAdImg:setActive(false) self.claimBtnAdImg:setActive(false)
self.claimBtnIcon:setActive(false) self.claimBtnIcon:setActive(false)
self.claimBtnNumTx:setActive(false) self.claimBtnNumTx:setActive(false)

3
lua/app/userdata/arena/arena_data.lua
View File

@ -232,6 +232,9 @@ end
-- 获取所在段位的积分 cur - min -- 获取所在段位的积分 cur - min
function ArenaData:getGradingScore(score) function ArenaData:getGradingScore(score)
if score <= 0 then
return 0
end
return score - self:getGradingMinScore(score) return score - self:getGradingMinScore(score)
end end

2
lua/app/userdata/battle/battle_base_data.lua
View File

@ -816,7 +816,7 @@ function BattleBaseData:initHeroData(formation)
---- 攻击力 ---- 攻击力
for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do
unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) // DEFAULT_FACTOR
end end
---- 暴击率 ---- 暴击率