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

签到

Browse Source
This commit is contained in:
puxuan 2025-10-07 17:18:55 +08:00
parent 933bbc243f
commit 3e1693d91d
30 changed files with 811 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lua/app/common/bi_report.lua
View File

@ -206,6 +206,18 @@ BIReport.ITEM_GET_TYPE = {
SHOP_GEM = "shop_gem",
SHOP_GOLD = "shop_gold",
-- SHOP_EMBLEM = "shop_emblem",
-- 基金
FUND_GROW = "fund_grow",-- 基金
ACT_CHAPTER_FUND_REWARD = "act_chapter_fund_reward",
ACT_LEVEL_FUND_REWARD = "act_level_fund_reward",
-- 七日签到战令
SIGN_BOUNTY = "signin_bounty",
SIGN_BOUNTY_REWARD = "sign_bounty_reward", -- 补领上次奖励
SIGN_BOUNTY_RESIGH = "sign_bounty_resigh",
SIGN_BOUNTY_SIGH = "sign_bounty_sigh",
SIGN_MONTH_ACCUM_CLAIM = "signin_30_accum_claim",
}
BIReport.ADS_CLICK_TYPE = {
@ -309,6 +321,9 @@ BIReport.GIFT_TYPE = {
-- 高级战令
BOUNTY_PRO_REWARD = "bounty_pro_reward",
FUND_GROW = "fund_grow",-- 成长基金
SIGN_BOUNTY = "sign_bounty",
}
BIReport.COIN_TYPE = {

6
lua/app/common/pay_manager.lua
View File

@ -33,6 +33,8 @@ PayManager.PURCHARSE_ACT_TYPE = {
-- TOURN_WAVE_GIFT = 23,
-- TOURN_ARENA_GIFT = 24,
BOUNTY = 3,
FUND = 4,
SIGN_BOUNTY = 5,
GIFT_POP_CHAPTER = 10, -- 章节礼包
ACT_COMMON = 11,-- 活动礼包通用11,具体礼包类型使用activity表中的act_type
ACT_SEVEN_DAY = 15, -- 七天乐
@ -57,6 +59,8 @@ PayManager.PURCHARSE_TYPE_CONFIG = {
PayManager.BI_ITEM_GET_TYPE = {
[PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
[PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.ITEM_GET_TYPE.BOUNTY,
[PayManager.PURCHARSE_ACT_TYPE.FUND] = BIReport.ITEM_GET_TYPE.FUND_GROW,
[PayManager.PURCHARSE_ACT_TYPE.SIGN_BOUNTY] = BIReport.ITEM_GET_TYPE.SIGN_BOUNTY,
[PayManager.PURCHARSE_ACT_TYPE.GIFT_POP_CHAPTER] = BIReport.ITEM_GET_TYPE.GIFT_POP_CHAPTER,
[PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON] = {},
-- [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.ITEM_GET_TYPE.FIRST_RECHARGE,
@ -90,6 +94,8 @@ PayManager.BI_ITEM_GET_TYPE = {
PayManager.BI_GIFT_TYPE = {
[PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
[PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY_PRO_REWARD,
[PayManager.PURCHARSE_ACT_TYPE.FUND] = BIReport.GIFT_TYPE.FUND_GROW,
[PayManager.PURCHARSE_ACT_TYPE.SIGN_BOUNTY] = BIReport.GIFT_TYPE.SIGN_BOUNTY,
[PayManager.PURCHARSE_ACT_TYPE.GIFT_POP_CHAPTER] = BIReport.GIFT_TYPE.GIFT_POP_CHAPTER,
[PayManager.PURCHARSE_ACT_TYPE.ACT_COMMON] = {},
-- [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = BIReport.GIFT_TYPE.FIRST_RECHARGE,

2
lua/app/common/white_res_manager.lua
View File

@ -5,7 +5,7 @@ local WhiteResManager = {}
local GAME_RES_WHITE_LIST = {
-- ui
GConst.ATLAS_PATH.COMMON,
GConst.ATLAS_PATH.ACT_COMMON,
GConst.ATLAS_PATH.UI_ACT_COMMON,
-- icon
GConst.ATLAS_PATH.ICON_SKILL,
GConst.ATLAS_PATH.ICON_SKILL_ROGUE,

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

@ -212,7 +212,7 @@ GConst.TYPEOF_LUA_CLASS = {
GConst.ATLAS_PATH = {
COMMON = "assets/arts/atlas/ui/common.asset",
ACT_COMMON = "assets/arts/atlas/ui/act_common.asset",
UI_ACT_COMMON = "assets/arts/atlas/ui/act_common.asset",
MAIN = "assets/arts/atlas/ui/main.asset",
BATTLE = "assets/arts/atlas/ui/battle.asset",
DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset",

8
lua/app/module/activity/act_sprint/act_sprint_const.lua
View File

@ -69,10 +69,10 @@ ActSprintConst.MAIN_PAGE_BTN_DESC = {
}
ActSprintConst.BOTTOM_PAGE = {
SCORE_TASK = 1,
BOUNTY = 2,
GIFT = 3,
TASK = 4,
SCORE_TASK = 4,
BOUNTY = 3,
GIFT = 2,
TASK = 1,
}
ActSprintConst.COMP = {

6
lua/app/module/shop/shop_const.lua
View File

@ -28,12 +28,6 @@ ShopConst.FIRST_RECHARGE_ID = {
[ShopConst.FIRST_RECHARGE_GEARS.GEAR_3] = {1003000601, 1003000701, 1003000801},-- 第三档首充
}
-- 新首充id
-- ShopConst.FIRST_RECHARGE_ID_2 = {
-- [ShopConst.FIRST_RECHARGE_GEARS.GEAR_1] = {11002, 11102, 11202},-- 第一档首充
-- [ShopConst.FIRST_RECHARGE_GEARS.GEAR_2] = {11302, 11402, 11502},-- 第二档首充
-- [ShopConst.FIRST_RECHARGE_GEARS.GEAR_3] = {11602, 11702, 11802},-- 第三档首充
-- }
ShopConst.PRIVILEGE_SHOW_PAGE = {
FREE_DAILY_REWARDS = 1,
AD_CARD = 2,

13
lua/app/module/shop/shop_manager.lua
View File

@ -152,19 +152,6 @@ function ShopManager:rspBuyEmblemGift(result)
DataManager.ShopData:onBuyEmblemGiftSuccess(result.reqData.id)
end
function ShopManager:reqBuyEmblemGift(id)
self:sendMessage(ProtoMsgType.FromMsgEnum.MallMythicBuyReq, {id = id}, self.rspBuyEmblemGift, BIReport.ITEM_GET_TYPE.SHOP_EMBLEM)
end
function ShopManager:rspBuyEmblemGift(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
end
GFunc.showRewardBox(result.rewards)
DataManager.ShopData:onBuyEmblemGiftSuccess(result.reqData.id)
end
-- 金币商店
function ShopManager:reqBuyGoldGift(id)
self:sendMessage(ProtoMsgType.FromMsgEnum.MallGoldBuyReq, {id = id}, self.rspBuyGoldGift, BIReport.ITEM_GET_TYPE.SHOP_GOLD)

19
lua/app/module/sign/sign_const.lua
View File

@ -1,8 +1,9 @@
local SignConst = {}
SignConst.GIFT_ID = {
[1] = 1004000001,
[2] = 1004000101,
[1] = 1034000001,
[2] = 1034000001,
-- [2] = 1004000101,
}
SignConst.REWARD_TYPE = {
@ -15,7 +16,7 @@ SignConst.MONTH_REWARD_TYPE = {
}
SignConst.SIGN_SHOW_PAGE = {
WEEK = 1,
MONTH = 2,
-- MONTH = 2,
}
SignConst.SIGN_STATE = {
CAN_SIGN = 1, -- 可签到
@ -39,27 +40,27 @@ SignConst.SIGN_MONTH_SLIDER_RANG ={
-- 签到预制体挂载的组件
SignConst.SIGN_COMP = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = "app/ui/sign/comp/sign_week_comp",
[SignConst.SIGN_SHOW_PAGE.MONTH] = "app/ui/sign/comp/sign_month_comp",
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = "app/ui/sign/comp/sign_month_comp",
}
SignConst.SIGN_COMP_NAME = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = "sign_main_ui.sign_week_comp",
[SignConst.SIGN_SHOW_PAGE.MONTH] = "sign_main_ui.sign_month_comp",
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = "sign_main_ui.sign_month_comp",
}
SignConst.SIGN_PAGE_BTN_ICON_ATLAS = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = GConst.ATLAS_PATH.UI_ACT_COMMON,
[SignConst.SIGN_SHOW_PAGE.MONTH] = GConst.ATLAS_PATH.UI_ACT_COMMON,
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = GConst.ATLAS_PATH.UI_ACT_COMMON,
}
SignConst.SIGN_PAGE_BTN_ICON_1 = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = "act_common_btn_8_1",
[SignConst.SIGN_SHOW_PAGE.MONTH] = "act_common_btn_9_1",
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = "act_common_btn_9_1",
}
SignConst.SIGN_PAGE_BTN_ICON_2 = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = "act_common_btn_8_2",
[SignConst.SIGN_SHOW_PAGE.MONTH] = "act_common_btn_9_2",
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = "act_common_btn_9_2",
}
SignConst.SIGN_PAGE_BTN_DESC = {
[SignConst.SIGN_SHOW_PAGE.WEEK] = I18N.GlobalConst.ACT_30SIGNIN_2,
[SignConst.SIGN_SHOW_PAGE.MONTH] = I18N.GlobalConst.ACT_30SIGNIN_1,
-- [SignConst.SIGN_SHOW_PAGE.MONTH] = I18N.GlobalConst.ACT_30SIGNIN_1,
}
return SignConst

41
lua/app/module/sign/sign_manager.lua
View File

@ -2,7 +2,7 @@ local SignManager = class("SignManager", BaseModule)
-- 领取遗留奖励
function SignManager:reqSignAutoRewardsClaimed()
self:sendMessage(ProtoMsgType.FromMsgEnum.SignAutoRewardsClaimedReq, {}, {}, self.rspSignAutoRewardsClaimed, BIReport.ITEM_GET_TYPE.SIGN_BOUNTY_REWARD)
self:sendMessage(ProtoMsgType.FromMsgEnum.SignAutoRewardsClaimedReq, {}, self.rspSignAutoRewardsClaimed, BIReport.ITEM_GET_TYPE.SIGN_BOUNTY_REWARD)
end
function SignManager:rspSignAutoRewardsClaimed(result)
@ -10,12 +10,12 @@ function SignManager:rspSignAutoRewardsClaimed(result)
return
end
GFunc.showRewardBox(result.rewards)
if result.rewards and #result.rewards > 0 then
GFunc.showRewardBox(result.rewards)
BIReport:postSignBountyOpt(BIReport.SIGN_WEEK_OPT_TYPE.REWARD)
end
end
function SignManager:showSignUI(showPage, onlyShowPage, callback)
local params = {
showPage = showPage,
@ -24,11 +24,13 @@ function SignManager:showSignUI(showPage, onlyShowPage, callback)
}
UIManager:showUI("app/ui/sign/sign_main_ui", params)
end
-- 签到
function SignManager:reqSignClaimed(day, isAll)
local isUnlock = DataManager.SignWeekData:isUnlockPro(day)
self:sendMessage(ProtoMsgType.FromMsgEnum.SignClaimedReq, {day = day, pay = isUnlock, all = isAll}, self.rspSignClaimed, BIReport.ITEM_GET_TYPE.SIGN_BOUNTY_SIGH)
end
function SignManager:rspSignClaimed(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
@ -45,6 +47,7 @@ end
function SignManager:reqSignReCheckin(day)
self:sendMessage(ProtoMsgType.FromMsgEnum.SignReCheckinReq, {day = day}, self.rspSignReCheckin, BIReport.ITEM_GET_TYPE.SIGN_BOUNTY_RESIGH)
end
function SignManager:rspSignReCheckin(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
@ -57,10 +60,10 @@ function SignManager:rspSignReCheckin(result)
BIReport:postSignBountyOpt(BIReport.SIGN_WEEK_OPT_TYPE.RESIGN)
end
function SignManager:reqMonthSign(day)
self:sendMessage(ProtoMsgType.FromMsgEnum.Sign30ClaimReq, {day = day}, self.rspMonthSign, BIReport.ITEM_GET_TYPE.SIGN_MONTH)
end
function SignManager:rspMonthSign(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
@ -69,9 +72,11 @@ function SignManager:rspMonthSign(result)
GFunc.showRewardBox(result.rewards)
DataManager.SignMonthData:setSignSucceed()
end
function SignManager:reqMonthSignAgain()
self:sendMessage(ProtoMsgType.FromMsgEnum.Sign30ClaimReq, {again = true}, self.rspSignMonthAgain, BIReport.ITEM_GET_TYPE.SIGN_MONTH_AGAIN)
end
function SignManager:rspSignMonthAgain(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
@ -80,9 +85,11 @@ function SignManager:rspSignMonthAgain(result)
DataManager.SignMonthData:setSignAgainSucceed()
BIReport:postSignBountyOpt(BIReport.SIGN_MONTH_OPT_TYPE.SIGN_AGAIN)
end
function SignManager:reqMonthAccumClaim(day)
self:sendMessage(ProtoMsgType.FromMsgEnum.Sign30AccumClaimReq, {id = day}, self.rspMonthAccumClaim, BIReport.ITEM_GET_TYPE.SIGN_MONTH_ACCUM_CLAIM)
end
function SignManager:rspMonthAccumClaim(result)
if result.err_code ~= GConst.ERROR_STR.SUCCESS then
return
@ -92,4 +99,30 @@ function SignManager:rspMonthAccumClaim(result)
BIReport:postSignBountyOpt(BIReport.SIGN_MONTH_OPT_TYPE.ACCUM_CLAIM)
end
--region 上报
local EVENT_SIGN_BOUNTY = "client_sign_bounty"-- 签到战令
BIReport.SIGN_WEEK_OPT_TYPE = {
SIGN = "Sign",
RESIGN = "ReSign",
REWARD = "Reward"
}
BIReport.SIGN_MONTH_OPT_TYPE = {
SIGN = "Sign",
SIGN_AGAIN = "SignAgain",
ACCUM_CLAIM = "AccumClaim"
}
-- 七日签到战令
function BIReport:postSignBountyOpt(optType, day, rewards)
local args = {
opt_type = optType,
day = day,
reward_str = GFunc.getRewardsStr(rewards),
}
self:report(EVENT_SIGN_BOUNTY, args)
end
--endregion
return SignManager

36
lua/app/proto/proto_msg_type.lua
View File

@ -104,6 +104,8 @@ local ProtoMsgType = {
[2258628591] = "SummonWishClaimRsp",
[2285872137] = "ChapterBoxRewardReq",
[2285873970] = "ChapterBoxRewardRsp",
[2339018130] = "SevenDaysReq",
[2339019963] = "SevenDaysRsp",
[2429586383] = "MailCycleReq",
[2429588216] = "MailCycleRsp",
[2431353944] = "SignClaimedReq",
@ -122,6 +124,8 @@ local ProtoMsgType = {
[2553353804] = "ChapterDailyChallengeStartRsp",
[2581180989] = "MailListReq",
[2581182822] = "MailListRsp",
[2620369240] = "SevenDayRewardReq",
[2620371073] = "SevenDayRewardRsp",
[2660643921] = "SignReCheckinReq",
[2660645754] = "SignReCheckinRsp",
[2706989220] = "TriggerGrowUpGift2Ntf",
@ -131,6 +135,8 @@ local ProtoMsgType = {
[2729914669] = "LevelFundClaimedRsp",
[2731281392] = "MailExtractReq",
[2731283225] = "MailExtractRsp",
[2740236933] = "SevenDaysTaskReq",
[2740238766] = "SevenDaysTaskRsp",
[2772586812] = "DebugPowerReq",
[2772588645] = "DebugPowerRsp",
[2806041093] = "ChapterDoubleRewardReq",
@ -160,6 +166,8 @@ local ProtoMsgType = {
[3137379205] = "ActPayRsp",
[3190730044] = "KickOutNtf",
[3197501935] = "ArenaBountyBoughtNtf",
[3224230499] = "SevenDayTaskRewardReq",
[3224232332] = "SevenDayTaskRewardRsp",
[3309820798] = "HeroPutOnReq",
[3309822631] = "HeroPutOnRsp",
[3341173994] = "BountyBoughtNtf",
@ -189,6 +197,8 @@ local ProtoMsgType = {
[3624439233] = "NewMailNtf",
[3629950931] = "PVPStageRewardReq",
[3629952764] = "PVPStageRewardRsp",
[3634156164] = "ActivityExchangeReq",
[3634157997] = "ActivityExchangeRsp",
[3750411183] = "EquipWearReq",
[3750413016] = "EquipWearRsp",
[3757169544] = "BountyRewardReq",
@ -219,6 +229,8 @@ local ProtoMsgType = {
[4192051877] = "DungeonSweepRsp",
[4195650791] = "TriggerWeaponArmorGiftReq",
[4195652624] = "TriggerWeaponArmorGiftRsp",
[4234787821] = "SevenDaysScoreRewardReq",
[4234789654] = "SevenDaysScoreRewardRsp",
[4250417467] = "PlayerInfoReq",
[4250419300] = "PlayerInfoRsp",
[4256333947] = "ExistReq",
@ -329,6 +341,8 @@ local ProtoMsgType = {
SummonWishClaimRsp = 2258628591,
ChapterBoxRewardReq = 2285872137,
ChapterBoxRewardRsp = 2285873970,
SevenDaysReq = 2339018130,
SevenDaysRsp = 2339019963,
MailCycleReq = 2429586383,
MailCycleRsp = 2429588216,
SignClaimedReq = 2431353944,
@ -347,6 +361,8 @@ local ProtoMsgType = {
ChapterDailyChallengeStartRsp = 2553353804,
MailListReq = 2581180989,
MailListRsp = 2581182822,
SevenDayRewardReq = 2620369240,
SevenDayRewardRsp = 2620371073,
SignReCheckinReq = 2660643921,
SignReCheckinRsp = 2660645754,
TriggerGrowUpGift2Ntf = 2706989220,
@ -356,6 +372,8 @@ local ProtoMsgType = {
LevelFundClaimedRsp = 2729914669,
MailExtractReq = 2731281392,
MailExtractRsp = 2731283225,
SevenDaysTaskReq = 2740236933,
SevenDaysTaskRsp = 2740238766,
DebugPowerReq = 2772586812,
DebugPowerRsp = 2772588645,
ChapterDoubleRewardReq = 2806041093,
@ -385,6 +403,8 @@ local ProtoMsgType = {
ActPayRsp = 3137379205,
KickOutNtf = 3190730044,
ArenaBountyBoughtNtf = 3197501935,
SevenDayTaskRewardReq = 3224230499,
SevenDayTaskRewardRsp = 3224232332,
HeroPutOnReq = 3309820798,
HeroPutOnRsp = 3309822631,
BountyBoughtNtf = 3341173994,
@ -414,6 +434,8 @@ local ProtoMsgType = {
NewMailNtf = 3624439233,
PVPStageRewardReq = 3629950931,
PVPStageRewardRsp = 3629952764,
ActivityExchangeReq = 3634156164,
ActivityExchangeRsp = 3634157997,
EquipWearReq = 3750411183,
EquipWearRsp = 3750413016,
BountyRewardReq = 3757169544,
@ -444,6 +466,8 @@ local ProtoMsgType = {
DungeonSweepRsp = 4192051877,
TriggerWeaponArmorGiftReq = 4195650791,
TriggerWeaponArmorGiftRsp = 4195652624,
SevenDaysScoreRewardReq = 4234787821,
SevenDaysScoreRewardRsp = 4234789654,
PlayerInfoReq = 4250417467,
PlayerInfoRsp = 4250419300,
ExistReq = 4256333947,
@ -554,6 +578,8 @@ local ProtoMsgType = {
SummonWishClaimRsp = "SummonWishClaimRsp",
ChapterBoxRewardReq = "ChapterBoxRewardReq",
ChapterBoxRewardRsp = "ChapterBoxRewardRsp",
SevenDaysReq = "SevenDaysReq",
SevenDaysRsp = "SevenDaysRsp",
MailCycleReq = "MailCycleReq",
MailCycleRsp = "MailCycleRsp",
SignClaimedReq = "SignClaimedReq",
@ -572,6 +598,8 @@ local ProtoMsgType = {
ChapterDailyChallengeStartRsp = "ChapterDailyChallengeStartRsp",
MailListReq = "MailListReq",
MailListRsp = "MailListRsp",
SevenDayRewardReq = "SevenDayRewardReq",
SevenDayRewardRsp = "SevenDayRewardRsp",
SignReCheckinReq = "SignReCheckinReq",
SignReCheckinRsp = "SignReCheckinRsp",
TriggerGrowUpGift2Ntf = "TriggerGrowUpGift2Ntf",
@ -581,6 +609,8 @@ local ProtoMsgType = {
LevelFundClaimedRsp = "LevelFundClaimedRsp",
MailExtractReq = "MailExtractReq",
MailExtractRsp = "MailExtractRsp",
SevenDaysTaskReq = "SevenDaysTaskReq",
SevenDaysTaskRsp = "SevenDaysTaskRsp",
DebugPowerReq = "DebugPowerReq",
DebugPowerRsp = "DebugPowerRsp",
ChapterDoubleRewardReq = "ChapterDoubleRewardReq",
@ -610,6 +640,8 @@ local ProtoMsgType = {
ActPayRsp = "ActPayRsp",
KickOutNtf = "KickOutNtf",
ArenaBountyBoughtNtf = "ArenaBountyBoughtNtf",
SevenDayTaskRewardReq = "SevenDayTaskRewardReq",
SevenDayTaskRewardRsp = "SevenDayTaskRewardRsp",
HeroPutOnReq = "HeroPutOnReq",
HeroPutOnRsp = "HeroPutOnRsp",
BountyBoughtNtf = "BountyBoughtNtf",
@ -639,6 +671,8 @@ local ProtoMsgType = {
NewMailNtf = "NewMailNtf",
PVPStageRewardReq = "PVPStageRewardReq",
PVPStageRewardRsp = "PVPStageRewardRsp",
ActivityExchangeReq = "ActivityExchangeReq",
ActivityExchangeRsp = "ActivityExchangeRsp",
EquipWearReq = "EquipWearReq",
EquipWearRsp = "EquipWearRsp",
BountyRewardReq = "BountyRewardReq",
@ -669,6 +703,8 @@ local ProtoMsgType = {
DungeonSweepRsp = "DungeonSweepRsp",
TriggerWeaponArmorGiftReq = "TriggerWeaponArmorGiftReq",
TriggerWeaponArmorGiftRsp = "TriggerWeaponArmorGiftRsp",
SevenDaysScoreRewardReq = "SevenDaysScoreRewardReq",
SevenDaysScoreRewardRsp = "SevenDaysScoreRewardRsp",
PlayerInfoReq = "PlayerInfoReq",
PlayerInfoRsp = "PlayerInfoRsp",
ExistReq = "ExistReq",

6
lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua
View File

@ -14,10 +14,10 @@ local PAGE_BTN_LIGHT = {
"act_common_btn_28_1",
}
local PAGE_BTN_DESC = {
"ACT_GOGOGO_DESC_1",
"ACT_GOGOGO_DESC_10",
"ACT_GOGOGO_DESC_11",
"ACT_GOGOGO_DESC_20",
"ACT_GOGOGO_DESC_11",
"ACT_GOGOGO_DESC_10",
"ACT_GOGOGO_DESC_1",
}
function ActMainUI:showCommonBG()

6
lua/app/ui/activity/common/act_base_ui.lua
View File

@ -1,5 +1,7 @@
local ActBaseUI = class("ActBaseUI", BaseUI)
local ACT_PAGE_BTNS_COMP = "app/ui/activity/common/comp/act_page_btns_comp"
function ActBaseUI:ctor(params)
self.page = params.page or 1
self.ActConst = self:getActConst()
@ -38,7 +40,7 @@ function ActBaseUI:_display()
self.titleTx = uiMap["act_main_ui.top.title_tx"]
self.helpBtn = uiMap["act_main_ui.title_bg.help_btn"]
self.timeTx = uiMap["act_main_ui.top.time_bg.time_tx"]
self.pageBtnsCompObj = uiMap["act_main_ui.bottom.page_btns_comp"]
self.pageBtnsCompObj = uiMap["act_main_ui.bottom.act_page_btns_comp"]
self.disableBg = uiMap["act_main_ui.disable_bg"]
self.disableBg:setActive(false)
@ -271,7 +273,7 @@ function ActBaseUI:refreshPageBtns()
end
if self.pageBtnsCompObj then
self.pageBtnsComp = self.pageBtnsCompObj:addLuaComponent(GConst.TYPEOF_LUA_CLASS.PAGE_BTNS_COMP)
self.pageBtnsComp = self.pageBtnsCompObj:addLuaComponent(ACT_PAGE_BTNS_COMP)
self.pageBtnsComp:refresh(self.pageBtnInfos)
end

40
lua/app/ui/activity/common/cell/act_page_btn_cell.lua Executable file
View File

@ -0,0 +1,40 @@
local PageBtnCell = class("PageBtnCell", BaseCell)
function PageBtnCell:init()
local uiMap = self:getUIMap()
self.imgIcon = uiMap["page_btn_cell.img_icon"]
self.txDesc = uiMap["page_btn_cell.tx_desc"]
self.redPosX = 32
self.redPosY = 20
self.redScale = 1
end
function PageBtnCell:setRedPointPos(posX, posY, scale)
self.redPosX = posX or self.redPosX
self.redPosY = posY or self.redPosY
self.redScale = scale or self.redScale
end
function PageBtnCell:refresh(info)
local atlas = info.atlas
local icon = info.icon
local desc = info.desc
local redPoint = info.redPoint
local callback = info.callback
self:getBaseObject():getGameObject().name = icon
self.imgIcon:setSprite(atlas, icon, function()
self.imgIcon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
self.txDesc:setText(desc)
self:addClickListener(callback)
if redPoint then
self:getBaseObject():addRedPoint(self.redPosX, self.redPosY, self.redScale)
else
self:getBaseObject():removeRedPoint()
end
end
return PageBtnCell

10
lua/app/ui/activity/common/cell/act_page_btn_cell.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 9605cd038397d4de5b990399ca37e57a
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

41
lua/app/ui/activity/common/comp/act_page_btns_comp.lua Executable file
View File

@ -0,0 +1,41 @@
local PageBtnsComp = class("PageBtnsComp", LuaComponent)
local PAGE_BTN_CELL = "app/ui/activity/common/cell/act_page_btn_cell"
function PageBtnsComp:init()
local uiMap = self:getUIMap()
self.scrollrect = uiMap["act_page_btns_comp.scrollrect"]
end
function PageBtnsComp:setRedPointPos(posX, posY, scale)
self.redPosX = posX
self.redPosY = posY
self.redScale = scale
end
function PageBtnsComp:refresh(list, index)
self.list = list or {}
if not self.scrollRect then
self.scrollRect = self.scrollrect:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.scrollRect:addInitCallback(function()
return PAGE_BTN_CELL
end)
self.scrollRect:addRefreshCallback(function(index, cell)
cell:setRedPointPos(self.redPosX, self.redPosY, self.redScale)
cell:refresh(self.list[index])
end)
end
if self.scrollRect:getTotalCount() == nil or self.scrollRect:getTotalCount() <= 0 then
self.scrollRect:refillCells(#self.list)
elseif self.scrollRect:getTotalCount() ~= #self.list then
self.scrollRect:clearCells()
self.scrollRect:refillCells(#self.list)
else
self.scrollRect:updateAllCell()
end
if index then
self.scrollRect:moveToIndex(index)
end
end
return PageBtnsComp

10
lua/app/ui/activity/common/comp/act_page_btns_comp.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: f6bb8065a515748e3b3b5f8d3c12ef19
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

4
lua/app/ui/arena/arena_recent_battle_ui.lua
View File

@ -91,7 +91,7 @@ function ArenaRecentBattleUI:refreshRecord(obj, info)
end
uiMap["tx_name"]:setText(name)
if info.win then
obj:setSprite(GConst.ATLAS_PATH.ACT_COMMON,"act_common_bg_9")
obj:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON,"act_common_bg_9")
uiMap["tx_score"]:setText("<color=#2BFF35>+"..info.incr_score.."</color>")
-- uiMap["img_result"]:setSprite(GConst.ATLAS_PATH.ARENA, "arena_dec_2")
if info.attacker then
@ -100,7 +100,7 @@ function ArenaRecentBattleUI:refreshRecord(obj, info)
uiMap["tx_result"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_17))
end
else
obj:setSprite(GConst.ATLAS_PATH.ACT_COMMON,"act_common_bg_8")
obj:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON,"act_common_bg_8")
if info.incr_score == 0 then
uiMap["tx_score"]:setText("<color=#FF5454>-"..info.incr_score.."</color>")
else

8
lua/app/ui/arena/cell/arena_rank_cell.lua
View File

@ -41,22 +41,22 @@ function ArenaRankCell:refresh(rank)
self.txRank:setActive(false)
self.imgRank:setActive(true)
self.imgRank:setSprite(GConst.ATLAS_PATH.ARENA, "arena_ranking_1")
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_2")
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_2")
elseif rank == 2 then
self.txRank:setActive(false)
self.imgRank:setActive(true)
self.imgRank:setSprite(GConst.ATLAS_PATH.ARENA, "arena_ranking_2")
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_3")
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_3")
elseif rank == 3 then
self.txRank:setActive(false)
self.imgRank:setActive(true)
self.imgRank:setSprite(GConst.ATLAS_PATH.ARENA, "arena_ranking_3")
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_4")
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_4")
else
self.imgRank:setActive(false)
self.txRank:setActive(true)
self.txRank:setText(rank)
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_8")
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_bg_8")
end
end

4
lua/app/ui/common/cell/bounty_reward_cell.lua
View File

@ -27,9 +27,9 @@ end
function BountyRewardCell:refresh(reward, isPro, isLock, showCheck)
self:showCheck(showCheck)
if isPro then
self.bg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_2")
self.bg:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_board_2")
else
self.bg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_1")
self.bg:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_board_1")
end
if isLock then
self.lock:setVisible(true)

6
lua/app/ui/dungeon_rune/cell/rank_cell.lua
View File

@ -26,7 +26,7 @@ function RankCell:refresh(index, info)
local imgRank = uiMap["act_rank_cell.img_rank"]
if RANK_ICON[index] then
imgRank:setVisible(true)
imgRank:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_ICON[index])
imgRank:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, RANK_ICON[index])
uiMap["act_rank_cell.tx_rank"]:setText(GConst.EMPTY_STRING)
else
imgRank:setVisible(false)
@ -34,9 +34,9 @@ function RankCell:refresh(index, info)
local imgBg = uiMap["act_rank_cell.bg"]
if RANK_BG[index] then
imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[index])
imgBg:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, RANK_BG[index])
else
imgBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_BG[4])
imgBg:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, RANK_BG[4])
end
local txName = uiMap["act_rank_cell.tx_name"]

2
lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua
View File

@ -186,7 +186,7 @@ function DungeonRuneRankUI:refreshMyRankInfo()
local imgRank = uiMap["dungeon_rune_rank_ui.bg.my_node.img_rank"]
if RANK_ICON[rank] then
imgRank:setVisible(true)
imgRank:setSprite(GConst.ATLAS_PATH.ACT_COMMON, RANK_ICON[rank])
imgRank:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, RANK_ICON[rank])
rankObj:setText(GConst.EMPTY_STRING)
else
imgRank:setVisible(false)

2
lua/app/ui/fund/cell/fund_chapter_cell.lua
View File

@ -64,6 +64,7 @@ function FundChapterCell:refresh(id, isLast)
cell:showFrameAnimation()
else
cell:hideFrameAnimation()
cell:clearClickListener()
end
else
cell:setActive(false)
@ -86,6 +87,7 @@ function FundChapterCell:refresh(id, isLast)
cell:showFrameAnimation()
else
cell:hideFrameAnimation()
cell:clearClickListener()
end
else
cell:setActive(false)

11
lua/app/ui/shop/cell/daily_cell.lua
View File

@ -29,11 +29,12 @@ function DailyCell:refresh(id)
end
local cfg = DataManager.ShopData:getDailyConfig(self.id)
local maxCount = DataManager.ShopData:getDailyCount(self.id)
local remainCount = math.max(0, DataManager.ShopData:getDailyRemainCount(self.id))
local adCount = cfg.limit_ad or 0
local cost = DataManager.ShopData:getDailyCost(self.id)
self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_15) .. remainCount)
self.txLimit:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_5, remainCount, maxCount))
if remainCount <= 0 then
-- 告罄
@ -41,7 +42,7 @@ function DailyCell:refresh(id)
self.baseObject:setTouchEnable(false)
self.baseObject:removeRedPoint()
self.imgCost:setActive(false)
self.txCost:setText("<color=#FF8F8F>" .. I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_14) .. "</color>")
self.txCost:setText("<color=#FF8F8F>" .. I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20) .. "</color>")
self.txCost:setAnchoredPositionX(0)
self.txCost:setSizeDeltaX(150)
elseif not cost or cost.num <= 0 then
@ -51,7 +52,7 @@ function DailyCell:refresh(id)
self.baseObject:addRedPoint(84, 118, 1.2)
-- 纯免费
self.imgCost:setActive(false)
self.txCost:setText(I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_12))
self.txCost:setText(I18N:getGlobalText(I18N.GlobalConst.FREE_DESC))
self.txCost:setAnchoredPositionX(0)
else
if SDKManager:isAdLoaded() then
@ -98,12 +99,12 @@ function DailyCell:refresh(id)
if remainCount == 0 then
return
end
if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true, BIReport.ITEM_GET_TYPE.SHOP_DAILY) then
if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then
return
end
if GFunc.getRewardId(cost) == GConst.ItemConst.ITEM_ID_GEM then
local params = {}
params.content = I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_13)
params.content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33)
params.boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL
params.showToday = GConst.MESSAGE_BOX_SHOW_TODAY.SHOP_DAILY
params.okFunc = function()

18
lua/app/ui/shop/cell/daily_main_cell.lua
View File

@ -36,17 +36,9 @@ function DailyMainCell:init()
return
end
self:onRefreshDaily(false)
-- local params = {}
-- params.content = I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_13)
-- params.boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL
-- params.showToday = GConst.MESSAGE_BOX_SHOW_TODAY.SHOP_DAILY
-- params.okFunc = function()
-- self:onRefreshDaily(false)
-- end
-- GFunc.showMessageBox(params)
end
end)
self.btnRefreshAd:addClickListener(function()
if DataManager.ShopData:getDailyAdRefreshRemainCount() <= 0 then
return
@ -59,7 +51,7 @@ end
function DailyMainCell:updateTime()
local remainTime = DataManager.ShopData:getDailyRefreshAutoTime()
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.MALL_DESC_5, remainTime))
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_22, remainTime))
if DataManager.ShopData:getDailyAdRefreshRemainCount() <= 0 then
self.txTimeAd:setText(remainTime)
end
@ -83,7 +75,7 @@ function DailyMainCell:refresh()
GFunc.setAdsSprite(self.imgAd, true)
self.btnRefreshAd:removeRedPoint()
end
self.txAd:setText(I18N:getGlobalText(I18N.GlobalConst.REFRESH_DESC_1))
self.txAd:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH))
GFunc.centerImgAndTx(self.imgAd, self.txAd, 3)
-- 免费/钻石
@ -92,7 +84,7 @@ function DailyMainCell:refresh()
self.btnRefresh:setTouchEnable(true)
GFunc.setGrey(self.btnRefresh:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE), false)
self.imgCost:setActive(false)
self.txCost:setText(I18N:getGlobalText(I18N.GlobalConst.REFRESH_DESC_2))
self.txCost:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_PVP_DESC_10))
self.txCost:setAnchoredPositionX(0)
self.txTimeCost:setText("(" .. DataManager.ShopData:getDailyFreeRefreshRemainCount() .. "/" .. DataManager.ShopData:getDailyRefreshFreeCount() .. ")")
self.txFree:setText("")
@ -116,7 +108,7 @@ function DailyMainCell:refresh()
self.imgCost:setActive(false)
self.txCost:setText("")
self.txTimeCost:setText("")
self.txFree:setText(I18N:getGlobalText(I18N.GlobalConst.REFRESH_DESC_2))
self.txFree:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH))
self.btnRefresh:removeRedPoint()
end
end

92
lua/app/ui/shop/shop_comp.lua
View File

@ -124,22 +124,23 @@ function ShopComp:init()
end
function ShopComp:refresh(showIdx, noShowIdx)
if showIdx ~= nil then
if showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.FORCE_SKIN then
self.curPage = PAGE_TYPE.SKIN
else
self.curPage = PAGE_TYPE.SHOP
end
end
-- if showIdx ~= nil then
-- if showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.FORCE_SKIN then
-- self.curPage = PAGE_TYPE.SKIN
-- else
-- self.curPage = PAGE_TYPE.SHOP
-- end
-- end
if self.curPage == PAGE_TYPE.SHOP then
-- if self.curPage == PAGE_TYPE.SHOP then
-- self:refreshShop(showIdx, noShowIdx)
-- elseif self.curPage == PAGE_TYPE.SKIN then
-- self:refreshSkin()
-- end
-- self.btnShop:setSprite(GConst.ATLAS_PATH.COMMON, self.curPage == PAGE_TYPE.SHOP and "common_menu_6" or "common_menu_5")
-- self.btnSkin:setSprite(GConst.ATLAS_PATH.COMMON, self.curPage == PAGE_TYPE.SKIN and "common_menu_6" or "common_menu_5")
self:refreshShop(showIdx, noShowIdx)
elseif self.curPage == PAGE_TYPE.SKIN then
self:refreshSkin()
end
self.btnShop:setSprite(GConst.ATLAS_PATH.COMMON, self.curPage == PAGE_TYPE.SHOP and "common_menu_6" or "common_menu_5")
self.btnSkin:setSprite(GConst.ATLAS_PATH.COMMON, self.curPage == PAGE_TYPE.SKIN and "common_menu_6" or "common_menu_5")
-- if DataManager.ShopData:showRedPoint() then
-- self.btnShop:addRedPoint(75, 23, 0.9)
@ -155,7 +156,7 @@ function ShopComp:refreshShop(showIdx, noShowIdx)
self.scrollrectNode:setActive(true)
self.scrollrectSkinNode:setActive(false)
self.showIdx = showIdx
self.showIdx = showIdx or self.showIdx
self:updateList(noShowIdx)
-- if self.showIdx then -- 指定跳转
@ -224,7 +225,6 @@ function ShopComp:updateList(noShowIdx)
self.rpPosY = nil
end
function ShopComp:updateChapterList(offsetY)
-- 没有新手礼包
if CS.BF.BFMain.IsShenhe then
@ -263,41 +263,41 @@ function ShopComp:updateChapterList(offsetY)
return offsetY
end
function ShopComp:updateCoreSoulCell(offsetY)
-- self.imgShopIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, ModuleManager.ItemManager:getItemIcon(GConst.ItemConst.SOUL_SHOP_GOLD))
-- self.txShopNum:setText(DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.SOUL_SHOP_GOLD))
self.txShopNum:setText(I18N:getGlobalText(I18N.GlobalConst.CORE_SUMMON_DESC_21))
self.coreSoulTitleBg:setActive(false)
self.coreSoulMainCell:setActive(false)
-- function ShopComp:updateCoreSoulCell(offsetY)
-- -- self.imgShopIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, ModuleManager.ItemManager:getItemIcon(GConst.ItemConst.SOUL_SHOP_GOLD))
-- -- self.txShopNum:setText(DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.SOUL_SHOP_GOLD))
-- self.txShopNum:setText(I18N:getGlobalText(I18N.GlobalConst.CORE_SUMMON_DESC_21))
-- self.coreSoulTitleBg:setActive(false)
-- self.coreSoulMainCell:setActive(false)
if DataManager.SummonData:getSummonShopSoulUnlock(3) then
self.soulSpine:setActive(true)
else
self.soulSpine:setActive(false)
end
-- if DataManager.SummonData:getSummonShopSoulUnlock(3) then
-- self.soulSpine:setActive(true)
-- else
-- self.soulSpine:setActive(false)
-- end
if not DataManager.ShopData:isCoreSoulOpen() then
return offsetY
end
self.coreSoulTitleBg:setActive(true)
self.coreSoulMainCell:setActive(true)
if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.CORE_SOUL_STORE then
self.beginPosY = math.abs(offsetY)
end
if self.rpPosY == nil then
self.rpPosY = DataManager.ShopData:hasCoreSoulRedPoint() and math.abs(offsetY) or nil
end
-- if not DataManager.ShopData:isCoreSoulOpen() then
-- return offsetY
-- end
-- self.coreSoulTitleBg:setActive(true)
-- self.coreSoulMainCell:setActive(true)
-- if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.CORE_SOUL_STORE then
-- self.beginPosY = math.abs(offsetY)
-- end
-- if self.rpPosY == nil then
-- self.rpPosY = DataManager.ShopData:hasCoreSoulRedPoint() and math.abs(offsetY) or nil
-- end
self.coreSoulTitleBg:setAnchoredPositionY(offsetY)
offsetY = offsetY - 75
self.coreSoulMainCell:setAnchoredPositionY(offsetY)
offsetY = offsetY - 450
-- self.coreSoulTitleBg:setAnchoredPositionY(offsetY)
-- offsetY = offsetY - 75
-- self.coreSoulMainCell:setAnchoredPositionY(offsetY)
-- offsetY = offsetY - 450
local cell = self.coreSoulMainCell:addLuaComponent(CORE_SOUL_MAIN_CELL)
cell:refresh()
-- local cell = self.coreSoulMainCell:addLuaComponent(CORE_SOUL_MAIN_CELL)
-- cell:refresh()
return offsetY
end
-- return offsetY
-- end
function ShopComp:updateDailyCell(offsetY)
self.dailyCell:setActive(false)

16
lua/app/ui/sign/sign_main_ui.lua
View File

@ -50,7 +50,7 @@ function SignMainUI:onLoadRootComplete()
self.btnContent = uiMap["sign_main_ui.bottom.btns.viewport.content"]
self.btns = {}
self.txBtns = {}
for i = 1, table.nums(GConst.SignConst.SIGN_SHOW_PAGE) do
for i = 1, 6 do
table.insert(self.btns, uiMap["sign_main_ui.bottom.btns.viewport.content.btn_" .. i])
table.insert(self.txBtns, uiMap["sign_main_ui.bottom.btns.viewport.content.btn_" .. i .. ".tx_desc"])
end
@ -137,8 +137,8 @@ end
function SignMainUI:switchOtherPage()
if DataManager.SignWeekData:showRedPoint() then
self.curPage = GConst.SignConst.SIGN_SHOW_PAGE.WEEK
elseif DataManager.SignMonthData:showRedPoint() then
self.curPage = GConst.SignConst.SIGN_SHOW_PAGE.MONTH
-- elseif DataManager.SignMonthData:showRedPoint() then
-- self.curPage = GConst.SignConst.SIGN_SHOW_PAGE.MONTH
end
if self.curPage ~= nil then
@ -200,17 +200,19 @@ end
function SignMainUI:isOpen(type)
if type == GConst.SignConst.SIGN_SHOW_PAGE.WEEK then
return DataManager.SignWeekData:isOpen()
elseif type == GConst.SignConst.SIGN_SHOW_PAGE.MONTH then
return DataManager.SignMonthData:isOpen()
-- elseif type == GConst.SignConst.SIGN_SHOW_PAGE.MONTH then
-- return DataManager.SignMonthData:isOpen()
end
return false
end
function SignMainUI:hasRedPoint(type)
if type == GConst.SignConst.SIGN_SHOW_PAGE.WEEK then
return DataManager.SignWeekData:showRedPoint()
elseif type == GConst.SignConst.SIGN_SHOW_PAGE.MONTH then
return DataManager.SignMonthData:showRedPoint()
-- elseif type == GConst.SignConst.SIGN_SHOW_PAGE.MONTH then
-- return DataManager.SignMonthData:showRedPoint()
end
return false
end
return SignMainUI

4
lua/app/ui/summon/summon_main_ui.lua
View File

@ -214,9 +214,9 @@ end
function SummonMainUI:refreshPageBtn()
for i = 1, 2 do
if self.page == i then
self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_btn_" .. i .."_1")
self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_btn_" .. i .."_1")
else
self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_btn_" .. i .."_2")
self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.UI_ACT_COMMON, "act_common_btn_" .. i .."_2")
end
end
end

2
lua/app/userdata/chapter/chapter_data.lua
View File

@ -566,7 +566,7 @@ end
function ChapterData:getChapterNameXYMode(chapterId)
local chapterCfg = self:getChapterCfg()[chapterId]
if chapterCfg then
return string.format("%s-%s",chapterCfg.chapter_id, chapterCfg.stage_num)
return string.format("%s-%s", chapterCfg.chapter, chapterCfg.stage)
end
return chapterId
end

24
lua/app/userdata/shop/shop_data.lua
View File

@ -418,6 +418,16 @@ function ShopData:getDailyRemainCount(id)
return (cfg.limit or 0) + (cfg.limit_ad or 0) - count
end
function ShopData:getDailyCount(id)
local cfg = self:getDailyConfig(id)
if not cfg then
return 0
end
return (cfg.limit or 0) + (cfg.limit_ad or 0)
end
-- 剩余次数,只包括免费,不包括广告
function ShopData:getDailyRemainFreeCount(id)
local cfg = self:getDailyConfig(id)
@ -688,22 +698,8 @@ function ShopData:setFirstrechargePoped()
self.firstRechargePoped = true
end
-- 是否使用新的首充礼包
-- function ShopData:isNewFirstRechargeGift(gear)
-- if gear == nil then
-- return false
-- end
-- local oldId = GConst.ShopConst.FIRST_RECHARGE_ID[gear][1]
-- return DataManager.PaymentData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, oldId) <= 0
-- end
-- 获取档位id
function ShopData:getFirstRechargeGiftId(gear, day)
-- if self:isNewFirstRechargeGift(gear) then
-- return GConst.ShopConst.FIRST_RECHARGE_ID_2[gear][day or 1]
-- else
-- return GConst.ShopConst.FIRST_RECHARGE_ID[gear][day or 1]
-- end
return GConst.ShopConst.FIRST_RECHARGE_ID[gear][day or 1]
end

2
lua/app/userdata/sign/sign_week_data.lua
View File

@ -263,7 +263,7 @@ function SignWeekData:getSeason()
end
function SignWeekData:getReSignCost()
return GFunc.getConstCost("act_bounty_buy_cost")
return GFunc.getConstReward2("act_bounty_buy_cost")
end
-- 解锁高级奖励