TCX_dev_zeroFive_online
DESKTOP-RH64908\Administrator 2025-05-20 10:07:07 +08:00
parent 4ee2b812b2
commit 0085e99f86
8 changed files with 30 additions and 26 deletions

View File

@ -226,31 +226,14 @@ function this.OnTabChange(index, lastIndex)
-- 是否能够发言
this._CurChannel = _TabData[index].channel
local chanel = AppConst.SdkChannel
if this._CurChannel == CHAT_CHANNEL.FAMILY or this._CurChannel == CHAT_CHANNEL.GLOBAL or this._CurChannel == CHAT_CHANNEL.JUMP_SERVER then
local mission = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan, 2202)
local state = mission.state
LogError("VipManager.GetChargedNum()==" .. VipManager.GetChargedNum().." chanel:"..chanel)
--ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT)
--xiao7 渠道
if VipManager.GetChargedNum() >= 30 and chanel and chanel == "TCX027" then
if VipManager.GetChargedNum() >= 98 then
this.input:SetActive(true)
this.noInputTip:SetActive(false)
elseif FightPointPassManager.IsFightPointPass(15151) and chanel and chanel ~= "TCX027" then
this.input:SetActive(true)
this.noInputTip:SetActive(false)
--其他渠道及本地
--elseif VipManager.GetChargedNum() >= 0 and FightPointPassManager.IsFightPointPass(15151) then
--this.input:SetActive(true)
--this.noInputTip:SetActive(false)
else
this.input:SetActive(false)
this.noInputTip:SetActive(true)
if chanel and chanel == "TCX027" then
this.noInputTip:GetComponent("Text").text = "累计充值30元才可发言"
else
this.noInputTip:GetComponent("Text").text = "通关15-15副本才可发言"
end
this.noInputTip:GetComponent("Text").text = "累计充值98元才可发言"
end
elseif this._CurChannel == CHAT_CHANNEL.FRIEND or this._CurChannel == CHAT_CHANNEL.SYSTEM then
this.input:SetActive(false)

View File

@ -233,7 +233,7 @@ end
function HandBookHeroAndEquipListPanel:GetHeroData()
--得到所有的对应星级的英雄
local elevenHeroList = {}
local tenHeroList = {}
local sexHeroList = {}
local fiveHeroList = {}
@ -243,7 +243,9 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
local oneHeroList = {}
for id, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
if (not v.Hide or v.Hide == 0) and HeroManager.InVersion(id) then
if v.MaxRank == 15 and (proId == 0 or v.PropertyName == proId) then
table.insert(elevenHeroList,v)
end
if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then
table.insert(tenHeroList,v)
elseif v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then
@ -264,7 +266,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
end
end
end
self:SortHeroNatural(elevenHeroList)
self:SortHeroNatural(tenHeroList)
self:SortHeroNatural(sexHeroList)
self:SortHeroNatural(fiveHeroList)
@ -274,6 +276,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
self:SortHeroNatural(oneHeroList)
--设置图鉴的循环列表
local herodatas={}
herodatas[8]=elevenHeroList
herodatas[7]=tenHeroList
herodatas[6]=sexHeroList
herodatas[5]=fiveHeroList
@ -281,6 +284,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
herodatas[3]=threeHeroList
herodatas[2]=twoHeroList
herodatas[1]=oneHeroList
PlayerManager.heroHandBookListData = herodatas
local heroScrolldatas = {}
@ -302,6 +306,8 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
local showStar=v[i].MaxRank
if k==6 then
showStar=11
elseif k == 8 then
showStar=16
end
if i%5 ==0 then
table.insert(heroScrolldatas,{type = 1,natural=k, star = showStar,index = math.floor(i/5), content = tempData})

View File

@ -4141,6 +4141,9 @@ function this.GetIsShowSoulPrintRedPoint(curHeroData)
local allBagSoulPrintData = BagManager.GetBagItemDataByItemType(ItemBaseType.SoulPrint)
for i = 1, #allBagSoulPrintData do
LogError("allBagSoulPrintData[i].id=="..allBagSoulPrintData[i].id)
--LogError("allBagSoulPrintData[i].id=="..equipConfig[allBagSoulPrintData[i].id])
local a = equipConfig[allBagSoulPrintData[i].id].Range
LogError("allBagSoulPrintData[i].id=="..tostring(a[1]))
if not allUpSoulPrint[allBagSoulPrintData[i].id] and equipConfig[allBagSoulPrintData[i].id].Range[1] == 0 then
return true
--有空位可以穿戴

View File

@ -141,6 +141,7 @@ function VerifyToken(token, openId, channel, verifyCallback)
local json = require 'cjson'
local context = json.decode(msg)
if context and context.status == 1 then
LogError("验证成功 openid"..context.userId)
verifyCallback(1, context.userId)
else
verifyCallback(1, openId)

View File

@ -854,7 +854,11 @@ function this.RequestHttpLogin()
local url = ""
local user_channel = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel
local tokenStr=AppConst.TokenStr
local Platform=1
local Platform = "1"
if AppConst.SdkChannel == "DNA01" then
Platform= "Android"
end
-- if user_channel~="pc" then
-- local chanel= SDKMgr:GetChannel()
-- if chanel and chanel=="Ohayoo" then

View File

@ -64,7 +64,7 @@ function this.Pay(id, func)
CheckRedPointStatus(RedPointType.GrowthPackage) --成长礼包的红点检测
--直购商品
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id)
if rechargeConfig.OtherBuy1 then
if rechargeConfig.OtherBuy2 then
local yhqNum = BagManager.GetItemCountById(1342)
local leftTimes = PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GM_YI_YUAN_UP_TIME)
if yhqNum >= rechargeConfig.Price and rechargeConfig.Price > 0 and leftTimes >= rechargeConfig.Price then
@ -207,7 +207,10 @@ function this.RequestPay(context)
-- 角色相关
--if chanel and (chanel == "TCXQKGM09" or chanel == "TCXQUZB" or chanel == "TCXQUZB2" or chanel == "TCXQKZB07") then
--LogError("太初行quick渠道支付参数"..PlayerManager.uid)
params.roleID = tostring(PlayerManager.uid) ..
if channel == "DNA01" then
params.roleID = tostring(PlayerManager.uid)
else
params.roleID = tostring(PlayerManager.uid) ..
"_" ..
tostring(context.Id) ..
"_" ..
@ -215,6 +218,8 @@ function this.RequestPay(context)
"_" ..
AppConst
.Platform --.."_"..tostring(context.orderId or "0").."_"..tostring(LoginManager.ServerId)
end
params.extension = tostring(PlayerManager.uid) ..
"_" ..
tostring(context.Id) ..

View File

@ -387,7 +387,7 @@ function this.ChallengeCopyShow()
end), data[2], 0.5):SetEase(Ease.Linear)
local scoreTextArr = {"chall_score_lianghao","chall_score_youxiu","chall_score_shishi","chall_score_chuanshuo","chall_score_shenhua"}
local scoreImageArr = {"r_hero_tujian_lianghao","r_hero_tujian_youxiu","r_hero_tujian_shishi","r_hero_tujian_chuanshuo","r_hero_tujian_shenhua"}
local scoreImageArr = {"r_hero_tujian_lianghao","r_hero_tujian_youxiu","r_hero_tujian_shishi","r_hero_tujian_chuanshuo","r_hero_tujian_shenhua","r_hero_tujian_shenwang"}
local scoreText= Util.GetGameObject(this.challengeInfo,"layout/progressBg/scoreText")
local boutNum= Util.GetGameObject(this.challengeInfo,"layout/progressBg/boutNum")
local lvArr=data[3]

View File

@ -97,6 +97,8 @@ function RoleTalentPopup:GetTalentDataShow()
titleStr="飞升四阶激活:\n"
elseif curUpStarId==29 then
titleStr="飞升五阶激活:\n"
elseif curUpStarId==30 then
titleStr="飞升六阶激活:\n"
end
else