From d084904f33ea58225aea054b9961dacf9e560fbf Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 18 May 2021 16:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E5=91=8A=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=AC=E5=91=8A=E9=80=9A=E9=81=93=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 09d0c8a3eb..5ec3028a4d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -10,6 +10,8 @@ ServerConfigManager.SettingConfig = { UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 屏幕适配 IS_PLAY_VOICE = "IS_PLAY_VOICE", -- 是否播放游戏内语音 IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示 + NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号 + PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号 } diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index ae5a386e2f..555de111e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -20,7 +20,7 @@ local LoginRoot_SubChannel = ServerConfigManager.GetVersionInfo("subChannel") local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel") local LoginRoot_Version = ServerConfigManager.GetVersionInfo("version") local LoginRoot_PackageVersion = ServerConfigManager.GetVersionInfo("packageVersion") -local LoginRoot_NoticeChannel = ServerConfigManager.GetVersionInfo("noticeChannel") or "" +local LoginRoot_NoticeChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.NOTICE_CHANNEL) or "" local orginLayer local timeStamp = Time.realtimeSinceStartup diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs index 976cc9492e..7e65257c9f 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs @@ -241,7 +241,7 @@ namespace GameEditor.FrameTool { public string packageVersion; public string version; public string serverUrl; - public string noticeChannel; + //public string noticeChannel; } @@ -339,8 +339,8 @@ namespace GameEditor.FrameTool { m_VersionTxt.packageVersion = EditorGUILayout.TextField("", m_VersionTxt.packageVersion); EditorGUILayout.LabelField("热更版本号:"); m_VersionTxt.version = EditorGUILayout.TextField("", m_VersionTxt.version); - EditorGUILayout.LabelField("公告:"); - m_VersionTxt.noticeChannel = EditorGUILayout.TextField("", m_VersionTxt.noticeChannel); + //EditorGUILayout.LabelField("公告:"); + //m_VersionTxt.noticeChannel = EditorGUILayout.TextField("", m_VersionTxt.noticeChannel); EditorGUILayout.EndVertical(); if (GUILayout.Button("应用", GUILayout.Height(40f)))