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

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-06-01 20:58:32 +08:00
commit b9a6f17c11
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua
View File

@ -17,8 +17,4 @@ function SideBarFirstRechargeCell:onClick()
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true)
end
function SideBarFirstRechargeCell:getIsShowRedPoint()
return false
end
return SideBarFirstRechargeCell

12
lua/app/ui/shop/box_reward_ui.lua
View File

@ -9,6 +9,7 @@ local QLT_DELAY_TIME = {
[4] = 0.5, -- 紫
[5] = 0.5, -- 预留
}
local FIRST_DELAY_TIME = 0
local FADE_TIME = 0.5
local MAX_SCREEN_CELL_COUNT = 12 -- 同屏界面能展示的最大数量
@ -22,6 +23,8 @@ function BoxRewardUI:ctor(params)
-- self.turnIdx = MAX_SCREEN_CELL_COUNT // CELL_NUM
-- self.maxIdx = math.ceil(#self.params.rewards / CELL_NUM)
-- end
-- 将超过界面展示范围外的cell默认打开
if #self.params.rewards > MAX_SCREEN_CELL_COUNT then
for i = MAX_SCREEN_CELL_COUNT + 1, #self.params.rewards do
self.actionStatus[i] = true
@ -105,7 +108,12 @@ function BoxRewardUI:playCellAction(cell, idx)
if self.actionStatus[idx] then
return
end
local delayTime = self:getCellDelayTime(idx)
local delayTime = FIRST_DELAY_TIME
if idx > 1 then
delayTime = self:getCellDelayTime(idx - 1)
end
local canvasGroup = cell.baseObject:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
if not canvasGroup then
canvasGroup = cell.baseObject:addComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
@ -113,8 +121,8 @@ function BoxRewardUI:playCellAction(cell, idx)
canvasGroup.alpha = 0
local seq = cell.baseObject:createBindTweenSequence()
seq:AppendInterval(delayTime)
local tween = canvasGroup:DOFade(1, FADE_TIME)
seq:AppendInterval(delayTime)
tween:SetEase(CS.DG.Tweening.Ease.InOutSine)
seq:Append(tween)
seq:AppendCallback(function()

16
lua/app/ui/shop/cell/box_sell_cell.lua
View File

@ -1,7 +1,7 @@
local BoxSellCell = class("BoxSellCell", BaseCell)
local BASE_CELL_HEIGHT = 508
local FULL_CELL_HEIGHT = 754
local BASE_CELL_HEIGHT = 522
local FULL_CELL_HEIGHT = 786
local HEIGHT_ADD = 30
function BoxSellCell:init()
@ -11,14 +11,14 @@ function BoxSellCell:init()
boxNameTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1)) -- 普通宝箱
local boxDescTx1 = uiMap["box_sell_cell.bg.box_1.desc_tx"]
boxDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_24)) -- 必出<color=#5fff57>普通</color>英雄
self.boxBuyBtn1 = uiMap["box_sell_cell.bg.box_1.buy_btn"]
self.boxBuyBtn1 = uiMap["box_sell_cell.bg.box_1"]
self.boxBuyBtnCoin1 = uiMap["box_sell_cell.bg.box_1.buy_btn.coin"]
self.boxBuyBtnTx1 = uiMap["box_sell_cell.bg.box_1.buy_btn.buy_tx"]
local boxNameTx2 = uiMap["box_sell_cell.bg.box_2.name_tx"]
boxNameTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2)) -- 精致宝箱
local boxDescTx2 = uiMap["box_sell_cell.bg.box_2.desc_tx"]
boxDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_25)) -- 必出<color=#8aedff>稀有</color>英雄
self.boxBuyBtn2 = uiMap["box_sell_cell.bg.box_2.buy_btn"]
self.boxBuyBtn2 = uiMap["box_sell_cell.bg.box_2"]
self.boxBuyBtnCoin2 = uiMap["box_sell_cell.bg.box_2.buy_btn.coin"]
self.boxBuyBtnTx2 = uiMap["box_sell_cell.bg.box_2.buy_btn.buy_tx"]
self.box3 = uiMap["box_sell_cell.bg.box_3"]
@ -26,7 +26,7 @@ function BoxSellCell:init()
boxNameTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3)) -- 珍贵宝箱
local boxDescTx3 = uiMap["box_sell_cell.bg.box_3.desc_tx"]
boxDescTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_26)) -- 必出<color=#ff8af0>史诗</color>英雄
self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3.buy_btn"]
self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3"]
self.boxBuyBtnCoin3 = uiMap["box_sell_cell.bg.box_3.buy_btn.coin"]
self.boxBuyBtnTx3 = uiMap["box_sell_cell.bg.box_3.buy_btn.buy_tx"]
self.progressSlider = uiMap["box_sell_cell.bg.progress_slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
@ -54,13 +54,15 @@ end
function BoxSellCell:refresh()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.STORE_BOX_3_OPEN, true) then -- 没解锁的话第三个宝箱不显示
self.cellHeight = BASE_CELL_HEIGHT + 20
self.cellHeight = BASE_CELL_HEIGHT + 70
self.baseObject:setSizeDeltaY(BASE_CELL_HEIGHT)
self.bg:setTexture("assets/arts/textures/background/shop/shop_bg_10.png")
self.bg:setSizeDeltaY(BASE_CELL_HEIGHT - HEIGHT_ADD)
self.box3:setVisible(false)
else
self.cellHeight = FULL_CELL_HEIGHT + 20
self.cellHeight = FULL_CELL_HEIGHT + 70
self.baseObject:setSizeDeltaY(FULL_CELL_HEIGHT)
self.bg:setTexture("assets/arts/textures/background/shop/shop_bg_9.png")
self.bg:setSizeDeltaY(FULL_CELL_HEIGHT - HEIGHT_ADD)
self.box3:setVisible(true)
end

2
lua/app/ui/shop/cell/gem_cell.lua
View File

@ -59,7 +59,7 @@ function GemCell:refresh(id, cfgInfo)
self.doubleNode:setVisible(true)
self.doubleDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_21, tostring(leftDoubleTimes))) -- 剩余次数:{0}
self.doubleText:setText("+" .. tostring(reward.num * 2))
GFunc.centerImgAndTx(self.doubleImg, self.doubleText, 5)
-- GFunc.centerImgAndTx(self.doubleImg, self.doubleText, 5)
self.doubleOriginText:setText(reward.num)
self.doubleOriginLine:setVisible(true)
else