Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-20 5e5551e8e7630f816a68c7bbe554a7e0bfa8705f

 System/MainInterfacePanel/CardLevelTaskButton.cs

@@ -87,7 +87,7 @@
            var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[taskID].InforList);
            if (config == null)
            {
                DesignDebug.LogError("配置表格出错");
                DebugEx.LogError("配置表格出错");
            }
            for (int i = 0; i < MainlineTaskType.Length; i++)
            {