diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index d182942977..d2ac076428 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -211,17 +211,28 @@ 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()) - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and VipManager.GetChargedNum()>=600 then + --xiao7 渠道 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and VipManager.GetChargedNum()>=600 and chanel and chanel=="XQDC" then + this.input:SetActive(true) + this.noInputTip:SetActive(false) + --其他渠道及本地 + elseif ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and VipManager.GetChargedNum()>=10000 then this.input:SetActive(true) this.noInputTip:SetActive(false) else this.input:SetActive(false) this.noInputTip:SetActive(true) - this.noInputTip:GetComponent("Text").text = "等级达到20级且折扣后真实充值达到6元才可发言" + if chanel and chanel=="XQDC" then + this.noInputTip:GetComponent("Text").text = "等级达到20级且折扣后真实充值达到6元才可发言" + else + this.noInputTip:GetComponent("Text").text = "等级达到20级且折扣后真实充值达到100元才可发言" + end + end elseif this._CurChannel == CHAT_CHANNEL.FRIEND or this._CurChannel == CHAT_CHANNEL.SYSTEM then this.input:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index e208334186..6f5b42e29c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -452,7 +452,7 @@ function this.RequestProtos(userId) Log("用户和隐私协议功能未开启") return end - local chanel= SDKMgr:GetChannel() + local chanel= AppConst.SdkChannel local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel local PackageID = PackageManager.GetPackageID() if PackageID then @@ -477,7 +477,7 @@ function this.RequestProtos(userId) end if UrlList[1] ~= "" and UrlList[2] ~="" then this.protos:SetActive(true) - if chanel=="YGDC" or chanel=="XQDC" then + if chanel and (chanel=="YGDC" or chanel=="XQDC") then this.newproto:SetActive(true) else this.newproto:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 965d4bb8f5..c401020e0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -50,7 +50,7 @@ function this.SetBasicValues(giftGoodsList) if rechargeConfigLocal then LogBlue("礼包类型:"..tostring(rechargeConfigLocal.Type).." 礼包ID:"..tostring(giftGoodsInfo.goodsId).." 已购:"..tostring(giftGoodsInfo.buyTimes) .."次 开始时间:"..tostring(giftGoodsInfo.startTime).." 结束时间:"..tostring(giftGoodsInfo.endTime).. " 可购:" ..tostring(giftGoodsInfo.dynamicBuyTimes).." 是否已买:"..tostring(giftGoodsInfo.isBought)) - if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8 ) and (rechargeConfigLocal.Package == 2 and SDKMgr:GetChannel()=="XQDC") then + if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8 ) and (rechargeConfigLocal.Package == 2 and AppConst.SdkChannel=="XQDC") then else if giftGoodsInfoList[rechargeConfigLocal.Type] then table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)