diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index de41901b..23ba40e6 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -24,7 +24,6 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_gold_pig_cell", - "app/ui/main_city/cell/side_bar_level_fund_cell", "app/ui/main_city/cell/side_bar_growth_fund_cell", "app/ui/main_city/cell/side_bar_first_recharge_cell", "app/ui/main_city/cell/side_bar_beginner_gift_cell", diff --git a/lua/app/ui/shop/cell/gem_sell_cell.lua b/lua/app/ui/shop/cell/gem_sell_cell.lua index 37b2c5f4..56c9af48 100644 --- a/lua/app/ui/shop/cell/gem_sell_cell.lua +++ b/lua/app/ui/shop/cell/gem_sell_cell.lua @@ -8,8 +8,8 @@ function GemSellCell:init() self.cells = {} self.cellHeight = 0 local cellHeight = nil - local cfg = ConfigManager:getConfig("mall_treasure") - for i = 1, 19 do -- 正常9个 提审19个 暂未处理提审模式 -- TODOJ + local cfg = ConfigManager:getConfig("mall_treasure") -- 审核模式读取另一张表 + for i = 1, 19 do -- 正常9个 提审19个 local cell = uiMap["gem_sell_cell.cell_" .. i] if cellHeight == nil then local w, h = cell:fastGetSizeDelta() diff --git a/lua/app/ui/shop/cell/hot_sell_cell.lua b/lua/app/ui/shop/cell/hot_sell_cell.lua index 8b2ed387..b9aec6fd 100644 --- a/lua/app/ui/shop/cell/hot_sell_cell.lua +++ b/lua/app/ui/shop/cell/hot_sell_cell.lua @@ -8,7 +8,7 @@ function HotSellCell:init() uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠 uiMap["hot_sell_cell.help_btn"]:addClickListener(function() - -- TODOJ + ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"]:getBaseObject()) end) self.timeTx = uiMap["hot_sell_cell.time_tx"] self.cells = {} @@ -30,25 +30,24 @@ end function HotSellCell:refresh() local goods = DataManager.ShopData:getMallDailyGoods() - local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 免费刷新次数 - local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 钻石刷新次数 + local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 剩余免费刷新次数 + local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 剩余钻石刷新次数 local gemRefreshCost = DataManager.ShopData:getMallDailyDiamondResetCost() -- 钻石刷新消耗 - if freeRefreshCount > 0 then - self.refreshBtn:setVisible(true) + self.refreshBtn:setActive(true) self.refreshAdImg:setVisible(true) GFunc.setAdsSprite(self.refreshAdImg) self.refreshGemImg:setVisible(false) self.refreshText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH)) - self.refreshBtn:addRedPoint(70, 30, 0.6) + self.refreshBtn:addRedPoint(80, 30, 0.6) elseif gemRefreshCount > 0 then - self.refreshBtn:setVisible(true) + self.refreshBtn:setActive(true) self.refreshAdImg:setVisible(false) self.refreshGemImg:setVisible(true) self.refreshText:setText(gemRefreshCost) self.refreshBtn:removeRedPoint() else - self.refreshBtn:setVisible(false) + self.refreshBtn:setActive(false) self.refreshBtn:removeRedPoint() end