Merge branch 'china/dev_bt' into china/dev_bt_develop

dev_chengFeng
wangzhenxing 2023-04-04 16:55:09 +08:00
commit e4de1d7188
3 changed files with 7 additions and 3 deletions

View File

@ -11564,6 +11564,9 @@ local passivityList = {
if skill and not skill.isTriggerJudge and judge==1 then
return
end
if skill==nil then
return
end
if skill.type~=BattleSkillType.Special then
return
end

View File

@ -214,13 +214,13 @@ function this.OnTabChange(index, lastIndex)
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
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and state>0 then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) then
this.input:SetActive(true)
this.noInputTip:SetActive(false)
else
this.input:SetActive(false)
this.noInputTip:SetActive(true)
this.noInputTip:GetComponent("Text").text = "等级达到20级且开通超级GM特权才可发言"
this.noInputTip:GetComponent("Text").text = "等级达到20级才可发言"
end
elseif this._CurChannel == CHAT_CHANNEL.FRIEND or this._CurChannel == CHAT_CHANNEL.SYSTEM then
this.input:SetActive(false)

View File

@ -434,7 +434,8 @@ function this._TimeUpdate()
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) then
local config=ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.CARDELAY)
if config then
this.timeText.text = config.OpenRules[1][2].."级开启"
LogError("config.OpenRules[1][2]=="..config.OpenRules[2])
this.timeText.text = config.OpenRules[2].."级开启"
else
this.timeText.text = "50级开启"
end