diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 7dde8d856d..2dcc210eed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index c8b97f9cdd..5452d58bb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 4052cdeadb..57dba28aba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -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