Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

PC-202302260912\Administrator 2025-04-18 15:27:24 +08:00
commit c60f30534d
8 changed files with 19 additions and 9 deletions

View File

@ -2528,6 +2528,12 @@ RANK_TYPE = {
SoulSign2 = 100103, --魂印排行榜(冲榜)
Level_chong = 1003, --关卡排行榜(冲榜)
FightValue_chong = 10022, --战力排行榜(冲榜)
DaijinquanRank_chong = 100201, --代金券排行榜(冲榜)
YingxiongRank_chong = 100202, --英雄召唤排行榜(冲榜)
FabaoRank_chong = 100203, --法宝召唤排行榜(冲榜)
XunxianRank_chong = 100204, --寻仙召唤排行榜(冲榜)
Demons_chong = 1004, --心魔排行榜(冲榜)
ShanHe_chong = 10030, --山河排行榜(冲榜)
GodsWayTower = 45, --多队塔

View File

@ -355,16 +355,16 @@ function this.UpdateRankInfo(go, data)
elseif rankType == RANK_TYPE.UpStar or rankType == RANK_TYPE.UpStar2 then
infoTxt.gameObject:SetActive(true)
infoTxt.text = Language[11932] .. data.rankInfo.param1
elseif rankType == RANK_TYPE.DaijinquanRank then
elseif rankType == RANK_TYPE.DaijinquanRank or rankType == RANK_TYPE.DaijinquanRank_chong then
infoTxt.gameObject:SetActive(true)
infoTxt.text = GetLanguageStrById("代金券")..":" .. data.rankInfo.param1
elseif rankType == RANK_TYPE.YingxiongRank then
infoTxt.text = GetLanguageStrById("代金券") .. ":" .. data.rankInfo.param1
elseif rankType == RANK_TYPE.YingxiongRank or rankType == RANK_TYPE.YingxiongRank_chong then
infoTxt.gameObject:SetActive(true)
infoTxt.text = GetLanguageStrById("次数:") .. data.rankInfo.param1
elseif rankType == RANK_TYPE.FabaoRank then
elseif rankType == RANK_TYPE.FabaoRank or rankType == RANK_TYPE.FabaoRank_chong then
infoTxt.gameObject:SetActive(true)
infoTxt.text = GetLanguageStrById("次数:") .. data.rankInfo.param1
elseif rankType == RANK_TYPE.XunxianRank then
elseif rankType == RANK_TYPE.XunxianRank or rankType == RANK_TYPE.XunxianRank_chong then
infoTxt.gameObject:SetActive(true)
infoTxt.text = GetLanguageStrById("次数:") .. data.rankInfo.param1
end

View File

@ -106,6 +106,11 @@ function this.Pay(id, func)
args[4] = sureFunc
args[5] = nil
UIManager.OpenPanel(UIName.GMCommonConfirmPanel, args)
SubmitExtraData({
type = SDKSubMitType.TYPE_CLICKRECHARGEPACKAGE,
roleCreateTime = "" .. id,
roleLevelUpTime = rechargeConfig.RechargeId
})
return
end

View File

@ -53,8 +53,8 @@ function this:BindEvent()
local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
HeroManager.ResetHeroStar(data)
HeroManager.SetTalismanLv(data, 1)
HeroManager.SetSoulPrintNil(data)
HeroManager.SetGodPrintNil(data)
--HeroManager.SetSoulPrintNil(data)
--HeroManager.SetGodPrintNil(data)
PopupTipPanel.ShowTip(Language[12386])
HeroPropManager.SetDirtyByType(data, Hero_Prop_Type.Base)
HeroPropManager.SetDirtyByType(data, Hero_Prop_Type.Talisman)

View File

@ -758,7 +758,7 @@ function this:SetSelectBtn(index)
tabs[index].title or
"<size=45>" ..
tabs[index].title ..
"</size>" --tabs[index].title--
"</size>" --tabs[index].title--
end
-- tab改变事件
@ -889,7 +889,6 @@ function this:UpdateHeroInfoData()
--魂印按钮逻辑
this.soulPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(87) and
curHeroData.heroConfig.MaxRank >= EquipSignUnlock[2][2])
--神印按钮逻辑
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 149)
if config then
local limits = string.split(config.Value, "#")

Binary file not shown.