diff --git a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab index 721e2ee20f..2cc6f1d37c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab @@ -1232,7 +1232,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6425339784358585307 RectTransform: m_ObjectHideFlags: 0 @@ -21010,7 +21010,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8147778913635139471 RectTransform: m_ObjectHideFlags: 0 @@ -21027,8 +21027,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 90} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 59, y: 90} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7399324483747271151 CanvasRenderer: @@ -21060,7 +21060,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -21071,7 +21071,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u8BE5\u9891\u9053\u4E0B\u65E0\u6CD5\u53D1\u8A00" + m_Text: "\u7B49\u7EA7\u8FBE\u523020\u7EA7\u4E14\u5F00\u901A\u8D85\u7EA7GM\u7279\u6743\u624D\u53EF\u53D1\u8A00" LanguageIndex: 0 --- !u!1 &6559912417954526918 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 0c49160af9..c8b97f9cdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -212,13 +212,15 @@ function this.OnTabChange(index, lastIndex) -- 是否能够发言 this._CurChannel = _TabData[index].channel if this._CurChannel == CHAT_CHANNEL.FAMILY or this._CurChannel == CHAT_CHANNEL.GLOBAL or this._CurChannel == CHAT_CHANNEL.JUMP_SERVER then - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) then + local mission=ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan,2202) + local state=mission.state + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CHAT) and state>0 then this.input:SetActive(true) this.noInputTip:SetActive(false) else this.input:SetActive(false) this.noInputTip:SetActive(true) - this.noInputTip:GetComponent("Text").text = Language[10353] + this.noInputTip:GetComponent("Text").text = "等级达到20级且开通超级GM特权才可发言" end elseif this._CurChannel == CHAT_CHANNEL.FRIEND or this._CurChannel == CHAT_CHANNEL.SYSTEM then this.input:SetActive(false)