diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 06f6acf7..21659200 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -884,6 +884,16 @@ local LocalizationGlobalConst = MONTHLY_CARD_DESC_1_3 = "MONTHLY_CARD_DESC_1_3", MONTHLY_CARD_DESC_2_1 = "MONTHLY_CARD_DESC_2_1", MONTHLY_CARD_DESC_2_2 = "MONTHLY_CARD_DESC_2_2", + PRIVILEGE_CARD_NAME_1 = "PRIVILEGE_CARD_NAME_1", + PRIVILEGE_CARD_NAME_2 = "PRIVILEGE_CARD_NAME_2", + PRIVILEGE_CARD_NAME_3 = "PRIVILEGE_CARD_NAME_3", + PRIVILEGE_CARD_DESC_1 = "PRIVILEGE_CARD_DESC_1", + PRIVILEGE_CARD_DESC_2 = "PRIVILEGE_CARD_DESC_2", + PRIVILEGE_CARD_DESC_3 = "PRIVILEGE_CARD_DESC_3", + PRIVILEGE_CARD_DESC_4 = "PRIVILEGE_CARD_DESC_4", + PRIVILEGE_CARD_DESC_5 = "PRIVILEGE_CARD_DESC_5", + PRIVILEGE_CARD_DESC_6 = "PRIVILEGE_CARD_DESC_6", + PRIVILEGE_CARD_DESC_7 = "PRIVILEGE_CARD_DESC_7", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index b0fe792d..f33ec080 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -864,28 +864,30 @@ local localization_global = ["ADS_DESC_15"] = "免广告卡", ["ADS_DESC_16"] = "免广告永久有效", ["AD_FREE_DESC_9"] = "看广告", - ["MONTHLY_CARD_1"] = "月卡", - ["MONTHLY_CARD_2"] = "超值月卡", - ["MONTHLY_CARD_3"] = "特权月卡", - ["MONTHLY_CARD_4"] = "购买立得", ["MONTHLY_CARD_5"] = "特权福利", - ["MONTHLY_CARD_6"] = "续费", ["MONTHLY_CARD_7"] = "每日获得", - ["MONTHLY_CARD_8"] = "好运成双", - ["MONTHLY_CARD_9"] = "同时激活两张月卡可领取", - ["MONTHLY_CARD_10"] = "开启战斗2倍加速", - ["MONTHLY_CARD_11"] = "免看广告得奖励", ["MONTHLY_CARD_12"] = "已激活", ["MONTHLY_CARD_13"] = "未激活", ["MONTHLY_CARD_14"] = "剩余时间:{0}", ["MONTHLY_CARD_15"] = "有效期{0}天", - ["MONTHLY_CARD_16"] = "1.购买月卡后,享30天每日奖励和特权。\n2.同时激活超值月卡和特权可领取好运成双奖励。", ["MONTHLY_CARD_17"] = "已达到当前购买上限", - ["MONTHLY_CARD_DESC_1_1"] = "无限快速挂机", - ["MONTHLY_CARD_DESC_1_2"] = "体力恢复速度+10%", - ["MONTHLY_CARD_DESC_1_3"] = "精力上限+10", - ["MONTHLY_CARD_DESC_2_1"] = "体力上限+20", - ["MONTHLY_CARD_DESC_2_2"] = "每日体力购买次数+2", + ["PRIVILEGE_CARD_NAME_1"] = "每日福利", + ["PRIVILEGE_CARD_NAME_2"] = "永久免广告卡", + ["PRIVILEGE_CARD_NAME_3"] = "月卡", + -- ["PRIVILEGE_CARD_NAME_4"] = "终身卡", + -- ["PRIVILEGE_CARD_NAME_5"] = "挑战征服卡", + ["PRIVILEGE_CARD_DESC_1"] = "已累计{0}天", + ["PRIVILEGE_CARD_DESC_2"] = "永久免广告特权", + ["PRIVILEGE_CARD_DESC_3"] = "购买后立即获得", + ["PRIVILEGE_CARD_DESC_4"] = "解锁战斗3倍速", + ["PRIVILEGE_CARD_DESC_5"] = "免费刷新齿轮次数+1", + ["PRIVILEGE_CARD_DESC_6"] = "解锁快速挂机不限次", + ["PRIVILEGE_CARD_DESC_7"] = "每天领取大量钻石", + -- ["PRIVILEGE_CARD_DESC_8"] = "每天获得巨量钻石", + -- ["PRIVILEGE_CARD_DESC_9"] = "立得终身卡头像框", + -- ["PRIVILEGE_CARD_DESC_10"] = "体力上限+20", + -- ["PRIVILEGE_CARD_DESC_11"] = "{0}挑战次数+{1}", + -- ["PRIVILEGE_CARD_DESC_12"] = "购买月卡可解锁3倍速", } return localization_global \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 9189541d..98707069 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -32,6 +32,7 @@ local CONST_PATHS = { SignConst = "app/module/sign/sign_const", ActSprintConst = "app/module/activity/act_sprint/act_sprint_const", + MonthlyCardConst = "app/module/monthly_card/monthly_card_const", } if EDITOR_MODE then diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index abd75b97..8ac37fa2 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -521,19 +521,11 @@ end --isGetList 为true时返回列表，反之返回第一个元素 function GFunc.getConstCost(key, isGetList) local ConstCfg = ConfigManager:getConfig("const") - if ConstCfg[key] == nil or ConstCfg[key].cost == nil or #ConstCfg[key].cost <= 0 then + if ConstCfg[key] == nil or ConstCfg[key].reward == nil or #ConstCfg[key].reward <= 0 then return nil end - return isGetList and ConstCfg[key].cost or ConstCfg[key].cost[1] -end - -function GFunc.getConstReward2(key) - local ConstCfg = ConfigManager:getConfig("const") - if not ConstCfg[key] or not ConstCfg[key].reward then - return - end - return ConstCfg[key].reward + return isGetList and ConstCfg[key].reward or ConstCfg[key].reward[1] end function GFunc.getTargetAnchoredPosition(targetGo, parent) diff --git a/lua/app/module/activity/act_sprint/act_sprint_const.lua b/lua/app/module/activity/act_sprint/act_sprint_const.lua index 516ca689..4a1cc725 100644 --- a/lua/app/module/activity/act_sprint/act_sprint_const.lua +++ b/lua/app/module/activity/act_sprint/act_sprint_const.lua @@ -27,7 +27,7 @@ ActSprintConst.ACT_ROUND_LIMIT = { } ActSprintConst.ACT_ROUND_REWARD = { - [ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstReward2("act_gogogo_round_reward_1"), + [ActSprintConst.ACT_ID.SUMMON_ALL] = GFunc.getConstCost("act_gogogo_round_reward_1", true), } ActSprintConst.REFRESH_TYPE = { diff --git a/lua/app/module/monthly_card.meta b/lua/app/module/monthly_card.meta new file mode 100644 index 00000000..c41320ee --- /dev/null +++ b/lua/app/module/monthly_card.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ea0d0f33c04f4d698564e841986ac6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/monthly_card/monthly_card_const.lua b/lua/app/module/monthly_card/monthly_card_const.lua new file mode 100644 index 00000000..7c85972f --- /dev/null +++ b/lua/app/module/monthly_card/monthly_card_const.lua @@ -0,0 +1,13 @@ +local MonthlyCardConst = {} + +MonthlyCardConst.CARD_TYPE = { + CARD_1 = 1, -- 超值 + CARD_2 = 2, -- 特权 +} + +MonthlyCardConst.CARD_GIFT_ID = { + [MonthlyCardConst.CARD_TYPE.CARD_1] = 20102, + [MonthlyCardConst.CARD_TYPE.CARD_2] = 20202, +} + +return MonthlyCardConst \ No newline at end of file diff --git a/lua/app/ui/privilege/monthly_card_comp.lua.meta b/lua/app/module/monthly_card/monthly_card_const.lua.meta similarity index 86% rename from lua/app/ui/privilege/monthly_card_comp.lua.meta rename to lua/app/module/monthly_card/monthly_card_const.lua.meta index 4487d533..d289cefb 100644 --- a/lua/app/ui/privilege/monthly_card_comp.lua.meta +++ b/lua/app/module/monthly_card/monthly_card_const.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5f23024c723d4c989385492f61ad3fd +guid: d17037799435e48e3946da2f2f712e02 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua b/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua index d422be65..a0645866 100644 --- a/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua +++ b/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua @@ -17,8 +17,8 @@ function FreeDailyRewardsComp:init() end function FreeDailyRewardsComp:refresh() - self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CLAIM)) - self.getBtnGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_GOT_DESC)) + self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) + self.getBtnGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE)) local isClaimed = DataManager.PrivilegeCardData:getIsClaimedFreeDailyReward() local reward = GFunc.getConstCost("card_free_dailyreward") diff --git a/lua/app/ui/privilege/comp/monthly_card_comp.lua b/lua/app/ui/privilege/comp/monthly_card_comp.lua index 6a65e108..1317381d 100644 --- a/lua/app/ui/privilege/comp/monthly_card_comp.lua +++ b/lua/app/ui/privilege/comp/monthly_card_comp.lua @@ -74,7 +74,7 @@ function MonthlyCardComp:refresh() end if isClaimed then self.payBtnGrey:setActive(true) - self.payBtnGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_GOT_DESC)) + self.payBtnGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE)) self.payBtn:setActive(false) self.rewadCell1:hideFrameAnimation() self.rewadCell1:clearClickListener() @@ -85,7 +85,7 @@ function MonthlyCardComp:refresh() else self.payBtnGrey:setActive(false) self.payBtn:setActive(true) - self.payBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CLAIM)) + self.payBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) local count = DataManager.PrivilegeCardData:getUnclaimedMonthlyCardDailyRewardCount() if count > 1 then self.descTx6:setText("" .. I18N:getGlobalText(I18N.GlobalConst.PRIVILEGE_CARD_DESC_1, count) .. "") @@ -122,7 +122,7 @@ function MonthlyCardComp:refresh() end self.payBtnGrey:setActive(false) self.payBtn:setActive(true) - self.payBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CLAIM)) + self.payBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) if rewards and rewards[1] then local num = count*rewards[1].num self.rewadCell1:refreshByConfig(rewards[1], false, false) diff --git a/lua/app/ui/privilege/monthly_card_comp.lua b/lua/app/ui/privilege/monthly_card_comp.lua deleted file mode 100644 index 1b39921c..00000000 --- a/lua/app/ui/privilege/monthly_card_comp.lua +++ /dev/null @@ -1,90 +0,0 @@ -local MonthlyCardComp = class("MonthlyCardComp", LuaComponent) - -local CELL = "app/ui/privilege/cell/card_cell" - -function MonthlyCardComp:onClose() - if self.cardCell1 then - self.cardCell1:onClose() - end - if self.cardCell2 then - self.cardCell2:onClose() - end - - DataManager.MonthlyCardData:markAlertTime() -- mark -end - -function MonthlyCardComp:init() - local uiMap = self.baseObject:genAllChildren() - self.card1 = uiMap["monthly_card_comp.card_cell_1"] - self.card2 = uiMap["monthly_card_comp.card_cell_2"] - - -- 双月卡奖励 - self.doubleCardNode = uiMap["monthly_card_comp.double_card"] - self.txDoubleTitle = uiMap["monthly_card_comp.double_card.tx_title"] - self.txDoubleTips = uiMap["monthly_card_comp.double_card.tx_tips"] - self.doubleRewardCells = {} - for i = 1, 2 do - table.insert(self.doubleRewardCells, uiMap["monthly_card_comp.double_card.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) - end - self.btnDoubleHelp = uiMap["monthly_card_comp.double_card.btn_help"] - - self.cardCell1 = self.card1:addLuaComponent(CELL) - self.cardCell2 = self.card2:addLuaComponent(CELL) - - self.btnDoubleHelp:addClickListener(function() - ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_16), self.btnDoubleHelp) - end) - self:bind(DataManager.MonthlyCardData, "isDirty", function() - self:refresh() - end) - self:bind(DataManager.PaymentData, "isDirty", function() - self:refresh() - end) -end - -function MonthlyCardComp:updateTime() - if self.cardCell1 and self.cardCell1.updateTime then - self.cardCell1:updateTime() - end - if self.cardCell2 and self.cardCell2.updateTime then - self.cardCell2:updateTime() - end -end - -function MonthlyCardComp:refresh() - DataManager.MonthlyCardData:setPoped() - DataManager.MonthlyCardData:markAlertTime()-- mark - - self.cardCell1:refresh(GConst.MonthlyCardConst.CARD_TYPE.CARD_1) - self.cardCell2:refresh(GConst.MonthlyCardConst.CARD_TYPE.CARD_2) - - self:refreshDoubleCard() -end - -function MonthlyCardComp:refreshDoubleCard() - self.txDoubleTitle:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_8)) - self.txDoubleTips:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_9)) - - local received = DataManager.MonthlyCardData:getIsDoubleCardRewardClaimed() - local canGet = DataManager.MonthlyCardData:checkCanGetDoubleCardReward() - local rewards = DataManager.MonthlyCardData:getDoubleCardRewards() - for i, cell in ipairs(self.doubleRewardCells) do - if rewards and rewards[i] then - cell:getBaseObject():setActive(true) - cell:refreshByConfig(rewards[i], received, received) - if canGet then - cell:showFrameAnimation() - cell:addClickListener(function() - ModuleManager.MonthlyCardManager:reqGetDoubleCardReward() - end) - else - cell:hideFrameAnimation() - cell:setClickShowTips() - end - else - cell:getBaseObject():setActive(false) - end - end -end - -return MonthlyCardComp \ No newline at end of file diff --git a/lua/app/ui/privilege/monthly_card_ui.lua b/lua/app/ui/privilege/monthly_card_ui.lua deleted file mode 100644 index c1c6b42c..00000000 --- a/lua/app/ui/privilege/monthly_card_ui.lua +++ /dev/null @@ -1,227 +0,0 @@ -local MonthlyCardUI = class("MonthlyCardUI", BaseUI) - -local IMG_BANNER = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = "monthlycard_banner_2", - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = "monthlycard_banner_1", -} - -local IMG_TITLE = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = "monthlycard_tattle_2", - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = "monthlycard_tattle_1", -} - -local TX_TITLE = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = "MONTHLY_CARD_2", - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = "MONTHLY_CARD_3", -} - -local IMG_OFF = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = "monthlycard_bg_4", - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = "monthlycard_bg_3", -} - -local IMG_SHOW = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = {"monthlycard_dec_2" , "monthlycard_dec_3"}, - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = {"monthlycard_dec_4"}, -} - -local TX_SHOW = { - [GConst.MonthlyCardConst.CARD_TYPE.CARD_1] = {"MONTHLY_CARD_20" , "MONTHLY_CARD_DESC_1_1"}, - [GConst.MonthlyCardConst.CARD_TYPE.CARD_2] = {"MONTHLY_CARD_2"}, -} - -function MonthlyCardUI:isFullScreen() - return false -end - -function MonthlyCardUI:showCommonBG() - return false -end - -function MonthlyCardUI:getPrefabPath() - return "assets/prefabs/ui/privilege/monthly_card_ui.prefab" -end - -function MonthlyCardUI:onPressBackspace() - self:closeUI() -end - -function MonthlyCardUI:onClose() - if self.callback then - self.callback() - end -end - -function MonthlyCardUI:ctor(param) - self.cardType = param.cardType - self.callback = param.callback - self.showToday = param.showToday -end - -function MonthlyCardUI:onLoadRootComplete() - local uiMap = self.root:genAllChildren() - self.banner = uiMap["monthly_card_ui.banner"] - self.card1Node = uiMap["monthly_card_ui.banner.card_1"] - self.txDesc1 = uiMap["monthly_card_ui.banner.card_1.tx_desc"] - self.txTips1 = uiMap["monthly_card_ui.banner.card_1.tx_tips"] - self.card2Node = uiMap["monthly_card_ui.banner.card_2"] - self.txDesc2 = uiMap["monthly_card_ui.banner.card_2.tx_desc"] - self.txTips2 = uiMap["monthly_card_ui.banner.card_2.tx_tips"] - self.titleNode = uiMap["monthly_card_ui.content.title"] - self.txTitle = uiMap["monthly_card_ui.content.title.tx_title"] - self.discountNode = uiMap["monthly_card_ui.content.discount"] - self.txDiscount = uiMap["monthly_card_ui.content.discount.tx_discount"] - self.imgShows = {} - self.txShows = {} - for i = 1, 2 do - table.insert(self.imgShows, uiMap['monthly_card_ui.content.show.img_show_' .. i]) - table.insert(self.txShows, uiMap['monthly_card_ui.content.show.img_show_' .. i .. '.tx_show']) - end - self.listPrivilege = uiMap["monthly_card_ui.content.list_privilege"] - self.content = uiMap["monthly_card_ui.content.list_privilege.content"] - self.privilegeNodes = {} - self.txPrivilegeDescs = {} - for i = 1, 5 do - table.insert(self.privilegeNodes, uiMap['monthly_card_ui.content.list_privilege.content.privilege_' .. i]) - table.insert(self.txPrivilegeDescs, uiMap['monthly_card_ui.content.list_privilege.content.privilege_' .. i .. '.tx_desc']) - end - self.txImmediate = uiMap["monthly_card_ui.content.immediate.tx_immediate"] - self.immediateRewardCell = uiMap["monthly_card_ui.content.immediate.reward_cell_immediate"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) - self.txDaily = uiMap["monthly_card_ui.content.daily.tx_daily"] - self.dailyRewardCells = {} - for i = 1, 2 do - table.insert(self.dailyRewardCells, uiMap['monthly_card_ui.content.daily.reward_cell_daily_' .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) - end - self.btnBuy = uiMap["monthly_card_ui.content.btn_buy"] - self.txBuy = uiMap["monthly_card_ui.content.btn_buy.tx_buy"] - self.btnClose = uiMap["monthly_card_ui.btn_close"] - -- 今日不再展示 - self.todayNode = uiMap["monthly_card_ui.content.today"] - self.todatCheck = uiMap["monthly_card_ui.content.today.check"] - self.todaySelect = uiMap["monthly_card_ui.content.today.check.select"] - self.txToday = uiMap["monthly_card_ui.content.today.text"] - - self.txDaily:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_7)) - self.txImmediate:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_4)) - self.txDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_20) .. "\n " .. I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_DESC_1_1)) - self.txDesc2:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_21)) - self.txTips1:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_22)) - self.txTips2:setText(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_22)) - - self.btnClose:addClickListener(function() - self:closeUI() - end) - self.btnBuy:addClickListener(function() - ModuleManager.MonthlyCardManager:buyMonthlyCard(self.cardType) - self:closeUI() - end) - self.todatCheck:addClickListener(function() - if ModuleManager.BattleManager.battleController and ModuleManager.BattleManager.battleController.battleData then - ModuleManager.BattleManager.battleController.battleData:setNotPopMonthlyCard(not LocalData:getMonthlyTodayNotShow()) - end - LocalData:setMonthlyTodayNotShow(not LocalData:getMonthlyTodayNotShow()) - self:onRefresh() - end) -end - -function MonthlyCardUI:onRefresh() - self.banner:setSprite(GConst.ATLAS_PATH.UI_MONTHLY_CARD, IMG_BANNER[self.cardType]) - self.card1Node:setActive(self.cardType == GConst.MonthlyCardConst.CARD_TYPE.CARD_1) - self.card2Node:setActive(self.cardType == GConst.MonthlyCardConst.CARD_TYPE.CARD_2) - self.titleNode:setSprite(GConst.ATLAS_PATH.UI_MONTHLY_CARD, IMG_TITLE[self.cardType]) - self.discountNode:setSprite(GConst.ATLAS_PATH.UI_MONTHLY_CARD, IMG_OFF[self.cardType]) - for i = 1, 2 do - if IMG_SHOW[self.cardType][i] then - self.imgShows[i]:setActive(true) - self.imgShows[i]:setSprite(GConst.ATLAS_PATH.UI_MONTHLY_CARD, IMG_SHOW[self.cardType][i], function() - self.imgShows[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() - end) - self.txShows[i]:setText(I18N:getGlobalText(I18N.GlobalConst[TX_SHOW[self.cardType][i]])) - else - self.imgShows[i]:setActive(false) - end - end - self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst[TX_TITLE[self.cardType]])) - - local actGiftCfg = DataManager.MonthlyCardData:getActGiftConfig(self.cardType) - self.txBuy:setText(GFunc.getFormatPrice(actGiftCfg.recharge_id)) - self.txDiscount:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_MAGIC_DESC_9, actGiftCfg.value)) - - if self.cardType == GConst.MonthlyCardConst.CARD_TYPE.CARD_1 then - local totalHeight = 0 - for i, node in ipairs(self.privilegeNodes) do - local key = I18N.GlobalConst["MONTHLY_CARD_DESC_1_" .. i] - if key then - local str = I18N:getGlobalText(key) - if str and str ~= "" then - node:setActive(true) - self.txPrivilegeDescs[i]:setText(str) - local curHeight = self.txPrivilegeDescs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredHeight - curHeight = curHeight + 10 - totalHeight = totalHeight + curHeight - self.txPrivilegeDescs[i]:setSizeDeltaY(curHeight) - node:setSizeDeltaY(curHeight) - else - node:setActive(false) - end - else - node:setActive(false) - end - end - self.content:setSizeDeltaY(totalHeight) - else - local totalHeight = 0 - for i, node in ipairs(self.privilegeNodes) do - local key = I18N.GlobalConst["MONTHLY_CARD_DESC_2_" .. i] - if key then - local str = I18N:getGlobalText(key) - if str and str ~= "" then - node:setActive(true) - self.txPrivilegeDescs[i]:setText(str) - local curHeight = self.txPrivilegeDescs[i]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredHeight - curHeight = curHeight + 10 - totalHeight = totalHeight + curHeight - self.txPrivilegeDescs[i]:setSizeDeltaY(curHeight) - node:setSizeDeltaY(curHeight) - else - node:setActive(false) - end - else - node:setActive(false) - end - end - self.content:setSizeDeltaY(totalHeight) - end - - -- 每日奖励 - local isActive = DataManager.MonthlyCardData:getIsCardActive(self.cardType) - local canGetDailyReward = DataManager.MonthlyCardData:checkCanGetDailyReward(self.cardType) - local dailyRewards = DataManager.MonthlyCardData:getCardDailyRewards(self.cardType) - for i, cell in ipairs(self.dailyRewardCells) do - if dailyRewards[i] then - cell:getBaseObject():setActive(true) - cell:refreshByConfig(dailyRewards[i], isActive and not canGetDailyReward, isActive and not canGetDailyReward) - if canGetDailyReward then - cell:showFrameAnimation() - cell:addClickListener(function() - ModuleManager.MonthlyCardManager:getDailyReward() - end) - else - cell:hideFrameAnimation() - cell:setClickShowTips() - end - else - cell:getBaseObject():setActive(false) - end - end - -- 购买立得 - local immediateReward = DataManager.MonthlyCardData:getCardBuyReward()[1] - self.immediateRewardCell:refreshByConfig(immediateReward) - - self.todayNode:setActive(self.showToday) - self.todaySelect:setActive(LocalData:getMonthlyTodayNotShow()) - self.txToday:setText(I18N:getGlobalText(I18N.GlobalConst.CONFIRM_IGNORE)) - GFunc.centerImgAndTx(self.todatCheck, self.txToday, 5) -end - -return MonthlyCardUI \ No newline at end of file diff --git a/lua/app/ui/privilege/monthly_card_ui.lua.meta b/lua/app/ui/privilege/monthly_card_ui.lua.meta deleted file mode 100644 index 832f78ba..00000000 --- a/lua/app/ui/privilege/monthly_card_ui.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 70ede8196ca5246a4bddd7fe446aefc2 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/privilege/privilege_main_ui.lua b/lua/app/ui/privilege/privilege_main_ui.lua index dbd6d3ab..67427980 100644 --- a/lua/app/ui/privilege/privilege_main_ui.lua +++ b/lua/app/ui/privilege/privilege_main_ui.lua @@ -50,10 +50,10 @@ function PrivilegeMainUI:onLoadRootComplete() ModuleManager.PrivilegeCardManager:getPurchaseCardDailyReward(0) end) self.btnAllTx = uiMap["privilege_main_ui.bottom.btn_all.text"] - self.btnAllTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CLAIMALL)) + self.btnAllTx:setText(I18N:getGlobalText(I18N.GlobalConst.ONE_KEY_GET_DESC)) self.btnAllGrey = uiMap["privilege_main_ui.bottom.btn_all_grey"] self.btnAllGreyTx = uiMap["privilege_main_ui.bottom.btn_all_grey.text"] - self.btnAllGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_GOT_DESC)) + self.btnAllGreyTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE)) self:scheduleGlobal(function() self:updateTime() diff --git a/lua/app/userdata/sign/sign_week_data.lua b/lua/app/userdata/sign/sign_week_data.lua index 4ea04ad1..d9390159 100755 --- a/lua/app/userdata/sign/sign_week_data.lua +++ b/lua/app/userdata/sign/sign_week_data.lua @@ -263,7 +263,7 @@ function SignWeekData:getSeason() end function SignWeekData:getReSignCost() - return GFunc.getConstReward2("act_bounty_buy_cost") + return GFunc.getConstCost("act_bounty_buy_cost", true) end -- 解锁高级奖励